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

Assets/Mapbox/Examples/2_AstronautGame/AstronautGame/Road/RoadMaterial.mat
+1 -1
View File
@@ -47,7 +47,7 @@ Material:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8d97105b69182cd48a279b7135b33a47, type: 3}
m_Scale: {x: 0.05, y: 1}
m_Offset: {x: -0.4964345, y: 0.2}
m_Offset: {x: -0.6767515, y: 0.2}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}