From 3861b284c63fd8ba519c71e386a8f49dcad26dab Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 24 十一月 2025 11:35:15 +0800
Subject: [PATCH] 332 【主界面】座骑系统-服务端(按阶解锁的改为手动解锁)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  135 +++++++++++++++++++++-----------------------
 1 files changed, 65 insertions(+), 70 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index ee41b3f..2a6e740 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -160,14 +160,14 @@
 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
 AttrID_ComboDamPerDef,                      # 连击减伤 70
-AttrID_ArenaDamPer,                         # 竞技增伤 71
-AttrID_ArenaDamPerDef,                      # 竞技减伤 72
+AttrID_PVPDamPer,                           # PVP增伤 71
+AttrID_PVPDamPerDef,                        # PVP减伤 72
 ) = range(1, 1 + 72)
 
 # 需要计算的武将战斗属性ID列表
@@ -181,8 +181,8 @@
                         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_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_ArenaDamPer, AttrID_ArenaDamPerDef
+                        AttrID_BatDamPer, AttrID_BatDamPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
+                        AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef
                         ]
 
 # 基础三维属性ID列表
@@ -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:"红颜",
                 }
 
 ##-----------------------------------------------------------------------------------------------
@@ -915,7 +917,7 @@
 (
 HurtType_Fail,              # 失败 - 如概率没有触发 0
 HurtType_Normal,            # 伤害 1
-HurtTYpe_Recovery,          # 回血 2
+HurtTYpe_Cure,              # 治疗 2
 HurtType_3,
 HurtType_Immune,            # 免疫 4
 HurtType_Parry,             # 格挡 5
@@ -926,7 +928,8 @@
 HurtType_PoisonCureHurt,    # 伤害毒奶 10
 HurtType_PoisonCureSuck,    # 吸血毒奶 11
 HurtType_HarmSelf,          # 自残 12
-) = range(13)
+HurtType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
+) = range(14)
 
 #伤害类型
 (
@@ -1448,7 +1451,7 @@
    Def_SkillType_Passive      ,  #被动技能(与被动BUFF无直接关系)   7
    Def_SkillType_Revive       ,  #复活     8
    Def_SkillType_Increment    ,  #增值技能(不可清除)9  
-   Def_SkillType_Aura         ,  #光环技能  10
+   Def_SkillType_Halo         ,  #光环技能  10
    Def_SkillType_Equip        ,  #装备技能  11
    Def_SkillType_Area         ,  #场景技能(buff)  12
    Def_SkillType_Summon       ,  #召唤  13
@@ -1457,6 +1460,7 @@
 ) = range(0, 1 + 15)
 
 # 以下废弃
+Def_SkillType_Aura = 10 #光环技能,旧命名  10
 (
    Def_SkillType_LstPlsBuffAtk,  #持续攻击类BUFF 15
    Def_SkillType_PassivePlsBuff,  #被动触发增益类buff 16
@@ -1532,6 +1536,10 @@
 Def_BuffLayer_Add = 0   # 每次触发层级递增
 Def_BuffLayer_Sub = 1   # 每次触发层级递减
 
+# Buff时间计算规则
+#【注】光环类buff默认与光源(施法者)同步,其他受光环影响的目标同步该buff持续时间,持续时间及效果由施法者决定
+BuffLastTimeType_Default = 0 # 默认以获得buff时自身回合前后判断
+BuffLastTimeType_BigTurn = 1 # 大回合buff,每大回合开始固定减1回合
 
 #动作类区分标识
 (
@@ -2865,7 +2873,9 @@
 TurnBattleType_Pursue, # 追击 3
 TurnBattleType_Enhance, # 额外技能(一般是主技能拆分为多个效果的技能) 4
 TurnBattleType_Passive, # 被动触发的技能 5
-) = range(6)
+TurnBattleType_Dot, # 持续伤害触发 6
+TurnBattleType_Cot, # 持续治疗触发 7
+) = range(8)
 
 Def_PerTurnTick = 1000 # 每回合等同于常规tick时长
 
