From 2a659639d74889599ed54458863a2f7b31ff4eff Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 29 九月 2023 01:54:33 +0800
Subject: [PATCH] 9946 【BT0.1】【主干】仙盟BOSS修改

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index f336ce1..f402a26 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -727,12 +727,6 @@
                 
         return
     
-    # 战盟副本boss开始、被击杀
-    if callName =="FamilyBossFBState":
-        PlayerFamilyBoss.FamilyBossOnKilled(eval(resultName), tick)
-        return
-    
-
     # 击杀boss掉落好物品
     if callName =="BossDropGoodItem":
         GameWorldBoss.OnKillBossDropGoodItem(eval(resultName), tick)
@@ -991,6 +985,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 +1018,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