From b69fe56d5ebb784c4430cb5e86f460efafa1b30a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 16:57:29 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(生产系统)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   91 ++++++++++++++++-----------------------------
 1 files changed, 33 insertions(+), 58 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index bf03415..cd02fab 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -44,18 +44,17 @@
 import GameWorldOpenServerCampaign
 import ShareDefine
 import GameDataRecord
-import GameWorldShopItem
 import PlayerCompensation
 import PlayerFB
 import UpdatePlayerName
 import PlayerFamilyBoss
-import PlayerManorWar
 import GameWorldBoss
 import GameWorldFamilyWar
 #import PlayerFamilyTech
 import PlayerFamilyRedPacket
 import PlayerFBHelpBattle
-import PlayerFamilyStore
+import PlayerHorsePetBoss
+#import PlayerFamilyStore
 import PlayerFamilySWRH
 import GameWorldProcess
 import PlayerLVAward
@@ -73,6 +72,7 @@
 import CrossRealmPK
 import ChPyNetSendPack
 import NetPackCommon
+import AuctionHouse
 
 import time
 import datetime
@@ -484,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":
@@ -528,14 +528,6 @@
         if not curPlayer:
             return
         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':    #地图服务器更新玩家充值总数排行榜
@@ -665,16 +657,6 @@
                 
         return
     
-    # 领地争夺战拔旗消耗
-    if callName =="ManorWarGetFlagCost":
-        PlayerManorWar.ManorWarGetFlagCost(eval(resultName))
-        return
-    
-    # 领地争夺战获胜战盟
-    if callName =="ManorWarWinner":
-        PlayerManorWar.DoMapServerManorWarWinner(eval(resultName))
-        return
-    
     # 战盟副本boss开始、被击杀
     if callName =="FamilyBossFBState":
         PlayerFamilyBoss.FamilyBossOnKilled(eval(resultName), tick)
@@ -719,22 +701,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)
-        if not curPlayer:
-            return
-        
-        guiderDay = eval(resultName)[0]
-        PlayerControl.SetFreshmanGuiderDay(curPlayer, guiderDay)
-        return
-    
     #生成仙盟红包
     if callName == "MapServer_CreatRedPacket":
         PlayerFamilyRedPacket.MapServer_CreatRedPacket(eval(resultName))
@@ -761,6 +727,10 @@
     if callName =="DuJieFBOver":
         PlayerDuJie.DoDuJieFBOver(eval(resultName))
         return
+    #境界提升全服buff
+    if callName =="RealmUpAddBuff":
+        PlayerDuJie.DoRealmUpAddBuff(resultName)
+        return
     
     # 组队副本队长请求进入询问结果
     if callName == "EnterFBTeamAsk":
@@ -778,6 +748,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 +819,14 @@
     #增加boss复活点
     if callName =="AddBossRebornPoint":
         GameWorldBoss.AddBossRebornPoint(eval(resultName))
+        return
+    #多仙盟BOSS结束
+    if callName =="AllFamilyBossOver":
+        PlayerFamilyBoss.AllFamilyBossKilled()
+        return
+    #骑宠BOSS结束
+    if callName =="HorsePetBossOver":
+        PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))
         return
     
 #---return分割线-----------------------------------------------------------------
@@ -910,25 +898,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 == "HighLadderReward":
-        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-        import HighLadder
-        needResult, resultName = HighLadder.MapServer_HighLadderReward(curPlayer, eval(resultName))
-        if not needResult:
-            return
+#    # 战盟仓库
+#    if callName == "FamilyStore":
+#        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+#        if not curPlayer:
+#            return
+#        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
         
     srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
     

--
Gitblit v1.8.0