@@ -2971,7 +2981,9 @@
     BatObjState_RebornLimit, # 无法复活 25
     BatObjState_26, # 脆弱 26
     BatObjState_27, # 阴咒 27
-) = range(1 + 27)
+    BatObjState_Zhiming, # 织命(甄宓) 28
+    BatObjState_Link, # 链接(董白) 29
+) = range(1 + 29)
 
 #玩家状态定义,不能超过31个,如超过,需扩展多个key支持
 Def_PlayerStateList = (
@@ -3501,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,用于补发上次活动用
@@ -3539,13 +3556,6 @@
 Def_PDict_FeastWishTemplateID = "FeastWishTemplateID" # 玩家身上的模板ID
 Def_PDict_FeastWishBottleValue = "FeastWishBottleValue_%s"  # 祝福瓶当前祝福值,参数(瓶子编号)
 Def_PDict_FeastWishBottleGetState = "FeastWishBottleGetState_%s"  # 祝福瓶已领取记录,参数(瓶子编号),按记录索引二进制位存储是否已领取
-
-#节日游历活动
-Def_PDict_FeastTravelID = "FeastTravelID"  # 玩家身上的活动ID,唯一标识,取活动开始日期time值
-Def_PDict_FeastTravelPoint = "FeastTravelPoint" # 当前总游历点数
-Def_PDict_FeastTravelValue = "FeastTravelValue_%s" # 游历任务总进度值,参数(任务ID)
-Def_PDict_FeastTravelCount = "FeastTravelCount_%s" # 游历任务已完成次数,参数(任务ID)
-Def_PDict_FeastTravelAwardCount = "FeastTravelAwardCount_%s" # 游历已领奖次数,参数(奖励索引)
 
 #多日连充活动
 Def_PDict_ManyDayRechargeID = "ManyDayRechargeID_%s"  # 玩家身上的活动ID,唯一标识,取活动开始日期time值,参数:(活动编号)
@@ -3670,11 +3680,9 @@
 Def_PDict_LastEnterFBTick = "LastEnterFBTick_%s"  # 上次进入副本的时间%s副本id
 
 # 投资理财
-Def_PDict_InvestTime = "InvestTime_%s"  # 投资时的时间,参数为投资类型
-Def_PDict_InvestProgress = "InvestProgress_%s_%s"  # 投资可领奖进度值,参数为(投资类型, key编号)
-Def_PDict_InvestReward = "InvestReward_%s_%s"  # 投资领奖记录,参数为(投资类型, key编号)
-Def_PDict_InvestRewardTime = "InvestRewardTime_%s"  # 投资最后一次领奖时间,参数为(投资类型)
-Def_PDict_InvestKeyCount = 3 # key编号数
+Def_PDict_InvestTime = "InvestTime_%s"  # 投资时的时间,参数(投资类型)
+Def_PDict_InvestEndTime = "InvestEndTime_%s"  # 投资到期时间,参数(投资类型)
+Def_PDict_InvestRewardTime = "InvestRewardTime_%s"  # 投资最后一次领奖时间,参数(投资类型)
 
 # 成就 Def_PDictType_Success
 Def_PDict_SuccessValue = "Succ_%s_%s" # 当前次数值,参数(成就类型、条件)
@@ -3755,6 +3763,7 @@
 
 #竞技场
 Def_PDict_ArenaScore = "ArenaScore" # 当前积分
+Def_PDict_ArenaWinCnt = "ArenaWinCnt" # 累计胜利次数
 
 #功能系统特权
 Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳,参数(系统功能ID)
@@ -3771,10 +3780,6 @@
 #古宝
 Def_PDict_GubaoInfo = "Gubao_%s"  # 古宝信息,参数(古宝ID),特殊效果层*100000 + 等级*100 + 星级
 
-#神通
-Def_PDict_ShentongLVInfo = "ShentongLVInfo_%s"  # 神通等级信息,参数(神通ID),阶级*100+等级
-Def_PDict_ShentongSkillID = "ShentongSkillID_%s"  # 神通出战技能ID,参数(编号)
-
 #自定义奖励
 Def_PDict_CustomAwardCanGet = "CustomAwardCanGet_%s" # 是否可领取,参数(key编号)
 Def_PDict_CustomAwardGetState = "CustomAwardGetState_%s" # 是否已领取,参数(key编号)
@@ -3784,8 +3789,8 @@
 Def_PDict_TreeLVUPState = "TreeLVUPState" # 仙树升级状态;0-未升级;1-升级中
 Def_PDict_TreeLVUPRemainTime = "TreeLVUPRemainTime" # 仙树升级剩余时间,秒
 Def_PDict_TreeLVUPRefreshTime = "TreeLVUPRefreshTime" # 仙树升级上次刷新时间戳
-Def_PDict_TreeFreeTimeCnt = "TreeFreeTimeCnt" # 今日已领取免费减时次数,过天重置
-Def_PDict_TreeFreeTimeLast = "TreeFreeTimeLast" # 今日上次领取免费减时时间戳,过天重置
+Def_PDict_TreeEnergy = "TreeEnergy" # 当前可用充能次数
+Def_PDict_TreeEnergyTimeLast = "TreeEnergyTimeLast" # 上次获得免费充能次数时间戳
 
 #历练秘笈
 Def_PDict_LLMJLVInfo = "LLMJLVInfo" # 秘笈等级,消耗战锤*100 + 秘笈等级
@@ -3829,7 +3834,7 @@
 
 #主线
 Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
-Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数,有3位小数,即 1234 实际为 1.234
+Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数
 Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数,参数(itemID)
 Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量,参数(itemID)
 Def_PDict_AppointDropEquipCnt = "AppointDropEquipCnt" # 定制掉落装备掉落第x次,只记录到配置的最高次数
@@ -3969,7 +3974,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]
@@ -3999,6 +4016,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]
@@ -4168,7 +4187,7 @@
 Def_Cost_UseSpeaker, # 喇叭发言
 Def_Cost_Revive, # 复活
 Def_Cost_5, # 副本鼓舞 5
