Merge branch 'master' of https://git.joywaygames.cn/basegames/zeling_v2
# Conflicts: # Assets/_Game/Scenes/Persistent.unity
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1074
Assets/_Game/Scenes/Testings/MainMenu.unity
Normal file
1074
Assets/_Game/Scenes/Testings/MainMenu.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/_Game/Scenes/Testings/MainMenu.unity.meta
Normal file
7
Assets/_Game/Scenes/Testings/MainMenu.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2a1ec0c1f9a64054f95911d1cda97f6e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -183,7 +183,7 @@ Camera:
|
||||
height: 1
|
||||
near clip plane: 0.1
|
||||
far clip plane: 5000
|
||||
field of view: 10
|
||||
field of view: 40
|
||||
orthographic: 0
|
||||
orthographic size: 10
|
||||
m_Depth: -1
|
||||
@@ -210,7 +210,7 @@ Transform:
|
||||
m_GameObject: {fileID: 265623115}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.19243693, y: -1.6213, z: -64}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user