From 6366979426fccd97c0cb0bd384ada3a8b9843a24 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 25 十月 2018 14:37:22 +0800
Subject: [PATCH] 2198 【主干】仙盟盟主5天没上线,盟主没有主动传位

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
index f988118..0c8873c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -235,15 +235,16 @@
     
     # 当前状态处理
     if curState == ShareDefine.Def_PetState_Fight:
-        curPet = curPlayer.GetPetMgr().GetFightPet()
-        if curPet:
-            #已是出战状态, C++召唤坐标和人重叠
-            resultPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), ChConfig.Def_SummonAppearDist)
-            curPet.ResetPos(resultPos.GetPosX(), resultPos.GetPosY())
-            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPet)
-            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveBuff(curPet)
-        return
-        #PetControl.ReCallFightPet(curPlayer)
+#        curPet = curPlayer.GetPetMgr().GetFightPet()
+#        if curPet:
+#            #已是出战状态, C++召唤坐标和人重叠
+#            resultPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), ChConfig.Def_SummonAppearDist)
+#            curPet.ResetPos(resultPos.GetPosX(), resultPos.GetPosY())
+#            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPet)
+#            PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveBuff(curPet)
+#        return
+        #18/10/15 因为某种未知原因宠物物品的状态是出战(实际场景中未出战),导致该宠物无法出战,故再次发包出战时,此处不拦!
+        PetControl.ReCallFightPet(curPlayer)
    
     else:
         pass
@@ -316,7 +317,7 @@
     PetControl.SetPetHP(rolePet, rolePet.GetMaxHP(), False)
     
     #---通知客户端---
-    rolePet.Sync_PetInfo()
+    #rolePet.Sync_PetInfo()
     #刷新技能栏
     rolePet.Sync_SkillList()
     

--
Gitblit v1.8.0