From 0cb288fc2cad76d7cd8150a3e0b15bbe0eff2c1e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 05 三月 2019 10:57:47 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(强化)
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 72d7a71..fa1f1ee 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -42,7 +42,6 @@
import PlayerUniversalGameRec
import PlayerFamily
import GameWorldOpenServerCampaign
-import GameWorldMixServerCampaign
import ShareDefine
import GameDataRecord
import GameWorldShopItem
@@ -74,6 +73,7 @@
import CrossRealmPK
import ChPyNetSendPack
import NetPackCommon
+import AuctionHouse
import time
import datetime
@@ -340,7 +340,7 @@
## 收到子服请求查看跨服地图NPC个数信息
mapID = msgData["MapID"]
- zoneIpyData = CrossRealmPlayer.GetServerCrossZoneIpyData(mapID, serverGroupID)
+ zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(mapID, serverGroupID)
if not zoneIpyData:
return
realMapID = zoneIpyData.GetMapID()
@@ -505,9 +505,13 @@
CrossRealmMsg.SendMsgToClientServer(msgType, dataMsg, serverGroupIDList)
return
- if callName == 'MergeWorldNotify':
- country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo = eval(resultName)
- PlayerControl.MergeWorldNotify(country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo, 1)
+ if callName == "SetCrossPlayerAttrValue":
+ CrossRealmPlayer.SetCrossPlayerAttrValue(eval(resultName), tick)
+ return
+
+ if callName == 'CrossNotify':
+ serverGroupIDList, crossNotifyList = eval(resultName)
+ PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)
return
if callName == "CommMapServerInitOK":
@@ -537,17 +541,6 @@
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': #地图服务器玩家退出答题
@@ -744,8 +737,8 @@
return
#生成仙盟红包
- if callName == 'CreatFamilyRedPacket':
- PlayerFamilyRedPacket.CreatFamilyRedPacket(eval(resultName))
+ if callName == "MapServer_CreatRedPacket":
+ PlayerFamilyRedPacket.MapServer_CreatRedPacket(eval(resultName))
return
#发仙盟红包
if callName == 'SendFamilyRedPacket':
@@ -786,6 +779,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":
@@ -848,11 +851,7 @@
if callName =="AddBossRebornPoint":
GameWorldBoss.AddBossRebornPoint(eval(resultName))
return
- #通知神兽副本NPC刷新时间
- if callName =="DogzNPCTime":
- PyGameData.g_dogzNPCRefreshTimeDict = eval(resultName)
- GameWorldBoss.Sync_DogzNPCRefreshTime()
- return
+
#---return分割线-----------------------------------------------------------------
@@ -899,11 +898,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':
#可否领取开服活动奖励
--
Gitblit v1.8.0