From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 十月 2018 15:04:06 +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_MergeBoss.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.py
index 43083e9..bab5052 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.py
@@ -40,7 +40,7 @@
import NPCCommon
import BuffSkill
import ChNPC
-
+import GameObj
import random
#当前副本地图的状态
@@ -807,7 +807,7 @@
objID = curNPC.GetID()
npcID = curNPC.GetNPCID()
- g_curBossDict["%s_%s" % (objID, npcID)] = [objID, npcID, curNPC.GetHP(), curNPC.GetMaxHP(),
+ g_curBossDict["%s_%s" % (objID, npcID)] = [objID, npcID, GameObj.GetHP(curNPC), GameObj.GetMaxHP(curNPC),
curNPC.GetPosX(), curNPC.GetPosY()]
__CheckOutTimeBuff(tick)
@@ -1142,7 +1142,7 @@
hpPerList = sorted(hpPerDict.keys(), reverse = True)
maxBuffCnt = bossBuffInfo[2]
- nowHPPer = defender.GetHP() * 100 / defender.GetMaxHP() # 当前百分比
+ nowHPPer = GameObj.GetHP(defender) * 100 / GameObj.GetMaxHP(defender) # 当前百分比
gameFB = GameWorld.GetGameFB()
hpPerMarkKey = FBDict_BossHPPerMark % (objID, npcID)
hpPerLogicMark = gameFB.GetGameFBDictByKey(hpPerMarkKey)
@@ -1219,7 +1219,7 @@
# @param tick 时间戳
# @return 无意义
# @remarks
-def OnCollectOK(curPlayer, tick):
+def OnCollectOK(curPlayer, npcID, tick):
global g_buffOwnerNPCDict
global g_bossBuffCntDict
--
Gitblit v1.8.0