-Def_Cost_GoldInvest, # 理财投资
+Def_Cost_6, # 理财投资
 Def_Cost_Pray, # 祈祷
 Def_Cost_8, # 资源找回
 Def_Cost_BuyVIPItem, # 购买VIP礼包
@@ -4253,7 +4272,6 @@
 
 # 有分消费对象子类的
 Def_Cost_BuyVIPItem:"BuyVIPItem",
-Def_Cost_GoldInvest:"GoldInvest",
 Def_Cost_Pray:"Pray",
 Def_Cost_Treasure:"Treasure",
 Def_Cost_OpenNoble:"OpenNoble",
@@ -4328,7 +4346,7 @@
 Def_GiveMoney_UseItem, # 使用物品
 Def_GiveMoney_Pickup, # 拾取
 Def_GiveMoney_Bourse, # 交易所 10
-Def_GiveMoney_GoldInvest, # 绑钻投资
+Def_GiveMoney_11, # 绑钻投资
 Def_GiveMoney_12, # 资源找回
 Def_GiveMoney_13, # 红包
 Def_GiveMoney_RefineGift, # 炼制奖励
@@ -4366,7 +4384,6 @@
 Def_GiveMoney_UseItem:"UseItem",
 Def_GiveMoney_Pickup:"Pickup",
 Def_GiveMoney_Bourse:"Bourse",
-Def_GiveMoney_GoldInvest:"GoldInvest",
 Def_GiveMoney_RefineGift:"RefineGift",
 Def_GiveMoney_Mail:"Mail",
 Def_GiveMoney_RuneDecompose:"RuneDecompose",
