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/Attack/BattleObj.py |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
index aaf563b..f2a0f36 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
@@ -421,7 +421,7 @@
         self._value2 = 0
         self._value3 = 0
         self._isCopy = 0 # 是否复制的buff
-        self._effExDict = {} # 效果ID额外数值 {effID:value, ...} # 计算方式取决于本buff技能中属性效果ID的配置
+        self._effExDict = {} # 效果ID额外数值 {(effID, calcType):value, ...} # 计算方式取决于本buff技能中属性效果ID的配置
         self._haloObjIDList = [] # 光环有效目标ID列表 [objID, ...],ownerID为自己时即为光源,包含光源
         return
     
@@ -465,11 +465,8 @@
     def SetValue3(self, value): self._value3 = value
     def GetIsCopy(self): return self._isCopy
     def SetIsCopy(self, isCopy): self._isCopy = isCopy
-    def GetEffectValueEx(self, effID):
-        if effID in self._effExDict:
-            return self._effExDict[effID]
     def ResetEffectValueEx(self): self._effExDict = {}
-    def AddEffectValueEx(self, effID, valueEx): self._effExDict[effID] = self._effExDict.get(effID, 0) + valueEx
+    def AddEffectValueEx(self, effID, valueEx, calcType=1): self._effExDict[(effID, calcType)] = self._effExDict.get((effID, calcType), 0) + valueEx
     def GetEffectExDict(self): return self._effExDict
     def GetHaloObjIDList(self): return self._haloObjIDList
     def SetHaloObjIDList(self, haloObjIDList): self._haloObjIDList = haloObjIDList

--
Gitblit v1.8.0