From 7dec0e3a8f5586236e7943a63216511415772390 Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Wed, 24 Dec 2025 22:53:50 +0800 Subject: [PATCH] 1 --- .../UI/GodsWay/GodsWayTowerPanel.prefab | 303 +++++++++++------- .../Modules/BecomeAGod/BecomeAGodPanel.lua | 11 +- .../Modules/MonsterCamp/GodsWayTowerPanel.lua | 14 +- .../~Lua/Modules/Popup/HelpPopup.lua | 8 +- 4 files changed, 219 insertions(+), 117 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab index be67b83a90..34b658108f 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab @@ -25027,6 +25027,7 @@ RectTransform: - {fileID: 5075218065937803515} - {fileID: 196186067740596525} - {fileID: 588216521391439557} + - {fileID: 3407864823253707517} m_Father: {fileID: 7806638948147681323} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -25164,6 +25165,84 @@ MonoBehaviour: m_EffectColor: {r: 0.4156863, g: 0.21568629, b: 0.18431373, a: 1} m_EffectDistance: {x: 3, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &2837016172000128144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3407864823253707517} + - component: {fileID: 1679797244624832356} + - component: {fileID: 6516192846563123884} + m_Layer: 5 + m_Name: tips2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3407864823253707517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837016172000128144} + 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: 176440091997260688} + 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: 0, y: 5.3} + m_SizeDelta: {x: 994.61, y: 113.48352} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1679797244624832356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837016172000128144} + m_CullTransparentMesh: 0 +--- !u!114 &6516192846563123884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837016172000128144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9803922, g: 0.80392164, b: 0.427451, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7ACB\u5373\u83B7\u5F97 \u6536\u76CA" + LanguageIndex: 0 --- !u!1 &3792261282643875722 GameObject: m_ObjectHideFlags: 0 @@ -73739,9 +73818,9 @@ PrefabInstance: objectReference: {fileID: 4239138255771575618} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &2874966427381289844 stripped +--- !u!4 &8145092030358069884 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} @@ -73751,9 +73830,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &3847535138429139909 stripped +--- !u!4 &1478786657260596419 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8630497023421281403 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4239138255771575618 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!224 &3517335542461511980 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8215435202396873296 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} @@ -73775,27 +73878,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &1478786657260596419 stripped +--- !u!4 &3458715491590983735 stripped Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &8630497023421281403 stripped +--- !u!4 &2874966427381289844 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &8145092030358069884 stripped +--- !u!4 &3847535138429139909 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &4239138255771575618 stripped +--- !u!4 &7324771491079276774 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1440675248861179971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6789526059838717039 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} @@ -73811,42 +73920,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!224 &3517335542461511980 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8215435202396873296 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6789526059838717039 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} --- !u!4 &8834863461068896970 stripped Transform: m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1440675248861179971} m_PrefabAsset: {fileID: 0} ---- !u!4 &7324771491079276774 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3458715491590983735 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 1440675248861179971} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2312794644865576594 PrefabInstance: m_ObjectHideFlags: 0 @@ -74086,6 +74165,18 @@ PrefabInstance: objectReference: {fileID: 662747332772281235} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} +--- !u!4 &662747332772281235 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2024701814541766374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} --- !u!4 &1875746557491206881 stripped Transform: m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, @@ -74104,9 +74195,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!4 &662747332772281235 stripped +--- !u!4 &2590766443349557498 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} @@ -74116,6 +74207,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} +--- !u!224 &231630760203003901 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2838191739614327314 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2312794644865576594} + m_PrefabAsset: {fileID: 0} --- !u!4 &4623231488584757961 stripped Transform: m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, @@ -74146,12 +74249,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!224 &231630760203003901 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} --- !u!4 &3704848856444800584 stripped Transform: m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, @@ -74170,24 +74267,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2312794644865576594} m_PrefabAsset: {fileID: 0} ---- !u!4 &2024701814541766374 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2590766443349557498 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2838191739614327314 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 2312794644865576594} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3059358959801072177 PrefabInstance: m_ObjectHideFlags: 0 @@ -74442,21 +74521,15 @@ PrefabInstance: objectReference: {fileID: 242976170226757424} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &2997696272135148633 stripped +--- !u!4 &1085587704857244898 stripped Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &4378795258779545256 stripped +--- !u!4 &5224851005951387662 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3246810435530417841 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} @@ -74466,9 +74539,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &4832632607405404344 stripped +--- !u!4 &3246810435530417841 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5642701455126167049 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &242976170226757424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} @@ -74478,9 +74563,21 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &242976170226757424 stripped +--- !u!4 &4832632607405404344 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2997696272135148633 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4699914484981592956 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} @@ -74520,39 +74617,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} ---- !u!4 &3138934397645299919 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1085587704857244898 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5224851005951387662 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5642701455126167049 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4699914484981592956 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 3059358959801072177} - m_PrefabAsset: {fileID: 0} --- !u!4 &7324141232903758657 stripped Transform: m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 3059358959801072177} m_PrefabAsset: {fileID: 0} +--- !u!4 &3138934397645299919 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4378795258779545256 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 3059358959801072177} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/BecomeAGod/BecomeAGodPanel.lua b/Assets/ManagedResources/~Lua/Modules/BecomeAGod/BecomeAGodPanel.lua index ca9e2045f2..9ac2409f5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/BecomeAGod/BecomeAGodPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/BecomeAGod/BecomeAGodPanel.lua @@ -35,7 +35,16 @@ end --绑定事件(用于子类重写) function BecomeAGodPanel:BindEvent() Util.AddClick(this.btn_help, function() - UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.BecomeAGod, 0, 0) + UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.BecomeAGod, 0, 0, function() + for i = 1, 6 do + this.godlist[i].effect.gameObject:SetActive(true) + end + this.effect.gameObject:SetActive(true) + end) + for i = 1, 6 do + this.godlist[i].effect.gameObject:SetActive(false) + end + this.effect.gameObject:SetActive(false) end) Util.AddClick(this.btnGotoFight, function() if CheckFunctionOpen(FUNCTION_OPEN_TYPE.GodsWayTower_3) then diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua index 35f583d15b..7e2410e4ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua @@ -50,6 +50,8 @@ function GodsWayTowerPanel:InitComponent() this.rewardList = {} this.titleText = Util.GetGameObject(self.gameObject, "InfoRoot/tiitleRoot/title"):GetComponent("Text") this.moppingUpBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/moppingUpBtn") + this.becomeAGodText = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/tips2"):GetComponent("Text") + this.becomeAGodText1 = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/tips") this.canFightWaves = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/canFightWaves"):GetComponent("Text") this.freeMoppingTimes = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/freeMoppingTimes"):GetComponent( "Text") @@ -173,7 +175,7 @@ end function GodsWayTowerPanel:OnOpen(index) curType = index --BindRedPointObject(redTrailType[curType],this.btnHelpFightRed) - if curType == 2 then + if curType == 3 then this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.BecomeAGod }) else this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) @@ -229,8 +231,18 @@ function GodsWayTowerPanel:OnShow() curId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.godsWayTowerTreasure_two) elseif curType == 2 then curId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.godsWayTowerTreasure_three) + this.becomeAGodText1.gameObject:SetActive(true) + this.becomeAGodText.gameObject:SetActive(false) else curId = 0 + curFloor = 0 + this.becomeAGodText1.gameObject:SetActive(false) + this.becomeAGodText.gameObject:SetActive(true) + local curDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - PlayerManager.userCreateTime) / + 86400) + 1 + local floorPerDay = tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 193).Value) + local floorLimit = curDay * floorPerDay + this.becomeAGodText.text = "当前可挑战层数上限" .. floorLimit .. "层(功能开启后每天解锁20层挑战上限)" end this.btnHelpFightObj:SetActive(curId ~= 0) this.moppingUpBtn:SetActive(curFloor ~= 0) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua index 25156b880a..1e0fa72513 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/HelpPopup.lua @@ -47,7 +47,7 @@ function HelpPopup:RemoveListener() end --界面打开时调用(用于子类重写) -function HelpPopup:OnOpen(_QAConfigID, posX, poxY) +function HelpPopup:OnOpen(_QAConfigID, posX, poxY, func) this.QAConfigID = _QAConfigID this.Rect = Util.GetGameObject(self.transform, "HelpPopup"):GetComponent("RectTransform") this.helpBtnPosX = posX @@ -61,7 +61,7 @@ function HelpPopup:OnOpen(_QAConfigID, posX, poxY) this.value = -1 end --ogErrorTrace(this.value) - + this.func = func local update update = function() if Input.GetMouseButtonDown(0) then @@ -114,7 +114,9 @@ end --界面关闭时调用(用于子类重写) function HelpPopup:OnClose() - + if this.func then + this.func() + end end --界面销毁时调用(用于子类重写)