From a075f7841fb2d0a3b32bf10c8bc2df5bf02d6acb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 14 十二月 2025 14:24:28 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(贾诩所有技能;5022效果支持配置buff额外属性计算方式;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 6c5daa6..9aa13c5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -223,7 +223,7 @@
 Def_CalcAttrList = (
 Def_CalcAttr_LV, # 主公等级 0
 Def_CalcAttr_MainEquip, # 主装备 1
-Def_CalcAttr_2,
+Def_CalcAttr_HeroFates, # 武将宿缘 2
 Def_CalcAttr_Realm, # 官职 3
 Def_CalcAttr_Gubao, # 古宝 4
 Def_CalcAttr_HJG, # 幻境阁 5
@@ -234,6 +234,7 @@
 CalcAttrName = {
                 Def_CalcAttr_LV:"主公等级",
                 Def_CalcAttr_MainEquip:"主装备",
+                Def_CalcAttr_HeroFates:"武将宿缘",
                 Def_CalcAttr_Realm:"官职",
                 Def_CalcAttr_Gubao:"古宝",
                 Def_CalcAttr_HJG:"幻境阁",
@@ -469,7 +470,7 @@
 Def_ItemID_VIPExperience = 985               # VIP体验卡
 
 # 直接转换为对应数值的物品ID列表
-Def_ItemID_GoldMoney = 20               # 直接给仙玉
+Def_ItemID_GoldMoney = 1               # 直接给仙玉/元宝
 Def_ItemID_SilverMoney = 22               # 直接给铜钱
 Def_ItemID_FamilyContribution = 26               # 直接给战盟贡献点
 Def_ItemID_SP = 29               # 直接给sp
@@ -494,12 +495,6 @@
                            Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
                            Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint,
                            Def_ItemID_FamilyFlagWarPoint]
-# 货币类型对应直接给货币物品ID
-MoneyItemIDDict = {IPY_GameWorld.TYPE_Price_Gold_Money:Def_ItemID_GoldMoney,
-                   IPY_GameWorld.TYPE_Price_Gold_Paper:Def_ItemID_GoldPaper,
-                   ShareDefine.TYPE_Price_GongdePoint:Def_ItemID_GongdePoint,
-                   ShareDefine.TYPE_Price_FamilyFlagWarPoint:Def_ItemID_FamilyFlagWarPoint,
-                   }
 #---------------------------------------------------------------------
 #写死的物品类型都放这边
 Def_ItemType_All = -1             #所有类型
@@ -1350,7 +1345,8 @@
 SkillTagAim_Vertical, # 竖排/纵排 4
 SkillTagAim_Self, # 自己 5
 SkillTagAim_MainSkill, # 继承主技能目标 6
-) = range(7)
+SkillTagAim_MainSkillEx, # 继承主技能目标一次性处理 7
+) = range(8)
 
 # 技能目标 - 细分
 (
@@ -1893,6 +1889,10 @@
 PassByStarMapIDList = []
 #扫荡不需要检查是否已过关的地图
 SweepUnCheckPassMapIDList = [Def_FBMapID_Tianzi]
+#固定玩家获胜的地图
+PlayerWinMapIDList = [Def_FBMapID_Tianzi]
+#需要汇报中心副本过关进度的地图
+ReportCenterMapIDList = [Def_FBMapID_Zhanchui]
 
 #注册上传跨服服务器数据后直接进入跨服服务器的地图
 RegisterEnter_CrossServerMapIDList = []
@@ -3278,8 +3278,8 @@
 Def_PDict_EquipViewCacheState = "EquipViewCacheState"  # 本次上线是否同步过装备缓存
 Def_PDict_PackDataSyncState = "PackDataSyncState"  # 本次上线打包数据同步状态,按位存储是否同步 0-本服,1-跨服
 Def_PDict_PackDataSyncFightPower = "PackDataSyncFightPower"  # 本次上线打包数据同步时的战力,用于对比,只对比求余亿部分即可
-Def_PDict_DayOnlineTime = "OnlineTime"  # 当日在线时长
-Def_PDict_OnlineStartTick = "OnlineStartTime"        # 在线计算时间
+Def_PDict_DayOnlineTime = "DayOnlineTime"  # 当日在线时长
+Def_PDict_DayOnlineCalcTime = "DayOLCalcTime"        # 当日在线计算时间
 Def_PDict_LVAwardGetRecord = "LVAwardGetRecord"  # 等级奖励领取信息记录,按二进制位标示
 Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord"  # 等级奖励vip领取信息记录,按二进制位标示
 Def_PDict_HistoryChargeAwardGetRecord = "HTotalGoldAwardRecord"  # 历史累计充值奖励领取信息记录,按二进制位标示
@@ -3842,6 +3842,7 @@
 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 + 宿缘状态
 
 #主线
 Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
@@ -4001,12 +4002,13 @@
 TriggerWay_InBattlefield, # 在场时 40
 TriggerWay_Revive, # 复活时 41
 TriggerWay_BigTurnStartByDead, # 大回合开始时(死亡后有效) 42
-) = range(1, 1 + 42)
+TriggerWay_WhenDie, # 死亡时(自己) 43
+) = range(1, 1 + 43)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
 # 死亡可以触发的方式
-DeadCanTriggerWayList = [TriggerWay_BigTurnStartByDead]
+DeadCanTriggerWayList = [TriggerWay_BigTurnStartByDead, TriggerWay_WhenDie]
 
 # 被动触发有效来源
 TriggerSrc_Skill = 1    # 身上技能有效
@@ -4739,9 +4741,13 @@
 ) = range(1, 1 + 6)
 
 # 部分武将ID
-HeroID_Zhenfu = 510013
-HeroID_Caoren = 510015
-HeroID_Dongbai = 540009
+HeroID_Simayi = 510012 # 司马懿
+HeroID_Zhenfu = 510013 # 甄宓
+HeroID_Caoren = 510015 # 曹仁
+HeroID_Dongbai = 540009 # 董白
+
+# 部分技能ID
+SkillID_SmyFanzhao = 1012050 # 返照
 
 # 经验倍率限制类型
 (

--
Gitblit v1.8.0