From ac36bdcfa7db1557790a5b912c3248b22625841f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十一月 2025 18:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 108 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index cf12465..368e745 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:"红颜",
}
##-----------------------------------------------------------------------------------------------
@@ -1352,7 +1354,8 @@
SkillTagAffect_AtkHighest, # 攻击力最高 5
SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
SkillTagAffect_PoisonCure, # 仅焚血（毒奶）目标 7
-) = range(8)
+SkillTagAffect_DamShield, # 承伤盾目标优先 8
+) = range(9)
#技能施法目标
Def_UseSkillAim_Type = 3
@@ -3511,6 +3514,20 @@
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_TravelEnergy = "TravelEnergy" # 剩余体力
+Def_PDict_TravelEnergyTime = "TravelEnergyTime" # 上次恢复体力时间戳
+Def_PDict_TravelCnt = "TravelCnt" # 累计游历次数
+Def_PDict_TravelScenery = "TravelScenery" # 景观信息，景观左上角所在格子索引 * 10 + 景观类型
+Def_PDict_TravelSceneryLVInfo = "TravelSceneryLVInfo" # 景观等级信息，个位数-第1次升级成功与否，1-成功，2-失败；十位-第2次 ...
+Def_PDict_TravelGridInfo = "TravelGridInfo_%s_%s" # 格子信息，参数(行, 列) 事件ID*100+是否双倍*10+开启状态
+Def_PDict_TravelState = "TravelState" # 本盘游历记录，1-已领取景观奖励
+
#周狂欢
Def_PDict_WeekPartyActID = "WeekPartyActID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
Def_PDict_WeekPartyID = "WeekPartyID" # 玩家身上的活动ID，配置ID，用于补发上次活动用
@@ -3549,13 +3566,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值，参数：(活动编号)
@@ -3763,6 +3773,7 @@
#竞技场
Def_PDict_ArenaScore = "ArenaScore" # 当前积分
+Def_PDict_ArenaWinCnt = "ArenaWinCnt" # 累计胜利次数
#功能系统特权
Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳，参数(系统功能ID)
@@ -3779,10 +3790,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编号)
@@ -3792,8 +3799,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 + 秘笈等级
@@ -3841,6 +3848,7 @@
Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数，参数(itemID)
Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量，参数(itemID)
Def_PDict_AppointDropEquipCnt = "AppointDropEquipCnt" # 定制掉落装备掉落第x次，只记录到配置的最高次数
+Def_PDict_ChallengeLVID = "ChallengeLVID" # 最后一次挑战的关卡ID，无论胜负
#天子考验
Def_PDict_TianziHisHurt = "TianziHisHurt_%s" # 历史最高伤害，求余亿部分，参数（bossID）
@@ -3977,7 +3985,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]
@@ -4007,6 +4027,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]
@@ -4025,6 +4047,7 @@
SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残（先扣血）
SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
+SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff
(
TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4757,7 +4780,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 -废弃
@@ -4789,7 +4812,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
@@ -4877,30 +4900,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 = (
@@ -5106,7 +5105,18 @@
TaskType_KillNPC, # 击败X只怪物 7
TaskType_GetMoney, # 累计获得xx货币 8
TaskType_EquipColor, # 穿戴x件x品质及以上装备 9
-) = range(1, 1 + 9)
+TaskType_MainLevelChallenge, # 主线挑战xxx 10
+TaskType_ArenaBattle, # 演武场战斗x次 11
+TaskType_HorseLVUP, # 坐骑升级x次 12
+TaskType_FBZhanchui, # 白骨盈野击败xx 13
+TaskType_HeroLVUP, # 武将升级X次 14
+TaskType_HeroStarUP, # 武将升星x次 15
+TaskType_GoldRush, # 淘金采集x次 16
+TaskType_GoldRushWorkers, # 拥有x名监工 17
+TaskType_ReqOrJoinFamily, # 创建或者申请加入公会 18
+TaskType_FBTianzi, # 挑战天子的考验x次 19
+TaskType_Rename, # 改名 20
+) = range(1, 1 + 20)
# 任务分组
TaskGroupList = (
--
Gitblit v1.8.0