Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
commit
9c15d51669
|
@ -1332,7 +1332,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &2221885512223848565
|
--- !u!224 &2221885512223848565
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -2104,19 +2104,6 @@ MonoBehaviour:
|
||||||
loop: 0
|
loop: 0
|
||||||
loopType: 0
|
loopType: 0
|
||||||
targetObj: {fileID: 2423465471356683207}
|
targetObj: {fileID: 2423465471356683207}
|
||||||
- initV3: {x: 0, y: 0, z: 0}
|
|
||||||
initFloat: 0
|
|
||||||
isInit: 0
|
|
||||||
changeV3: {x: 0, y: 0, z: 0}
|
|
||||||
changeFloat: 1
|
|
||||||
duration: 1
|
|
||||||
delay: 0
|
|
||||||
curveType: 7
|
|
||||||
changeType: 8
|
|
||||||
sequeueType: 1
|
|
||||||
loop: 0
|
|
||||||
loopType: 0
|
|
||||||
targetObj: {fileID: 2423465471356683207}
|
|
||||||
isPlayAudio: 1
|
isPlayAudio: 1
|
||||||
isHaveCloseBtn: 0
|
isHaveCloseBtn: 0
|
||||||
isPlayOnOpen: 1
|
isPlayOnOpen: 1
|
||||||
|
|
|
@ -17257,19 +17257,6 @@ MonoBehaviour:
|
||||||
loop: 0
|
loop: 0
|
||||||
loopType: 0
|
loopType: 0
|
||||||
targetObj: {fileID: 2925180131101153177}
|
targetObj: {fileID: 2925180131101153177}
|
||||||
- initV3: {x: 0, y: 0, z: 0}
|
|
||||||
initFloat: 0
|
|
||||||
isInit: 0
|
|
||||||
changeV3: {x: 0, y: 0, z: 0}
|
|
||||||
changeFloat: 1
|
|
||||||
duration: 1
|
|
||||||
delay: 0
|
|
||||||
curveType: 7
|
|
||||||
changeType: 8
|
|
||||||
sequeueType: 1
|
|
||||||
loop: 0
|
|
||||||
loopType: 0
|
|
||||||
targetObj: {fileID: 2925180131101153177}
|
|
||||||
isPlayAudio: 1
|
isPlayAudio: 1
|
||||||
isHaveCloseBtn: 0
|
isHaveCloseBtn: 0
|
||||||
isPlayOnOpen: 1
|
isPlayOnOpen: 1
|
||||||
|
|
Loading…
Reference in New Issue