From abe9dbc7d8eb82602cc975284a7d2ae8894e4ef9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 12 十二月 2025 17:35:03 +0800
Subject: [PATCH] 389 流向记录(登录、下线、主线任务、主线关卡、副本、货币、物品)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  233 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 116 insertions(+), 117 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..0ebf652 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -93,6 +93,12 @@
 
 Def_BuffValue_Count = 3     # buff记录的value个数
 
+# buff保留类型定义
+(
+BuffRetainType_Dead, # 死亡保留 1
+BuffRetainType_Revive, # 复活保留 2
+) = range(1, 1 + 2)
+
 #游戏对象属性--------------------------------------------
 # 属性ID列表,所有对象类型通用,如Player、NPC
 AttrIDList = (
@@ -160,15 +166,17 @@
 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
-) = range(1, 1 + 72)
+AttrID_PVPDamPer,                           # PVP增伤 71
+AttrID_PVPDamPerDef,                        # PVP减伤 72
+AttrID_ReviveHPPer,                         # 复活生命加成 73
+AttrID_ReviveXPPer,                         # 复活怒气加成 74
+) = range(1, 1 + 74)
 
 # 需要计算的武将战斗属性ID列表
 CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef, 
@@ -181,8 +189,9 @@
                         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,
+                        AttrID_ReviveHPPer, AttrID_ReviveXPPer,
                         ]
 
 # 基础三维属性ID列表
@@ -214,21 +223,23 @@
 Def_CalcAttrList = (
 Def_CalcAttr_LV, # 主公等级 0
 Def_CalcAttr_MainEquip, # 主装备 1
-Def_CalcAttr_HeroBook, # 武将图鉴 2
+Def_CalcAttr_HeroFates, # 武将宿缘 2
 Def_CalcAttr_Realm, # 官职 3
 Def_CalcAttr_Gubao, # 古宝 4
 Def_CalcAttr_HJG, # 幻境阁 5
 Def_CalcAttr_Horse, # 坐骑 6
-) = range(7)
+Def_CalcAttr_Beauty, # 红颜 7
+) = range(8)
 
 CalcAttrName = {
                 Def_CalcAttr_LV:"主公等级",
                 Def_CalcAttr_MainEquip:"主装备",
-                Def_CalcAttr_HeroBook:"武将图鉴",
+                Def_CalcAttr_HeroFates:"武将宿缘",
                 Def_CalcAttr_Realm:"官职",
                 Def_CalcAttr_Gubao:"古宝",
                 Def_CalcAttr_HJG:"幻境阁",
                 Def_CalcAttr_Horse:"坐骑",
+                Def_CalcAttr_Beauty:"红颜",
                 }
 
 ##-----------------------------------------------------------------------------------------------
@@ -459,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
@@ -484,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             #所有类型
@@ -911,22 +916,22 @@
 AfterLogic_AddBuff = "AddBuff"
 AfterLogic_SyncBuff = "SyncBuff"
 
-#伤害类型
+#伤害飘血类型
 (
-HurtType_Fail,              # 失败 - 如概率没有触发 0
-HurtType_Normal,            # 伤害 1
-HurtTYpe_Cure,              # 治疗 2
-HurtType_3,
-HurtType_Immune,            # 免疫 4
-HurtType_Parry,             # 格挡 5
-HurtType_IgnoreDef,         # 无视防御/真实伤害 6
-HurtType_SuperHit,          # 暴击 7
-HurtType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
-HurtType_Miss,              # 闪避 9
-HurtType_PoisonCureHurt,    # 伤害毒奶 10
-HurtType_PoisonCureSuck,    # 吸血毒奶 11
-HurtType_HarmSelf,          # 自残 12
-HurtType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
+HurtAtkType_Fail,              # 失败 - 如概率没有触发 0
+HurtAtkType_Hurt,              # 伤害 1
+HurtAtkType_Cure,              # 治疗 2
+HurtAtkType_Revive,            # 复活 3
+HurtAtkType_Immune,            # 免疫 4
+HurtAtkType_Parry,             # 格挡 5
+HurtAtkType_IgnoreDef,         # 无视防御/真实伤害 6
+HurtAtkType_SuperHit,          # 暴击 7
+HurtAtkType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
+HurtAtkType_Miss,              # 闪避 9
+HurtAtkType_PoisonCureHurt,    # 伤害毒奶 10
+HurtAtkType_PoisonCureSuck,    # 吸血毒奶 11
+HurtAtkType_HarmSelf,          # 自残 12
+HurtAtkType_CaorenProtect,     # 本次伤害有受曹仁防护标记 13
 ) = range(14)
 
 #伤害类型
