Merge branch 'master' of https://git.joywaygames.cn/basegames/zeling_v2
# Conflicts: # Assets/_Game/Data/Player/PLY_PlayerMovementConfig.asset # Assets/_Game/Scenes/Persistent.unity # ZeLing.sln
This commit is contained in:
@@ -14364,7 +14364,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 78aa6d3a73e834a4499f5988e78f28a6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_roomId:
|
||||
_roomId: FengXianMountain
|
||||
_spawnPoints:
|
||||
- {fileID: 442873751}
|
||||
_cameraArea: {fileID: 0}
|
||||
|
||||
Reference in New Issue
Block a user