From d6e4fc9d6c90c5b583b46d292d016a4a3f7e2463 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 20 四月 2019 16:52:09 +0800
Subject: [PATCH] 6459 【后端】【2.0】缥缈仙域开发单(采集物表增加是否任务采集物)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 6690bda..7b38343 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,7 +47,6 @@
 import PlayerFB
 import UpdatePlayerName
 import PlayerFamilyBoss
-import PlayerManorWar
 import GameWorldBoss
 import GameWorldFamilyWar
 #import PlayerFamilyTech
@@ -514,6 +512,14 @@
         PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)
         return
     
+    if callName == "DynamicLineMapStateChange":
+        PlayerFB.OnCrossDynamicLineStateChange(eval(resultName))
+        return
+    
+    if callName == "DynamicLineMapInitOK":
+        PlayerFB.OnCrossDynamicMapReset(eval(resultName))
+        return
+    
     if callName == "CommMapServerInitOK":
         dataMapID, lineID, realMapID, copyMapID = eval(resultName)
         PyGameData.g_commMapLineInfo[(dataMapID, lineID)] = (realMapID, copyMapID)
@@ -545,11 +551,6 @@
         msg, msgList = eval(resultName)
         
         PlayerControl.TeamNotify(teamID, msg, msgList)
-        return
-    
-    if callName == 'ReveiveRecallAward':
-        #召回奖励领取情况
-        PlayerRecall.ReveiveRecallAwardResult(srcPlayerID, resultName)
         return
     
     if callName == "NotifyTruckDestroy":
@@ -658,16 +659,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)
@@ -710,16 +701,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
     
     #生成仙盟红包
@@ -893,10 +874,6 @@
             return
         resultName = '%s' % ret
         
-    if callName == 'SendInviteCode':
-        #邀请码验证回复
-        resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())
-    
     if callName == 'OpenServerCampaignAward':
         #可否领取开服活动奖励
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -925,14 +902,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