From a99b65c9ca7569dcaa24fef933e913e400fa9fef Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 25 十二月 2025 20:18:29 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(行商地板价后砍价随机范围开配置;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5022.py |   46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 45 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5022.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5022.py
index 2e01ef8..c5a57de 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5022.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5022.py
@@ -16,14 +16,58 @@
 #-------------------------------------------------------------------------------
 
 import GameWorld
+import BattleObj
 
 def DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs):
     effEx1 = curEffect.GetEffectValue(0) # 支持多个属性
     effEx2 = curEffect.GetEffectValue(1) # 支持多个属性
-    for effEX in [effEx1, effEx2]:
+    calcRule = curEffect.GetEffectValue(2) # 附加计算规则,没配置默认增加固定值
+    
+    effExAdd = [0, 0, 0] # 某种条件下再额外效果值组 [buff效果ID/属性ID, 值, 计算方式]
+    calcLayer = 1 # 没配置的默认1层,相当于固定值
+    if calcRule:
+        ruleType = calcRule[0]
+        # 100 - 按友方某个国家武将数  参数1:国家
+        if ruleType == 100:
+            country = calcRule[1] if len(calcRule) > 1 else 0
+            onlyAlive = calcRule[2] if len(calcRule) > 2 else 0
+            batLineup = batObj.GetBatLineup()
+            countryCnt = 0
+            batObjMgr = BattleObj.GetBatObjMgr()
+            for objID in batLineup.posObjIDDict.values():
+                batObj = batObjMgr.getBatObj(objID)
+                if not batObj:
+                    continue
+                if batObj.GetCountry() != country:
+                    continue
+                if onlyAlive and not batObj.IsAlive():
+                    continue
+                countryCnt += 1
+            calcLayer = countryCnt
+            GameWorld.DebugLogEx("按友方某个国家武将数计算额外buff属性: ruleType=%s,country=%s,countryCnt=%s,onlyAlive=%s", ruleType, country, countryCnt, onlyAlive)
+        # 101 - 仅对指定性别有效  参数1:性别
+        elif ruleType == 101:
+            onlySex = calcRule[1] if len(calcRule) > 1 else 0
+            if tagObj.GetSex() != onlySex:
+                GameWorld.DebugLogEx("5022额外buff对该性别无效: ruleType=%s,onlySex=%s,tagSex=%s,tagID=%s", ruleType, onlySex, tagObj.GetSex(), tagObj.GetID())
+                return
+        # 102 - 同国武将额外提升 参数1:额外提升值
+        elif ruleType == 102:
+            if batObj.GetCountry() == tagObj.GetCountry() and len(calcRule) == 4:
+                effExAdd = calcRule[1:]
+                GameWorld.DebugLogEx("同国武将再额外buff属性: ruleType=%s,country=%s,effExAdd=%s", ruleType, tagObj.GetCountry(), effExAdd)
+                
+    if calcLayer <= 0:
+        return
+    
+    for effEX in [effEx1, effEx2, effExAdd]:
         if not isinstance(effEX, list) or len(effEX) != 3:
             continue
         attrID, attrValue, calcType = effEX
+        if not attrID or not attrValue:
+            continue
+        if calcLayer > 1:
+            attrValue = int(attrValue * calcLayer)
         GameWorld.DebugLogEx("额外buff效果ID/属性ID值: attrID=%s,attrValue=%s,calcType=%s", attrID, attrValue, calcType)
         connBuff.AddEffectValueEx(attrID, attrValue, calcType)
     return True

--
Gitblit v1.8.0