From aa385f92cd9b9809fa3417a1c757ee60d36d35bf Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 04 四月 2019 14:28:53 +0800
Subject: [PATCH] 3258 【主干】修为池显示错误

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   44 +++++---------------------------------------
 1 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index e5e9e64..7672c0a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -37,7 +37,6 @@
 import PlayerBillboard
 import PlayerExam
 import PlayerControl
-import PlayerRecall
 import PlayerFamilyAction
 import PlayerUniversalGameRec
 import PlayerFamily
@@ -48,12 +47,12 @@
 import PlayerFB
 import UpdatePlayerName
 import PlayerFamilyBoss
-import PlayerManorWar
 import GameWorldBoss
 import GameWorldFamilyWar
 #import PlayerFamilyTech
 import PlayerFamilyRedPacket
 import PlayerFBHelpBattle
+import PlayerHorsePetBoss
 #import PlayerFamilyStore
 import PlayerFamilySWRH
 import GameWorldProcess
@@ -546,11 +545,6 @@
         PlayerControl.TeamNotify(teamID, msg, msgList)
         return
     
-    if callName == 'ReveiveRecallAward':
-        #召回奖励领取情况
-        PlayerRecall.ReveiveRecallAwardResult(srcPlayerID, resultName)
-        return
-    
     if callName == "NotifyTruckDestroy":
         killTruckPlayerName, exp, zhenQi, prestige, moneyCnt, moneyType = eval(resultName)
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -657,16 +651,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)
@@ -709,16 +693,6 @@
     # 全局击杀数统计
     if callName =="GlobalKillCount":
         GameWorldProcess.UpdGlobalKillCount(eval(resultName))
-        return
-    
-    # 新手指导员天数
-    if callName =="FreshmanGuiderDay":
-        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-        if not curPlayer:
-            return
-        
-        guiderDay = eval(resultName)[0]
-        PlayerControl.SetFreshmanGuiderDay(curPlayer, guiderDay)
         return
     
     #生成仙盟红包
@@ -844,6 +818,10 @@
     if callName =="AllFamilyBossOver":
         PlayerFamilyBoss.AllFamilyBossKilled()
         return
+    #骑宠BOSS结束
+    if callName =="HorsePetBossOver":
+        PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))
+        return
     
 #---return分割线-----------------------------------------------------------------
 
@@ -888,10 +866,6 @@
             return
         resultName = '%s' % ret
         
-    if callName == 'SendInviteCode':
-        #邀请码验证回复
-        resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())
-    
     if callName == 'OpenServerCampaignAward':
         #可否领取开服活动奖励
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -920,14 +894,6 @@
 #        if not curPlayer:
 #            return
 #        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
-     
-    # 玩家天梯奖励
-    if callName == "HighLadderReward":
-        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-        import HighLadder
-        needResult, resultName = HighLadder.MapServer_HighLadderReward(curPlayer, eval(resultName))
-        if not needResult:
-            return
         
     srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
     

--
Gitblit v1.8.0