From fd46c6afd9024b1739a449786c284461d0394d0b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 01 十二月 2025 15:05:47 +0800
Subject: [PATCH] 358 【内政】红颜系统-服务端(白骨盈野特殊效果改为固定奖励)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   64 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index a04cbe8..cc573b3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -93,6 +93,12 @@
 
 Def_BuffValue_Count = 3     # buff记录的value个数
 
+# buff保留类型定义
+(
+BuffRetainType_Dead, # 死亡保留 1
+BuffRetainType_Revive, # 复活保留 2
+) = range(1, 1 + 2)
+
 #游戏对象属性--------------------------------------------
 # 属性ID列表,所有对象类型通用,如Player、NPC
 AttrIDList = (
@@ -168,7 +174,9 @@
 AttrID_ComboDamPerDef,                      # 连击减伤 70
 AttrID_PVPDamPer,                           # PVP增伤 71
 AttrID_PVPDamPerDef,                        # PVP减伤 72
-) = range(1, 1 + 72)
+AttrID_ReviveHPPer,                         # 复活生命加成 73
+AttrID_ReviveXPPer,                         # 复活怒气加成 74
+) = range(1, 1 + 74)
 
 # 需要计算的武将战斗属性ID列表
 CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef, 
@@ -182,7 +190,8 @@
                         AttrID_WeiFinalDamPer, AttrID_WeiFinalDamPerDef, AttrID_ShuFinalDamPer, AttrID_ShuFinalDamPerDef,
                         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_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef,
+                        AttrID_ReviveHPPer, AttrID_ReviveXPPer,
                         ]
 
 # 基础三维属性ID列表
@@ -913,22 +922,22 @@
 AfterLogic_AddBuff = "AddBuff"
 AfterLogic_SyncBuff = "SyncBuff"
 
-#伤害类型
+#伤害飘血类型
 (
-HurtType_Fail,              # 失败 - 如概率没有触发 0
-HurtType_Normal,            # 伤害 1
-HurtTYpe_Cure,              # 治疗 2
-HurtType_3,
-HurtType_Immune,            # 免疫 4
-HurtType_Parry,             # 格挡 5
-HurtType_IgnoreDef,         # 无视防御/真实伤害 6
-HurtType_SuperHit,          # 暴击 7
-HurtType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
-HurtType_Miss,              # 闪避 9
-HurtType_PoisonCureHurt,    # 伤害毒奶 10
-HurtType_PoisonCureSuck,    # 吸血毒奶 11
-HurtType_HarmSelf,          # 自残 12
-HurtType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
+HurtAtkType_Fail,              # 失败 - 如概率没有触发 0
+HurtAtkType_Hurt,              # 伤害 1
+HurtAtkType_Cure,              # 治疗 2
+HurtAtkType_Revive,            # 复活 3
+HurtAtkType_Immune,            # 免疫 4
+HurtAtkType_Parry,             # 格挡 5
+HurtAtkType_IgnoreDef,         # 无视防御/真实伤害 6
+HurtAtkType_SuperHit,          # 暴击 7
+HurtAtkType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
+HurtAtkType_Miss,              # 闪避 9
+HurtAtkType_PoisonCureHurt,    # 伤害毒奶 10
+HurtAtkType_PoisonCureSuck,    # 吸血毒奶 11
+HurtAtkType_HarmSelf,          # 自残 12
+HurtAtkType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
 ) = range(14)
 
 #伤害类型
@@ -1354,7 +1363,8 @@
 SkillTagAffect_AtkHighest, # 攻击力最高 5
 SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
 SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
-) = range(8)
+SkillTagAffect_DamShield, # 承伤盾目标优先 8
+) = range(9)
 
 #技能施法目标
 Def_UseSkillAim_Type = 3
@@ -3285,8 +3295,6 @@
 Def_PDict_MonthCTGCount = "MonthCTGCount_%s"  # 本月充值次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s"  # 对应充值商品已购买次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGSelectItemValue = "CTGSelectItemValue_%s"  # 充值自选选择记录,参数(CTG对应的商品记录ID) 每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
-Def_PDict_OnlineRechargeTHAward = "OnlineRechargeTHAward"  # 在线特惠充值额外奖励 - 是否已领取奖励
-Def_PDict_DayFreeGoldGiftState = "DayFreeGoldGiftState"  # 每日免费直购礼包领取记录
 Def_PDict_FirstChargeRecord = "FirstChargeRecord_%s"  # 首充领取记录,按位记录首充第x天是否已领取,参数(首充ID)
 Def_PDict_FirstChargeTime = "FirstChargeTime_%s"  # 首充充值时间戳,参数(首充ID)
 Def_PDict_IsReBorn = "Def_PDict_IsReBorn"  # 是否回城复活
@@ -3996,10 +4004,15 @@
 TriggerWay_BeParry, # 被格挡时 37
 TriggerWay_BeMiss, # 被闪避时 38
 TriggerWay_BeAtkBack, # 被反击时 39
-) = range(1, 1 + 39)
+TriggerWay_InBattlefield, # 在场时 40
+TriggerWay_Revive, # 复活时 41
+TriggerWay_BigTurnStartByDead, # 大回合开始时(死亡后有效) 42
+) = range(1, 1 + 42)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
+# 死亡可以触发的方式
+DeadCanTriggerWayList = [TriggerWay_BigTurnStartByDead]
 
 # 被动触发有效来源
 TriggerSrc_Skill = 1    # 身上技能有效
@@ -4028,6 +4041,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 +4060,8 @@
 SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
 SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
 SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
+SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff
+SkillEff_ReviveNoUse = 7011 # 没有复活目标时释放其他技能
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4816,7 +4832,7 @@
 Def_RewardType_ManyDayRecharge, #多日连充41
 Def_RewardType_InfiniteMoney, #无限货币42
 Def_RewardType_SingleRecharge, #单笔累充 43
-Def_RewardType_OnlineRechargeTH, #创角在线特惠充值额外奖励 44
+Def_RewardType_44, #创角在线特惠充值额外奖励 44
 Def_RewardType_SWC, #送万充奖励 45
 Def_RewardType_FairyCardSponsor, #仙卡赞助奖励 46
 Def_RewardType_CritGodBoxCTG, #暴击神兵奖励 47
@@ -5113,7 +5129,9 @@
 TaskType_GoldRushWorkers, # 拥有x名监工 17
 TaskType_ReqOrJoinFamily, # 创建或者申请加入公会 18
 TaskType_FBTianzi, # 挑战天子的考验x次 19
-) = range(1, 1 + 19)
+TaskType_Rename, # 改名 20
+TaskType_HeroBook, # 武将图鉴激活x个  21
+) = range(1, 1 + 21)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0