From d254a370d14e560470889eb69537bd21532bc254 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 02 三月 2026 18:58:56 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(郭嘉所有技能;增加触发类型62、63、64、65;增加效果6038;增加技能类型16-减益光环,对自己无效,原类型10为增益光环对自己有效;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index b85a86e..b41cbd1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -241,12 +241,14 @@
 Def_CalcAttr_Beauty, # 红颜 7
 Def_CalcAttr_Dingjunge, # 定军阁 8
 Def_CalcAttr_Mingge, # 命格 9
-) = range(10)
+Def_CalcAttr_HeroSkin, # 武将时装 10
+) = range(11)
 
 CalcAttrName = {
                 Def_CalcAttr_LV:"主公等级",
                 Def_CalcAttr_MainEquip:"主装备",
                 Def_CalcAttr_HeroFates:"武将宿缘",
+                Def_CalcAttr_HeroSkin:"武将时装",
                 Def_CalcAttr_Realm:"官职",
                 Def_CalcAttr_Gubao:"古宝",
                 Def_CalcAttr_HJG:"幻境阁",
@@ -651,7 +653,7 @@
 Def_Effect_EmojiPack = 276   #表情包物品;A值-表情包ID
 Def_Effect_RecycleItemMoney = 277   #回收物品转化为货币; A值-直接给货币物品ID;B值-货币数量
 Def_Effect_FamilyEmblem = 278   #激活仙盟徽章; A值-徽章ID;
-Def_Effect_HeroSkin = 279   #激活武将皮肤; A值-武将ID;B值-皮肤索引
+#Def_Effect_HeroSkin = 279   #激活武将皮肤; A值-武将ID;B值-皮肤索引 废弃,直接按物品ID处理
 Def_Effect_FamilyTaofaCnt = 280   #增加公会讨伐次数; A值-讨伐次数
 Def_Effect_AddActivity = 281   #给活跃度
 
@@ -1456,13 +1458,14 @@
    Def_SkillType_Passive      ,  #被动技能(与被动BUFF无直接关系)   7
    Def_SkillType_Revive       ,  #复活     8
    Def_SkillType_Increment    ,  #增值技能(不可清除)9  
-   Def_SkillType_Halo         ,  #光环技能  10
+   Def_SkillType_HaloPls      ,  #增益光环  10
    Def_SkillType_AtkEx        ,  #额外攻击  (一般用于额外造成的伤害,区分直接攻击)11
    Def_SkillType_Area         ,  #场景技能(buff)  12
    Def_SkillType_Summon       ,  #召唤  13
    Def_SkillType_Action       ,  #影响行为BUFF 14
    Def_SkillType_CleanBuff    ,  #清除buff类(如净化等) 15
-) = range(0, 1 + 15)
+   Def_SkillType_HaloDep      ,  #减益光环  16
+) = range(0, 1 + 16)
 
 # 以下废弃
 Def_SkillType_Aura = 10 #光环技能,旧命名  10
@@ -1490,7 +1493,8 @@
                        Def_SkillType_PassiveBuff    : IPY_GameWorld.btPassiveBuf,  # 被动技能 7 (废弃,无此定义分散为其他buff)
                        #Def_SkillType_Revive     : IPY_GameWorld.bfIncBuff,  #复活     8
                        Def_SkillType_Increment  : IPY_GameWorld.bfIncBuff,  #增值技能(不可清除)9
-                       Def_SkillType_Aura       : IPY_GameWorld.bfAura   ,  #光环技能  10
+                       Def_SkillType_HaloPls       : IPY_GameWorld.bfAura   ,  #增益光环  10
+                       Def_SkillType_HaloDep       : IPY_GameWorld.bfAura   ,  #减益光环  10
                        #Def_SkillType_Equip      : IPY_GameWorld.bfEquipBuff,#装备技能  11
                        Def_SkillType_Area       : IPY_GameWorld.bfMapBuff , #场景技能(buff)  12
                        Def_SkillType_Action     : IPY_GameWorld.bfActionBuff , #影响行为BUFF 14
@@ -1503,6 +1507,9 @@
                        Def_SkillType_PassiveLstPlsBuffAtk : IPY_GameWorld.bfProcessBuff   ,  #持续增益BUFF  3
                        
                      }
+
+# 光环技能类型
+Def_HaloSkill_List = [Def_SkillType_HaloPls, Def_SkillType_HaloDep]
 
 # 伤害型技能
 Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_AtkEx, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk]
