From caba629e01f8f603b8e05f588688c40e82eb6c88 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 十一月 2025 16:44:33 +0800
Subject: [PATCH] 358 【内政】红颜系统-服务端

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index a4937b9..63faebc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -160,8 +160,8 @@
 AttrID_WuFinalDamPerDef,                    # 对吴减伤 62
 AttrID_QunFinalDamPer,                      # 对群增伤 63
 AttrID_QunFinalDamPerDef,                   # 对群减伤 64
-AttrID_SkillPer,                            # 技能增伤 65
-AttrID_SkillPerDef,                         # 技能减伤 66
+AttrID_BatDamPer,                           # 战斗增伤 65
+AttrID_BatDamPerDef,                        # 战斗减伤 66
 AttrID_PursueDamPer,                        # 追击增伤 67
 AttrID_PursueDamPerDef,                     # 追击减伤 68
 AttrID_ComboDamPer,                         # 连击增伤 69
@@ -181,7 +181,7 @@
                         AttrID_ShieldPer, AttrID_ShieldPerDef, AttrID_DOTPer, AttrID_DOTPerDef,
                         AttrID_WeiFinalDamPer, AttrID_WeiFinalDamPerDef, AttrID_ShuFinalDamPer, AttrID_ShuFinalDamPerDef,
                         AttrID_WuFinalDamPer, AttrID_WuFinalDamPerDef, AttrID_QunFinalDamPer, AttrID_QunFinalDamPerDef,
-                        AttrID_SkillPer, AttrID_SkillPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
+                        AttrID_BatDamPer, AttrID_BatDamPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
                         AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef
                         ]
 
@@ -219,7 +219,8 @@
 Def_CalcAttr_Gubao, # 古宝 4
 Def_CalcAttr_HJG, # 幻境阁 5
 Def_CalcAttr_Horse, # 坐骑 6
-) = range(7)
+Def_CalcAttr_Beauty, # 红颜 7
+) = range(8)
 
 CalcAttrName = {
                 Def_CalcAttr_LV:"主公等级",
@@ -229,6 +230,7 @@
                 Def_CalcAttr_Gubao:"古宝",
                 Def_CalcAttr_HJG:"幻境阁",
                 Def_CalcAttr_Horse:"坐骑",
+                Def_CalcAttr_Beauty:"红颜",
                 }
 
 ##-----------------------------------------------------------------------------------------------
@@ -3511,6 +3513,11 @@
 Def_PDict_EmojiPackState = "EmojiPackState_%s"  # 表情包状态,参数(key编号)
 Def_PDict_EmojiPackEndTime = "EmojiPackEndTime_%s"  # 到期时间戳,0为永久,参数(表情包ID)
 
+#红颜
+Def_PDict_BeautyLVInfo = "BeautyLVInfo_%s"  # 红颜等级信息,参数(红颜ID) 经验*10000+等级*10+是否已激活
+Def_PDict_BeautyAwardLV = "BeautyAwardLV_%s"  # 红颜已领取到的奖励等级,参数(红颜ID)
+Def_PDict_BeautySkinInfo = "BeautySkinInfo_%s"  # 红颜时装信息,参数(时装ID) 星级*100+是否使用+是否已激活
+
 #周狂欢
 Def_PDict_WeekPartyActID = "WeekPartyActID"  # 玩家身上的活动ID,唯一标识,取活动开始日期time值
 Def_PDict_WeekPartyID = "WeekPartyID"  # 玩家身上的活动ID,配置ID,用于补发上次活动用
@@ -3763,6 +3770,7 @@
 
 #竞技场
 Def_PDict_ArenaScore = "ArenaScore" # 当前积分
+Def_PDict_ArenaWinCnt = "ArenaWinCnt" # 累计胜利次数
 
 #功能系统特权
 Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳,参数(系统功能ID)
@@ -3973,7 +3981,19 @@
 TriggerWay_BeDOTHurt, # 受到持续伤害 25
 TriggerWay_EnemyDie, # 敌方单位死亡时 26
 TriggerWay_FriendDie, # 己方单位死亡时 27
-) = range(1, 1 + 27)
+TriggerWay_Combo, # 连击时 28
+TriggerWay_Pursue, # 追击时 29
+TriggerWay_Stun, # 击晕时 30
+TriggerWay_SuperHit, # 暴击时 31
+TriggerWay_Parry, # 格挡时 32
+TriggerWay_Miss, # 闪避时 33
+TriggerWay_AtkBack, # 反击时 34
+TriggerWay_BeStun, # 被击晕时 35
+TriggerWay_BeSuperHit, # 被暴击时 36
+TriggerWay_BeParry, # 被格挡时 37
+TriggerWay_BeMiss, # 被闪避时 38
+TriggerWay_BeAtkBack, # 被反击时 39
+) = range(1, 1 + 39)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
@@ -4003,6 +4023,8 @@
 PassiveEff_AddShieldHurtPer = 6016 # 对护盾造成伤害加成
 PassiveEff_SkillInvalid = 6017 # 使技能无效
 PassiveEff_AddAngerSkillPerByXP = 6018 # 增加怒气技能伤害(按消耗怒气值)
+PassiveEff_AddBatDamPerByTagLostHP = 6019 # 战斗增伤(按目标已损失生命)
+PassiveEff_AddSkillPerByBuffState = 6020 # 增加技能系数(验证由buff状态触发的)
 
 # 被动效果ID有触发值时就返回的
 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid]
@@ -4753,7 +4775,7 @@
 Def_RewardType_FamilyTaofaBox,  # 公会讨伐领取宝箱奖励 3
 Def_RewardType_LineupRecommend,  # 阵容推荐奖励 4
 Def_RewardType_LVAward,  # 玩家等级奖励5
-Def_RewardType_XBXZ, # 仙宝寻主奖励6
+Def_RewardType_BeautyLVAward, # 红颜等级奖励 6
 Def_RewardType_DayRealmPoint, # 每日任务修行点奖励7
 Def_RewardType_FirstCharge, # 首充礼包奖励8
 Def_RewardType_MWSoulAward, # 法宝之魂奖励9 -废弃

--
Gitblit v1.8.0