lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_combine' into dev_release

Browse Source 
# Conflicts:
#	Assets/Scenes/Test.unity
#	Assets/SoftMaskForUGUI-1.0.2/Samples~/Demo/Mobile.meta
This commit is contained in:
Caiyanpeng committed 2022-07-15 13:35:28 +08:00
2 parents eeb9a42c83 4d0a383a88
commit bf3b0d2642
386 files changed
+26250 -66181
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/Test.unity.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9ec66d37a813b444181145203d30ca5e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Test2.unity
-1816
View File
File diff suppressed because it is too large. Load diff
Assets/Scenes/Test2.unity.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3d0269b6fae5e324d9275b72e070b1e7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: