diff --git a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab index 198c713c79..3b46765295 100644 --- a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab @@ -490,7 +490,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 173035024924221736} + m_Father: {fileID: 4377297715282720494} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -682,7 +682,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 173035024924221736} + m_Father: {fileID: 4377297715282720494} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -833,7 +833,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 173035024924221736} + m_Father: {fileID: 4377297715282720494} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1074,12 +1074,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 173035024924221736} + m_Father: {fileID: 4377297715282720494} 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} - m_AnchoredPosition: {x: 0.0000012715682, y: -84.1} + m_AnchoredPosition: {x: 0, y: -84.1} m_SizeDelta: {x: 64.4, y: 37.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &173035024562447181 @@ -1379,8 +1379,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.0083923, y: -492.34967} - m_SizeDelta: {x: 929.85, y: -1322.6} + m_AnchoredPosition: {x: 0, y: -475.2} + m_SizeDelta: {x: 929.8, y: -1239.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &173035024914206083 CanvasRenderer: @@ -1429,6 +1429,7 @@ GameObject: m_Component: - component: {fileID: 173035024924221736} - component: {fileID: 173035024924221739} + - component: {fileID: 2277598051074647944} m_Layer: 5 m_Name: equipPre m_TagString: Untagged @@ -1447,13 +1448,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 173035024044824782} - - {fileID: 173035024319700656} - - {fileID: 6961650406877088323} - - {fileID: 173035024562447171} - - {fileID: 173035026078594646} - - {fileID: 173035023964388908} - - {fileID: 80173930009964820} + - {fileID: 4377297715282720494} m_Father: {fileID: 4397479298825062296} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1470,6 +1465,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 173035024924221737} m_CullTransparentMesh: 0 +--- !u!114 &2277598051074647944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173035024924221737} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -20, 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: 4377297715282720494} + - 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: 4377297715282720494} + - 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: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 4377297715282720494} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &173035025018043091 GameObject: m_ObjectHideFlags: 0 @@ -2802,11 +2852,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 173035026078594647} - 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: 173035024924221736} + m_Father: {fileID: 4377297715282720494} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3234,9 +3284,9 @@ RectTransform: m_Father: {fileID: 1301495729145041487} 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: 0, y: -50} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &333376664040560257 @@ -3314,9 +3364,9 @@ RectTransform: m_Father: {fileID: 1301495729145041487} 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: 197.71, y: -50} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &333376664151362643 @@ -3850,6 +3900,7 @@ GameObject: m_Component: - component: {fileID: 6411121460683469980} - component: {fileID: 8140873250175168331} + - component: {fileID: 855829325810273979} m_Layer: 5 m_Name: equipPre m_TagString: Untagged @@ -3868,13 +3919,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4122877755543955406} - - {fileID: 8829651664474203959} - - {fileID: 3878367276810287454} - - {fileID: 7291176350439359246} - - {fileID: 4971482571803648380} - - {fileID: 4969538680224614470} - - {fileID: 6075002979138424878} + - {fileID: 2737538918811415485} m_Father: {fileID: 4238521044405819011} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3891,6 +3936,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794177181286338631} m_CullTransparentMesh: 0 +--- !u!114 &855829325810273979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794177181286338631} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -20, 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: 2737538918811415485} + - 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: 2737538918811415485} + - 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: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 2737538918811415485} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &803987117256222226 GameObject: m_ObjectHideFlags: 0 @@ -4068,12 +4168,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 761216932126479290} + m_Father: {fileID: 6076787007939389549} 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} - m_AnchoredPosition: {x: 0.0000012715682, y: -84.1} + m_AnchoredPosition: {x: 0, y: -84.1} m_SizeDelta: {x: 64.4, y: 37.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &641605568867831018 @@ -9719,7 +9819,7 @@ ParticleSystem: --- !u!199 &1083645269967354099 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10110,7 +10210,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -10827,7 +10927,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 761216932126479290} + m_Father: {fileID: 6076787007939389549} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12155,6 +12255,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2000805982699022394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2737538918811415485} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2737538918811415485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000805982699022394} + 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: 4122877755543955406} + - {fileID: 8829651664474203959} + - {fileID: 3878367276810287454} + - {fileID: 7291176350439359246} + - {fileID: 4971482571803648380} + - {fileID: 4969538680224614470} + - {fileID: 6075002979138424878} + m_Father: {fileID: 6411121460683469980} + 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: 150.41, y: 179.24} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2066087396968331785 GameObject: m_ObjectHideFlags: 0 @@ -12321,7 +12463,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 761216932126479290} + m_Father: {fileID: 6076787007939389549} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12396,7 +12538,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 761216932126479290} + m_Father: {fileID: 6076787007939389549} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12510,7 +12652,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 761216932126479290} + m_Father: {fileID: 6076787007939389549} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -14254,10 +14396,10 @@ RectTransform: m_Father: {fileID: 462842546081780959} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 534, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5170376102302170640 CanvasRenderer: @@ -15148,6 +15290,7 @@ GameObject: m_Component: - component: {fileID: 5332558558999968326} - component: {fileID: 5030238110021769745} + - component: {fileID: 8425794216536068849} m_Layer: 5 m_Name: equipPre m_TagString: Untagged @@ -15188,6 +15331,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3433514866375936824} m_CullTransparentMesh: 0 +--- !u!114 &8425794216536068849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3433514866375936824} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -20, 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: 0} + - 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: 0} + - 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: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 0} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &3447043568196997151 GameObject: m_ObjectHideFlags: 0 @@ -19909,7 +20107,7 @@ ParticleSystem: --- !u!199 &8451515492985319499 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20230,12 +20428,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} 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} - m_AnchoredPosition: {x: 0.0000012715682, y: -84.1} + m_AnchoredPosition: {x: 0, y: -84.1} m_SizeDelta: {x: 64.4, y: 37.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6470398465757734508 @@ -25133,7 +25331,7 @@ ParticleSystem: --- !u!199 &6598447891554960103 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25615,10 +25813,10 @@ RectTransform: m_Father: {fileID: 462842546081780959} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 346, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4601091411996965119 CanvasRenderer: @@ -25915,11 +26113,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4498883541644521720} - 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: 761216932126479290} + m_Father: {fileID: 6076787007939389549} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -26983,10 +27181,10 @@ RectTransform: m_Father: {fileID: 462842546081780959} m_RootOrder: 3 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: 722, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6948744261597523614 CanvasRenderer: @@ -27166,11 +27364,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5188116232032911361} - 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: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -27551,7 +27749,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -33919,7 +34117,7 @@ ParticleSystem: --- !u!199 &5882379970318000206 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35719,6 +35917,7 @@ GameObject: m_Component: - component: {fileID: 761216932126479290} - component: {fileID: 387188541047370733} + - component: {fileID: 1533649665548603960} m_Layer: 5 m_Name: equipPre m_TagString: Untagged @@ -35737,12 +35936,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2284584958303568675} - - {fileID: 2284948366073915321} - - {fileID: 643101345874072414} - - {fileID: 504370525425354330} - - {fileID: 9134737607493978811} - - {fileID: 1497742950057136408} + - {fileID: 6076787007939389549} m_Father: {fileID: 217968288355428412} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -35759,6 +35953,102 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8013914269468615364} m_CullTransparentMesh: 0 +--- !u!114 &1533649665548603960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8013914269468615364} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -20, 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: 6076787007939389549} + - 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: 6076787007939389549} + - 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: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 6076787007939389549} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 +--- !u!1 &8024679170016953206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6076787007939389549} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6076787007939389549 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8024679170016953206} + 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: 2284584958303568675} + - {fileID: 2284948366073915321} + - {fileID: 643101345874072414} + - {fileID: 504370525425354330} + - {fileID: 9134737607493978811} + - {fileID: 1497742950057136408} + m_Father: {fileID: 761216932126479290} + 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: 150.41, y: 179.24} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8032578843263420831 GameObject: m_ObjectHideFlags: 0 @@ -35788,7 +36078,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -36199,12 +36489,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.000045776367, y: 36.91004} + m_AnchoredPosition: {x: -25.20491, y: -2.7099533} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} --- !u!1 &8639826644056209216 @@ -36350,7 +36640,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411121460683469980} + m_Father: {fileID: 2737538918811415485} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -36519,7 +36809,7 @@ RectTransform: m_Children: - {fileID: 8427847367349070885} - {fileID: 2898105087065902420} - m_Father: {fileID: 173035024924221736} + m_Father: {fileID: 4377297715282720494} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} @@ -36775,7 +37065,7 @@ RectTransform: m_Children: - {fileID: 7185374841457457045} - {fileID: 1446635057907152230} - m_Father: {fileID: 173035024924221736} + m_Father: {fileID: 4377297715282720494} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -36817,10 +37107,10 @@ RectTransform: m_Father: {fileID: 462842546081780959} 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: 158, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &279566617621062442 CanvasRenderer: @@ -37018,6 +37308,48 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &9165355004160257323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4377297715282720494} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4377297715282720494 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9165355004160257323} + 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: 173035024044824782} + - {fileID: 173035024319700656} + - {fileID: 6961650406877088323} + - {fileID: 173035024562447171} + - {fileID: 173035026078594646} + - {fileID: 173035023964388908} + - {fileID: 80173930009964820} + m_Father: {fileID: 173035024924221736} + 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: 150.41, y: 179.24} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9175191194959260715 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua index aa8186f4fe..c69c1fe150 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua @@ -110,6 +110,12 @@ function this.OnClickTabBtn(_curIndex) this.SingleItemDataShow(go, equipDatas[index],equipStarsConfig[equipDatas[index].Star]) end) this.ShowTitleData(equipStarsConfig[curSelectEquip.Star]) + this.ScrollView:ForeachItemGO(function(index, go) + Timer.New(function() + go.gameObject:SetActive(true) + PlayUIAnim(go.gameObject) + end, 0.001 * (index - 1)):Start() + end) end function this.ShowTitleData(curEquipStarsConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua index c2275e22af..d4209b262b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua @@ -90,6 +90,12 @@ function this.OnShowData() this.ScrollView:SetData(soulPrintDatas, function (index, go) this.SingleItemDataShow(go, soulPrintDatas[index]) end) + this.ScrollView:ForeachItemGO(function(index, go) + Timer.New(function() + go.gameObject:SetActive(true) + PlayUIAnim(go.gameObject) + end, 0.001 * (index - 1)):Start() + end) sortingOrder2 = sortingOrder end function this.ShowGoldNum(equipSign) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 91971b19eb..3b5a75dd55 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -97,7 +97,12 @@ function this.ShowCurrPosTreasures() this.ScrollView:SetData(equipDatas, function (index, go) this.SingleItemDataShow(go, equipDatas[index]) end) - + this.ScrollView:ForeachItemGO(function(index, go) + Timer.New(function() + go.gameObject:SetActive(true) + PlayUIAnim(go.gameObject) + end, 0.001 * (index - 1)):Start() + end) end --设置按钮选中