Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
ff3c5f147e
Binary file not shown.
Binary file not shown.
|
|
@ -111,9 +111,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2199965736590105517}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 139, y: 62}
|
||||
m_SizeDelta: {x: 278, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &327594048
|
||||
|
|
@ -1071,6 +1071,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 224114314216780152}
|
||||
- component: {fileID: 222698783592158610}
|
||||
- component: {fileID: 231900065013038523}
|
||||
m_Layer: 5
|
||||
m_Name: page_2
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1108,6 +1109,100 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1520310459542706}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &231900065013038523
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1520310459542706}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 318, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 338, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 224291194868403116}
|
||||
- initV3: {x: 0, y: -350, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: -330, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 444703403}
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 1.15, y: 1.15, z: 1.15}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 444703403}
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 1.15, y: 1.15, z: 1.15}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 224291194868403116}
|
||||
- initV3: {x: 1.15, y: 1.15, z: 1.15}
|
||||
initFloat: 0
|
||||
isInit: 0
|
||||
changeV3: {x: 1, y: 1, z: 1}
|
||||
changeFloat: 0
|
||||
duration: 0.2
|
||||
delay: 0.3
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 224291194868403116}
|
||||
- initV3: {x: 1.15, y: 1.15, z: 1.15}
|
||||
initFloat: 0
|
||||
isInit: 0
|
||||
changeV3: {x: 1, y: 1, z: 1}
|
||||
changeFloat: 0
|
||||
duration: 0.2
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 444703403}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 1
|
||||
--- !u!1 &1531894272219114
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1464,7 +1559,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -0.0000076293945, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &222100271953241440
|
||||
|
|
@ -1614,14 +1709,14 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 32768560072745213}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 9088936014447285928}
|
||||
- {fileID: 9089353588579488963}
|
||||
m_Father: {fileID: 2924517106368601152}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 5508011536928199910}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -2414,8 +2509,8 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 563237265199161640}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 4360329824225806819}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -3499,6 +3594,47 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: (0/30)
|
||||
--- !u!1 &840332189626918327
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4360329824225806819}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4360329824225806819
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 840332189626918327}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3968611324517669801}
|
||||
- {fileID: 998547832838250492}
|
||||
- {fileID: 4569623759690158786}
|
||||
- {fileID: 5634794037942938247}
|
||||
- {fileID: 2248610908997595937}
|
||||
- {fileID: 8906977163640189163}
|
||||
m_Father: {fileID: 563237265199161640}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1079, y: 222}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &878582022375169147
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3657,7 +3793,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5615828735167990986
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8705,6 +8841,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3506946013066069159}
|
||||
- component: {fileID: 6627258998995166970}
|
||||
- component: {fileID: 1950286511315828216}
|
||||
m_Layer: 5
|
||||
m_Name: itemPro
|
||||
m_TagString: Untagged
|
||||
|
|
@ -8740,6 +8877,35 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1092110567069061419}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1950286511315828216
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1092110567069061419}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 5216500300360272989}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &1181266593738038207
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -24268,9 +24434,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2199965736590105517}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 641, y: 62}
|
||||
m_SizeDelta: {x: 278, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6393442140888169436
|
||||
|
|
@ -34678,7 +34844,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -5}
|
||||
m_SizeDelta: {x: 0, y: 1}
|
||||
m_SizeDelta: {x: 780, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2199965736590105504
|
||||
CanvasRenderer:
|
||||
|
|
@ -35358,18 +35524,18 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2539570355885575054}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1329770250990912199}
|
||||
- {fileID: 1420061579026952015}
|
||||
m_Father: {fileID: 563237265199161640}
|
||||
m_RootOrder: 3
|
||||
m_Father: {fileID: 4360329824225806819}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -198, y: 0}
|
||||
m_AnchoredPosition: {x: -200, y: 0}
|
||||
m_SizeDelta: {x: 210, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1540079820545720113
|
||||
|
|
@ -55663,16 +55829,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3135189428327624307}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 563237265199161640}
|
||||
m_RootOrder: 4
|
||||
m_Father: {fileID: 4360329824225806819}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -198, y: 0}
|
||||
m_AnchoredPosition: {x: 291.5, y: 0}
|
||||
m_SizeDelta: {x: 128, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4396020523891365893
|
||||
|
|
@ -55877,12 +56043,12 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3168616876640495851}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2924517106368601152}
|
||||
m_RootOrder: 4
|
||||
m_Father: {fileID: 5508011536928199910}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -66111,7 +66277,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 563237265199161640}
|
||||
- component: {fileID: 754817880113616929}
|
||||
- component: {fileID: 5890019827306121965}
|
||||
- component: {fileID: 6498641700355309772}
|
||||
m_Layer: 5
|
||||
m_Name: ItemPre
|
||||
m_TagString: Untagged
|
||||
|
|
@ -66130,11 +66296,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 998547832838250492}
|
||||
- {fileID: 4569623759690158786}
|
||||
- {fileID: 5634794037942938247}
|
||||
- {fileID: 2248610908997595937}
|
||||
- {fileID: 8906977163640189163}
|
||||
- {fileID: 4360329824225806819}
|
||||
m_Father: {fileID: 863016053}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -66151,35 +66313,35 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3596373170249733097}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5890019827306121965
|
||||
--- !u!114 &6498641700355309772
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3596373170249733097}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 9cf858f8b245d364a84fe80c411a5e76, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 4360329824225806819}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &3665995632461046258
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -76639,9 +76801,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2199965736590105517}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 390, y: 62}
|
||||
m_SizeDelta: {x: 278, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1714597984582524258
|
||||
|
|
@ -78682,6 +78844,154 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4954321097826904504
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3968611324517669801}
|
||||
- component: {fileID: 6286540561692478435}
|
||||
- component: {fileID: 8668016671690575119}
|
||||
m_Layer: 5
|
||||
m_Name: tiao
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3968611324517669801
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954321097826904504}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4360329824225806819}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6286540561692478435
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954321097826904504}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8668016671690575119
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4954321097826904504}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 9cf858f8b245d364a84fe80c411a5e76, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5024369005553145120
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2816240849483154346}
|
||||
- component: {fileID: 4605502330294474367}
|
||||
- component: {fileID: 7248186498776422940}
|
||||
m_Layer: 5
|
||||
m_Name: tiao
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2816240849483154346
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5024369005553145120}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5508011536928199910}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4605502330294474367
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5024369005553145120}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7248186498776422940
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5024369005553145120}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 064b311ca0c97a0438a84c77d7271da7, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5105486057348059079
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -89515,14 +89825,14 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5710886440702187341}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 901868829}
|
||||
- {fileID: 7305974942792532435}
|
||||
m_Father: {fileID: 563237265199161640}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 4360329824225806819}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -89552,13 +89862,13 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5751583284864658793}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 194586983384993300}
|
||||
m_Father: {fileID: 563237265199161640}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 4360329824225806819}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -89862,15 +90172,15 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6097593520329571519}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7002425998312134743}
|
||||
- {fileID: 197343560864776484}
|
||||
- {fileID: 3352408273144539857}
|
||||
m_Father: {fileID: 2924517106368601152}
|
||||
m_RootOrder: 3
|
||||
m_Father: {fileID: 5508011536928199910}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
@ -94855,8 +95165,8 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2924517106368601152}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 5508011536928199910}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -100185,6 +100495,47 @@ ParticleSystemRenderer:
|
|||
m_Mesh2: {fileID: 0}
|
||||
m_Mesh3: {fileID: 0}
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &6488820786110482633
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5508011536928199910}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5508011536928199910
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6488820786110482633}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2816240849483154346}
|
||||
- {fileID: 8941189206087909222}
|
||||
- {fileID: 632442217117464314}
|
||||
- {fileID: 151631391564263469}
|
||||
- {fileID: 8535956605462728217}
|
||||
- {fileID: 4514060143372939764}
|
||||
m_Father: {fileID: 2924517106368601152}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1080, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6556588511537999546
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -120653,10 +121004,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2173812392418515848}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 140, y: -87}
|
||||
m_SizeDelta: {x: 150, y: 134}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3176581777211206878
|
||||
CanvasRenderer:
|
||||
|
|
@ -132171,7 +132522,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2924517106368601152}
|
||||
- component: {fileID: 8843145044311152465}
|
||||
- component: {fileID: 6262034760256263984}
|
||||
- component: {fileID: 1350565985612100619}
|
||||
m_Layer: 5
|
||||
m_Name: ItemPre
|
||||
m_TagString: Untagged
|
||||
|
|
@ -132190,11 +132541,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8941189206087909222}
|
||||
- {fileID: 632442217117464314}
|
||||
- {fileID: 151631391564263469}
|
||||
- {fileID: 8535956605462728217}
|
||||
- {fileID: 4514060143372939764}
|
||||
- {fileID: 5508011536928199910}
|
||||
m_Father: {fileID: 4427077378120398490}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -132211,35 +132558,35 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8030597526205519662}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6262034760256263984
|
||||
--- !u!114 &1350565985612100619
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8030597526205519662}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 064b311ca0c97a0438a84c77d7271da7, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
tweenSequeue:
|
||||
- initV3: {x: 230, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.15
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 5508011536928199910}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &8093168888230901033
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -132275,7 +132622,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -8.5}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -540.86, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &6538759313221513635
|
||||
MonoBehaviour:
|
||||
|
|
@ -132352,7 +132699,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 154}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &6671191003300140796
|
||||
CanvasRenderer:
|
||||
|
|
@ -132578,13 +132925,13 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8260052436792020870}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 6828991179878766596}
|
||||
m_Father: {fileID: 2924517106368601152}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 5508011536928199910}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
|
|||
|
|
@ -5620,7 +5620,7 @@ ParticleSystem:
|
|||
--- !u!199 &6259170830804911733
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -10425,7 +10425,7 @@ ParticleSystem:
|
|||
--- !u!199 &7663224388703278961
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15813,7 +15813,7 @@ ParticleSystem:
|
|||
--- !u!199 &8731954686797860230
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15990,7 +15990,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 170.8, y: 0, z: 180}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -61.88916, y: -597}
|
||||
m_AnchoredPosition: {x: -34, y: -669}
|
||||
m_SizeDelta: {x: 549, y: 135}
|
||||
m_Pivot: {x: 0, y: 0.46}
|
||||
--- !u!222 &8799478995309223127
|
||||
|
|
@ -20696,7 +20696,7 @@ ParticleSystem:
|
|||
--- !u!199 &8433999198031367376
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25457,7 +25457,7 @@ ParticleSystem:
|
|||
--- !u!199 &3108859455760721518
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25606,6 +25606,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 8894499022537600995}
|
||||
- component: {fileID: 840746498085804288}
|
||||
- component: {fileID: 3851857610972387640}
|
||||
m_Layer: 5
|
||||
m_Name: Pre
|
||||
m_TagString: Untagged
|
||||
|
|
@ -25624,17 +25625,13 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1629927164610522929}
|
||||
- {fileID: 5639553083932582212}
|
||||
- {fileID: 5084471964954372020}
|
||||
- {fileID: 20411050760171557}
|
||||
- {fileID: 8807871667260928089}
|
||||
- {fileID: 481795990949624217}
|
||||
m_Father: {fileID: 6447950466076688394}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1080, y: -1557.15}
|
||||
m_AnchoredPosition: {x: 540, y: -597.15}
|
||||
m_SizeDelta: {x: 1010, y: 362}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &840746498085804288
|
||||
|
|
@ -25645,6 +25642,35 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3831279955435173212}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3851857610972387640
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3831279955435173212}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: -1000, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 481795990949624217}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &3871477573993352174
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -25821,11 +25847,11 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4575774280842539614}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8894499022537600995}
|
||||
m_Father: {fileID: 481795990949624217}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -30613,7 +30639,7 @@ ParticleSystem:
|
|||
--- !u!199 &8993958049925528917
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -35889,7 +35915,7 @@ ParticleSystem:
|
|||
--- !u!199 &6352028774183577065
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -40592,7 +40618,7 @@ ParticleSystem:
|
|||
--- !u!199 &6341223334757385390
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -40676,11 +40702,11 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6747506837572112753}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8894499022537600995}
|
||||
m_Father: {fileID: 481795990949624217}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -40759,7 +40785,7 @@ RectTransform:
|
|||
- {fileID: 6538996507845315743}
|
||||
- {fileID: 8858376813385161282}
|
||||
- {fileID: 393803494939130447}
|
||||
m_Father: {fileID: 8894499022537600995}
|
||||
m_Father: {fileID: 481795990949624217}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -45775,7 +45801,7 @@ ParticleSystem:
|
|||
--- !u!199 &1364151743088453039
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -45868,7 +45894,7 @@ RectTransform:
|
|||
- {fileID: 2485244589506583548}
|
||||
- {fileID: 5401908618956169136}
|
||||
- {fileID: 8235184455388538258}
|
||||
m_Father: {fileID: 8894499022537600995}
|
||||
m_Father: {fileID: 481795990949624217}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -50727,7 +50753,7 @@ ParticleSystem:
|
|||
--- !u!199 &8405279735407594183
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -50815,7 +50841,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8894499022537600995}
|
||||
m_Father: {fileID: 481795990949624217}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -50905,6 +50931,46 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -275.90155, y: 337.75018}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8311552460376748282
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 481795990949624217}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &481795990949624217
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8311552460376748282}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1629927164610522929}
|
||||
- {fileID: 5639553083932582212}
|
||||
- {fileID: 5084471964954372020}
|
||||
- {fileID: 20411050760171557}
|
||||
- {fileID: 8807871667260928089}
|
||||
m_Father: {fileID: 8894499022537600995}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1010, y: 362}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8318712298413401496
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -55616,7 +55682,7 @@ ParticleSystem:
|
|||
--- !u!199 &1786108631160810919
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -95,4 +95,5 @@ SoundConfig = {
|
|||
Sound_dntg_qj ="UI_dntg_qj",
|
||||
Sound_dntg_cy ="UI_dntg_cy",
|
||||
Sound_all_switch ="UI_all_switch",
|
||||
Sound_interface ="UI_interface",
|
||||
}
|
||||
|
|
@ -48,10 +48,10 @@ function ArenaResultPopup:OnOpen(_args,_fun)
|
|||
local args = _args
|
||||
fun = _fun
|
||||
if not args then return end
|
||||
|
||||
this.realResult = args.result
|
||||
local panelType = args.panelType or 0
|
||||
local isWin = args.result == 1
|
||||
--王振兴修改
|
||||
local isWin = args.result.result == 1
|
||||
local blueInfo = args.blue
|
||||
local redInfo = args.red
|
||||
-- 如果我在防守方,交换数据,我要显示在蓝方
|
||||
|
|
|
|||
|
|
@ -2518,8 +2518,7 @@ local passivityList = {
|
|||
if skill.type == BattleSkillType.Special then
|
||||
local list = skill:GetDirectTargetsNoMiss()
|
||||
if list then
|
||||
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(pro) * f1))
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1))
|
||||
LogError(role:GetRoleData(pro).." ".. f1.." " .. tv)
|
||||
for _, r in ipairs(list) do
|
||||
local auraBuff = Buff.Create(role, BuffName.HOT, i1, 1, tv)
|
||||
|
|
@ -2543,7 +2542,7 @@ local passivityList = {
|
|||
if skill.type == BattleSkillType.Normal then
|
||||
local list = skill:GetDirectTargetsNoMiss()
|
||||
if list then
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(pro) * f1))
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1))
|
||||
LogError(role:GetRoleData(pro).." ".. f1.." " .. tv)
|
||||
for _, r in ipairs(list) do
|
||||
local auraBuff = Buff.Create(role, BuffName.HOT, i1, 1, tv)
|
||||
|
|
|
|||
|
|
@ -1014,6 +1014,8 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function this:OnShow()
|
||||
-- 音效
|
||||
SoundManager.PlaySound(SoundConfig.Sound_interface)
|
||||
isRefeshIcon = true
|
||||
this.vipLevelText.sprite = VipManager.SetVipLevelImg()
|
||||
timePressStarted = Time.realtimeSinceStartup
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ function this.RegisterMessage(network)
|
|||
--公户副本推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_BUY_BUFF_INDICATION, this.GuildChallengeBuyBuffIndication)
|
||||
--公户副本推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_FIVE_INDICATION, this.GuildChallengeFiveIndication)
|
||||
-- socket:RegistNetMessage(MessageTypeProto_pb.GUILD_CHALLENGE_FIVE_INDICATION, this.GuildChallengeFiveIndication)
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -786,9 +786,9 @@ function this.GuildChallengeBuyBuffIndication(buffer)
|
|||
-- LogGreen("%%%%%%%%%%%msg.buffCount: "..msg.buffCount.." msg.buffTime: "..msg.buffTime)
|
||||
GuildTranscriptManager.RefreshGuildTranscriptBuffInfo(msg)
|
||||
end
|
||||
function this.GuildChallengeFiveIndication(buffer)
|
||||
-- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ")
|
||||
GuildTranscriptManager.GuildChallengeFiveIndication()
|
||||
end
|
||||
-- function this.GuildChallengeFiveIndication(buffer)
|
||||
-- -- LogGreen("%%%%%%%%%%% 天宫副本五点推送更新是否可扫荡 ")
|
||||
-- GuildTranscriptManager.GuildChallengeFiveIndication()
|
||||
-- end
|
||||
|
||||
return this
|
||||
|
|
@ -3,7 +3,7 @@ local curGiftsId--当前礼包Id
|
|||
local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)--读取礼包任务信息
|
||||
local rewardNameConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)--读取奖励名称信息
|
||||
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
|
||||
local isPlayAnim = true
|
||||
local giftList = {
|
||||
[101] = 6,--表内没有礼包id(101、102、103、104、105)和ActivityId的对应关系,
|
||||
[102] = 7,
|
||||
|
|
@ -49,6 +49,7 @@ function GrowthGiftPage:BindEvent()
|
|||
end
|
||||
|
||||
function GrowthGiftPage:OnShow()
|
||||
isPlayAnim = true
|
||||
self.gameObject:SetActive(true)
|
||||
self:RefreshData()
|
||||
end
|
||||
|
|
@ -92,6 +93,10 @@ function GrowthGiftPage:RefreshGiftData()
|
|||
self:RefreshShowData(item, list[index])
|
||||
end
|
||||
self.scrollView:SetData(list, callBack)
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(self.scrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
end
|
||||
|
||||
--刷新每一条item
|
||||
|
|
@ -120,6 +125,12 @@ function GrowthGiftPage:RefreshShowData(item, data)
|
|||
local state = singleRewardData.state
|
||||
local isCanGetReward = PlayerManager.level >= actRewardConfig[data.Id].Values[1][2]
|
||||
|
||||
if isPlayAnim then
|
||||
item:SetActive(false)
|
||||
else
|
||||
item:SetActive(true)
|
||||
end
|
||||
|
||||
--设置滚动条
|
||||
if self.ItemList[item] then--如果已经存在在list中
|
||||
self.ItemList[item]:OnOpen(false, {shows[1][1],shows[1][2]}, 0.9,false,false,false,self.mainPanel.sortingOrder)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function MonthCardPage:OnShow()
|
|||
self.gameObject:SetActive(true)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, self.BuySuccess, self)
|
||||
-- 刷新显示
|
||||
|
||||
PlayUIAnim(self.gameObject)
|
||||
--差红点 差 倒计时关闭刷新
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||
local sortingOrder = 0
|
||||
local extra=nil--判断周、月礼包
|
||||
|
||||
local isPlayAnim = true
|
||||
local data = {
|
||||
[1]={picture = "m_meiyuelibao_banner1",picture2 = "m_meiyuelibao_banner11",}, --周礼包
|
||||
[2]={picture = "m_meiyuelibao_banner2",picture2 = "m_meiyuelibao_banner22",}, --月礼包
|
||||
|
|
@ -44,6 +44,7 @@ function WeekMonthGiftPackPage:BindEvent()
|
|||
end
|
||||
|
||||
function WeekMonthGiftPackPage:OnShow(_sortingOrder,extraTab)
|
||||
isPlayAnim = true
|
||||
sortingOrder = _sortingOrder
|
||||
extra=extraTab
|
||||
self:RefreshData()
|
||||
|
|
@ -89,6 +90,10 @@ function WeekMonthGiftPackPage:RefreshGiftData()
|
|||
self:RefreshShowData(item, shopData[index].data)
|
||||
end
|
||||
self.scrollView:SetData(shopData, callBack)
|
||||
if isPlayAnim then
|
||||
SecTorPlayAnimByScroll(self.scrollView)
|
||||
isPlayAnim = false
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -116,6 +121,11 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
|
|||
--limitNum = OperatingManager.GetLeftBuyTime(GoodsTypeDef.DirectPurchaseGift,data.goodsId)
|
||||
costId, finalNum, oriCostNum = nil,shopItemData.Price,nil
|
||||
|
||||
if isPlayAnim then
|
||||
item:SetActive(false)
|
||||
else
|
||||
item:SetActive(true)
|
||||
end
|
||||
|
||||
--滚动条复用重设itemview
|
||||
if self.ItemList[item] then
|
||||
|
|
|
|||
|
|
@ -27,7 +27,11 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||
-- 进入公会界面之前初始化一遍数据
|
||||
MyGuildManager.InitAllData(function()
|
||||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||
-- UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||
local openPanel = UIManager.GetOpenPanel(UIName.GuildMainCityPanel)
|
||||
if openPanel then
|
||||
openPanel:OnShow()
|
||||
end
|
||||
end)
|
||||
end
|
||||
else
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
|||
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
|
||||
local orginLayer = 0
|
||||
local isPlayAnim = true
|
||||
|
||||
--抽卡类型
|
||||
local rType={
|
||||
|
|
@ -105,6 +106,7 @@ function RecruitPanel:OnSortingOrderChange()
|
|||
end
|
||||
|
||||
function RecruitPanel:OnShow(...)
|
||||
isPlayAnim = true
|
||||
this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit })
|
||||
|
||||
this.UpdatePanelData()
|
||||
|
|
@ -144,6 +146,7 @@ function this.UpdatePanelData()
|
|||
o.name="Pre"..i
|
||||
preList[i]=o
|
||||
end
|
||||
preList[i]:SetActive(false)
|
||||
local bg=Util.GetGameObject(preList[i],"Bg"):GetComponent("Image")
|
||||
local time=Util.GetGameObject(preList[i],"Time"):GetComponent("Text")
|
||||
|
||||
|
|
@ -240,8 +243,9 @@ function this.UpdatePanelData()
|
|||
end
|
||||
end
|
||||
|
||||
this.TimeCountDown()
|
||||
SecTorPlayAnim(preList)
|
||||
|
||||
this.TimeCountDown()
|
||||
local num=BagManager.GetItemCountById(lotterySetting[RecruitType.RecruitBox].CostItem[1][1])
|
||||
RecruitManager.isCanOpenBox=num>=lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
|
||||
this.slider.fillAmount =num/lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
|
||||
|
|
|
|||
Loading…
Reference in New Issue