From df2aaca6d5b503cc993ec2bf782de6a3a6d900cb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 27 四月 2019 11:52:45 +0800
Subject: [PATCH] 6636 【后端】【2.0】仙宝寻主
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.py
index a9c50a9..89a7e9c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.py
@@ -145,7 +145,7 @@
# GameWorld.DebugLog(" 创建新战盟家园: tagFamilyID=%s,tagFamilyHomeLV=%s,resultLineID=%s"
# % (tagFamilyID, tagFamilyHomeLV, resultLineID))
#===================================================================================================
- elif tagMapID in [ChConfig.Def_FBMapID_SealDemon, ChConfig.Def_FBMapID_ZhuXianBoss]:
+ elif tagMapID in [ChConfig.Def_FBMapID_HorsePetBoss, ChConfig.Def_FBMapID_SealDemon, ChConfig.Def_FBMapID_ZhuXianBoss, ChConfig.Def_FBMapID_AllFamilyBoss, ChConfig.Def_FBMapID_DemonKing]:
tagMapPropertyID = tagMapLineID + 1 # 因为PropertyID默认是0，所以使用时从1开始
resultLineID = -1 # 结果lineID
@@ -166,24 +166,24 @@
# 如果不是同一线路属性的，则跳过
if propertyID == tagMapPropertyID:
if tagMapID == ChConfig.Def_FBMapID_SealDemon:
- if GameLogic_SealDemon.GetBossRemainHPPer(tagMapLineID, tick) < 15:
+ if GameLogic_SealDemon.GetBossRemainHPPer(index, tagMapLineID, tick) < 15:
findGameWord = None
findPlayerManager = None
notifyMark = "DemonJar_Text4"
break
elif tagMapID == ChConfig.Def_FBMapID_ZhuXianBoss:
- if GameLogic_ZhuXianBoss.GetBossRemainHPPer(tagMapLineID, tick) < 15:
+ if GameLogic_ZhuXianBoss.GetBossRemainHPPer(index, tagMapLineID, tick) < 15:
findGameWord = None
findPlayerManager = None
notifyMark = "DemonJar_Text4"
break
findGameWord = gameWorld
- findPlayerManager = gameWorld
+ findPlayerManager = playerManager
break
if not findGameWord and propertyID == 0:
findGameWord = gameWorld
- findPlayerManager = gameWorld
+ findPlayerManager = playerManager
if findPlayerManager and tagMapID == ChConfig.Def_FBMapID_ZhuXianBoss:
if packCMDList[3] !=-1 and not GameLogic_ZhuXianBoss.GetHasSameFamilyMerber(packCMDList[3], findPlayerManager):
--
Gitblit v1.8.0