From c615417ddd01508caebc533b4fa21ed961d4bf06 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 20 十二月 2025 21:52:57 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(吕玲绮突破2潜能;张飞突破2、4潜能;刘备突破2潜能;黄月英突破2、6、7潜能;增加效果5508;优化效果5005;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 0ebf652..f3ef64c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -176,7 +176,9 @@
 AttrID_PVPDamPerDef,                        # PVP减伤 72
 AttrID_ReviveHPPer,                         # 复活生命加成 73
 AttrID_ReviveXPPer,                         # 复活怒气加成 74
-) = range(1, 1 + 74)
+AttrID_DOTBurnPer,                          # 灼烧增伤 75
+AttrID_DOTBurnPerDef,                       # 灼烧减伤 76
+) = range(1, 1 + 76)
 
 # 需要计算的武将战斗属性ID列表
 CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef, 
@@ -191,7 +193,7 @@
                         AttrID_WuFinalDamPer, AttrID_WuFinalDamPerDef, AttrID_QunFinalDamPer, AttrID_QunFinalDamPerDef,
                         AttrID_BatDamPer, AttrID_BatDamPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
                         AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef,
-                        AttrID_ReviveHPPer, AttrID_ReviveXPPer,
+                        AttrID_ReviveHPPer, AttrID_ReviveXPPer, AttrID_DOTBurnPer, AttrID_DOTBurnPerDef,
                         ]
 
 # 基础三维属性ID列表
@@ -932,7 +934,8 @@
 HurtAtkType_PoisonCureSuck,    # 吸血毒奶 11
 HurtAtkType_HarmSelf,          # 自残 12
 HurtAtkType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
-) = range(14)
+HurtAtkType_IgnoreShield,      # 无视承伤盾 14
+) = range(15)
 
 #伤害类型
 (
@@ -1346,7 +1349,8 @@
 SkillTagAim_Self, # 自己 5
 SkillTagAim_MainSkill, # 继承主技能目标 6
 SkillTagAim_MainSkillEx, # 继承主技能目标一次性处理 7
-) = range(8)
+SkillTagAim_MainSkillFriend, # 继承主技能友军 8
+) = range(9)
 
 # 技能目标 - 细分
 (
@@ -1359,7 +1363,8 @@
 SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
 SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
 SkillTagAffect_DamShield, # 承伤盾目标优先 8
-) = range(9)
+SkillTagAffect_Bleeding, # 仅流血目标 9
+) = range(10)
 
 #技能施法目标
 Def_UseSkillAim_Type = 3
@@ -1457,7 +1462,7 @@
    Def_SkillType_Revive       ,  #复活     8
    Def_SkillType_Increment    ,  #增值技能(不可清除)9  
    Def_SkillType_Halo         ,  #光环技能  10
-   Def_SkillType_Equip        ,  #装备技能  11
+   Def_SkillType_AtkEx        ,  #额外攻击  (一般用于额外造成的伤害,区分直接攻击)11
    Def_SkillType_Area         ,  #场景技能(buff)  12
    Def_SkillType_Summon       ,  #召唤  13
    Def_SkillType_Action       ,  #影响行为BUFF 14
@@ -1491,7 +1496,7 @@
                        #Def_SkillType_Revive     : IPY_GameWorld.bfIncBuff,  #复活     8
                        Def_SkillType_Increment  : IPY_GameWorld.bfIncBuff,  #增值技能(不可清除)9
                        Def_SkillType_Aura       : IPY_GameWorld.bfAura   ,  #光环技能  10
-                       Def_SkillType_Equip      : IPY_GameWorld.bfEquipBuff,#装备技能  11
+                       #Def_SkillType_Equip      : IPY_GameWorld.bfEquipBuff,#装备技能  11
                        Def_SkillType_Area       : IPY_GameWorld.bfMapBuff , #场景技能(buff)  12
                        Def_SkillType_Action     : IPY_GameWorld.bfActionBuff , #影响行为BUFF 14
                        
