From 49687fb87f3ca5fb311cf0caef1185825dfa3ed0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 十二月 2025 14:12:46 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(优化战斗效率;司马懿所有技能;)

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
index a53d5a4..d16dfec 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -27,8 +27,8 @@
     passiveEffMgr = batObj.GetPassiveEffManager()
     skillEffInfo = passiveEffMgr.RefreshSkillPassiveEffect()
     buffEffInfo = passiveEffMgr.RefreshBuffPassiveEffect()
-    skillEffInfo and GameWorld.DebugLog("    被动技能效果: %s" % skillEffInfo)
-    buffEffInfo and GameWorld.DebugLog("    被动Buff效果: %s" % buffEffInfo)
+    skillEffInfo and GameWorld.DebugLogEx("    被动技能效果: %s", skillEffInfo)
+    buffEffInfo and GameWorld.DebugLogEx("    被动Buff效果: %s", buffEffInfo)
     return
 
 def OnTriggerPassiveEffect(turnFight, batObj, triggerWay, tagObj=None, connSkill=None, connSkillTypeID=0, connBuff=None, **kwargs):
@@ -43,7 +43,7 @@
         return
     # [["skill/buff", skillID, buffID, effIDList], ...]
     tagID = tagObj.GetID() if tagObj else 0
-    GameWorld.DebugLog("触发被动: triggerWay=%s,objID=%s,tagID=%s,%s" % (triggerWay, batObj.GetID(), tagID, effInfoList))
+    GameWorld.DebugLogEx("触发被动: triggerWay=%s,objID=%s,tagID=%s,%s", triggerWay, batObj.GetID(), tagID, effInfoList)
     for effInfo in effInfoList:
         sign = effInfo[0]
         skillID, buffID, effIDList = effInfo[1:]
@@ -63,6 +63,7 @@
     if not effSkill:
         return
     
+    kwargs["triggerWay"] = triggerWay
     for effID in effIDList:
         curEffect = effSkill.GetEffectByID(effID, triggerWay)
         if not curEffect:
@@ -91,6 +92,7 @@
         return
     skillData = effBuff.GetSkillData()
     
+    kwargs["triggerWay"] = triggerWay
     for effID in effIDList:
         curEffect = skillData.GetEffectByID(effID, triggerWay)
         if not curEffect:
@@ -170,7 +172,7 @@
             
             if effID in ChConfig.PassiveEffHappenValueList:
                 if value:
-                    GameWorld.DebugLog("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s,curValue=%s" % (calcEffID, atkObj.GetID(), tagID, effInfoList, value))
+                    GameWorld.DebugLogEx("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s,curValue=%s", calcEffID, atkObj.GetID(), tagID, effInfoList, value)
                     return value
             elif effID in ChConfig.PassiveEffValueMaxList:
                 curValue = max(curValue, value) # 取最大值
@@ -185,6 +187,6 @@
             #    if curSkill.GetCoolDownTime():
             #        SkillCommon.SetSkillRemainTime(curSkill, 0, tick, attacker)
             
-    GameWorld.DebugLog("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s,curValue=%s" % (calcEffID, atkObj.GetID(), tagID, effInfoList, curValue))
+    GameWorld.DebugLogEx("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s,curValue=%s", calcEffID, atkObj.GetID(), tagID, effInfoList, curValue)
     return curValue
 

--
Gitblit v1.8.0