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

Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

Browse Source 
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
Caiyanpeng committed 2021-09-28 11:30:08 +08:00
2 parents c73545d912 75900ccf3d
commit 5bd1c3b1ca
278 files changed
+19740 -112
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Common/Mobile/Loading.prefab
+1 -1
View File
@@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 308, y: 222}
m_SizeDelta: {x: 360, y: 360}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6067144360479621595
CanvasRenderer: