From 84f8b05044e64036c5abb6b840bf0fd96f8c3bc2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 十二月 2018 18:09:32 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（流程调通版，可匹配、PK、结算，其他功能没有）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index e5909fc..2f5eb69 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -74,6 +74,9 @@
import PyGameData
import PlayerTalk
import PlayerStore
+import CrossRealmPlayer
+import CrossRealmMsg
+import CrossRealmPK
import time
import datetime
@@ -426,12 +429,14 @@
PlayerCompensation.SendPersonalItemMailBatch(eval(resultName))
return
- if callName == 'SendMergerChildMsg':
- operType, dataMsg = eval(resultName)
- MergeChildMsg.SendMergerChildToCenterStringData(operType, dataMsg)
- # 如果是恢复跨服PK连胜的，先记录恢复的玩家ID, 等待成功后同步最新结果给玩家
- if operType == ChConfig.Def_RecoverMergePKWin:
- GameWorldMergePK.Add_RecoverMergePKWinPlayer(srcPlayerID)
+ if callName == "SendMsgToCrossServer":
+ msgType, dataMsg = eval(resultName)
+ CrossRealmMsg.SendMsgToCrossServer(msgType, dataMsg)
+ return
+
+ if callName == "SendMsgToClientServer":
+ msgType, dataMsg, serverGroupIDList = eval(resultName)
+ CrossRealmMsg.SendMsgToClientServer(msgType, dataMsg, serverGroupIDList)
return
if callName == 'MergeWorldNotify':
@@ -534,26 +539,36 @@
return
#跨服赛报名获得新账号
- if callName == 'MergeRegister':
- PlayerMergeRegister.MergeWarRegisterNewAcc(srcPlayerID, eval(resultName), tick)
- return
+ #if callName == 'MergeRegister':
+ # PlayerMergeRegister.MergeWarRegisterNewAcc(srcPlayerID, eval(resultName), tick)
+ # return
#跨服王者争霸
if callName == 'MergeKingFB':
GameWorldMergeKing.MapServer_MergeKingFB(eval(resultName))
return
- #跨服匹配PK
- if callName == 'MergePKOver':
- GameWorldMergePK.MapServer_MergePKOver(eval(resultName))
+ #跨服匹配PK战斗结算
+ if callName == "CrossPKOver":
+ CrossRealmPK.MapServer_MergePKOver(eval(resultName))
+ return
+
+ #跨服匹配房间开启
+ if callName == "CrossPKRoomOpen":
+ CrossRealmPK.MapServer_CrossPKRoomOpen(eval(resultName))
return
#跨服匹配PK取消匹配
- if callName == 'MergePKCancel':
+ if callName == "CrossRealmPKCancel":
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
if not curPlayer:
return
- GameWorldMergePK.SendCancelMergePKMatch(curPlayer, resultName)
+ CrossRealmPK.SendCancelCrossRealmPKMatch(curPlayer, resultName)
+ return
+
+ #跨服注册结果
+ if callName == "CrossRealmReg":
+ CrossRealmPlayer.OnCrossRealmRegOK(srcPlayerID, eval(resultName), tick)
return
#py喇叭聊天
--
Gitblit v1.8.0