From cc90791b848bcb172aec11658a2d2b9861bfedcb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 五月 2025 15:54:09 +0800
Subject: [PATCH] 10367 【越南】【英语】【BT】【砍树】仙盟攻城战-服务端（修复同步城池内防守人员血量错误bug；）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 209 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 175 insertions(+), 34 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 1516745..0d5af85 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -44,6 +44,7 @@
import GameWorldOpenServerCampaign
import ShareDefine
import GameDataRecord
+import PlayerPackData
import PlayerCompensation
import PlayerFB
import UpdatePlayerName
@@ -51,7 +52,10 @@
import GameWorldBoss
import GameWorldFamilyWar
#import PlayerFamilyTech
+import PlayerFamilyEmblem
+import PlayerFamilyZhenfa
import PlayerFamilyRedPacket
+import PlayerFamilyZhenbaoge
import PlayerFBHelpBattle
import PlayerHorsePetBoss
#import PlayerFamilyStore
@@ -67,18 +71,31 @@
import PyGameData
import PlayerTalk
import PlayerStore
+import CrossYaomoBoss
import CrossRealmPlayer
import CrossRealmMsg
import CrossRealmPK
import CrossChampionship
import CrossBattlefield
+import CrossFamilyFlagwar
+import CrossActAllRecharge
+import CrossFamilyGCZ
+import PlayerActGubao
+import PlayerActHorsePetTrain
+import PlayerActLianqi
+import PlayerActXianXiaMJ
+import PlayerActBossTrial
+import PlayerActFamilyCTGAssist
import ChPyNetSendPack
import NetPackCommon
import AuctionHouse
import PlayerFairyDomain
import GameWorldSkyTower
+import GameWorldMineArea
+import PlayerTurnFight
import GameWorldArena
import GameWorldItem
+import PlayerRecData
import PlayerAssist
import PlayerLove
@@ -250,6 +267,13 @@
elif queryType == ChConfig.queryType_FamilyImpeach:
#玩家使用弹劾符
PlayerFamily.PlayerExecLeaderImpeach(curPlayer, tick)
+ return
+
+ elif queryType == ChConfig.queryType_FamilyEmblem:
+ #玩家激活仙盟徽章
+ familyID = curPlayer.GetFamilyID()
+ emblemID = GameWorld.ToIntDef(sendCMD)
+ PlayerFamilyEmblem.AddFamilyEmblem(familyID, emblemID)
return
#角色改名
@@ -627,27 +651,9 @@
GameDataRecord.ChangeCoinCnt(eval(resultName))
return
- #跨服排位PK战斗结算
- if callName == "CrossChampionshipPKOver":
- CrossChampionship.MapServer_CrossChampionshipPKOver(eval(resultName), tick)
- return
-
- #跨服匹配PK战斗结算
- if callName == "CrossPKOver":
- CrossRealmPK.MapServer_CrossPKOver(eval(resultName), tick)
- return
-
- #跨服匹配房间开启
- if callName == "CrossPKRoomOpen":
- CrossRealmPK.MapServer_CrossPKRoomOpen(eval(resultName), tick)
- return
-
- #跨服匹配PK取消匹配
- if callName == "CrossRealmPKCancel":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- if not curPlayer:
- return
- CrossRealmPK.SendCancelCrossRealmPKMatch(curPlayer, resultName)
+ #请求玩家的打包数据
+ if callName == "ReuestPlayerPackData":
+ PlayerPackData.OnMGReuestPlayerPackData(eval(resultName))
return
#跨服PK请求玩家当前排名
@@ -666,6 +672,64 @@
# 跨服战场结算
if callName =="CrossBattlefieldOver":
CrossBattlefield.MapServer_CrossBattlefieldOver(eval(resultName))
+ return
+
+ # 跨服仙盟夺旗战/逐鹿万界 结算
+ if callName =="CrossFamilyFlagwarOver":
+ CrossFamilyFlagwar.MapServer_CrossFamilyFlagwarOver(eval(resultName))
+ return
+
+ # 跨服妖魔boss伤害结算
+ if callName =="CrossYaomoBossHurtInfo":
+ CrossYaomoBoss.MapServer_CrossYaomoBossHurtInfo(eval(resultName))
+ return
+
+ # 跨服全民充值
+ if callName == "CrossActAllRecharge":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ CrossActAllRecharge.MapServer_CrossActAllRecharge(curPlayer, eval(resultName))
+ return
+
+ # Boss历练
+ if callName == "BossTrial":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerActBossTrial.MapServer_BossTrial(curPlayer, eval(resultName))
+ return
+
+ # 仙匣秘境
+ if callName == "XianXiaMJ":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerActXianXiaMJ.MapServer_XianXiaMJ(curPlayer, eval(resultName))
+ return
+
+ # 古宝养成
+ if callName == "ActGubao":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerActGubao.MapServer_Gubao(curPlayer, eval(resultName))
+ return
+
+ # 骑宠养成
+ if callName == "ActHorsePetTrain":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerActHorsePetTrain.MapServer_HorsePetTrain(curPlayer, eval(resultName))
+ return
+
+ # 炼器
+ if callName == "ActLianqi":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerActLianqi.MapServer_Lianqi(curPlayer, eval(resultName))
return
#py喇叭聊天
@@ -687,6 +751,13 @@
# 战盟联赛
if callName =="FamilyWarOver":
GameWorldFamilyWar.MapServer_FamilyWarOver(eval(resultName))
+ return
+
+ # 增加玩家Rec数据
+ if callName == "AddPlayerRec":
+ curPlayer = None if not srcPlayerID else GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ recType, valueList, userData, notifyType = eval(resultName)
+ PlayerRecData.MapServer_AddPlayerRec(curPlayer, recType, valueList, userData, notifyType)
return
# 删除通用玩家Rec数据
@@ -712,12 +783,6 @@
return
- # 战盟副本boss开始、被击杀
- if callName =="FamilyBossFBState":
- PlayerFamilyBoss.FamilyBossOnKilled(eval(resultName), tick)
- return
-
-
# 击杀boss掉落好物品
if callName =="BossDropGoodItem":
GameWorldBoss.OnKillBossDropGoodItem(eval(resultName), tick)
@@ -894,6 +959,22 @@
if callName =="AllFamilyBossOver":
PlayerFamilyBoss.AllFamilyBossKilled()
return
+ #仙盟阵法
+ if callName =="FamilyZhenfa":
+ curPlayer = None
+ if srcPlayerID:
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerFamilyZhenfa.MapServer_FamilyZhenfa(curPlayer, eval(resultName))
+ return
+ #仙盟传功
+ if callName =="FamilyChuangong":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ PlayerFamily.MapServer_FamilyChuangong(curPlayer, eval(resultName))
+ return
#骑宠BOSS结束
if callName =="HorsePetBossOver":
PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))
@@ -959,7 +1040,7 @@
# 副本助战
- if callName =="FBHelpBattle":
+ if callName == "FBHelpBattle":
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
if not curPlayer:
return
@@ -969,15 +1050,49 @@
resultName = '%s' % ret
# 竞技场
- if callName =="Arena":
+ if callName == "Arena":
+ ret = GameWorldArena.MapServer_Arena(srcPlayerID, eval(resultName))
+ resultName = '%s' % ret if ret != None else '' # 需要重置间隔，每次都回复
+
+ # 仙盟充值互助
+ if callName == "FamilyCTGAssist":
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
if not curPlayer:
return
- ret = GameWorldArena.MapServer_Arena(curPlayer, eval(resultName))
- resultName = '%s' % ret if ret != None else '' # 需要重置间隔，每次都回复
+ ret = PlayerActFamilyCTGAssist.MapServer_FamilyCTGAssist(curPlayer, eval(resultName))
+ if ret == None:
+ return
+ resultName = '%s' % ret
+
+ # 仙盟攻城战
+ if callName == "FamilyGCZ":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ ret = CrossFamilyGCZ.MapServer_FamilyGCZ(curPlayer, eval(resultName))
+ if ret == None:
+ return
+ resultName = '%s' % ret
+
+ # 仙盟珍宝阁
+ if callName =="FamilyZhenbaoge":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ ret = PlayerFamilyZhenbaoge.MapServer_ZhenbaogeOP(curPlayer, eval(resultName))
+ if ret == None:
+ return
+ resultName = '%s' % ret
+
+ # 仙盟boss
+ if callName == "FamilyBoss":
+ ret = PlayerFamilyBoss.MapServer_FamilyBoss(eval(resultName), tick)
+ if ret == None:
+ return
+ resultName = '%s' % ret
# 情缘
- if callName =="Love":
+ if callName == "Love":
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
if not curPlayer:
return
@@ -986,9 +1101,32 @@
return
resultName = '%s' % ret
+ # 回合制
+ if callName == "TurnFight":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ ret = PlayerTurnFight.MapServer_TurnFight(curPlayer, eval(resultName))
+ if ret == None:
+ return
+ resultName = '%s' % ret
+
+ # 福地
+ if callName == "MineArea":
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ ret = GameWorldMineArea.MapServer_MineArea(curPlayer, eval(resultName))
+ if ret == None:
+ return
+ resultName = '%s' % ret
+
# 天星塔
if callName == "SkyTower":
- ret = GameWorldSkyTower.MapServer_SkyTowerInfo(eval(resultName))
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ ret = GameWorldSkyTower.MapServer_SkyTowerInfo(curPlayer, eval(resultName))
if ret == None:
return
resultName = '%s' % ret
@@ -999,7 +1137,10 @@
# if not curPlayer:
# return
# resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
-
+
+ if not srcPlayerID:
+ return
+
srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
if not srcPlayer:
--
Gitblit v1.8.0