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_6014.py |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6014.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6014.py
index 138239b..59d5158 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6014.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6014.py
@@ -16,16 +16,36 @@
 #-------------------------------------------------------------------------------
 
 import GameWorld
+import ChConfig
 
 def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, connSkill, **skillkwargs):
-    onlyFirstUse = curEffect.GetEffectValue(1) # 是否仅首次释放技能有效
-    if onlyFirstUse:
-        skillID = connSkill.GetSkillID() if connSkill else skillkwargs.get("connSkillID", 0)
+    addRate = curEffect.GetEffectValue(0)
+    firstTimeRate = curEffect.GetEffectValue(1) # 首次释放增加概率万分率
+    skillID = connSkill.GetSkillID() if connSkill else skillkwargs.get("connSkillID", 0)
+    if firstTimeRate:
         if not skillID:
             #GameWorld.DebugLog("没有增加概率的技能ID! %s" % skillkwargs)
             return
         useCnt = attacker.GetSkillUseCnt(skillID)
-        if useCnt > 0:
-            GameWorld.DebugLog("技能非首次使用不增加额外概率! skillID=%s,useCnt=%s" % (skillID, useCnt))
-            return
-    return curEffect.GetEffectValue(0)
+        if useCnt <= 0:
+            addRate = firstTimeRate
+            GameWorld.DebugLogEx("技能首次使用增加额外概率! skillID=%s,useCnt=%s,addRate=%s", skillID, useCnt, addRate)
+            
+    failAddRateEx = curEffect.GetEffectValue(2) # 失败次数额外增加概率
+    if failAddRateEx:
+        failCnt = attacker.GetSkillHappenFailCnt(skillID)
+        mustHappenFailCnt = curEffect.GetEffectValue(3) # x次失败后必定释放,大于0有效
+        if mustHappenFailCnt and failCnt >= mustHappenFailCnt:
+            addRate = ChConfig.Def_MaxRateValue # 强制增加满概率
+            GameWorld.DebugLog("技能概率失败次数必定成功: mustHappenFailCnt=%s,failCnt=%s,addRate=%s" % (mustHappenFailCnt, failCnt, addRate))
+        elif failCnt > 0:
+            addRate += failAddRateEx * failCnt
+            GameWorld.DebugLog("技能概率失败次数增加概率: failAddRateEx=%s,failCnt=%s,addRate=%s" % (failAddRateEx, failCnt, addRate))
+            
+    if effBuff:
+        buffLayer = effBuff.GetLayer()
+        if buffLayer > 1:
+            addRate *= buffLayer
+            GameWorld.DebugLog("多层buff增加技能概率! skillID=%s,buffLayer=%s,addRate=%s" % (effBuff.GetSkillID(), buffLayer, addRate))
+            
+    return addRate

--
Gitblit v1.8.0