From 7b90cde5f40489da145a24dd30dc44c5e784c08e Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 26 十一月 2025 20:34:19 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py index bd5c6db..80618ed 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py @@ -918,7 +918,7 @@ HurtType_Fail, # 失败 - 如概率没有触发 0 HurtType_Normal, # 伤害 1 HurtTYpe_Cure, # 治疗 2 -HurtType_3, +HurtType_Revive, # 复活 3 HurtType_Immune, # 免疫 4 HurtType_Parry, # 格挡 5 HurtType_IgnoreDef, # 无视防御/真实伤害 6 @@ -1354,7 +1354,8 @@ SkillTagAffect_AtkHighest, # 攻击力最高 5 SkillTagAffect_Burn, # 灼烧/玄火目标优先 6 SkillTagAffect_PoisonCure, # 仅焚血（毒奶）目标 7 -) = range(8) +SkillTagAffect_DamShield, # 承伤盾目标优先 8 +) = range(9) #技能施法目标 Def_UseSkillAim_Type = 3 @@ -3996,7 +3997,9 @@ TriggerWay_BeParry, # 被格挡时 37 TriggerWay_BeMiss, # 被闪避时 38 TriggerWay_BeAtkBack, # 被反击时 39 -) = range(1, 1 + 39) +TriggerWay_InBattlefield, # 在场时 40 +TriggerWay_Revive, # 复活时 41 +) = range(1, 1 + 41) # 不加载的被动触发方式，一般用于本技能固定触发逻辑用的 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst] @@ -4028,6 +4031,7 @@ PassiveEff_AddAngerSkillPerByXP = 6018 # 增加怒气技能伤害（按消耗怒气值） PassiveEff_AddBatDamPerByTagLostHP = 6019 # 战斗增伤（按目标已损失生命） PassiveEff_AddSkillPerByBuffState = 6020 # 增加技能系数（验证由buff状态触发的） +PassiveEff_AddBuffLayer = 6021 # 添加buff层级时额外增加x层 # 被动效果ID有触发值时就返回的 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid] @@ -4046,6 +4050,8 @@ SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能 SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残（先扣血） SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数 +SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff +SkillEff_ReviveNoUse = 7011 # 没有复活目标时释放其他技能 ( TriggerType_BeSuperHit, # 被暴击触发技能 1 -- Gitblit v1.8.0