diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 57eb4928f4..29e6ce9b0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -857,7 +857,7 @@ end -- 是否解锁跳过功能 function this.IsUnlockBattlePass() -- return false - return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-20或充值任意金额后解锁" + return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁" end -- 战斗暂停控制 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 2962089003..5c425f5c30 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -50,18 +50,19 @@ local UpdateBtnGMFunc = { -- [BATTLE_TYPE.DAILY_CHALLENGE] = function() -- return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!" -- end, - -- [BATTLE_TYPE.STORY_FIGHT] = function() - -- if not BattleManager.IsUnlockBattlePass() then - -- return SKIP_STATE.LOCK, "25级或充值任意金额后解锁" - -- end - -- -- if FightPointPassManager.GetCurOpenFightIdIsBoss() then - -- -- return SKIP_STATE.NOUSE, "首领关卡无法跳过!" - -- -- end - -- -- if this.curRound <= _NO_JUMP_ROUND then - -- -- return SKIP_STATE.NOUSE, "第二回合结束后可以跳过" - -- -- end - -- return SKIP_STATE.UNLOCK - -- end, + [BATTLE_TYPE.STORY_FIGHT] = function() + local isUnlock, tip = BattleManager.IsUnlockBattlePass() + if not isUnlock then + return SKIP_STATE.LOCK, tip + end + if FightPointPassManager.GetCurOpenFightIdIsBoss() then + if this.curRound <= _NO_JUMP_ROUND then + return SKIP_STATE.NOUSE, "首领关卡第二回合结束后可以跳过" + end + -- return SKIP_STATE.NOUSE, "首领关卡无法跳过!" + end + return SKIP_STATE.UNLOCK + end, -- [BATTLE_TYPE.DAILY_CHALLENGE] = function() -- -- if not BattleManager.IsUnlockBattlePass() then -- -- return SKIP_STATE.LOCK, "25级或充值任意金额后解锁" @@ -773,7 +774,7 @@ function this.OnRoundChanged(round) this.roundText.text = string.format(Language[10211], curRound, maxRound) -- 设置跳过按钮的状态 - -- this.SetJumpBtnState() + this.SetJumpBtnState() end -- 角色轮转回调 function this.RoleTurnChange(role)