Merge remote-tracking branch 'origin/dev' into dev_cyp
This commit is contained in:
commit
d1d9c92f1c
40 files changed
+2954
-4271
No files matched your search
@@ -5,6 +5,9 @@ EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/MainScene.unity
|
||||
guid: ab586a3c1bacd4a48a55178eb06fe0cc
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/1-Login.unity
|
||||
guid: 6dce3e17997730b4492f91dd8fede429
|
||||
|
||||
Reference in new issue
Block a user