From 9b25b2ff7ed6de7722ec81e77c7181913f991d93 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 29 五月 2024 22:18:50 +0800
Subject: [PATCH] 10170 【越南】【主干】【港台】终身卡(快速完成任务附加验证玩家是否有该任务)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index f336ce1..23652a3 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -51,6 +51,7 @@
 import GameWorldBoss
 import GameWorldFamilyWar
 #import PlayerFamilyTech
+import PlayerFamilyZhenfa
 import PlayerFamilyRedPacket
 import PlayerFBHelpBattle
 import PlayerHorsePetBoss
@@ -73,6 +74,7 @@
 import CrossRealmPK
 import CrossChampionship
 import CrossBattlefield
+import CrossFamilyFlagwar
 import CrossActAllRecharge
 import ChPyNetSendPack
 import NetPackCommon
@@ -670,6 +672,11 @@
         CrossBattlefield.MapServer_CrossBattlefieldOver(eval(resultName))
         return
     
+    # 跨服仙盟夺旗战/逐鹿万界 结算
+    if callName =="CrossFamilyFlagwarOver":
+        CrossFamilyFlagwar.MapServer_CrossFamilyFlagwarOver(eval(resultName))
+        return
+    
     # 跨服妖魔boss伤害结算
     if callName =="CrossYaomoBossHurtInfo":
         CrossYaomoBoss.MapServer_CrossYaomoBossHurtInfo(eval(resultName))
@@ -727,12 +734,6 @@
                 
         return
     
-    # 战盟副本boss开始、被击杀
-    if callName =="FamilyBossFBState":
-        PlayerFamilyBoss.FamilyBossOnKilled(eval(resultName), tick)
-        return
-    
-
     # 击杀boss掉落好物品
     if callName =="BossDropGoodItem":
         GameWorldBoss.OnKillBossDropGoodItem(eval(resultName), tick)
@@ -909,6 +910,22 @@
     if callName =="AllFamilyBossOver":
         PlayerFamilyBoss.AllFamilyBossKilled()
         return
+    #仙盟阵法
+    if callName =="FamilyZhenfa":
+        curPlayer = None
+        if srcPlayerID:
+            curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+            if not curPlayer:
+                return
+        PlayerFamilyZhenfa.MapServer_FamilyZhenfa(curPlayer, eval(resultName))
+        return
+    #仙盟传功
+    if callName =="FamilyChuangong":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        PlayerFamily.MapServer_FamilyChuangong(curPlayer, eval(resultName))
+        return
     #骑宠BOSS结束
     if callName =="HorsePetBossOver":
         PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))
@@ -991,6 +1008,13 @@
         ret = GameWorldArena.MapServer_Arena(curPlayer, eval(resultName))
         resultName = '%s' % ret if ret != None else '' # 需要重置间隔,每次都回复
         
+    # 仙盟boss
+    if callName =="FamilyBoss":
+        ret = PlayerFamilyBoss.MapServer_FamilyBoss(eval(resultName), tick)
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
     # 情缘
     if callName =="Love":
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
@@ -1017,7 +1041,10 @@
 #        if not curPlayer:
 #            return
 #        resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
-        
+    
+    if not srcPlayerID:
+        return
+    
     srcPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
     
     if not srcPlayer:

--
Gitblit v1.8.0