提交跨服切磋的一些修改内容

script/common/InnerHandler.lua

@@ -155,7 +155,7 @@ end
 -------------------- 跨服请求战斗数据开始 --------------------
 function LW_COMBAT_GETINFO(fd, msg)
     if _G.is_middle ~= true then return end
-    MiddleCommonLogic.LW_COMBAT_GETINFO(fd, msg)
+    MiddleConnect.LW_COMBAT_GETINFO(fd, msg)
 end
 
 function WL_COMBAT_GETINFO(fd, msg)
@@ -164,7 +164,7 @@ end
 
 function LW_COMBAT_GETINFO_SEND(fd, msg)
     if _G.is_middle ~= true then return end
-    MiddleCommonLogic.LW_COMBAT_GETINFO_SEND(fd, msg)
+    MiddleConnect.LW_COMBAT_GETINFO_SEND(fd, msg)
 end
 
 function WL_COMBAT_GETINFO_SEND(fd, msg)

script/module/middle/MiddleCommonLogic.lua

@@ -224,8 +224,10 @@ function MiddleCommonLogic_CombatBegin_SendWL(fd, msg)
         return
     end
 
-    local tCombatCache = MiddleCommonLogic_IsCache(human)
+    print("[MiddleCommonLogic_CombatBegin_SendWL] 收到信息进行打印")
+    local tCombatCache = MiddleCommonLogic_IsCache(nSrcUID)
     if not tCombatCache then
+        print("[MiddleCommonLogic_CombatBegin_SendWL] 不存在对应的战斗缓存信息")
         return
     else
         local nNowTime = os.time()
@@ -239,6 +241,7 @@ function MiddleCommonLogic_CombatBegin_SendWL(fd, msg)
 
     local nResult = msg.nResult
     if MiddleDefine.MIDDLE_GET_COMBAT_OK ~= nResult then
+        print("[MiddleCommonLogic_CombatBegin_SendWL] 获取的数据不正确,弹Tips并返回")
         MiddleCommonLogic_PopTips(human, nResult)
         return
     end
@@ -251,8 +254,12 @@ function MiddleCommonLogic_CombatBegin_SendWL(fd, msg)
         defJiban = msg.tJiBan,
     }
 
-    CombatLogic.combatBegin(human, MIDDLE_FRIEND_FIGHT_MAP, args, CombatDefine.COMBAT_TYPE14, tCombatCache.nDesUID)
+    print("[MiddleCommonLogic_CombatBegin_SendWL] 开始进行战斗")
+
+    CombatLogic.combatBegin(human, MIDDLE_FRIEND_FIGHT_MAP, args, tCombatCache.nCombatType, tCombatCache.nDesUID)
 
     MiddleCommonLogic_ClearCache(nSrcUID)
+
+    print("[MiddleCommonLogic_CombatBegin_SendWL] 战斗结束清理数据")
 end
 ---------------------------- 战斗相关结束 --------------------------------