From 416c1dc316df0be2aafa00657350ffca525c868f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 十月 2025 10:48:43 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(词条技能:增加属性类技能支持;增加触发方式24-掉血时触发;增加效果7009-限制技能最多触发次数;效果5011增加验证当前生命支持;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py                       |   39 ++++++++++++++++---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.py |   13 ++++++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py                      |   41 +++++++++++++++++++-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py                             |    4 +
 4 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 133feb9..d13e74f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -4051,7 +4051,8 @@
 TriggerWay_AttackOverDirectOne, # 直接攻击后(除dot或buff外的攻击,多目标仅触发一次)21
 TriggerWay_BeAnyEffect, # 受到任意效果时(除直接攻击外的任意效果,如buff、dot、治疗、额外怒技)22
 TriggerWay_BuffAddByOwner, # buff添加时(施法者触发) 23
-) = range(1, 1 + 23)
+TriggerWay_BeHurt, # 掉血时 24
+) = range(1, 1 + 24)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
@@ -4098,6 +4099,7 @@
 SkillEff_ActionUseInvalid = 7006 # 行动时不可释放技能(可连击、反击、追击)
 SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
 SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
+SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.py
index 34209f9..a93acd6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.py
@@ -20,6 +20,19 @@
 
 def DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs):
     skillID = curEffect.GetEffectValue(0) # 技能ID,为0时释放本技能
+    checkHPInfo = curEffect.GetEffectValue(1) # 可附加验证生命值[计算方式, 百分比]
+    if checkHPInfo:
+        checkType, checkHPPer = checkHPInfo
+        nowPer = batObj.GetHP() / float(batObj.GetMaxHP()) * 100
+        # 小于等于
+        if checkType == 0:
+            if nowPer > checkHPPer:
+                return
+        # 大于等于
+        else:
+            if nowPer < checkHPPer:
+                return
+            
     if not skillID:
         passiveSkill = effSkill
     else:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
index d101084..38d17f3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -357,8 +357,33 @@
     GameWorld.DebugLog("RefreshBuffAttr ID:%s,atk=%s,def=%s,hp=%s/%s,batAttrDict=%s" 
                        % (objID, batObj.GetAtk(), batObj.GetDef(), befHP, befMaxHP, batAttrDict))
     
+    skbufAttrDict = {}
+    
+    # 属性技能
+    skillAttrDict = {}
+    skillManager = batObj.GetSkillManager()
+    for index in range(0, skillManager.GetSkillCount()):
+        curSkill = skillManager.GetSkillByIndex(index)
+        if not curSkill:
+            continue
+        for eIndex in range(curSkill.GetEffectCount()):
+            effect = curSkill.GetEffect(eIndex)
+            effID = effect.GetEffectID()
+            if effID not in ChConfig.AttrIDList:
+                continue
+            if effect.GetTriggerWay():
+                continue
+            attrID = effID
+            attrValue = effect.GetEffectValue(0)
+            calcType = effect.GetEffectValue(1)
+            if calcType == 2: # 减少,其他默认增加
+                attrValue = -attrValue
+            skillAttrDict[attrID] = skillAttrDict.get(attrID, 0) + attrValue
+            skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue
+    skillAttrDict and GameWorld.DebugLog("    skillAttrDict=%s" % skillAttrDict)
+    
     # buff
-    buffAttrDict = {} # buff属性 {attrID:value, } value可能是负值
+    buffsAttrDict = {} # buff属性 {attrID:value, } value可能是负值
     buffMgr = batObj.GetBuffManager()
     for index in range(buffMgr.GetBuffCount()):
         buff = buffMgr.GetBuffByIndex(index)
@@ -375,17 +400,19 @@
             calcType = effect.GetEffectValue(1)
             if calcType == 2: # 减少,其他默认增加
                 attrValue = -attrValue
-            buffAttrDict[attrID] = buffAttrDict.get(attrID, 0) + attrValue
+            buffsAttrDict[attrID] = buffsAttrDict.get(attrID, 0) + attrValue
+            skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue
             
-    GameWorld.DebugLog("    buffAttrDict=%s" % buffAttrDict)
+    buffsAttrDict and GameWorld.DebugLog("    buffsAttrDict=%s" % buffsAttrDict)
+    GameWorld.DebugLog("    skbufAttrDict=%s" % skbufAttrDict)
     
     objID = batObj.GetID()
     # 先计算百分比加成或降低的
     perIDList = ChConfig.AttrPerDict.values()
     for attrID, attrPerID in ChConfig.AttrPerDict.items():
