From 33213bf05479454d216a067d7a30f739d5eaaff9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 15 十月 2018 15:34:14 +0800
Subject: [PATCH] 2143 【bug】灵宠冰火冥魂无法出战  宠物背包格子改为50

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 8a604b4..ac5dc5c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -840,7 +840,7 @@
 #初始化临时存放背包格子数
 Def_PackCnt_TempItem = 10
 #初始化宠物背包格子数
-Def_PackCnt_Pet = 20
+Def_PackCnt_Pet = 50
 #初始化通用宠物装备背包格子数
 Def_PackCnt_PetEquip = 4
 #主角刚登陆游戏开启精魄槽格子数/符文
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 272f7c9..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

--
Gitblit v1.8.0