From 6e928c09df9d294e2f90cd91189a3c9abb7b007f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 十月 2025 17:58:33 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(词条技能1014 ~ 1019:增加技能初始CD支持,优化技能CD;优化技能属性、buff属性计算;修复纯buff怒技没有同步技能的bug;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
index c419aac..f700730 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
@@ -27,6 +27,7 @@
 import ShareDefine
 import PlayerMail
 import DBDataMgr
+import TurnSkill
 import ObjPool
 
 def OnDay():
@@ -80,7 +81,7 @@
         GameWorld.DebugLog("非今日天子考验! mapID=%s,funcLineID=%s != %s,bossID=%s" % (mapID, funcLineID, lineID, bossID))
         return
     
-    return True
+    return True, funcLineID
 
 def GetFBNPCInitAttr(curPlayer, turnFight, npcObj):
     ## 获取副本指定NPC初始化属性
@@ -90,7 +91,7 @@
         return {}
     return __getBossAttrDict(ipyDataList[0])
 
-def OnFBNPCKilledBefore(curPlayer, turnFight, gameObj, killer):
+def OnFBNPCKilledBefore(curPlayer, turnFight, gameObj, killer=None, useSkill=None):
     ## 副本NPC被击杀前处理,一般用于处理一些不被击杀的副本NPC逻辑
     # @return: 可否被正常击杀
     
@@ -120,11 +121,12 @@
         GameWorld.Log("天子考验全部血条被击杀! totalHPMax=%s,statDefValueTotal=%s" % (totalHPMax, statDefValueTotal))
         return True
     
-    gameObj.SetMaxHP(ipyDataNow.GetMaxHP(), True)
-    gameObj.SetHP(hp, True)
+    gameObj.SetMaxHP(ipyDataNow.GetMaxHP(), False)
+    gameObj.SetHP(hp, False)
     GameWorld.DebugLog("更新NPC血条: hpNum=%s,hp=%s/%s, statDefValueTotal=%s" % (hpNum, gameObj.GetHP(), gameObj.GetMaxHP(), statDefValueTotal))
+    TurnSkill.Sync_HPRefresh(turnFight, gameObj)
     turnFight.SetDict("hpNum", hpNum)
-    turnFight.syncHelp({"hpNum":hpNum})
+    #turnFight.syncHelp({"hpNum":hpNum})
     gameObj.UpdInitBatAttr(__getBossAttrDict(ipyDataNow))
     return False
 

--
Gitblit v1.8.0