-        if attrPerID not in buffAttrDict:
+        if attrPerID not in skbufAttrDict:
             continue
-        attrPerValue = buffAttrDict[attrPerID] # 可能是负值
+        attrPerValue = skbufAttrDict[attrPerID] # 可能是负值
         attrValue = batObj.GetBatAttrValue(attrID, False)
         if attrValue <= 0:
             continue
@@ -395,7 +422,7 @@
         GameWorld.DebugLog("    attrID=%s(PerID:%s),attrValue=%s(PerValue:%s),updValue=%s" % (attrID, attrPerID, attrValue, attrPerValue, updValue))
         
     # 再累加非百分比的固定值
-    for attrID, addValue in buffAttrDict.items():
+    for attrID, addValue in skbufAttrDict.items():
         if attrID in perIDList:
             continue
         attrValue = batObj.GetBatAttrValue(attrID, False)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index 0f82ce0..c3fe775 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -68,6 +68,9 @@
             GameWorld.DebugLog("技能使用处于buff状态限制中! skillID=%s,buffStateGroups=%s,limitState=%s" % (skillID, buffStateGroups, limitState))
             return
         
+    if CheckSkillUseCntLimit(curBatObj, useSkill):
+        return
+    
     #没有指定目标,则按技能自身的目标逻辑
     if not tagObjList:
         tagObjList = GetSkillTags(turnFight, curBatObj, useSkill)
@@ -157,6 +160,32 @@
     if usePoolSkill:
         poolMgr.release(useSkill)
     return True
+
+def CheckSkillUseCntLimit(batObj, useSkill):
+    ## 检查技能使用次数是否受限
+    # @return: 是否受限
+    if not hasattr(useSkill, "GetEffectByID"):
+        return
+    effect = useSkill.GetEffectByID(ChConfig.SkillEff_SkillUseCntLimit)
+    if not effect:
+        return
+    useCntLimit = effect.GetEffectValue(0) # 每场战斗最大次数,0不限
+    turnUseCntLimit = effect.GetEffectValue(1) # 每大回合最大次数,0不限
+    
+    skillID = useSkill.GetSkillID()
+    if useCntLimit:
+        useCnt = batObj.GetSkillUseCnt(skillID)
+        if useCnt >= useCntLimit:
+            GameWorld.DebugLog("技能每场战斗使用次数受限! skillID=%s,useCnt=%s >= %s" % (skillID, useCnt, useCntLimit))
+            return True
+        
+    if turnUseCntLimit:
+        turnUseCnt = batObj.GetSkillTurnUseCnt(skillID)
+        if turnUseCnt >= turnUseCntLimit:
+            GameWorld.DebugLog("技能每大回合使用次数受限! skillID=%s,turnUseCnt=%s >= %s" % (skillID, turnUseCnt, turnUseCntLimit))
+            return True
+        
+    return
 
 def IsNeedSyncSkill(useSkill):
     ## 使用需要同步B427使用技能
@@ -976,7 +1005,8 @@
     # 统计伤血,可能单个技能对同一目标造成多次伤害
     totalHurtValue = 0
     isSuperHit, isStun, isSuckHP = False, False, False
-    missObjIDList, immuneObjIDList = [], []
+    missObjIDList, immuneObjIDList = [], [] # 闪避、免疫对象ID列表
+    beHurtObjIDList = [] # 受伤的对象ID列表
     for hurtObj in useSkill.GetHurtObjList():
         hurtObjID = hurtObj.GetObjID()
         tagObj = batObjMgr.getBatObj(hurtObjID)
@@ -988,7 +1018,10 @@
             
         if hurtObj.HaveHurtType(ChConfig.HurtType_Normal):
             totalHurtValue += hurtObj.GetHurtHP()
-            
+            if hurtObj.GetLostHP() > 0: # 有掉血的
+                if hurtObjID not in beHurtObjIDList:
+                    beHurtObjIDList.append(hurtObjID)
+                    
         if hurtObj.HaveHurtType(ChConfig.HurtType_Miss):
             if hurtObjID not in missObjIDList:
                 missObjIDList.append(hurtObjID)
@@ -1054,6 +1087,10 @@
         if tagID in effIgnoreObjIDList:
             continue
         
+        # 掉血时
+        if tagID in beHurtObjIDList:
+            TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BeHurt, curObj, connSkill=useSkill)
+            
         # 直接攻击
         if isAttackDirect:
             if not triggerOne:

--
Gitblit v1.8.0