From bc9e2ca58aa69066ddf2e44f6d7cc81836a84445 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 十二月 2024 15:33:25 +0800
Subject: [PATCH] 10297 【越南】【英语】【砍树】【tqxbqy】轮回殿-服务端（奖励类型增加类型3 - 消耗物品，目前支持坐骑经验丹、灵宠经验丹）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 126 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 116 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index a6fc4a8..9fe85d6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -19,21 +19,34 @@
import ShareDefine
import PlayerAssist
import PlayerControl
+import PlayerPackData
+import PlayerFuncTeam
import CrossLuckyCloudBuy
import IPY_GameServer
+import PlayerViewCache
import CrossRealmPlayer
import PlayerCompensation
+import PlayerActBossTrial
+import PlayerActXianXiaMJ
+import PlayerActGubao
+import PlayerActHorsePetTrain
import CrossActionControl
+import CrossActAllRecharge
+import CrossFamilyFlagwar
import CrossChampionship
import CrossBattlefield
import CrossBillboard
+import CrossYaomoBoss
import GameWorldBoss
import CrossRealmPK
+import GameXiangong
+import GameWorship
import PlayerQuery
import PlayerTalk
import PyGameData
import CrossBoss
import ChConfig
+import ChPlayer
import PlayerFB
import GMShell
@@ -54,7 +67,7 @@
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))
return
- GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))
+ GameWorld.Log("SendMsgToCrossServer => %s, %s" % (msgType, srcMsg))
GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
return
@@ -66,11 +79,11 @@
return
msgDict = cPickle.loads(recvMsg)
- GameWorld.Log("OnCrossServerReceiveMsg: %s" % msgDict)
-
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
serverGroupID = msgDict.get("ServerGroupID", 0)
+
+ GameWorld.Log("OnCrossServerReceiveMsg: %s, %s, %s" % (msgType, serverGroupID, msgDict))
if msgType == ShareDefine.ClientServerMsg_PKMatch:
CrossRealmPK.ClientServerMsg_PKMatch(serverGroupID, msgData, tick)
@@ -101,7 +114,10 @@
elif msgType == ShareDefine.ClientServerMsg_ChatCrossWorld:
PlayerTalk.ClientServerMsg_ChatCrossWorld(serverGroupID, msgData, tick)
-
+
+ elif msgType == ShareDefine.ClientServerMsg_PlayerLoginout:
+ ChPlayer.ClientServerMsg_PlayerLoginout(serverGroupID, msgData)
+
elif msgType == ShareDefine.ClientServerMsg_GMCMD:
GMShell.ClientServerMsg_GMCMD(msgData, tick)
@@ -109,7 +125,16 @@
ClientServerMsg_ServerInitOK(serverGroupID, tick)
elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:
- CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+ PlayerViewCache.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_PushPlayerCache:
+ PlayerViewCache.ClientServerMsg_PushPlayerCache(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_PullOtherPlayerPackData:
+ PlayerPackData.ClientServerMsg_PullOtherPlayerPackData(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_PlayerPackData:
+ PlayerPackData.ClientServerMsg_PlayerPackData(serverGroupID, msgData)
elif msgType == ShareDefine.ClientServerMsg_QueryNPCInfo:
PlayerQuery.ClientServerMsg_QueryNPCInfo(serverGroupID, msgData)
@@ -159,6 +184,39 @@
elif msgType == ShareDefine.ClientServerMsg_ChampionshipWorship:
CrossChampionship.ClientServerMsg_ChampionshipWorship(serverGroupID, msgData)
+ elif msgType == ShareDefine.ClientServerMsg_ActAllRechargeValue:
+ CrossActAllRecharge.ClientServerMsg_ActAllRechargeValue(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_CrossYaomoBossHurtAward:
+ CrossYaomoBoss.ClientServerMsg_CrossYaomoBossHurtAward(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_BossTrialSubmit:
+ PlayerActBossTrial.ClientServerMsg_BossTrialSubmit(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_XianXiaMJScore:
+ PlayerActXianXiaMJ.ClientServerMsg_XianXiaMJScore(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_GubaoScore:
+ PlayerActGubao.ClientServerMsg_GubaoScore(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_HorsePetTrainScore:
+ PlayerActHorsePetTrain.ClientServerMsg_HorsePetTrainScore(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_CreateFuncTeam:
+ PlayerFuncTeam.ClientServerMsg_CreateFuncTeam(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_ChangeFuncTeam:
+ PlayerFuncTeam.ClientServerMsg_ChangeFuncTeam(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_FuncTeamMemOP:
+ PlayerFuncTeam.ClientServerMsg_FuncTeamMemOP(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_QueryFuncTeam:
+ PlayerFuncTeam.ClientServerMsg_QueryFuncTeam(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_QueryXiangong:
+ GameXiangong.ClientServerMsg_QueryXiangong(serverGroupID, msgData)
+
# 需要发送到地图服务器处理的
elif msgType in [ShareDefine.ClientServerMsg_Reborn, ShareDefine.ClientServerMsg_CollectNPC]:
MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID)
@@ -193,7 +251,10 @@
CrossBoss.Sync_CrossBossInitDataToClientServer(serverGroupID)
CrossActionControl.Sync_CrossActInfoToClientServer(serverGroupID)
CrossLuckyCloudBuy.Sync_LuckyCloudBuyDataToClientServer(tick, serverGroupID)
+ CrossActAllRecharge.Sync_AllRechargeDataToClientServer(serverGroupID)
+ CrossYaomoBoss.Sync_CrossYaomoBossDataToClientServer(serverGroupID)
PlayerCompensation.Sync_CrossMailPlayerIDToClientServer(serverGroupID)
+ GameWorship.Sync_CrossWorshipToClientServer(serverGroupID)
return
def MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID):
@@ -243,8 +304,8 @@
'''
if not GameWorld.IsCrossServer():
return
- if not dataMsg:
- return
+ #if not dataMsg:
+ # return
if serverGroupIDList == None:
serverGroupIDList = []
@@ -253,7 +314,7 @@
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.ErrLog("跨服服务器未启动好,不允许向子服发送数据! serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
return
- GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
+ GameWorld.Log("SendMsgToClientServer => %s, %s, %s" % (msgType, serverGroupIDList, srcMsg))
if not serverGroupIDList:
GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
else:
@@ -278,7 +339,7 @@
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
crossServerTimeStr = msgDict.get("CrossServerTime", "")
- GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)
+ GameWorld.Log("OnClientServerReceiveMsg: %s, %s" % (msgType, msgDict))
if crossServerTimeStr:
curServerTime = int(time.time())
crossServerTime = GameWorld.ChangeTimeStrToNum(crossServerTimeStr)
@@ -299,11 +360,26 @@
elif msgType == ShareDefine.CrossServerMsg_Notify:
PlayerControl.CrossServerMsg_Notify(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_PlayerLoginout:
+ ChPlayer.CrossServerMsg_PlayerLoginout(msgData)
+
elif msgType == ShareDefine.CrossServerMsg_ChatCrossWorld:
PlayerTalk.CrossServerMsg_ChatCrossWorld(msgData)
elif msgType == ShareDefine.CrossServerMsg_ViewPlayerCacheRet:
- CrossRealmPlayer.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+ PlayerViewCache.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+
+ elif msgType == ShareDefine.CrossServerMsg_PullPlayerViewCache:
+ PlayerViewCache.CrossServerMsg_PullPlayerViewCache(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PlayerPackDataState:
+ PlayerPackData.CrossServerMsg_PlayerPackDataState(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PullPlayerPackData:
+ PlayerPackData.CrossServerMsg_PullPlayerPackData(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PushPlayerPackData:
+ PlayerPackData.CrossServerMsg_PushPlayerPackData(msgData)
elif msgType == ShareDefine.CrossServerMsg_PKMatchReqRet:
CrossRealmPK.CrossServerMsg_PKMatchReqRet(msgData)
@@ -341,6 +417,27 @@
elif msgType == ShareDefine.CrossServerMsg_BattlefieldOver:
CrossBattlefield.CrossServerMsg_BattlefieldOver(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_FamilyFlagwarOver:
+ CrossFamilyFlagwar.CrossServerMsg_FamilyFlagwarOver(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_CrossBossTrialFamilyAward:
+ PlayerActBossTrial.CrossServerMsg_CrossBossTrialFamilyAward(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_FuncTeamInfo:
+ PlayerFuncTeam.CrossServerMsg_FuncTeamInfo(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_FuncTeamDel:
+ PlayerFuncTeam.CrossServerMsg_FuncTeamDel(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_FuncTeamList:
+ PlayerFuncTeam.CrossServerMsg_FuncTeamList(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_Worship:
+ GameWorship.CrossServerMsg_Worship(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_Xiangong:
+ GameXiangong.CrossServerMsg_Xiangong(msgData)
+
elif msgType == ShareDefine.CrossServerMsg_ChampionshipState:
CrossChampionship.CrossServerMsg_ChampionshipState(msgData)
@@ -359,6 +456,15 @@
elif msgType == ShareDefine.CrossServerMsg_ChampionshipDailyOfficial:
CrossChampionship.CrossServerMsg_ChampionshipDailyOfficial(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_ActAllRechargeInfo:
+ CrossActAllRecharge.CrossServerMsg_ActAllRechargeInfo(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_CrossDailyActionState:
+ CrossActionControl.CrossServerMsg_CrossDailyActionState(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_CrossYaomoBossHurtInfo:
+ CrossYaomoBoss.CrossServerMsg_CrossYaomoBossHurtInfo(msgData)
+
elif msgType == ShareDefine.CrossServerMsg_SyncBillboard:
CrossBillboard.CrossServerMsg_SyncBillboard(msgData, tick)
--
Gitblit v1.8.0