@@ -1340,7 +1345,8 @@
 SkillTagAim_Vertical, # 竖排/纵排 4
 SkillTagAim_Self, # 自己 5
 SkillTagAim_MainSkill, # 继承主技能目标 6
-) = range(7)
+SkillTagAim_MainSkillEx, # 继承主技能目标一次性处理 7
+) = range(8)
 
 # 技能目标 - 细分
 (
@@ -1352,7 +1358,8 @@
 SkillTagAffect_AtkHighest, # 攻击力最高 5
 SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
 SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
-) = range(8)
+SkillTagAffect_DamShield, # 承伤盾目标优先 8
+) = range(9)
 
 #技能施法目标
 Def_UseSkillAim_Type = 3
@@ -3072,7 +3079,6 @@
 Def_PlayerKey_Frist_Lock = "Frist_Lock"  # 是否接受了任务1
 Def_PlayerKey_TaskExpRewardMultiple = "TaskExpRewardMultiple"  # 任务经验奖励倍值
 Def_PlayerKey_BuyItemCnt = "BuyItemCnt"  # 购买物品数量
-Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState"  # 查询开服奖励状态
 
 Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex'  # 指定账号生成卡类型
 Def_PlayerKey_QueryNewGuyCardType = 'QueryNewGuyCardType'  # 查询的新手卡类型
@@ -3283,8 +3289,6 @@
 Def_PDict_MonthCTGCount = "MonthCTGCount_%s"  # 本月充值次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s"  # 对应充值商品已购买次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGSelectItemValue = "CTGSelectItemValue_%s"  # 充值自选选择记录,参数(CTG对应的商品记录ID) 每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
-Def_PDict_OnlineRechargeTHAward = "OnlineRechargeTHAward"  # 在线特惠充值额外奖励 - 是否已领取奖励
-Def_PDict_DayFreeGoldGiftState = "DayFreeGoldGiftState"  # 每日免费直购礼包领取记录
 Def_PDict_FirstChargeRecord = "FirstChargeRecord_%s"  # 首充领取记录,按位记录首充第x天是否已领取,参数(首充ID)
 Def_PDict_FirstChargeTime = "FirstChargeTime_%s"  # 首充充值时间戳,参数(首充ID)
 Def_PDict_IsReBorn = "Def_PDict_IsReBorn"  # 是否回城复活
@@ -3323,6 +3327,8 @@
 Def_PDict_SplitExpLVCnt = "SplitExpLVCnt_%s"  # 单位等级经验已拆分过的等级数, 参数为实际等级
 
 Def_PDict_IsAddReviveTired = "IsAddReviveTired"  # 死亡是否增加复活疲劳
+
+Def_PDict_DownloadAwardState = "DownloadAwardState"  # 分包包下载奖励状态 0-未领 >0-已领奖励编号
 
 Def_PDict_ChestsOpenCount = "ChestsOpenCount_%s"  # 宝箱已开启次数, 参数(宝箱ID), 只有有开启次数额外奖励的才会记录
 
@@ -3462,16 +3468,6 @@
 Def_PDict_CollectWordsExchangeCount = "CollectWordsCount_%s_%s"  # 兑换编号对应已兑换次数,参数(活动编号, 兑换编号)
 Def_PDict_CollectWordsGJSeconds = "CollectWordsGJSeconds_%s"  # 挂机未处理收益的秒数,参数(活动编号)
 
