Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble
# Conflicts: # Assets/Scenes/Login-Mobile.unity
This commit is contained in:
lishuo committed
commit
939d6f1d0c
20 files changed
+1636
-1518
No files matched your search
+1334
-1422
File diff suppressed because it is too large.
Load diff
@@ -418,7 +418,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &684809390
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in new issue
Block a user