From 8de6a6994a0dd623514899310e415269d42e4685 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 三月 2019 16:11:59 +0800
Subject: [PATCH] 6382 【后端】【2.0】功能是否绑定及拍品优化调整（部分绑定修改为是否拍品）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index bf03415..f4b7f99 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -55,7 +55,7 @@
#import PlayerFamilyTech
import PlayerFamilyRedPacket
import PlayerFBHelpBattle
-import PlayerFamilyStore
+#import PlayerFamilyStore
import PlayerFamilySWRH
import GameWorldProcess
import PlayerLVAward
@@ -73,6 +73,7 @@
import CrossRealmPK
import ChPyNetSendPack
import NetPackCommon
+import AuctionHouse
import time
import datetime
@@ -484,10 +485,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":
@@ -761,6 +762,10 @@
if callName =="DuJieFBOver":
PlayerDuJie.DoDuJieFBOver(eval(resultName))
return
+ #境界提升全服buff
+ if callName =="RealmUpAddBuff":
+ PlayerDuJie.DoRealmUpAddBuff(resultName)
+ return
# 组队副本队长请求进入询问结果
if callName == "EnterFBTeamAsk":
@@ -778,6 +783,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":
@@ -839,6 +854,10 @@
#增加boss复活点
if callName =="AddBossRebornPoint":
GameWorldBoss.AddBossRebornPoint(eval(resultName))
+ return
+ #多仙盟BOSS结束
+ if callName =="AllFamilyBossOver":
+ PlayerFamilyBoss.AllFamilyBossKilled()
return
#---return分割线-----------------------------------------------------------------
@@ -910,12 +929,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 == "FamilyStore":
+# curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+# if not curPlayer:
+# return
+# resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
# 自定义商店物品
if callName == "ShopItem":
--
Gitblit v1.8.0