diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index c2919ea291..0704e63524 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -104,7 +104,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1422410143328681534} - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -716,7 +716,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -870,7 +870,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2832,7 +2832,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3098,7 +3098,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4424,7 +4424,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4978,7 +4978,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5053,7 +5053,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8014293004056704312} - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5098,6 +5098,53 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4231405200606131463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2637400333458500407} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2637400333458500407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4231405200606131463} + 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: 2159214501237603423} + - {fileID: 2665612519152056609} + - {fileID: 4202284676437252242} + - {fileID: 8132837340443460501} + - {fileID: 43379092747560645} + - {fileID: 4688057380284176307} + - {fileID: 8275501976287477077} + - {fileID: 807694206507570120} + - {fileID: 1855383720470709656} + - {fileID: 9120872265090628817} + - {fileID: 6699343138398303099} + - {fileID: 320999063321282817} + m_Father: {fileID: 5015499777800791733} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4286237751930127560 GameObject: m_ObjectHideFlags: 0 @@ -5172,6 +5219,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4363526148003556223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3072639412923466909} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3072639412923466909 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4363526148003556223} + 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: 8098212382191051488} + - {fileID: 5290492688501385118} + - {fileID: 2109961850776132906} + - {fileID: 8370527934204238631} + - {fileID: 377903760176034352} + - {fileID: 5373429256794595735} + - {fileID: 466593261980153343} + m_Father: {fileID: 249968238702547965} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4390006519553152514 GameObject: m_ObjectHideFlags: 0 @@ -5199,12 +5288,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.7999268, y: 46.910057} + m_AnchoredPosition: {x: -23.200073, y: 1.8100815} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} --- !u!1 &4480184209769585281 @@ -5217,6 +5306,7 @@ GameObject: m_Component: - component: {fileID: 249968238702547965} - component: {fileID: 3527509865682700869} + - component: {fileID: 6508652104794434413} m_Layer: 5 m_Name: equipTreasurePre m_TagString: Untagged @@ -5235,13 +5325,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8098212382191051488} - - {fileID: 5290492688501385118} - - {fileID: 2109961850776132906} - - {fileID: 8370527934204238631} - - {fileID: 377903760176034352} - - {fileID: 5373429256794595735} - - {fileID: 466593261980153343} + - {fileID: 3072639412923466909} m_Father: {fileID: 9213049277214412281} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5258,6 +5342,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4480184209769585281} m_CullTransparentMesh: 0 +--- !u!114 &6508652104794434413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4480184209769585281} + 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: 3072639412923466909} + - 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: 3072639412923466909} + - 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: 3072639412923466909} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &4638485950281711444 GameObject: m_ObjectHideFlags: 0 @@ -5716,7 +5855,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 555840621366444552} - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -6645,12 +6784,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -85.5} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14.399933, y: -132} + m_AnchoredPosition: {x: -10.600067, y: -86.900024} m_SizeDelta: {x: 32.49, y: 32.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2113639908227441872 @@ -6848,7 +6987,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -7125,7 +7264,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -7354,7 +7493,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4171208097872319017} - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -7638,7 +7777,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6419625337030773458} - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -8082,7 +8221,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -10611,6 +10750,7 @@ GameObject: m_Component: - component: {fileID: 5015499777800791733} - component: {fileID: 9132739624637414777} + - component: {fileID: 7133570421678738462} m_Layer: 5 m_Name: item m_TagString: Untagged @@ -10629,18 +10769,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2159214501237603423} - - {fileID: 2665612519152056609} - - {fileID: 4202284676437252242} - - {fileID: 8132837340443460501} - - {fileID: 43379092747560645} - - {fileID: 4688057380284176307} - - {fileID: 8275501976287477077} - - {fileID: 807694206507570120} - - {fileID: 1855383720470709656} - - {fileID: 9120872265090628817} - - {fileID: 6699343138398303099} - - {fileID: 320999063321282817} + - {fileID: 2637400333458500407} m_Father: {fileID: 4582380774234793141} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10657,6 +10786,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8485111311815755030} m_CullTransparentMesh: 0 +--- !u!114 &7133570421678738462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8485111311815755030} + 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: 2637400333458500407} + - 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: 2637400333458500407} + - 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: 2637400333458500407} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &8627692296096970009 GameObject: m_ObjectHideFlags: 0 @@ -11191,7 +11375,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 249968238702547965} + m_Father: {fileID: 3072639412923466909} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -11265,7 +11449,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -11339,7 +11523,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5015499777800791733} + m_Father: {fileID: 2637400333458500407} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index fa082fe1ca..695b6dd614 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -108,12 +108,6 @@ function this.ShowCurrPosHeroCompound2() this.ScrollView:SetData(heroDatas, function (index, go) this.SingleHeroDataShow(go, heroDatas[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) this.SelectHeroShow(curSelectHeroConfig) end diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 2e60e07d43..70c6ea6e74 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -83,6 +83,12 @@ function this.SortTypeClick(_sortType) this.ScrollView:SetData(tarHero, function (index, go) this.SingleHeroDataShow(go, tarHero[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 --英雄单个数据展示 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua index 01b9f13cdd..ecf4d43126 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua @@ -82,6 +82,12 @@ function this.SortTypeClick(_sortType) this.ScrollView:SetData(tarEquipTreasure, function (index, go) this.SingleHeroDataShow(go, tarEquipTreasure[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 function this.SortDatas(tarEquipTreasure) table.sort( diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index cef080be3f..69d3d66683 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -92,6 +92,12 @@ function this.SortTypeClick(_sortType) this.ScrollView:SetData(tarHero, function (index, go) this.SingleHeroDataShow(go, tarHero[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 --获取筛选后的英雄数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua index a44ea9d949..8b4e7692d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua @@ -81,6 +81,12 @@ function this.SortTypeClick(_sortType) this.ScrollView:SetData(tarHero, function (index, go) this.SingleHeroDataShow(go, tarHero[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 --获取筛选后的英雄数据