-#BOSS复活
-Def_PDict_BossRebornID = "BossRebornID"  # 玩家身上的BOSS复活活动ID,唯一标识,取活动开始日期time值
-Def_PDict_BossRebornTemplateID = "BossRebornTemplateID"  # 玩家身上的BOSS复活模板ID
-Def_PDict_BRActionCurTimes = "BRActionCurTimes_%s" #当前完成次数 参数BOSS复活活动ID
-Def_PDict_BRActionGotTimes = "BRActionGotTimes_%s" #当前已领次数 参数BOSS复活活动ID
-Def_PDict_BRActionWorldLV = "BRActionWorldLV" #BOSS复活活动开启时世界等级
-
-#Boss首杀
-Def_PDict_BossFirstKillState = "BossFirstKillState_%s" # boss首杀相关状态记录
-
 #限时抢购活动
 Def_PDict_FlashSaleID = "FlashSaleID_%s"  # 玩家身上的限时抢购活动ID,唯一标识,取活动开始日期time,参数(活动编号)
 Def_PDict_FlashSaleState = "FlashSaleState_%s"  # 玩家身上的限时抢购活动state,参数(活动编号)
@@ -3511,6 +3507,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 +3559,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值,参数:(活动编号)
@@ -3688,6 +3691,10 @@
 Def_PDict_SuccessValue = "Succ_%s_%s" # 当前次数值,参数(成就类型、条件)
 Def_PDict_SuccessAward = "Succ_Award_%s" # 成就领奖记录,按成就ID位存储0-未领,1-已领,参数(key编号)
 
+# 开服庆典
+Def_PDict_OSACelebrationPoint = "OSACelebrationPoint" # 开服庆典累计积分
+Def_PDict_OSACelebrationAward = "OSACelebrationAward" # 开服庆典累计积分阶段奖励领奖状态,按积分排序后的索引位记录是否已领取
+
 # 通天令
 Def_PDict_TTL_StartTime = "TTL_StartTime" # 本轮通天令开始时间戳
 Def_PDict_TTL_LVInfo = "TTL_LVInfo" # 当前通天令等级激活信息 = 等级*10+是否已购买通天令
@@ -3763,6 +3770,7 @@
 
 #竞技场
 Def_PDict_ArenaScore = "ArenaScore" # 当前积分
+Def_PDict_ArenaWinCnt = "ArenaWinCnt" # 累计胜利次数
 
 #功能系统特权
 Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳,参数(系统功能ID)
@@ -3779,10 +3787,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 +3796,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 + 秘笈等级
@@ -3834,6 +3838,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" # 累计未结算经验的战锤数
@@ -3841,6 +3846,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,10 +3983,28 @@
 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
+TriggerWay_InBattlefield, # 在场时 40
+TriggerWay_Revive, # 复活时 41
+TriggerWay_BigTurnStartByDead, # 大回合开始时(死亡后有效) 42
+TriggerWay_WhenDie, # 死亡时(自己) 43
+) = range(1, 1 + 43)
 
 # 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
 TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
+# 死亡可以触发的方式
+DeadCanTriggerWayList = [TriggerWay_BigTurnStartByDead, TriggerWay_WhenDie]
 
 # 被动触发有效来源
 TriggerSrc_Skill = 1    # 身上技能有效
@@ -4007,6 +4031,9 @@
 PassiveEff_AddShieldHurtPer = 6016 # 对护盾造成伤害加成
 PassiveEff_SkillInvalid = 6017 # 使技能无效
 PassiveEff_AddAngerSkillPerByXP = 6018 # 增加怒气技能伤害(按消耗怒气值)
+PassiveEff_AddBatDamPerByTagLostHP = 6019 # 战斗增伤(按目标已损失生命)
+PassiveEff_AddSkillPerByBuffState = 6020 # 增加技能系数(验证由buff状态触发的)
+PassiveEff_AddBuffLayer = 6021 # 添加buff层级时额外增加x层
 
 # 被动效果ID有触发值时就返回的
 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid]
@@ -4025,6 +4052,8 @@
 SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
 SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
 SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
+SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff
+SkillEff_ReviveNoUse = 7011 # 没有复活目标时释放其他技能
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4344,7 +4373,7 @@
 Def_GiveMoney_Warehouse, # 仓库
 Def_GiveMoney_SellPackItem, # 出售背包物品
 Def_GiveMoney_CollectNPC, # 采集NPC
