From 6d910b5268cfbf54230d9de985b8e3143cd9dfc0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 十二月 2025 17:03:42 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(优化多地图战斗发送接收日志;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.py |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.py
index ae314e9..f65d7e5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.py
@@ -81,8 +81,17 @@
     SendToServer(msgType, dataMsg, serverIDList, ShareDefine.dirType_Main, playerID, isLog=False) # 默认发给主服即可
     return
 
-def SendToBattleServer(msgType, dataMsg, playerID=0):
-    SendToServer(msgType, dataMsg, dirType=ShareDefine.dirType_Battle, playerID=playerID)
+def SendBattleRequest(dataMsg, guid, mapID, funcLineID, reqPlayerID=0):
+    msgType = ShareDefine.SSMsg_BattleRequest
+    GameWorld.Log("SendToBattleServer => %s, funcMapID=%s,funcLineID=%s,%s,%s" % (msgType, mapID, funcLineID, guid, time.time()), reqPlayerID)
+    SendToServer(msgType, dataMsg, dirType=ShareDefine.dirType_Battle, playerID=reqPlayerID, isLog=False)
+    return
+
+def SendBattleResult(retInfo, fromServerID, guid, mapID, funcLineID, reqPlayerID=0):
+    msgType = ShareDefine.SSMsg_BattleResult
+    GameWorld.Log("SendToFromServer => %s, fromServerID=%s,funcMapID=%s,funcLineID=%s,%s,%s" 
+                  % (msgType, fromServerID, mapID, funcLineID, guid, time.time()), reqPlayerID)
+    SendToServer(msgType, retInfo, [fromServerID], ShareDefine.dirType_Main, reqPlayerID, isLog=False)
     return
 
 def SendToServer(msgType, dataMsg, serverIDList=None, dirType=ShareDefine.dirType_Main, playerID=0, isLog=True):
@@ -130,18 +139,18 @@
     try:
         dataMsg = cPickle.loads(recvMsg)
         if GameWorld.IsCrossServer():
-            GameWorld.Log("OnCrossServerReceiveMsg: %s, fromServerID=%s, %s" % (msgType, fromServerID, dataMsg))
+            pass #GameWorld.Log("OnCrossServerReceiveMsg: %s, fromServerID=%s, %s" % (msgType, fromServerID, dataMsg))
         else:
-            GameWorld.Log("OnClientServerReceiveMsg: %s, fromServerID=%s, %s" % (msgType, fromServerID, dataMsg))
+            pass #GameWorld.Log("OnClientServerReceiveMsg: %s, fromServerID=%s, %s" % (msgType, fromServerID, dataMsg))
             
             crossServerID = GetCrossServerID()
             if crossServerID == fromServerID:
                 __fixCrossServerTime(msgType, fromServerTime)
                 
         if msgType == ShareDefine.SSMsg_BattleRequest:
-            TurnAttack.SSMsg_BattleRequest(dataMsg, fromServerID)
+            TurnAttack.SSMsg_BattleRequest(dataMsg, fromServerID, msgType)
         elif msgType == ShareDefine.SSMsg_BattleResult:
-            TurnAttack.SSMsg_BattleResult(dataMsg, fromServerID)
+            TurnAttack.SSMsg_BattleResult(dataMsg, fromServerID, msgType)
             
     except:
         GameWorld.RaiseException("服务器接收信息处理报错 \r\n%s" % str(traceback.format_exc()))

--
Gitblit v1.8.0