@@ -1545,6 +1550,7 @@
 #【注】光环类buff默认与光源(施法者)同步,其他受光环影响的目标同步该buff持续时间,持续时间及效果由施法者决定
 BuffLastTimeType_Default = 0 # 默认以获得buff时自身回合前后判断
 BuffLastTimeType_BigTurn = 1 # 大回合buff,每大回合开始固定减1回合
+BuffLastTimeType_BigTurnLayer = 2 # 大回合buff,每大回合开始固定减1层
 
 #动作类区分标识
 (
@@ -1889,6 +1895,10 @@
 PassByStarMapIDList = []
 #扫荡不需要检查是否已过关的地图
 SweepUnCheckPassMapIDList = [Def_FBMapID_Tianzi]
+#固定玩家获胜的地图
+PlayerWinMapIDList = [Def_FBMapID_Tianzi]
+#需要汇报中心副本过关进度的地图
+ReportCenterMapIDList = [Def_FBMapID_Zhanchui]
 
 #注册上传跨服服务器数据后直接进入跨服服务器的地图
 RegisterEnter_CrossServerMapIDList = []
@@ -2990,6 +3000,9 @@
     BatObjState_Link, # 链接(董白) 29
 ) = range(1 + 29)
 
+#属于灼烧状态的
+BurnStateList = [BatObjState_Burn, BatObjState_BurnPlus]
+
 #玩家状态定义,不能超过31个,如超过,需扩展多个key支持
 Def_PlayerStateList = (
     Def_PlayerState_Normal, # 无 0
@@ -3260,6 +3273,7 @@
 Def_PDict_TreasureLuck = "TreasureLuck_%s"  # 寻宝当前幸运值, 参数(寻宝类型)
 Def_PDict_TreasureCntAward = "TreasureCntAward_%s"  # 累计寻宝次数对应物品奖励领奖状态, 参数(寻宝类型)
 Def_PDict_TreasureGridCnt = "TreasureGridCnt_%s_%s"  # 格子对应累计产出次数, 参数(寻宝类型, 格子编号)
+Def_PDict_TreasureWish = "TreasureWish_%s_%s_%s"  # 心愿物品产出次数, 参数(寻宝类型, 库ID, 选择编号索引)  WishID*100+已产出次数
 
 Def_Player_Dict_LastAutoOpenPackTick = "LastAutoOpenPackTick219_%s"   #上一次自动购买的tick<背包类型>
 
@@ -3274,8 +3288,8 @@
 Def_PDict_EquipViewCacheState = "EquipViewCacheState"  # 本次上线是否同步过装备缓存
 Def_PDict_PackDataSyncState = "PackDataSyncState"  # 本次上线打包数据同步状态,按位存储是否同步 0-本服,1-跨服
 Def_PDict_PackDataSyncFightPower = "PackDataSyncFightPower"  # 本次上线打包数据同步时的战力,用于对比,只对比求余亿部分即可
-Def_PDict_DayOnlineTime = "OnlineTime"  # 当日在线时长
-Def_PDict_OnlineStartTick = "OnlineStartTime"        # 在线计算时间
+Def_PDict_DayOnlineTime = "DayOnlineTime"  # 当日在线时长
+Def_PDict_DayOnlineCalcTime = "DayOLCalcTime"        # 当日在线计算时间
 Def_PDict_LVAwardGetRecord = "LVAwardGetRecord"  # 等级奖励领取信息记录,按二进制位标示
 Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord"  # 等级奖励vip领取信息记录,按二进制位标示
 Def_PDict_HistoryChargeAwardGetRecord = "HTotalGoldAwardRecord"  # 历史累计充值奖励领取信息记录,按二进制位标示
@@ -3999,7 +4013,16 @@
 TriggerWay_Revive, # 复活时 41
 TriggerWay_BigTurnStartByDead, # 大回合开始时(死亡后有效) 42
 TriggerWay_WhenDie, # 死亡时(自己) 43
-) = range(1, 1 + 43)
+TriggerWay_EnemyAction, # 敌方行动后 44
+TriggerWay_FriendAction, # 友方行动后(包含自己) 45
+TriggerWay_HurtTag, # 对目标造成伤害时 46
+TriggerWay_BeControlledHard, # 受控时(硬控) 47
+TriggerWay_FriendCombo, # 友军连击时(包含自己) 48
+TriggerWay_FriendPursue, # 友军追击时(包含自己) 49
+TriggerWay_FriendAttackOverDirectOne, # 友方使用技能后(多目标仅触发一次,包含自己) 50
+TriggerWay_FriendAttackOverDirectOneNoSelf, # 友方使用技能后(多目标仅触发一次,不含自己) 51
+TriggerWay_DOTHurt, # 造成持续伤害时 52
+) = range(1, 1 + 52)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
@@ -4014,7 +4037,7 @@
 
 # 被动效果ID,属性类的直接使用属性ID当做效果ID
 PassiveEff_AddBuffLayerByWeight = 6001 # 根据权重随机添加buff层数 数值1-[[权重,层级], ...]
