Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
9a96a31b14
|
@ -983,7 +983,7 @@ MonoBehaviour:
|
||||||
m_PressedTrigger: Pressed
|
m_PressedTrigger: Pressed
|
||||||
m_DisabledTrigger: Disabled
|
m_DisabledTrigger: Disabled
|
||||||
m_Interactable: 1
|
m_Interactable: 1
|
||||||
m_TargetGraphic: {fileID: 0}
|
m_TargetGraphic: {fileID: 3903038972123698790}
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
@ -1409,19 +1409,6 @@ MonoBehaviour:
|
||||||
loop: 0
|
loop: 0
|
||||||
loopType: 0
|
loopType: 0
|
||||||
targetObj: {fileID: 0}
|
targetObj: {fileID: 0}
|
||||||
- initV3: {x: 0, y: 0, z: 0}
|
|
||||||
initFloat: 0
|
|
||||||
isInit: 0
|
|
||||||
changeV3: {x: 0, y: 0, z: 0}
|
|
||||||
changeFloat: 1
|
|
||||||
duration: 0.2
|
|
||||||
delay: 0
|
|
||||||
curveType: 1
|
|
||||||
changeType: 8
|
|
||||||
sequeueType: 1
|
|
||||||
loop: 0
|
|
||||||
loopType: 0
|
|
||||||
targetObj: {fileID: 0}
|
|
||||||
- initV3: {x: 0.95, y: 0.95, z: 0.95}
|
- initV3: {x: 0.95, y: 0.95, z: 0.95}
|
||||||
initFloat: 0
|
initFloat: 0
|
||||||
isInit: 0
|
isInit: 0
|
||||||
|
|
Loading…
Reference in New Issue