diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index cab4705e64..51336b3810 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2386,4 +2386,5 @@ [12385] = "五星成长礼", [12386] = "极速排名", [12387] = "军团副本", + [12388] = "该神将在巅峰战阵容中已上阵", } diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index 2136f099dd..a592949aee 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -117,11 +117,15 @@ function FirstRechargePanel:OnOpen(context,_fun) self.frame:SetActive(false) self.effect:SetActive(false) self.ani.enabled = false + self.closeBtn:GetComponent("Button").enabled = false Timer.New(function () self.frame:SetActive(true) self.effect:SetActive(true) self.ani.enabled = true end, 1.5):Start() + Timer.New(function () + self.closeBtn:GetComponent("Button").enabled = true + end, 2.5):Start() end function FirstRechargePanel:OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 8e0d94474d..a2cdc1e648 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -19,10 +19,10 @@ end function this.OnLevelChange() -- 首充引导特殊处理到十级开放 - -- if PlayerManager.level == 10 then - -- table.insert(_FuncGuideList, 100200) - -- this.CheckFuncGuide() - -- end + if PlayerManager.level == 10 then + table.insert(_FuncGuideList, 100200) + this.CheckFuncGuide() + end end -- function this.OnFunctionOpen(funcId) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 8ae3cc973e..097eb5383c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -355,7 +355,7 @@ function this.GetHeroFormationStr(teamId) return Language[11108] -- 1001 elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then - return Language[12280] + return Language[12388] end end return ""