From c43520367acc8e9866273aa83b77ac248933d013 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 16 Oct 2023 17:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BD=9C=E8=83=BD=E7=BA=A2=E7=82=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Guild/Skill/HeroPotencyPanel.prefab | 600 ++++++++++++++++++ .../~Lua/Common/GlobalDefine.lua | 3 + .../Guild/Skill/HeroPotencyLvUpPanel.lua | 9 +- .../Modules/Guild/Skill/HeroPotencyPanel.lua | 13 +- .../~Lua/Modules/Hero/HeroManager.lua | 50 ++ .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 4 +- 6 files changed, 670 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab index f551c90c07..f14cbdd4d1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab @@ -36,6 +36,7 @@ RectTransform: - {fileID: 4802171588345601306} - {fileID: 331358481893247823} - {fileID: 4322280219395181618} + - {fileID: 7030709416503984411} m_Father: {fileID: 8358685323825040817} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -471,6 +472,154 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5347 \u7EA7" LanguageIndex: 0 +--- !u!1 &334473220565065092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3878552651391521606} + - component: {fileID: 7068684328844932680} + - component: {fileID: 4344052554204321124} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3878552651391521606 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334473220565065092} + 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: 5194826025605829419} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7068684328844932680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334473220565065092} + m_CullTransparentMesh: 0 +--- !u!114 &4344052554204321124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334473220565065092} + 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: 095467b0a413f5344815d6f08dc95336, 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 &388459472560900521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7030709416503984411} + - component: {fileID: 7843492938762276598} + - component: {fileID: 2022465939191143054} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7030709416503984411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388459472560900521} + 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: 6043783546069413436} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7843492938762276598 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388459472560900521} + m_CullTransparentMesh: 0 +--- !u!114 &2022465939191143054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 388459472560900521} + 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: 095467b0a413f5344815d6f08dc95336, 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 &392019428338459679 GameObject: m_ObjectHideFlags: 0 @@ -1112,6 +1261,7 @@ RectTransform: - {fileID: 2753427395444164610} - {fileID: 52742562248641463} - {fileID: 1068649279584114237} + - {fileID: 7955930610838162720} m_Father: {fileID: 8358685323825040817} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1899,6 +2049,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1952768212876107946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6965593981606174307} + - component: {fileID: 9039032640355157439} + - component: {fileID: 2273541624603210907} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6965593981606174307 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952768212876107946} + 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: 815578064830052759} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9039032640355157439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952768212876107946} + m_CullTransparentMesh: 0 +--- !u!114 &2273541624603210907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952768212876107946} + 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: 095467b0a413f5344815d6f08dc95336, 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 &2041175939744678876 GameObject: m_ObjectHideFlags: 0 @@ -1935,6 +2159,7 @@ RectTransform: - {fileID: 3971573314683000791} - {fileID: 2285496987501679662} - {fileID: 111639907536816467} + - {fileID: 3878552651391521606} m_Father: {fileID: 8358685323825040817} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2341,6 +2566,7 @@ RectTransform: - {fileID: 219472471840878666} - {fileID: 462661107719702959} - {fileID: 8387194516949639004} + - {fileID: 6132763903856436571} m_Father: {fileID: 8358685323825040817} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2610,6 +2836,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &2436197816632250042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4681952702829148805} + - component: {fileID: 158052563656399450} + - component: {fileID: 3276779594270931222} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4681952702829148805 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2436197816632250042} + 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: 8063148406133354940} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &158052563656399450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2436197816632250042} + m_CullTransparentMesh: 0 +--- !u!114 &3276779594270931222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2436197816632250042} + 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: 095467b0a413f5344815d6f08dc95336, 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 &2503711414530782026 GameObject: m_ObjectHideFlags: 0 @@ -4536,6 +4836,7 @@ RectTransform: - {fileID: 3888252132181370516} - {fileID: 2808423367913644711} - {fileID: 3929479779406229604} + - {fileID: 1885328112427434136} m_Father: {fileID: 8358685323825040817} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5028,6 +5329,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5721342725605050359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6836555717885421733} + - component: {fileID: 6266123731685441667} + - component: {fileID: 8458920619985874357} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6836555717885421733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5721342725605050359} + 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: 746619502346980110} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6266123731685441667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5721342725605050359} + m_CullTransparentMesh: 0 +--- !u!114 &8458920619985874357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5721342725605050359} + 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: 095467b0a413f5344815d6f08dc95336, 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 &5786638447965128173 GameObject: m_ObjectHideFlags: 0 @@ -5334,6 +5709,7 @@ RectTransform: - {fileID: 9124889361505769342} - {fileID: 8989974840963219512} - {fileID: 3786651992061614646} + - {fileID: 4681952702829148805} m_Father: {fileID: 8358685323825040817} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6516,6 +6892,7 @@ RectTransform: - {fileID: 949876776593722685} - {fileID: 4388291841218257025} - {fileID: 5193586617416003896} + - {fileID: 6965593981606174307} m_Father: {fileID: 8358685323825040817} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6939,6 +7316,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u91CD\u7F6E" LanguageIndex: 0 +--- !u!1 &7520590658209543278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7955930610838162720} + - component: {fileID: 6981247615735322561} + - component: {fileID: 5159369971934188857} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7955930610838162720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7520590658209543278} + 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: 4813662481161820661} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6981247615735322561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7520590658209543278} + m_CullTransparentMesh: 0 +--- !u!114 &5159369971934188857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7520590658209543278} + 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: 095467b0a413f5344815d6f08dc95336, 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 &7600583929945328634 GameObject: m_ObjectHideFlags: 0 @@ -7161,6 +7612,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7674185278069702290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1885328112427434136} + - component: {fileID: 132449293688530856} + - component: {fileID: 563254016455740329} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1885328112427434136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674185278069702290} + 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: 614517551140276356} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &132449293688530856 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674185278069702290} + m_CullTransparentMesh: 0 +--- !u!114 &563254016455740329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674185278069702290} + 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: 095467b0a413f5344815d6f08dc95336, 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 &7806378820673067142 GameObject: m_ObjectHideFlags: 0 @@ -7720,6 +8245,7 @@ RectTransform: - {fileID: 3945743134570054443} - {fileID: 5071883113668339018} - {fileID: 3279784756745598631} + - {fileID: 6836555717885421733} m_Father: {fileID: 8358685323825040817} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7798,6 +8324,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8418748447848563058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6132763903856436571} + - component: {fileID: 4864226698249589882} + - component: {fileID: 184683823601943617} + m_Layer: 5 + m_Name: redpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6132763903856436571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8418748447848563058} + 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: 8167591637092550718} + 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} + m_AnchoredPosition: {x: 45, y: 45} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4864226698249589882 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8418748447848563058} + m_CullTransparentMesh: 0 +--- !u!114 &184683823601943617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8418748447848563058} + 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: 095467b0a413f5344815d6f08dc95336, 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 &8476357701644409611 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3851faaf50..a2e4c92398 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1805,8 +1805,10 @@ FUNCTION_OPEN_TYPE = { GemNew=144, --命格 SuperGem=145,--高级命格 Gift=146, --礼物 + Potency =147, --潜能 Number_Game=149,--数字游戏 + } TaskGetBtnIconDef = { @@ -2041,6 +2043,7 @@ HELP_TYPE = { GodsWayTreasure=140, --多队塔秘宝 GiftShop = 141, --礼物商店 Gift = 142, --礼物 + Potency = 143, --潜能 } NumToComplexFont = { diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua index a46fc1daee..41b1d3b0f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua @@ -74,16 +74,17 @@ function this.IsTabLock(index) if data[_TabData[index].type] then return false else - return true,config.Name.."未开启" + return true,PoTencyTypeName[_TabData[index].type].."未开启" end - return true,config.Name.."未开启" + return true,PoTencyTypeName[_TabData[index].type].."未开启" end -- tab节点显示自定义 function this.TabAdapter(tab, index, status) local tabLab = Util.GetGameObject(tab, "Text") - LogError("status==========================="..status) local img=Util.GetGameObject(tab,"Image") + local red=Util.GetGameObject(tab,"Redpot") + red:SetActive(HeroManager.CheckPotencyRedPointByType(dynamicId,_TabData[index].type)) img:GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status]) tabLab:GetComponent("Text").text = PoTencyTypeName[_TabData[index].type] tabLab:GetComponent("Text").color = _TabFontColor[status] @@ -93,7 +94,7 @@ function this.TabAdapter(tab, index, status) elseif status=="select" then img:GetComponent("RectTransform").sizeDelta = Vector2.New(105,70) end - --LogError("index=================================="..index) + --this.btnList[index]=tab end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua index 4027699b26..299fcdd548 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua @@ -51,6 +51,7 @@ function HeroPotencyPanel:InitComponent() this.btn_left = Util.GetGameObject(self.gameObject,"bg/btn_left") this.btn_right = Util.GetGameObject(self.gameObject,"bg/btn_right") this.allEquipList={} + this.redList={} for i=1,8 do local obj=Util.GetGameObject(self.gameObject,"bg/skills/frame ("..i..")") local skillItem={} @@ -60,6 +61,8 @@ function HeroPotencyPanel:InitComponent() skillItem.selectPar=Util.GetGameObject(obj,"selectImageParent") skillItem.lv=Util.GetGameObject(obj,"lvImage/Text"):GetComponent("Text") skillItem.lock=Util.GetGameObject(obj,"lock") + skillItem.red=Util.GetGameObject(obj,"redpoint") + table.insert(this.redList,skillItem.red) table.insert(this.allEquipList,skillItem) end @@ -68,7 +71,7 @@ end --绑定事件(用于子类重写) function HeroPotencyPanel:BindEvent() Util.AddClick(this.helpBtn,function() - UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.GuildSkill,this.helpPos.x,this.helpPos.y) + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Potency,this.helpPos.x,this.helpPos.y) end) Util.AddClick(this.backBtn,function() self:ClosePanel() @@ -145,13 +148,13 @@ function this.RefreshWindowData() local type=config.Type if data[type] then local lv=data[type].lv - LogError("lv======================="..lv.." giftlv==="..data[type].giftLv) + --LogError("lv======================="..lv.." giftlv==="..data[type].giftLv) item.lv.text=lv --判断下一级是否可以升级 local lvConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",type,"Level",lv+1) if lvConfig then if lvConfig.Open and #lvConfig.Open>0 and lvConfig.Open[1]~=nil and lvConfig.Open[2]~=nil then - LogError("lvconfig===============id============"..lvConfig.Id.." open[1]=="..lvConfig.Open[1].." open[2]=="..lvConfig.Open[2]) + --LogError("lvconfig===============id============"..lvConfig.Id.." open[1]=="..lvConfig.Open[1].." open[2]=="..lvConfig.Open[2]) if data[lvConfig.Open[1]] and data[lvConfig.Open[1]].lv>=lvConfig.Open[2] then item.lock:SetActive(false) else @@ -163,11 +166,12 @@ function this.RefreshWindowData() else item.lock:SetActive(false) end + else item.lv.text=0 item.lock:SetActive(true) end - + item.red:SetActive(HeroManager.CheckPotencyRedPointByType(curHeroData.dynamicId,type)) Util.AddClick(item.btn,function() UIManager.OpenPanel(UIName.HeroPotencyLvUpPanel,type,curHeroData.dynamicId,config,this) --UIManager.OpenPanel(UIName.HeroPotencyInfoPopup) @@ -199,6 +203,7 @@ end function HeroPotencyPanel:OnDestroy() this.spLoader:Destroy() this.allEquipList={} + this.redList={} end return HeroPotencyPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index d485428d39..4f41244103 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -258,6 +258,54 @@ function this.AddPotentialDataByType(dyn,type,lv) heroDatas[dyn].potential[type].giftLv=0 end end + +--检测英雄潜能红点 +function this.CheckHeroPotencyRedPoint(_did) + local isOpen= CheckFunctionOpen(FUNCTION_OPEN_TYPE.Potency) + if isOpen==false then + return false + end + if heroDatas[_did] then + if heroDatas[_did].potential then + for k, v in pairs(heroDatas[_did].potential) do + --LogError("k==========="..k) + local isRed=this.CheckPotencyRedPointByType(_did,k) + if isRed then + return true + end + end + end + end + return false +end + +--根据类型检测潜能红点 +function this.CheckPotencyRedPointByType(_did, _type) + local isOpen= CheckFunctionOpen(FUNCTION_OPEN_TYPE.Potency) + if isOpen==false then + return false + end + if heroDatas[_did] then + if heroDatas[_did].potential[_type] then + local lv=heroDatas[_did].potential[_type].lv + --LogError("_type=================".._type.." lv============="..lv) + local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",_type,"Level",lv) + if config.Consume and #config.Consume>0 and tonumber(config.Consume[1][1])~=nil then + local isCan=true + for i=1,#config.Consume do + local id=config.Consume[i][1] + local num=config.Consume[i][2] + if BagManager.GetItemCountById(id)