From 688e59b6ce2aab1838a08924ddf5bbee33180f61 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 19 六月 2019 10:41:20 +0800
Subject: [PATCH] 7389 【后端】【2.0】骑宠争夺中副本需要显示倒计时
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.py | 6 +++---
1 files changed, 3 insertions(+), 3 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 c83570d..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, ChConfig.Def_FBMapID_AllFamilyBoss]:
+ 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,13 +166,13 @@
# 如果不是同一线路属性的，则跳过
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"
--
Gitblit v1.8.0