@@ -4702,6 +4719,11 @@
 HeroSpecialty_SuckHP,       # 吸血 6
 ) = range(1, 1 + 6)
 
+# 部分武将ID
+HeroID_Zhenfu = 510013
+HeroID_Caoren = 510015
+HeroID_Dongbai = 540009
+
 # 经验倍率限制类型
 (
 ExpRateLimitType_Recover, # 资源找回
@@ -4710,13 +4732,9 @@
 
 # 投资理财类型,和前端对应,从7开始
 InvestTypeList = (
-InvestType_NewMonth, # 至尊月卡投资7
-InvestType_Month1, # 新30元月卡投资8
-InvestType_Login, # 登录 9
-InvestType_LV, # 等级 10
-InvestType_Boss, # Boss 11
-InvestType_Life, # 终身卡 12
-) = range(7, 7 + 6)
+InvestType_Month, # 月卡 1
+InvestType_Life, # 终身卡 2
+) = range(1, 1 + 2)
 
 (
 tttLeaveMap, # 退出倒计时 0
@@ -4750,7 +4768,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 -废弃
@@ -4782,7 +4800,7 @@
 Def_RewardType_GoodGame, #游戏好评奖励35
 Def_RewardType_CACTGBillboardDabiao, #跨服充值排行活动达标奖励36
 Def_RewardType_FeastLogin, #节日登录奖励37
-Def_RewardType_FeastTravel, #节日游历奖励38
+Def_RewardType_38,
 Def_RewardType_DailyRecharge, #永久每日累充奖励39
 Def_RewardType_RechargeGold30, #1元送30倍充值券每日奖励40
 Def_RewardType_ManyDayRecharge, #多日连充41
@@ -4870,30 +4888,6 @@
 Def_PPAct_FairyDomain,  #缥缈仙域 16  
 Def_PPAct_JSTreasure,  #绝世寻宝 17  
 ) = range(1, 17+1)
-
-#节日游历活动任务定义
-FeastTravelTaskIDList = (
-Def_FeastTravel_1,
-Def_FeastTravel_Treasure,  #极品寻宝 2
-Def_FeastTravel_RuneTreasure,  #符印寻宝 3
-Def_FeastTravel_4,
-Def_FeastTravel_XJMJ,  #仙界秘境 5
-Def_FeastTravel_6,
-Def_FeastTravel_WorldBoss,  #世界BOSS 7
-Def_FeastTravel_FMT,  #封魔坛 8
-Def_FeastTravel_FamilyParty,  #仙盟宴会 9
-Def_FeastTravel_10,
-Def_FeastTravel_Pray,  #祈愿 11
-Def_FeastTravel_BossHome,  #boss之家 12
-Def_FeastTravel_VIPBoss,  #vipBOSS 13
-Def_FeastTravel_RunFamilyTask, #仙盟任务 14
-Def_FeastTravel_FamilyBoss,  #仙盟Boss 15
-Def_FeastTravel_FairyDomain,  #缥缈仙域 16
-Def_FeastTravel_UseGold,  #累计消费X仙玉 17
-Def_FeastTravel_CTGExp,  #累计充值X仙玉,直接使用充值转化的经验 18
-Def_FeastTravel_JSTreasure,  #绝世寻宝 19 
-Def_FeastTravel_Arena,  #竞技场 20 
-) = range(1, 1 + 20)
 
 #周狂欢活动定义(七天巡礼)
 WeekPartyActIDList = (
@@ -5099,7 +5093,8 @@
 TaskType_KillNPC, # 击败X只怪物 7
 TaskType_GetMoney, # 累计获得xx货币 8
 TaskType_EquipColor, # 穿戴x件x品质及以上装备 9
-) = range(1, 1 + 9)
+TaskType_MainLevelChallenge, # 主线挑战xxx 10
+) = range(1, 1 + 10)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0