From 71ea04a0d2f445b3b3947175bacc6829a5996af9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 三月 2019 21:26:48 +0800
Subject: [PATCH] 6385 【后端】【2.0】五行灵根开发（修复洗点报错 ）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 76 ++++++++++++++-----------------------
1 files changed, 29 insertions(+), 47 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index bac4ef9..e5e9e64 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -42,10 +42,8 @@
import PlayerUniversalGameRec
import PlayerFamily
import GameWorldOpenServerCampaign
-import GameWorldMixServerCampaign
import ShareDefine
import GameDataRecord
-import GameWorldShopItem
import PlayerCompensation
import PlayerFB
import UpdatePlayerName
@@ -56,7 +54,7 @@
#import PlayerFamilyTech
import PlayerFamilyRedPacket
import PlayerFBHelpBattle
-import PlayerFamilyStore
+#import PlayerFamilyStore
import PlayerFamilySWRH
import GameWorldProcess
import PlayerLVAward
@@ -74,6 +72,7 @@
import CrossRealmPK
import ChPyNetSendPack
import NetPackCommon
+import AuctionHouse
import time
import datetime
@@ -340,7 +339,7 @@
## 收到子服请求查看跨服地图NPC个数信息
mapID = msgData["MapID"]
- zoneIpyData = CrossRealmPlayer.GetServerCrossZoneIpyData(mapID, serverGroupID)
+ zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(mapID, serverGroupID)
if not zoneIpyData:
return
realMapID = zoneIpyData.GetMapID()
@@ -485,10 +484,10 @@
resultName = pack.GetResultName() #[queryid, 人气值， 物品ID]
if callName == "SendMail":
- title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail = eval(resultName)
+ title, content, getDays, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource = eval(resultName)
limitTime = str(GameWorld.GetDatetimeByDiffDays(getDays))
limitTime = limitTime.split(".")[0]
- PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail)
+ PlayerCompensation.SendPersonalItemMail(title, content, limitTime, playerIDList, addItemList, gold, goldPaper, silver, detail=detail, moneySource=moneySource)
return
if callName == "SendMailBatch":
@@ -531,27 +530,8 @@
PlayerFamily.MapServer_PyAddFamilyInfoValue(curPlayer, eval(resultName))
return
- if callName == 'UpdRechargeRankBillboard': #地图服务器更新玩家通知特惠累计充值排行榜
- PlayerBillboard.MapServer_UpdateRechargeRankBillboard(eval(resultName))
- return
-
- if callName == 'UpdCostRankBillboard': #地图服务器更新玩家通知特惠累计消费排行榜
- PlayerBillboard.MapServer_UpdateCostRankBillboard(eval(resultName))
- return
-
if callName == 'UpdateTotalRechargeBillboard': #地图服务器更新玩家充值总数排行榜
PlayerBillboard.MapServer_UpdateTotalRechargeBillboard(eval(resultName))
- return
-
- if callName == 'UpdMSRechargeRankBillboard': #地图服务器更新玩家合服活动充值总数排行榜
- PlayerBillboard.MapServer_UpdMSRechargeRankBillboard(eval(resultName))
- return
-
- if callName == 'UpdMSFamilyKillBossBillboard': #地图服务器更新玩家合服活动战盟击杀boss总数排行榜
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- if not curPlayer:
- return
- GameWorldMixServerCampaign.UpdMixCampaignFamiliyBossCnt(curPlayer, eval(resultName))
return
if callName == 'ExitExam': #地图服务器玩家退出答题
@@ -731,12 +711,6 @@
GameWorldProcess.UpdGlobalKillCount(eval(resultName))
return
- # 自定义商店全服限购次数清空
- if callName =="ShopItemClearBuyCnt":
- shopID = eval(resultName)[0]
- GameWorldShopItem.DoShopItemClearBuyCnt(shopID)
- return
-
# 新手指导员天数
if callName =="FreshmanGuiderDay":
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -773,6 +747,10 @@
if callName =="DuJieFBOver":
PlayerDuJie.DoDuJieFBOver(eval(resultName))
return
+ #境界提升全服buff
+ if callName =="RealmUpAddBuff":
+ PlayerDuJie.DoRealmUpAddBuff(resultName)
+ return
# 组队副本队长请求进入询问结果
if callName == "EnterFBTeamAsk":
@@ -790,6 +768,16 @@
if not curPlayer:
return
PlayerBourse.OnGivePlayerBourseGainsResult(curPlayer, eval(resultName))
+ return
+
+ # 拍卖行
+ if callName == "AuctionHouse":
+ curPlayer = None
+ if srcPlayerID:
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+ if not curPlayer:
+ return
+ AuctionHouse.MapServer_AuctionHouseLogic(curPlayer, eval(resultName), tick)
return
if callName == "TeamMemFuncData":
@@ -852,6 +840,10 @@
if callName =="AddBossRebornPoint":
GameWorldBoss.AddBossRebornPoint(eval(resultName))
return
+ #多仙盟BOSS结束
+ if callName =="AllFamilyBossOver":
+ PlayerFamilyBoss.AllFamilyBossKilled()
+ return
#---return分割线-----------------------------------------------------------------
@@ -899,11 +891,6 @@
if callName == 'SendInviteCode':
#邀请码验证回复
resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())
-
- if callName == 'MixServerCampaignAward':
- #可否领取合服活动奖励
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- resultName = '%s' % GameWorldMixServerCampaign.CanGiveMixCampaignAward(curPlayer, eval(resultName))
if callName == 'OpenServerCampaignAward':
#可否领取开服活动奖励
@@ -927,17 +914,12 @@
return
resultName = '%s' % ret
- # 战盟仓库
- if callName == "FamilyStore":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- if not curPlayer:
- return
- resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
-
- # 自定义商店物品
- if callName == "ShopItem":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- resultName = '%s' % GameWorldShopItem.DoShopItemQueryResult(curPlayer, eval(resultName))
+# # 战盟仓库
+# if callName == "FamilyStore":
+# curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+# if not curPlayer:
+# return
+# resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
# 玩家天梯奖励
if callName == "HighLadderReward":
--
Gitblit v1.8.0