From a075f7841fb2d0a3b32bf10c8bc2df5bf02d6acb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 14 十二月 2025 14:24:28 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(贾诩所有技能;5022效果支持配置buff额外属性计算方式;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 0914eab..1109ecf 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
@@ -20,8 +20,10 @@
 import GameWorld
 import ItemControler
 import PlayerControl
+import PlayerSuccess
 import PlayerBillboard
 import ChPyNetSendPack
+import DataRecordPack
 import NetPackCommon
 import IpyGameDataPY
 import ShareDefine
@@ -29,7 +31,6 @@
 import PlayerMail
 import DBDataMgr
 import TurnSkill
-import ObjPool
 
 def OnDay():
     ## 结算昨日奖励
@@ -82,7 +83,6 @@
         GameWorld.DebugLog("非今日天子考验! mapID=%s,funcLineID=%s != %s,bossID=%s" % (mapID, funcLineID, lineID, bossID))
         return
     
-    PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_FBTianzi)
     return True, funcLineID
 
 def GetFBNPCInitAttr(turnFight, npcObj):
@@ -196,6 +196,9 @@
     FBCommon.AddEnterFBCount(curPlayer, mapID)
     ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Tianzi", False, {}], isNotifyAward=False)
     SyncTianziInfo(curPlayer, lineID, bossID)
+    __onFBTianzi(curPlayer)
+    
+    DataRecordPack.DR_FBPass(curPlayer, mapID, funcLineID, {"hpNum":hpNum, "totalHurt":totalHurt})
     return
 
 def __getTianziAwardList(todayHurt, bossID, sweepCnt=1):
@@ -252,12 +255,18 @@
     overDict = {FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList), FBCommon.Over_isSweep:1, 
                 "totalHurt":todayHurtTotal, "todayHurtTotal":todayHurtTotal}
     FBCommon.NotifyFBOver(curPlayer, mapID, lineID, isPass, overDict)
+    __onFBTianzi(curPlayer)
     return True
+
+def __onFBTianzi(curPlayer):
+    PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_FBTianzi)
+    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAFBTianzi, 1)
+    return
 
 def SyncTianziInfo(curPlayer, lineID=None, bossID=None):
     if lineID == None:
         lineID, bossID = GetTianziTodayInfo(curPlayer)
-    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCTianziKYInfo)
+    clientPack = ChPyNetSendPack.tagSCTianziKYInfo()
     clientPack.LineID = lineID
     clientPack.HistoryHurt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TianziHisHurt % bossID)
     clientPack.HistoryHurtEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TianziHisHurtEx % bossID)

--
Gitblit v1.8.0