Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
dd232c96d7
|
|
@ -4775,7 +4775,7 @@ Animator:
|
|||
m_GameObject: {fileID: 21568434771266973}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: e0b6dc81a691f224995a2757b93715f8, type: 2}
|
||||
m_Controller: {fileID: 9100000, guid: 591dd23bf5432ce4488c46f82cee810f, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
|
|
@ -14832,7 +14832,7 @@ Animator:
|
|||
m_GameObject: {fileID: 21568436506758426}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: e0b6dc81a691f224995a2757b93715f8, type: 2}
|
||||
m_Controller: {fileID: 9100000, guid: 591dd23bf5432ce4488c46f82cee810f, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue