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

Merge remote-tracking branch 'origin/dev' into dev_lishuo

Browse Source 
# Conflicts:
#	Assets/Mapbox/User/Modifiers.meta
#	Assets/Resources/UI/Control/PFUISlider.prefab.meta
#	Assets/StreamingAssets.meta
This commit is contained in:
lishuo committed 2021-04-21 14:09:34 +08:00
2 parents e7ad9473a5 1c712ff7d5
commit 40d118cea3
39 files changed
+7928 -2275
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Mapbox/User/Modifiers.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 9281e8bf86b8d70459ba6c65898fee31
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: