Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
0615469bb7
|
@ -105838,7 +105838,6 @@ GameObject:
|
||||||
- component: {fileID: 1992467313994325108}
|
- component: {fileID: 1992467313994325108}
|
||||||
- component: {fileID: 1377869764117395179}
|
- component: {fileID: 1377869764117395179}
|
||||||
- component: {fileID: 8791789729877601104}
|
- component: {fileID: 8791789729877601104}
|
||||||
- component: {fileID: 2758256526845086611}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: lock
|
m_Name: lock
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -105944,25 +105943,6 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!95 &2758256526845086611
|
|
||||||
Animator:
|
|
||||||
serializedVersion: 3
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5551026719691139111}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_Avatar: {fileID: 0}
|
|
||||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
|
||||||
m_CullingMode: 0
|
|
||||||
m_UpdateMode: 0
|
|
||||||
m_ApplyRootMotion: 0
|
|
||||||
m_LinearVelocityBlending: 0
|
|
||||||
m_WarningMessage:
|
|
||||||
m_HasTransformHierarchy: 1
|
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
|
||||||
--- !u!1 &5595811839997475725
|
--- !u!1 &5595811839997475725
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
Loading…
Reference in New Issue