From d3bf825fd42fb9327cd653331342fceb938147b8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 三月 2019 11:22:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
index 472774c..8df0ab8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
@@ -44,7 +44,8 @@
(
Def_BossTime, #BOSS时间
Def_LeaveTime, #离开时间
- ) = range(2)
+ Def_HPSpeed, #掉血速度公式
+ ) = range(3)
#当前副本地图的状态
(
@@ -158,9 +159,9 @@
FBCommon.SetFBStep(FB_Step_Fighting, tick)
EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_AllFamilyBoss, 0, ChConfig.CME_Log_Start)
- if fbStep >= FB_Step_Over:
- PlayerControl.PlayerLeaveFB(curPlayer)
- return
+ if fbStep >= FB_Step_Over:
+ PlayerControl.PlayerLeaveFB(curPlayer)
+ return
if familyID not in PyGameData.g_allfamilyBossDict:
PyGameData.g_allfamilyBossDict[familyID] = [curPlayer.GetFamilyName(), 0, [playerID]]
@@ -518,8 +519,9 @@
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
if lineID < 0:
return
-
- curSpeed = int(min(1 + 0.08 * (playerCnt - 1), 1.8) * 1000)
+
+
+ curSpeed = eval(FBCommon.GetFBLineStepTime(ChConfig.Def_FBMapID_AllFamilyBoss, lineID)[Def_HPSpeed])
gameWorld.SetGameWorldDict(FBDict_Speed, curSpeed)
if not gameWorld.GetGameWorldDictByKey(FBDict_IsReduceing):
return
--
Gitblit v1.8.0