From 10b89ac878a7d6ddf03818c73c74abb38615809c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 三月 2025 18:28:15 +0800
Subject: [PATCH] 10414 【英文】【BT】【砍树】减少跨服天梯比赛系统提示

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py
index ffe290e..89e30d8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTurnFight.py
@@ -17,6 +17,7 @@
 
 import GameWorld
 import GameWorldMineArea
+import GameWorldArena
 import ChConfig
 
 def MapServer_TurnFight(curPlayer, msgList):
@@ -43,20 +44,27 @@
     ## 回合战斗请求
     # @return: None-不允许战斗;非None-允许战斗,具体返回内容功能自己决定
     
-    mapID, funcLineID, tagPlayerID, valueList = dataMsg
+    mapID, funcLineID, tagType, tagID, valueList = dataMsg
     if mapID == ChConfig.Def_TFMapID_MineArea:
-        return GameWorldMineArea.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList)
+        return GameWorldMineArea.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagID, valueList)
+    
+    if mapID == ChConfig.Def_FBMapID_ArenaBattle:
+        return GameWorldArena.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList)
     
     return
 
 def __OnTurnFightOver(curPlayer, dataMsg):
     ## 回合战斗结束
     
-    mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList = dataMsg
+    mapID, funcLineID, tagType, tagID, valueList, fightRet, awardItemList = dataMsg
     
     if mapID == ChConfig.Def_TFMapID_MineArea:
-        return GameWorldMineArea.OnTurnFightOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList)
-        
+        return GameWorldMineArea.OnTurnFightOver(curPlayer, mapID, funcLineID, tagID, valueList, fightRet, awardItemList)
+    
+    if mapID == ChConfig.Def_FBMapID_ArenaBattle:
+        # 竞技场的over通知走原来的途径,仅请求战斗增加GameServer验证
+        return
+    
     return
 
 

--
Gitblit v1.8.0