From c8184bbca40d15c8e56c68442d718fc1583e7239 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 6 Apr 2023 15:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=A5=9E=E5=85=B5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GodWeapon/GodWeaponInfoPanel.prefab | 406 +++++++++++++++++- .../Modules/GodWeapon/GodWeaponInfoPanel.lua | 44 +- .../Modules/GodWeapon/GodWeaponManager.lua | 9 + 3 files changed, 435 insertions(+), 24 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab index b5fe24473d..8413c04258 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab @@ -815,6 +815,114 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &460678460131105852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2599335211014891414} + - component: {fileID: 7185026214995906352} + - component: {fileID: 9159399278894688511} + - component: {fileID: 5161636521366772762} + m_Layer: 5 + m_Name: btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2599335211014891414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460678460131105852} + 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: 7991299031522924707} + 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: 199.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7185026214995906352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460678460131105852} + m_CullTransparentMesh: 0 +--- !u!114 &9159399278894688511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460678460131105852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &5161636521366772762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460678460131105852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9159399278894688511} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &480735290220403521 GameObject: m_ObjectHideFlags: 0 @@ -990,6 +1098,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 9999 +--- !u!1 &716436422893576624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3736121473185287106} + - component: {fileID: 6755658365017777620} + - component: {fileID: 1662640275754933950} + m_Layer: 5 + m_Name: rightBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3736121473185287106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716436422893576624} + 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: 1900165126734038854} + m_Father: {fileID: 4861493823762066456} + 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: 450, y: 700} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6755658365017777620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716436422893576624} + m_CullTransparentMesh: 0 +--- !u!114 &1662640275754933950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716436422893576624} + 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: 1 + 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: 3a26a653ede19f547aa35b873069fb87, 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 &752175979406837730 GameObject: m_ObjectHideFlags: 0 @@ -1119,8 +1302,8 @@ RectTransform: m_Father: {fileID: 3564466436464413829} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 892.9, y: 88} m_Pivot: {x: 0, y: 1} @@ -3186,7 +3369,7 @@ RectTransform: - {fileID: 2696076604634790029} - {fileID: 2696076605675086636} m_Father: {fileID: 4861493823762066456} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4269,7 +4452,7 @@ RectTransform: m_Children: - {fileID: 8031147885079919500} m_Father: {fileID: 4861493823762066456} - m_RootOrder: 3 + 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} @@ -4317,10 +4500,10 @@ RectTransform: m_Father: {fileID: 3564466436464413829} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -101.5} - m_SizeDelta: {x: 892.9, y: 228} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 892.9, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7243463871698051491 CanvasRenderer: @@ -4563,10 +4746,10 @@ RectTransform: m_Father: {fileID: 7828067444209862821} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -395} - m_SizeDelta: {x: 892.9, y: 345} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 25, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &2201683020530963963 CanvasRenderer: @@ -4726,7 +4909,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -790} + m_AnchoredPosition: {x: 0, y: -790} m_SizeDelta: {x: 892.9, y: 345} m_Pivot: {x: 0, y: 1} --- !u!222 &5333624141908467609 @@ -5218,7 +5401,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4861493823762066456} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5356,6 +5539,8 @@ RectTransform: m_Children: - {fileID: 9161231162974998272} - {fileID: 2696076604783406710} + - {fileID: 7991299031522924707} + - {fileID: 3736121473185287106} - {fileID: 147497016996599419} - {fileID: 6495523033131202779} - {fileID: 2696076605182956554} @@ -5503,6 +5688,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4723944835769588203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7991299031522924707} + - component: {fileID: 1510806655689698514} + - component: {fileID: 5508304364647332175} + m_Layer: 5 + m_Name: leftBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7991299031522924707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723944835769588203} + 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: 2599335211014891414} + m_Father: {fileID: 4861493823762066456} + 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: -450, y: 700} + m_SizeDelta: {x: 60, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1510806655689698514 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723944835769588203} + m_CullTransparentMesh: 0 +--- !u!114 &5508304364647332175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4723944835769588203} + 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: 1 + 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: 87f02bd2a5259244aa2fe3d12563fcf7, 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 &4770165910470216970 GameObject: m_ObjectHideFlags: 0 @@ -6128,6 +6388,114 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7B49\u7EA7:" +--- !u!1 &5467604092506894617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1900165126734038854} + - component: {fileID: 5520116767769367751} + - component: {fileID: 8850679646819396949} + - component: {fileID: 7410755974000627579} + m_Layer: 5 + m_Name: btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1900165126734038854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467604092506894617} + 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: 3736121473185287106} + 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: 199.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5520116767769367751 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467604092506894617} + m_CullTransparentMesh: 0 +--- !u!114 &8850679646819396949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467604092506894617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &7410755974000627579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5467604092506894617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8850679646819396949} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5499090880538669778 GameObject: m_ObjectHideFlags: 0 @@ -6309,9 +6677,9 @@ RectTransform: m_Father: {fileID: 3564466436464413829} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -344} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 870, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8182022727084079425 @@ -6464,7 +6832,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000026664866} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3992972364876945023 @@ -9276,7 +9644,7 @@ RectTransform: m_Children: - {fileID: 6140365952946721514} m_Father: {fileID: 4861493823762066456} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua index 05547111e6..eb4f5292c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua @@ -5,6 +5,8 @@ local godwData --初始化组件(用于子类重写) function this:InitComponent() this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") + this.leftBtn = Util.GetGameObject(self.gameObject, "leftBtn/btn") + this.rightBtn = Util.GetGameObject(self.gameObject, "rightBtn/btn") this.spLoader = SpriteLoader.New() this.icon= Util.GetGameObject(self.gameObject, "iconBg/icon"):GetComponent("Image") this.nameText=Util.GetGameObject(self.gameObject, "nameInfo/nameText"):GetComponent("Text") @@ -24,6 +26,38 @@ function this:BindEvent() Util.AddClick(this.btnBack, function() self:ClosePanel() end) + Util.AddClick(this.leftBtn, function() + local posIndex= 1 + local allTeam= GodWeaponManager.GetAllTeamWeapon() + local posList=GodWeaponManager.GetAllTeamWeaponPos() + for i = 1, #posList do + if godwData.point==posList[i] then + posIndex=i + end + end + posIndex=posIndex-1 + if posIndex<=0 then + posIndex=#posList + end + local _data= allTeam[posList[posIndex]] + this.UpdateWin(_data) + end) + Util.AddClick(this.rightBtn, function() + local posIndex= 1 + local allTeam= GodWeaponManager.GetAllTeamWeapon() + local posList=GodWeaponManager.GetAllTeamWeaponPos() + for i = 1, #posList do + if godwData.point==posList[i] then + posIndex=i + end + end + posIndex=posIndex+1 + if posIndex>#posList then + posIndex=1 + end + local _data= allTeam[posList[posIndex]] + this.UpdateWin(_data) + end) Util.AddClick(this.upLvBtn, function() UIManager.OpenPanel(UIName.GodWeaponUpPanel,1,godwData) end) @@ -47,7 +81,6 @@ function this:BindEvent() Util.AddClick(this.changeBtn, function() UIManager.OpenPanel(UIName.GodWeaponListPanel,1,godwData,godwData.point) end) - end --添加事件监听(用于子类重写) @@ -62,12 +95,12 @@ end --界面打开时调用(用于子类重写) function this:OnOpen(_data) - this.unloadBtn.gameObject:SetActive(true) - this.changeBtn.gameObject:SetActive(true) this.UpdateWin(_data) end function this.UpdateWin(_data) + this.unloadBtn.gameObject:SetActive(true) + this.changeBtn.gameObject:SetActive(true) godwData=_data local upLvRed = GodWeaponManager.CheckUpLvRedPoint(godwData) this.upLvBtnRedPoint:SetActive(upLvRed) @@ -123,9 +156,10 @@ function this.UpdateWin(_data) end LayoutRebuilder.ForceRebuildLayoutImmediate(this.skillGrid.transform) end ---界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function this:OnShow() +--界面打开或者重新打开后,界面刷新时调用(用于子类重写) +function this.GetNextPos() + local pos=godwData.point+1 end function this:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua index 3614137a4b..713f8d12af 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua @@ -91,6 +91,15 @@ function this.GetAllTeamWeaponId() return list end +---获取所有已上阵的位置 +function this.GetAllTeamWeaponPos() + local list={} + for key, value in pairs(godWeaponTeamInfo) do + table.insert(list,value.point) + end + return list +end + function this.InitSingleGodWeaponData(data) local GodWeapon={} local GodWeapon={}