From a410c052ad4992ca846e3e30f0ccf9ab0b85a1d7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 九月 2025 17:14:32 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(甄姬、曹操技能;增加本次技能万分比效果ID6004;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index 2a01244..e5a4564 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -265,7 +265,7 @@
         @param turnNum: 第x回合
         '''
         self.timeline = timeline
-        GameWorld.DebugLog("时间节点更新: %s" % self.timeline)
+        GameWorld.DebugLog("[时间节点更新]: %s" % self.timeline)
         if isEmpty:
             # 空位置的节点可直接跳过
             return timeline
@@ -618,7 +618,7 @@
     else:
         heroID = 0
         skinID = 0
-        skillIDList = [] + npcData.GetSkillIDList()
+        skillIDList = []# + npcData.GetSkillIDList()
         
     # boss额外随机技能
     bossID = lineupIpyData.GetBossID()
@@ -664,7 +664,7 @@
     angerSkillID = heroIpyData.GetAngerSkillID()
     skillIDList = [normalSkillID, angerSkillID]
     
-    breakIpyDataList = IpyGameDataPY.GetIpyGameDataList("HeroBreak", heroID)
+    breakIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("HeroBreak", heroID)
     if breakIpyDataList:
         for breakIpyData in breakIpyDataList:
             if breakIpyData.GetBreakLV() > breakLV:
@@ -740,11 +740,12 @@
         heroID = heroInfo.get("HeroID", 0)
         skinID = heroInfo.get("SkinID", 0)
         lv = heroInfo.get("LV", 1)
+        specialty, atkDistType, country, sex = 0, 1, 0, 1
         heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) if heroID else None
         if heroIpyData:
+            objName = heroIpyData.GetName()
             specialty = heroIpyData.GetSpecialty()
             atkDistType = heroIpyData.GetAtkDistType()
-            objName = heroIpyData.GetName()
             country = heroIpyData.GetCountry()
             sex = heroIpyData.GetSex()
             
@@ -758,11 +759,7 @@
             if not npcDataEx:
                 continue
             if not heroIpyData:
-                specialty = 0
-                atkDistType = npcDataEx.GetAtkDistType()
                 objName = npcDataEx.GetNPCName()
-                country = npcDataEx.GetCountry()
-                sex = npcDataEx.GetSex()
                 
         batObj = batObjMgr.addBatObj()
         if not batObj:
@@ -1167,7 +1164,7 @@
                 turnFight.syncState(FightState_Fighting)
                 
             for faction, num in turnFight.actionSortList:
-                GameWorld.DebugLog("回合开始逻辑: turnNum=%s,faction=%s, num=%s" % (turnNum, faction, num))
+                GameWorld.DebugLog("大回合开始逻辑: turnNum=%s,faction=%s, num=%s" % (turnNum, faction, num))
                 batFaction = turnFight.getBatFaction(faction)
                 batLineup = batFaction.getBatlineup(num)
                 batLineup.actionNum = 1
@@ -1258,7 +1255,7 @@
             
         # 回合开始
         for faction, num in turnFight.actionSortList:
-            GameWorld.DebugLog("回合开始逻辑: turnNum=%s,faction=%s, num=%s" % (turnNum, faction, num))
+            GameWorld.DebugLog("大回合开始逻辑: turnNum=%s,faction=%s, num=%s" % (turnNum, faction, num))
             batFaction = turnFight.getBatFaction(faction)
             batLineup = batFaction.getBatlineup(num)
             batLineup.actionNum = 1
@@ -1465,6 +1462,7 @@
     if batObj.GetHP() <= 0:
         return
     
+    GameWorld.DebugLog("---[武将回合开始时] : curID=%s,curHP=%s/%s" % (batObj.GetID(), batObj.GetHP(), batObj.GetMaxHP()))
     TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_HeroTurnStart)
     return
 

--
Gitblit v1.8.0