-Def_GiveMoney_BossFirstKill, # Boss首杀
+Def_GiveMoney_20,
 Def_GiveMoney_21,
 Def_GiveMoney_Trade, # 交易
 Def_GiveMoney_23,
@@ -4379,7 +4408,6 @@
 Def_GiveMoney_Warehouse:"Warehouse",
 Def_GiveMoney_SellPackItem:"SellPackItem",
 Def_GiveMoney_CollectNPC:"CollectNPC",
-Def_GiveMoney_BossFirstKill:"BossFirstKill",
 Def_GiveMoney_Trade:"Trade",
 Def_GiveMoney_FreeGoods:"FreeGoods",
 Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
@@ -4709,9 +4737,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 # 返照
 
 # 经验倍率限制类型
 (
@@ -4757,16 +4789,16 @@
 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 -废弃
+Def_RewardType_OSACelebrationPointAward, # 开服庆典积分阶段奖励 9
 Def_RewardType_FreeGoods, # 极品白拿10
 Def_RewardType_CostRebate, # 消费返利11
 Def_RewardType_BossReborn, # BOSS复活12
 Def_RewardType_FCRecharge, # 仙界盛典充值大礼13
 Def_RewardType_FCParty, # 仙界盛典全民来嗨14
-Def_RewardType_15, # 分包下载奖励15
+Def_RewardType_DownLoad, # 分包下载奖励15
 Def_RewardType_WishingWell, # 许愿池奖励16
 Def_RewardType_OpenFunc, # 功能开启奖励17
 Def_RewardType_TotalRecharge, # 累计充值奖励18
@@ -4789,13 +4821,13 @@
 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
 Def_RewardType_InfiniteMoney, #无限货币42
 Def_RewardType_SingleRecharge, #单笔累充 43
-Def_RewardType_OnlineRechargeTH, #创角在线特惠充值额外奖励 44
+Def_RewardType_44, #创角在线特惠充值额外奖励 44
 Def_RewardType_SWC, #送万充奖励 45
 Def_RewardType_FairyCardSponsor, #仙卡赞助奖励 46
 Def_RewardType_CritGodBoxCTG, #暴击神兵奖励 47
@@ -4836,27 +4868,6 @@
 Def_RewardType_TreeFreeTime, # 仙树免费减时 82
 )= range(83)
 
-#boss复活相关活动定义
-BossRebornActIDList = (
-Def_BRAct_VIPBOSS, #进入VIPboss副本 1
-Def_BRAct_GodArea, #进入古神禁地副本 2
-Def_BRAct_MoneyPray, #铜钱祈愿 3
-Def_BRAct_ExpPray, #经验祈愿 4
-Def_BRAct_Treasure, #极品寻宝 5
-Def_BRAct_WorldBOSS, #击杀世界boss获得掉落归属 6
-Def_BRAct_BOSSHome, #击杀boss之家获得掉落归属 7
-Def_BRAct_FMT, #挑战封魔坛BOSS 8
-Def_BRAct_RunTask, #完成仙盟跑环 9
-Def_BRAct_XJMJ, #完成仙界秘境 10
-Def_BRAct_KirinHome, #完成麒麟之府 11
-Def_BRAct_TowerSweep, #符印塔扫荡 12
-Def_BRAct_RuneTreasure,  #符印寻宝 13
-Def_BRAct_FairyDomain,  #缥缈仙域 14
-Def_BRAct_FamilyBoss,  #仙盟BOSS 15
-Def_BRAct_ActivityPlace,  #活跃放置 16
-Def_BRAct_JSTreasure,  #绝世寻宝 17
-) = range(1, 17+1)
-
 #全民来嗨活动定义(仙界盛典)
 PeoplePartyActIDList = (
 Def_PPAct_Fireworks,  #购买烟花 1
@@ -4877,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 = (
@@ -5106,7 +5093,19 @@
 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
+TaskType_HeroBook, # 武将图鉴激活x个  21
+) = range(1, 1 + 21)
 
 # 任务分组
 TaskGroupList = (

--
Gitblit v1.8.0