-PassiveEff_ChangeHurtType = 6002 # 变更本次伤害类型
+PassiveEff_ChangeHurtType = 6002 # 变更本次伤害类型(可验证目标状态)
 PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值(可增可减)
 PassiveEff_AddSkillPer = 6004 # 增加本次技能万分比(验证目标状态)
 PassiveEff_AddSkillPerByDeadTeammate = 6005 # 增加本次技能万分比(按队友死亡数)
@@ -4034,9 +4057,18 @@
 PassiveEff_AddBatDamPerByTagLostHP = 6019 # 战斗增伤(按目标已损失生命)
 PassiveEff_AddSkillPerByBuffState = 6020 # 增加技能系数(验证由buff状态触发的)
 PassiveEff_AddBuffLayer = 6021 # 添加buff层级时额外增加x层
+PassiveEff_IgnoreShield = 6022 # 穿盾效果,无视护盾值
+PassiveEff_ChangeHurtTypeByBuff = 6023 # 变更本次伤害类型(可验证由xx状态buff触发的)
+PassiveEff_ReduceLayer5023 = 6024 # 减少5023效果所需的buff状态层数
+PassiveEff_AddCureMulti = 6025 # 提升治疗技能最终治疗效果(根据身上buff状态层数)
+PassiveEff_AddCheckPer5505 = 6026 # 增减5505效果验证生命百分比(根据目标身上buff状态层数)
+PassiveEff_AddHurtAtkPerMax = 6027 # 增加技能最大攻击万分比限制
+PassiveEff_AddChangeLayers5008 = 6028 # 增减5008效果的转化层数
+PassiveEff_AddBatDamPerByLayer = 6029 # 提升技能战斗伤害(根据身上buff状态层数)
 
 # 被动效果ID有触发值时就返回的
-PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid]
+PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid, 
+                             PassiveEff_IgnoreShield]
 # 被动效果ID触发值取最大值的
 PassiveEffValueMaxList = [PassiveEff_ChangeHurtMulti]
 # 被动效果ID触发值取最小值的
@@ -4744,6 +4776,7 @@
 
 # 部分技能ID
 SkillID_SmyFanzhao = 1012050 # 返照
+SkillID_DongbaiRevive = 4009240 # 董白 - 复活
 
 # 经验倍率限制类型
 (
@@ -5105,7 +5138,8 @@
 TaskType_FBTianzi, # 挑战天子的考验x次 19
 TaskType_Rename, # 改名 20
 TaskType_HeroBook, # 武将图鉴激活x个  21
-) = range(1, 1 + 21)
+TaskType_HeroCall, # 武将招募X次  22
+) = range(1, 1 + 22)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0