From 8a170778b8ff618e2c995cee5c2c11aa0c20abc3 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Sat, 20 Jan 2024 22:51:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E5=9F=8E=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua | 1 + Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua index 1ad2395345..dbb23ae8c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua @@ -24,6 +24,7 @@ function this.Initialize() this.Insert(FUNCTION_OPEN_TYPE.RECURITY, mainCity) this.Insert(FUNCTION_OPEN_TYPE.ELEMENT_RECURITY, mainCity) this.Insert(FUNCTION_OPEN_TYPE.COMPOUND_HERO, mainCity) + this.Insert(FUNCTION_OPEN_TYPE.HongMengZhen, mainCity) -- this.Insert(FUNCTION_OPEN_TYPE.SECRETBOX, mainCity) -- this.Insert(FUNCTION_OPEN_TYPE.TALENT_TREE, mainCity) -- this.Insert(FUNCTION_OPEN_TYPE.DIFFER_DEMONS, mainCity) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 67ea7f26b9..eb0dd6426b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -723,6 +723,7 @@ function this:BindEvent() UIManager.OpenPanel(UIName.HongMengPanel) end end) + this.ScenceBtnClick(FUNCTION_OPEN_TYPE.HongMengZhen) end) Util.AddClick(this.btnGMChange,function() From 8a2cbc7db29899e41bf0ee4e30bff6f0f394d6b4 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Sat, 20 Jan 2024 22:54:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=A3=E5=99=A8=E6=94=BE=E7=BD=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=9C=A3=E5=99=A8=E5=88=86=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab index 2bdfe52845..5f40a0f66a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab @@ -2730,7 +2730,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5723\u5668\u653E\u7F6E" + m_Text: "\u5723\u5668\u5206\u89E3" --- !u!114 &586208661 MonoBehaviour: m_ObjectHideFlags: 0