diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
index af372098d2..aa25b3306c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
@@ -113,6 +113,7 @@ function GMPanel:InitComponent()
         {type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "挑战怪物", inputTip = {"输入怪物组id"}, callBack = this.ChallengeMonster},
         {type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "测试假战斗", inputTip = {"输入假战斗id"}, callBack = this.RunFakeBattle},
         {type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "演算战斗数据", inputTip = {"战斗数据", "时间戳"}, callBack = this.RunBattleData},
+        {type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "快速战斗数据", inputTip = {"战斗数据", "时间戳"}, callBack = this.QuickRunBattleData},
         {type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "演算后端战斗", inputTip = {"GM格式：IP地址:端口", "输入战斗id"}, callBack = this.RunServerBattle},
     }
 
@@ -419,6 +420,28 @@ function this.RunBattleData(data, seed)
     UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test)
 end
 
+function this.QuickRunBattleData(data, seed)
+    
+    data = loadstring("return "..data)()
+    seed = tonumber(seed)
+    local fightMaxRound= 20
+    local seed = seed
+    local battleType = 0
+    local fightData = data
+    local userData = {}
+
+    Random.SetSeed(seed)
+    BattleLogic.Init(fightData, userData, fightMaxRound)
+    BattleLogic.Type = battleType
+    
+    BattleLogic.StartOrder()
+    while not BattleLogic.IsEnd do
+        BattleLogic.Update()
+    end
+    LogWarn("演算战斗结果："..BattleLogic.Result)
+    return BattleLogic.Result
+end
+
 -- 刷新服务器时间
 function this.RefreshServerTime()
     NetManager.GMEvent("10#1#0", function(msg)
diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
index 30c99af8da..493c757254 100644
--- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
@@ -158,7 +158,7 @@ end
 
 -- 刷新挑战列表
 function WorldArenaMainPanel:RefreshChallengeList()
-    if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
+    if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
         PopupTipPanel.ShowTip(Language[10075])
         return
     end