From 6a93c58b83b1072f3247e56b636442ee4f06580c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 13 三月 2019 11:09:09 +0800
Subject: [PATCH] 6349 【后端】【2.0】boss掉血根据人数加快

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py |   14 ++++++++------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py                |    4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 4e91a7f..3d1fdd5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -1962,7 +1962,7 @@
         return
     
     buffType = SkillCommon.GetBuffType(skillBuff)
-    BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
+    
     gameFB.SetPlayerGameFBDict(ownerID, key, encourageLV+1)
     gameFB.SetPlayerGameFBDict(ownerID, encourageCntKey, encourageCnt+1)
     #GameWorld.Log("FbEncourageBuff encourage nextLV=%s success" % encourageLV)
@@ -1976,6 +1976,7 @@
                 continue
             if player.GetFamilyID() != ownerID:
                 continue
+            BuffSkill.DoAddBuff(player, buffType, skillBuff, tick)
             PlayerControl.NotifyCode(player, "AllianceBossText2", [curPlayer.GetName(), encourageLV+1])
             SendFBEncourageInfo(player, encourageLV+1, ownerID)
             if player.GetID() == curPlayer.GetID():
@@ -1983,6 +1984,7 @@
                 EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
             
     else:
+        BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
         PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])
         SendFBEncourageInfo(curPlayer, encourageLV+1, ownerID)
         #成就
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