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/Cyp/Prefab.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Core/Plugins/Mapbox.meta
#	Assets/Mapbox/Core/Plugins/Mapbox/MapboxAccounts.meta
#	Assets/Plugins/Circle/ImageWithRoundedCorners.cs
#	Assets/Resources/Images/Devices.meta
#	Assets/Resources/UI/Prefab/Item.meta
#	Assets/Scripts/Devices/Ant/LegacyPages.meta
#	Assets/Scripts/UI/Prefab/Item.meta
#	Assets/StreamingAssets.meta
#	ProjectSettings/EditorBuildSettings.asset
This commit is contained in:
lishuo committed 2021-04-01 14:09:23 +08:00
2 parents 2e6338bcf3 ec7589096f
commit ae9cefc645
144 files changed
+32337 -8064
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ProjectSettings/EditorBuildSettings.asset
-9
View File
@@ -11,15 +11,6 @@ EditorBuildSettings:
- enabled: 0
path: Assets/Scenes/MainScene.unity
guid: ab586a3c1bacd4a48a55178eb06fe0cc
- enabled: 0
path: Assets/Scenes/2-Main.unity
guid: 3dd2c8541f2a842469032565763e427d
- enabled: 0
path: Assets/Scenes/3-MapList.unity
guid: 9ec66d37a813b444181145203d30ca5e
- enabled: 0
path: Assets/Scenes/MainScene.unity
guid: ab586a3c1bacd4a48a55178eb06fe0cc
- enabled: 1
path: Assets/Scenes/Ride/Ride.unity
guid: d9f6ee75d0d54714fb4d2f90016a28bc