@@ -1882,6 +1889,7 @@
 Def_FBMapID_MainBoss = 2 # 主线Boss
 Def_FBMapID_ArenaBattle = 3 # 演武场
 
+Def_FBMapID_HeroBatView = 30000 # 武将战斗预览
 Def_FBMapID_Zhanchui = 30010 # 白骨盈野/战锤秘境
 Def_FBMapID_Tianzi = 30020 # 天子考验
 Def_FBMapID_Dingjunge = 30030 # 定军阁
@@ -3277,6 +3285,7 @@
 Def_PDict_TreasureCountToday = "TreasureCountToday_%s"  # 今日寻宝次数, 参数(寻宝类型)
 Def_PDict_TreasureCountTodayGold = "TreasureCountTodayG_%s"  # 今日元宝寻宝次数, 参数(寻宝类型)
 Def_PDict_TreasureLuck = "TreasureLuck_%s"  # 寻宝当前幸运值, 参数(寻宝类型)
+Def_PDict_TreasureAtleastCnt = "TreasureAtleast_%s_%s"  # 至少寻宝次数限制统计, 参数(寻宝类型, 格子)
 Def_PDict_TreasureCntAward = "TreasureCntAward_%s"  # 累计寻宝次数对应物品奖励领奖状态, 参数(寻宝类型)
 Def_PDict_TreasureGridCnt = "TreasureGridCnt_%s_%s"  # 格子对应累计产出次数, 参数(寻宝类型, 格子编号)
 Def_PDict_TreasureWishSelect = "TreasureWSel_%s_%s_%s"  # 心愿物品选择记录, 参数(寻宝类型, 库ID, index) 已选择心愿物品ID
@@ -3663,9 +3672,8 @@
 Def_PDict_GoldRushAutoEndTime = "GoldRushAutoEndTime" # 自动淘金到期时间戳
 
 #武将
-Def_PDict_HeroSkin = "HeroSkin_%s" # 武将皮肤解锁状态,按皮肤索引二进制存储,参数(武将ID)
+Def_PDict_HeroSkinInfo = "HeroSkinInfo_%s" # 武将皮肤,参数(武将ID) 皮肤星级*10 + 是否解锁
 Def_PDict_HeroBook = "HeroBook_%s" # 武将图鉴激活等级,参数(武将ID) cccbbba a-初始激活状态1-英雄激活,2-初始图鉴激活; bbb-存星级图鉴激活等级;ccc-存突破图鉴激活等级
-Def_PDict_HeroBookH = "HeroBookH_%s" # 武将图鉴历史最高等级,参数(武将ID) cccbbba: bbb-存星级图鉴最高等级;ccc-存突破图鉴最高等级
 Def_PDict_HeroAwakeRebirthCnt = "HeroAwakeRebirthCnt" # 已觉醒过的武将今日已重生次数,共享次数
 Def_PDict_HeroRecommend = "HeroRecommend_%s" # 阵容推荐领奖状态,参数(推荐ID) 根据武将ID所在索引位记录是否领取
 Def_PDict_HeroFatesInfo = "HeroFatesInfo_%s" # 武将宿缘信息,参数(宿缘ID) 宿缘等级*10 + 宿缘状态
@@ -3867,7 +3875,11 @@
 TriggerWay_PursueAtk, # 追击直接攻击时 59
 TriggerWay_Frozen, # 冰冻目标时 60
 TriggerWay_AddDOTBuff, # 附加持续伤害buff时 61
-) = range(1, 1 + 61)
+TriggerWay_FriendComboHurt, # 友军连击时(包含自己)伤害类 62
+TriggerWay_FriendPursueHurt, # 友军追击时(包含自己)伤害类 63
+TriggerWay_FriendCausesFrozen, # 友方造成冰冻时(包含自己,多目标仅触发一次) 64
+TriggerWay_ComboOne, # 连击时 65
+) = range(1, 1 + 65)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
@@ -3919,6 +3931,7 @@
 PassiveEff_AddBuffTime = 6035 # 增加buff持续时间
 PassiveEff_AddSkillUseCntLimit = 6036 # 增加7009回合数
 PassiveEff_AddDamBackPerByBuffLayer = 6037 # 增加反弹伤害万分比(根据buff层级)
+PassiveEff_AddSkillPerByBeFrozenCnt = 6038 # 增加本次技能万分比(按目标累计被冰冻次数)
 
 # 被动效果ID有触发值时就返回的
 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid, 

--
Gitblit v1.8.0