From 0b314dd1d9f0c39e8d86de7e996c62836aa19aca Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 03 十一月 2025 15:01:04 +0800
Subject: [PATCH] 16 卡牌服务端(删除翅膀;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  781 +++++++++++++++++--------------------------------------
 1 files changed, 243 insertions(+), 538 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 0594b0b..c941776 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -114,7 +114,7 @@
 AttrID_AtkPer,                              # 攻击加成 16
 AttrID_DefPer,                              # 防御加成 17
 AttrID_MaxHPPer,                            # 生命加成 18
-AttrID_19,
+AttrID_XPRecoverPer,                        # 怒气恢复 19
 AttrID_20,
 AttrID_StunRate,                            # 击晕 21
 AttrID_StunRateDef,                         # 抗击晕 22
@@ -180,7 +180,7 @@
                         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_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer,
                         ]
 
 # 基础三维属性ID列表
@@ -214,19 +214,23 @@
 Def_CalcAttr_MainEquip, # 主装备 1
 Def_CalcAttr_HeroBook, # 武将图鉴 2
 Def_CalcAttr_Realm, # 官职 3
-) = range(4)
+Def_CalcAttr_Gubao, # 古宝 4
+Def_CalcAttr_HJG, # 幻境阁 5
+) = range(6)
 
 CalcAttrName = {
                 Def_CalcAttr_LV:"主公等级",
                 Def_CalcAttr_MainEquip:"主装备",
                 Def_CalcAttr_HeroBook:"武将图鉴",
                 Def_CalcAttr_Realm:"官职",
+                Def_CalcAttr_Gubao:"古宝",
+                Def_CalcAttr_HJG:"幻境阁",
                 }
 
 ##-----------------------------------------------------------------------------------------------
 
 Def_Calc_AllAttrType_MAX = 192
-#基本属性BUFF计算,顺序与 ObjProperty_AttrByIndex 对应,同时也为buff效果ID同步通知策划
+#基本属性BUFF计算,顺序与 ObjProperty_AttrByIndex 对应,同时也为buff效果ID同步通知策划【废弃】
 TYPE_Calc_AttrList = (
 TYPE_Calc_Metal,                        # 金 1
 TYPE_Calc_Wood,                         # 木 2
@@ -343,8 +347,8 @@
 TYPE_Calc_BaseDefAddPer,                # 基础防御百分比
 TYPE_Calc_BaseHitAddPer,                # 基础命中百分比
 TYPE_Calc_BaseMissAddPer,               # 基础闪避百分比
-TYPE_Calc_GodWeaponMaxHPPer,            # 神兵生命百分比 
-TYPE_Calc_GodWeaponAtkPer,              # 神兵攻击百分比 105
+TYPE_Calc_104,                          # 神兵生命百分比 
+TYPE_Calc_105,                          # 神兵攻击百分比 105
 TYPE_Calc_StoneMaxHPPer,                # 宝石生命百分比
 TYPE_Calc_StoneAtkPer,                  # 宝石攻击百分比
 TYPE_Calc_HPCureEnhance,                # 血瓶恢复效果增加
@@ -454,7 +458,6 @@
 Def_ItemID_GoldMoney = 20               # 直接给仙玉
 Def_ItemID_SilverMoney = 22               # 直接给铜钱
 Def_ItemID_FamilyContribution = 26               # 直接给战盟贡献点
-Def_ItemID_FamilyActive = 28               # 直接给战盟活跃点
 Def_ItemID_SP = 29               # 直接给sp
 Def_ItemID_GoldPaper = 30               # 直接给绑玉/灵石
 Def_ItemID_RealmPoint = 24               # 直接给修行点
@@ -471,12 +474,11 @@
 Def_ItemID_GongdePoint = 530               # 直接给功德点
 Def_ItemID_FamilyFlagWarPoint = 540       # 直接给万界积分
 Def_ItemID_TongTianPoint = 720               # 直接给通天令经验点
-Def_ItemID_SuccessScore = 590               # 直接给成就积分
-Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper, 
+Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_SP, Def_ItemID_GoldPaper, 
                            Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
                            Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
                            Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
-                           Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint, Def_ItemID_SuccessScore,
+                           Def_ItemID_GongdePoint, Def_ItemID_TongTianPoint,
                            Def_ItemID_FamilyFlagWarPoint]
 # 货币类型对应直接给货币物品ID
 MoneyItemIDDict = {IPY_GameWorld.TYPE_Price_Gold_Money:Def_ItemID_GoldMoney,
@@ -506,7 +508,6 @@
 Def_ItemType_MissionItem = 17      #任务物品
 Def_ItemType_TransMissionItem = 18      #转职任务物品
 Def_ItemType_RealmStuff = 19      #头衔(境界)升级道具
-Def_ItemType_GodWeaponStuff = 20      #头衔(境界)升级道具
 Def_ItemType_HorseStuff = 21      #坐骑丹
 Def_ItemType_HorseSoul = 22      #坐骑兽魂
 Def_ItemType_HorseBook = 23      #坐骑技能书
@@ -631,7 +632,6 @@
 Def_Effect_GivePlayerMoneyGold = 203    #给人物金钱 仙玉道具效果ID
 Def_Effect_AddDienstgrad = 204   #使用物品获得称号
 Def_Effect_UseItemGiveZhenQi = 205      #使用道具给予真气
-Def_Effect_ItemGiveFamilyActivity = 208      #使用道具给予仙盟活跃令
 Def_Effect_ItemGiveFamilyContribution = 209      #使用道具给予仙盟贡献
 Def_Effect_ItemAddExp = 213      #给经验道具 
 Def_Effect_ItemAddLV = 214       #直接升级道具 
@@ -667,7 +667,6 @@
 Def_Effect_ItemGiveMoney = 264    #通用给货币道具,A值数量,B值货币类型
 Def_Effect_GuajiAward = 266    #直接给挂机收益,A值分钟
 Def_Effect_ItemCount = 267     #自动转化为对应物品ID的个数,不存背包
-Def_Effect_GubaoPiece = 270     #古宝碎片效果ID, A值-古宝ID
 Def_Effect_TrainRealmLV = 272     #境界培养卡,值A-功能(1-坐骑;2-灵宠;3-灵器), 值B-境界
 Def_Effect_TiandaoQiyun = 273   #增加天道树气运;A值-增加值   效果值B: 领取是否默认直接使用
 Def_Effect_Face = 274   #头像物品;A值-头像ID
@@ -676,6 +675,7 @@
 Def_Effect_RecycleItemMoney = 277   #回收物品转化为货币; A值-直接给货币物品ID;B值-货币数量
 Def_Effect_FamilyEmblem = 278   #激活仙盟徽章; A值-徽章ID;
 Def_Effect_HeroSkin = 279   #激活武将皮肤; A值-武将ID;B值-皮肤索引
+Def_Effect_FamilyTaofaCnt = 280   #增加公会讨伐次数; A值-讨伐次数
 #----以下未使用或代码依然存在的---
 Def_Effect_ItemGiveGongXun = 1920        #使用道具给予功勋
 Def_Effect_ItemGiveRuneJH = 1925       #使用道具给予符印精华
@@ -720,11 +720,9 @@
 #Def_ItemEff_WeaponType = 2808   # 武器类型分类(非物品类型)
 #Def_ItemEff_Flower = 2816   # 鲜花
 #Def_Effect_AddMagicJifen = 1916      #使用道具给予幸运宝藏积分
-#Def_Effect_WingSkin = 1918   #翅膀皮肤
 #Def_Effect_AddSkyGodExp = 2854   #增加天神经验 A值天神经验
 #Def_Effect_SummonNPC = 2855   #召唤NPC A值NPCID B值持续时间 C值是否不删除物品,默认0删除
 #Def_Effect_AddOfficialExp = 2859   #增加爵位经验
-#Def_Effect_AddWingClassLV = 2862   #增加翅膀阶级 A值: N阶及N阶以下使用时翅膀直接升一阶; B值:是否保留祝福值
 
 #---------------------------------------------------------------------
 Def_Max_Update_Talent_Time = 3    #最大使用造化丹次数
@@ -771,8 +769,6 @@
 Def_Item_Eff_UseClassLV = 2821
 #祝福值波动范围 随机用
 Def_Item_Eff_BlessRange = 2818
-#神兵经验值
-Def_Item_Eff_GodWeaponExp = 206
 #---------------------------------------------------------------------
 #写死的任务ID
 #新手任务
@@ -933,7 +929,6 @@
 Def_SkillID_Teleport = 1400     #瞬间移动 用于不影响攻击间隔
 Def_SkillID_VipBuff = 11500     # VIPbuff
 Def_SkillID_TeamVIPBuff = 22000     # VIP队伍buff, 攻守同盟
-Def_SkillID_FBEncourageBuff = 20051     # 副本鼓舞buff
 Def_SkillID_PoisonAtkBuff = 25180   # 毒攻buff
 Def_SkillID_DropOwnerBuff = 20040   # 掉落归属buff
 Def_SkillID_TianxuanBuff = 5100   # 天玄丹特殊掉落buff
@@ -968,13 +963,16 @@
 HurtType_Normal,            # 伤害 1
 HurtTYpe_Recovery,          # 回血 2
 HurtType_3,
-HurtType_4,
+HurtType_Immune,            # 免疫 4
 HurtType_Parry,             # 格挡 5
 HurtType_IgnoreDef,         # 无视防御/真实伤害 6
 HurtType_SuperHit,          # 暴击 7
 HurtType_Stun,              # 击晕 8 仅算概率触发的击晕,技能额外击晕效果的不算
 HurtType_Miss,              # 闪避 9
-) = range(10)
+HurtType_PoisonCureHurt,    # 伤害毒奶 10
+HurtType_PoisonCureSuck,    # 吸血毒奶 11
+HurtType_HarmSelf,          # 自残 12
+) = range(13)
 
 #伤害类型
 (
@@ -1329,7 +1327,11 @@
 Def_Calc_MaxHP, # 最大生命值 1
 Def_Calc_LastHurt, # 最后一次伤害值 2
 Def_Calc_TagMaxHP, # 目标最大生命值 3
-) = range(4)
+Def_Calc_ByBuffValue, # 触发buff的buff值 4
+Def_Calc_TagLostHP, # 目标已损失生命 5
+Def_Calc_HarmSelfHP, # 按本次自残耗血值 6
+Def_Calc_AtkedSkillHurtHP, # 按最后受到攻击的技能伤害  7
+) = range(8)
 
 #治疗类型(影响公式参数)
 Def_CureTypeList = (
@@ -1392,7 +1394,10 @@
 SkillTagAffect_HPHighest, # 血量最高 2
 SkillTagAffect_Death, # 死亡单位 3
 SkillTagAffect_UncontrolledPriority, # 未被控制优先 4
-) = range(5)
+SkillTagAffect_AtkHighest, # 攻击力最高 5
+SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
+SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
+) = range(8)
 
 #技能施法目标
 Def_UseSkillAim_Type = 3
@@ -1478,11 +1483,10 @@
 ) = range( 0, Def_AutoAtkSkillType )
 
 #技能类型
-Def_SkillType_Count = 25
 (
    Def_SkillType_Special      ,  #特殊技能   0        
    Def_SkillType_Atk          ,  #攻击类   1
-   Def_SkillType_Rstr         ,  #恢复类   2
+   Def_SkillType_Cure         ,  #恢复类   2
    Def_SkillType_LstPlsBuff   ,  #持续增益BUFF  3
    Def_SkillType_LstDepBuff   ,  #持续减益BUFF  4
    Def_SkillType_PlsBuff      ,  #增益BUFF 5
@@ -1495,6 +1499,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_LstPlsBuffAtk,  #持续攻击类BUFF 15
    Def_SkillType_PassivePlsBuff,  #被动触发增益类buff 16
    Def_SkillType_PassiveDepBuff,  #被动触发减益类buff 17
@@ -1506,7 +1515,7 @@
    Def_SkillType_AttrSkillNoLearn,   # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
    Def_SkillType_PassiveLstPlsBuffAtk,  #被动持续攻击类BUFF 24
    
-) = range( 0, Def_SkillType_Count )
+) = range(115, 125)
 
 #数据库中的Buff类型对应返回C++中的Buff类型对象
 Def_SkillBuffList = {
@@ -1552,7 +1561,7 @@
 
 #不进入战斗状态的技能
 Def_NoBattleState_List = [
-                           Def_SkillType_Rstr         ,  #恢复类   2
+                           Def_SkillType_Cure         ,  #恢复类   2
                            Def_SkillType_LstPlsBuff   ,  #持续增益BUFF  3
                            Def_SkillType_PlsBuff      ,  #增益BUFF 5
                            Def_SkillType_Passive      ,  #被动技   7
@@ -1906,155 +1915,43 @@
 Def_FBMapID_MainBoss = 2 # 主线Boss
 Def_FBMapID_ArenaBattle = 3 # 演武场
 
-#创角新手村地图ID列表
-Def_CreatRoleMapIDList = [10000]
-#PK周赛
-Def_FBMapID_WeedPK = 12040
-#战盟副本-异界入侵、守卫人皇
-Def_FBMapID_FamilyInvade = 31170
+Def_FBMapID_Zhanchui = 30010 # 白骨盈野/战锤秘境
+Def_FBMapID_Tianzi = 30020 # 天子考验
 
-# 战盟boss副本
-Def_FBMapID_FamilyBossMap = 31210
-# 仙盟联赛
-Def_FBMapID_FamilyWar = 31220
-
-# 百战之地
-Def_FBMapID_BZZD = 31080
-
-#试炼之塔(符印塔)
-Def_FBMapID_TrialTower = 31130
-
-#除魔卫道
-Def_FBMapID_ClearDevil = 31040
-#新手副本
-#Def_FBMapID_ClearDevil2 = 31090
-#法宝副本
-Def_FBMapID_MagicWeapon = 41110
-
-#BOSS之家
-Def_FBMapID_BossHome = 31270 #31020地图ID修改,不使用副本类型
-
-#古神禁地
-Def_FBMapID_GodArea = 31150
-
-#冰晶矿脉
-Def_FBMapID_IceLode = 31140
-
-#渡劫副本
-Def_FBMapID_DuJie = 31110
-
-#麒麟之府
-Def_FBMapID_KirinHome = 311900
-
-#个人BOSS
-Def_FBMapID_PersonalBoss = 31240
-
-#仙盟宴会
-Def_FBMapID_FamilyParty = 31230
-
-#宗门试炼
-Def_FBMapID_MunekadoTrial = 60010
-
-#混乱妖域
-Def_FBMapID_ChaosDemon = 31180
-
-#讨伐妖魔
-Def_FBMapID_KillDevil = 31280
-
-#娲皇遗迹
-Def_FBMapID_QueenRelics = 51010
-
-#上古战场
-Def_FBMapID_ElderBattlefield = 31160
-
-#守护副本
-Def_FBMapID_Guard = 31250
-
-#封魔坛
-Def_FBMapID_SealDemon = 52010
-#单人封魔坛
-Def_FBMapID_SealDemonEx = 52020
-#诛仙BOSS/雷罚BOSS
-Def_FBMapID_ZhuXianBoss = 31380
-#天星塔/丹塔
-Def_FBMapID_SkyTower = 31370
-#境界塔
-Def_FBMapID_RealmTower = 31310
-#仙魔之争
-Def_FBMapID_XMZZ = 31010
-#神兽副本
-Def_FBMapID_Dogz = 21110
-#聚魂副本
-Def_FBMapID_GatherSoul = 31340
-#跨服竞技场
-Def_FBMapID_CrossRealmPK = 32010
-#跨服排位
-Def_FBMapID_CrossChampionship = 32070
-#跨服蓬莱仙境
-Def_FBMapID_CrossPenglai = 32020
-#跨服魔化之地
-Def_FBMapID_CrossDemonLand = 32080
-#跨服妖王
-Def_FBMapID_CrossDemonKing = 32030
-#本服妖王
-Def_FBMapID_DemonKing = 22030
-#多仙盟Boss
-Def_FBMapID_AllFamilyBoss = 31260
-#骑宠Boss
-Def_FBMapID_HorsePetBoss = 31200
-#缥缈宝藏
-Def_FBMapID_FairyTreasure = 31190
-#跨服灵草园
-Def_FBMapID_CrossGrasslandLing = 32040
-#跨服仙草园
-Def_FBMapID_CrossGrasslandXian = 32050
-#跨服战场
-Def_FBMapID_CrossBattlefield = 32060
-#跨服仙盟夺旗战/逐鹿万界
-Def_FBMapID_CrossFamilyFlagwar = 32090
-#情缘副本
-Def_FBMapID_Love = 31300
-#镜像切磋
-Def_FBMapID_MirrorBattle = 100
-
-#前端自定义场景地图
-ClientCustomSceneList = []
-
-#镜像PK的地图ID列表
-MirrorBattleMapIDList = []
+#线路未过关时免费的地图
+UnPassFreeMapIDList = [Def_FBMapID_Zhanchui]
+#按星级记录过关的地图
+PassByStarMapIDList = []
+#扫荡不需要检查是否已过关的地图
+SweepUnCheckPassMapIDList = [Def_FBMapID_Tianzi]
 
 #注册上传跨服服务器数据后直接进入跨服服务器的地图
-RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonLand, Def_FBMapID_CrossDemonKing, 
-                                      Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian, Def_FBMapID_CrossBattlefield,
-                                      Def_FBMapID_CrossChampionship, Def_FBMapID_CrossFamilyFlagwar,
-                                      ]
+RegisterEnter_CrossServerMapIDList = []
 #跨服地图
-Def_CrossMapIDList = RegisterEnter_CrossServerMapIDList + [Def_FBMapID_CrossRealmPK]
+Def_CrossMapIDList = RegisterEnter_CrossServerMapIDList + []
 #跨服分区类型配置, 没配置的默认 CrossZoneComm
 Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0,默认常规分区
-                         Def_FBMapID_CrossPenglai:"CrossZoneComm",
-                         Def_FBMapID_CrossDemonLand:"CrossZoneComm",
-                         Def_FBMapID_CrossRealmPK:"CrossZonePK",
-                         Def_FBMapID_CrossDemonKing:"CrossZonePK",
-                         Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
-                         Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
-                         Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield",
-                         Def_FBMapID_CrossChampionship:"CrossZonePK",
-                         Def_FBMapID_CrossFamilyFlagwar:"CrossZoneComm",
+#                         Def_FBMapID_CrossPenglai:"CrossZoneComm",
+#                         Def_FBMapID_CrossDemonLand:"CrossZoneComm",
+#                         Def_FBMapID_CrossDemonKing:"CrossZonePK",
+#                         Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
+#                         Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
+#                         Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield",
+#                         Def_FBMapID_CrossChampionship:"CrossZonePK",
+#                         Def_FBMapID_CrossFamilyFlagwar:"CrossZoneComm",
                          }
 #跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
-Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
-                             Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
-                             Def_FBMapID_CrossFamilyFlagwar:"CrossFamilyFlagwarZoneMap",
+Def_CrossZoneMapTableName = {
+                             #Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+                             #Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
+                             #Def_FBMapID_CrossFamilyFlagwar:"CrossFamilyFlagwarZoneMap",
                              }
 #需要动态分配线路的跨服地图
-Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian, Def_FBMapID_CrossBattlefield, Def_FBMapID_CrossChampionship]
+Def_CrossDynamicLineMap = []
 
 #副本关闭时未拾取的物品邮件发放给玩家
 #这里只有需要的副本才配置,不做默认逻辑,防止某些副本实际不能给导致刷物品,如麒麟之府
-Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial, 
-                                   Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx, Def_FBMapID_ZhuXianBoss, 
-                                   Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing, Def_FBMapID_KillDevil]
+Def_SendUnPickItemMailMapIDList = []
 
 #金钱不掉物品直接给玩家的地图
 Def_GiveMoneyMapIDList = []
@@ -2062,38 +1959,18 @@
 # 副本中玩家下线就被踢出
 Def_DisconnectExit_FBID = []
 #会有阵营的地图
-Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar, Def_FBMapID_GatherSoul, Def_FBMapID_CrossBattlefield] + MirrorBattleMapIDList
+Def_MapID_NeedCamp = []
 
 # 进入副本需要根据请求lineID动态分配虚拟分线属性的地图
-Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]
-                      
-# 进入副本需要发送到GameServer的地图
-Def_MapID_SendToGameServer = [Def_FBMapID_HorsePetBoss, Def_FBMapID_FamilyInvade, Def_FBMapID_SealDemon, Def_FBMapID_DemonKing,
-                              Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + \
-                              Def_MapID_LineIDToPropertyID + [Def_FBMapID_CrossChampionship] + MirrorBattleMapIDList
-                              
-# 刷新标识点在无玩家的情况下也需要刷新的地图
-Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_HorsePetBoss, Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]
-
-# 可重复进的副本
-Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_SealDemon]
+Def_MapID_LineIDToPropertyID = []
 
 # 无玩家时不自动关闭的自伸缩副本
-Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_GatherSoul]
+Def_NoPlayerNotCloseAutoSizeMap = []
 # 无玩家时自动关闭的非自伸缩副本
-Def_NoPlayerCloseNotAutoSizeMap = [Def_FBMapID_ZhuXianBoss]
-
-# 不可切换PK模式的地图
-Def_CanNotChangeAtkModelMap = []
+Def_NoPlayerCloseNotAutoSizeMap = []
 
 # 从副本退出时,可以返回进入前的副本ID
 Def_CanBackFBMap = []
-
-#答题触发地图
-Def_Subject_Map = [
-                   ]
-#没通关过不可资源找回的地图
-Def_UnRecoverNoPassMap = [Def_FBMapID_KirinHome, Def_FBMapID_MunekadoTrial, Def_FBMapID_QueenRelics]
 
 #副本延时踢出玩家的时间
 Def_FBKickPlayerTime = 5000 #5秒
@@ -2118,6 +1995,8 @@
                 'MainLevel':[Def_FBMapID_Main],  # 主线关卡
                 'MainLevelBoss':[Def_FBMapID_MainBoss],  # 主线关卡boss
                 'Arena':[Def_FBMapID_ArenaBattle],
+                'Zhanchui':[Def_FBMapID_Zhanchui],
+                'Tianzi':[Def_FBMapID_Tianzi],
                 }
 
 #特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -2584,21 +2463,6 @@
 ## 装备位 - 灵器
 EquipPlace_LingQi = []
 
-#装备物品位置,不需要重刷属性
-EquipItemNoRefreshState = [
-    ShareDefine.retHorse,        #19 坐骑
-    ShareDefine.retWeaponSkin,   #20 时装武器
-    ShareDefine.retClothesSkin,  #21 时装衣服
-    ShareDefine.retWeapon2Skin,  #22 时装副手
-                           ]
-
-# 需要广播外观的装备部位(除了境界装备3部位)
-Def_SyncEquipStateByIndex = [
-    ShareDefine.retWing,        #13 翅膀
-    ShareDefine.retGuard1,    #14 守护1
-    ShareDefine.retHorse,        #19 坐骑
-                             ]
-
 #---------------------------------------------------------------------
 #特殊物品光环,永久存在
 Def_SuperBuffList = []
@@ -3007,10 +2871,6 @@
 Def_PetRoleGapLVMax = 5                    # 宠物可出战的等级最多大于玩家等级数
 Def_Pet_ProcessHP_Tick = 3000              # 宠物回血间隔
 
-#---自动防外挂验证---
-#玩家字典用于连续自动检测不回复次数
-Def_Player_AutoCheck_Count = 'playerCheckCount0704'
-
 #角色记录是否使用外挂
 (
 Def_AutoCheck_State_Safe,
@@ -3041,11 +2901,9 @@
     Def_GameWallow_LV_Max,
 )= range(0, 10)
 
-#---物品卖给商店商店类型记录---
-(
-    Def_ShopType_NpcShop,     #NPC商店
-    Def_ShopType_LongSale,    #远程贩售
-) = range(1, 2+1)
+# 回合时机,以武将自身为参考
+TurnTiming_Before = 0 # 武将回合前
+TurnTiming_After = 1 # 武将回合后
 
 # 回合攻击战斗类型
 (
@@ -3053,8 +2911,8 @@
 TurnBattleType_Combo, # 连击 1
 TurnBattleType_AtkBack, # 反击 2
 TurnBattleType_Pursue, # 追击 3
-TurnBattleType_Enhance, # 额外技能 4
-TurnBattleType_Passive, # 被动技能 5
+TurnBattleType_Enhance, # 额外技能(一般是主技能拆分为多个效果的技能) 4
+TurnBattleType_Passive, # 被动触发的技能 5
 ) = range(6)
 
 Def_PerTurnTick = 1000 # 每回合等同于常规tick时长
@@ -3070,7 +2928,6 @@
 Def_Obj_Dict_HeroID = 'HeroID' # 该战斗NPC所绑定的武将ID,一般仅玩家阵容有
 Def_Obj_Dict_SkinID = 'SkinID' # 该战斗NPC所绑定的武将皮肤ID,一般仅玩家阵容有
 Def_Obj_Dict_TurnFightPosInfo = 'TurnFightPosInfo' # 回合制站位: 阵营编号*100+阵型站位,阵型站位为0时代表非主战单位
-Def_Obj_Dict_TurnFightTimeline = 'TurnFightTimeline' # 回合制战斗时间线: 回合数*100+行动编号节点
 Def_Obj_Dict_TurnMissNum = 'TurnMissNum' # 单次累计闪避次数
 Def_Obj_Dict_TurnBattleType = 'TurnBattleType' # 本次攻击战斗类型:TurnBattleType_xxx
 
@@ -3142,17 +2999,27 @@
     BatObjState_Poison, # 中毒 5
     BatObjState_Bleeding, # 流血 6
     BatObjState_EasyHurt, # 易伤 7
-    BatObjState_Wudi, # 无敌 8
+    BatObjState_Wudi, # 无敌( 受任意伤害、控制类、dot效果,全部飘“免疫”) 8
     BatObjState_Sneer, # 嘲讽 9
     BatObjState_LimitSkill, # 沉默 10
     BatObjState_LimitAddHP, # 禁疗 11
     BatObjState_Stone, # 石化 12
     BatObjState_Disarm, # 缴械 13
     BatObjState_ParryYJ, # 格挡印记 14
-) = range(15)
-
-# 被控制的状态列表,无法行动,处于某些控制类buff影响状态下,如晕眩,冰冻,石化
-InControlledStateList = [BatObjState_Frozen, BatObjState_Stun, BatObjState_Stone]
+    BatObjState_Weak, # 虚弱 15
+    BatObjState_Charm, # 魅惑 16
+    BatObjState_Chaos, # 混乱 17
+    BatObjState_18, # 权谋 18
+    BatObjState_FocusFire, # 军令/集火 19
+    BatObjState_20, # 贯龙枪 20
+    BatObjState_DamShield, # 承伤盾 21
+    BatObjState_DamBackShield, # 荆棘盾 22
+    BatObjState_BurnPlus, # 玄火(灼烧2) 23
+    BatObjState_PoisonCure, # 焚血(毒奶) 24
+    BatObjState_RebornLimit, # 无法复活 25
+    BatObjState_26, # 脆弱 26
+    BatObjState_27, # 阴咒 27
+) = range(1 + 27)
 
 #玩家状态定义,不能超过31个,如超过,需扩展多个key支持
 Def_PlayerStateList = (
@@ -3201,15 +3068,11 @@
 Def_PlayerKey_BuffHurtCnt = "BuffHurtCnt" # 持续buff掉血次数
 Def_PlayerKey_Zhansha = "zhansha"   # 斩杀标志
 Def_PlayerKey_LockHPSkillID = "LockHPSkillID"   # 锁血功能的技能
-Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD"   # 神兵护盾被攻击前的值
 Def_PlayerKey_curHurtValue = "curHurtValue"     # 计算中的临时伤害值,技能特殊用
 Def_PlayerKey_curHurtValueEx = "curHurtValueEx"     # 计算中的临时伤害值,技能特殊用
 Def_PlayerKey_SomersaultTime = "Somersault"     # 翻滚一定时间内无敌,表现为MISS
 Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff"   # 玩家属性刷新功能属性缓存,便于buff刷新计算, 间隔刷新
 Def_Player_HadRefreshAttr = "HadRefreshAttr"   # 玩家在本地图是否刷新过属性
-Def_PlayerKey_ClientCustomScene = "ClientCustomScene"     # 客户端自定义场景状态
-Def_PlayerKey_ClientCustomSceneStepTick = "ClientCustomSceneStepTick"     # 客户端自定义场景tick
-Def_PlayerKey_ClientCustomSceneGrade = "ClientCustomSceneGrade"     # 客户端自定义场景评级
 Def_PlayerKey_ChangeMapID = "ChangeMapID"     # 请求切换的地图ID
 Def_PlayerKey_ChangeLineID = "ChangeLineID"     # 请求切换的线路ID
 Def_PlayerKey_ResetFBLinePosX = "ResetFBLinePosX"     # 请求切换副本多合一地图功能线路ID
@@ -3249,7 +3112,6 @@
 Def_PlayerKey_BuyItemCnt = "BuyItemCnt"  # 购买物品数量
 Def_PlayerKey_SpeedHorse = "SpeedHorse"  # 骑乘时附加移动速度值
 Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState"  # 查询开服奖励状态
-Def_PlayerKey_QueryFamilyStoreTick = "QueryFamilyStoreTick"  # 战盟仓库操作tick
 
 Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex'  # 指定账号生成卡类型
 Def_PlayerKey_QueryNewGuyCardType = 'QueryNewGuyCardType'  # 查询的新手卡类型
@@ -3258,7 +3120,6 @@
 Def_PlayerKey_ComboBuffProcessState = "ComboBuffProcessState"    #持续性buff连击处理状态
 Def_PlayerKey_LvAwardQueryState = 'LvAwardQueryState'  # 等级奖励领奖查询状态
 Def_PlayerKey_StoreQueryState = 'StoreQueryState'  # 商店全服购买次数查询状态
-Def_PlayerKey_MysticalShopLastTime = 'MysticalShopLastTime'  # 神秘商店刷新时间
 #===============================================================================
 # # 持续性buff伤害处理连击技能ID列表
 # # 因为释放一次技能后一段时间内是持续性的, 故连接判断效果仅处理一次, 持续时间内均受此效果影响, 不重复处理连击
@@ -3313,7 +3174,7 @@
 Def_PDictType_FlashSale, #限时抢购
 Def_PDictType_TJGNotify,  # 脱机挂结果通知
 Def_PDictType_LVAward,  # 等级奖励领取信息记录
-Def_PDictType_OpenServerCampaign,  # 开服活动
+Def_PDictType_4,  # 开服活动
 Def_PDictType_WeekParty, #周狂欢
 Def_PDictType_FeastWeekParty,    # 节日巡礼
 Def_PDictType_LoginAward,    # 登录奖励运营活动
@@ -3348,21 +3209,6 @@
 Def_Player_Dict_FirstLogin = "FirstLogin"    # 首登标记 0-未首登; 1-首登过
 Def_GuideStateKeyCount = 8 # 引导状态key最大个数
 Def_Player_Dict_GuideState = "GuideState_%s" # 引导状态记录,参数为key个数编号
-Def_Player_Dict_VersionFix = "VersionFix_%s" # 版本修正标记,参数为key个数编号, 支持n个版本修正标记,每个key支持31个 
-Def_Player_Dict_PrestigeAwardMark = "PrestigeAwardMark_7"   # 领取威望物品奖励情况
-Def_Player_Dict_AutoCheckHack_Wait = "AutoCheckHackWait_10"    #自动检测外挂验证中标识
-Def_Player_Dict_AutoCheckHack_Source = "AutoCheckHackSource_11"    #自动检测外挂随机源
-Def_Player_Dict_AutoCheckHack_Type = "AutoCheckHackType_12"    #自动检测外挂类型
-Def_Player_Dict_AutoCheckHack_State = "AutoCheckHackState_13"    #自动检测外挂账号状态识别
-Def_Player_Dict_Captcha_WaitTick = "CaptchaWaitTick_14"    #图形验证回复等待时间
-Def_Player_Dict_Captcha_WaitSign = "CaptchaWaitSign_15"    #图形验证回复等待标识
-Def_Player_Dict_Captcha_ErrCount = 'CaptchaErrCount_16'    #玩家回答错误次数
-Def_Player_Dict_Captcha_Answer = 'CaptchaAnswer_17'    #图形验证码答案
-Def_Player_Dict_AutoCheckHack_ErrCnt = "AutoCheckHackErrCnt_19"    #自动检测外挂随机源
-Max_StoryMissionNum = 99
-Def_Player_Dict_StoryMissionState = "StoryMissionState_%s"  # 剧情任务编号完成状态, 参数(key编号), 按编号位记录
-Def_Player_Dict_TaskLastKillNPCID = "TaskLastKillNPCID"    #任务上次随机击杀NPCID
-Def_Player_Dict_TaskLastVisitNPCID = "TaskLastVisitNPCID"    #任务上次随机访问NPCID
 LittleHelperSetNumCount = 20 # 小助手设置编号个数
 LittleHelperValueCount = 6 # 小助手设置值个数
 Def_Player_Dict_LittleHelperValue = "LittleHelperValue%s_%s" # 小助手设置值存储, 参数(设置编号, value编号)
@@ -3377,7 +3223,6 @@
 
 Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap"  #跨服注册活动地图, dataMapID
 
-Def_Player_Dict_FamilyTechLV = "FamilyTechLV_%s"    #家族科技等级, 参数(科技ID)
 Def_Player_Dict_RouteServerInitOK = "RouteServerInitOK_33"     #RouteServer初始化成功(仅登陆一次)
 Def_Player_Dict_Wallow_LV = "GameWallowLV_34"    #防沉迷等级
 Def_Player_Dict_Wallow_OfflineTime = "GameWallowOfflineTime_35"    #防沉迷离线累积时间
@@ -3401,21 +3246,12 @@
 Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用,进入副本设置完后删除
 Def_Player_Dict_ReqFBMissionID = "ReqFBMissionID" # 请求进入副本的任务ID
 Def_Player_Dict_ReqFBMissionType = "ReqFBMissionType" # 请求进入副本的任务类型
-Def_Player_Dict_PlayerFBStar_MapId = "FBStar_%s_%s"  # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
-Def_Player_Dict_CustomMapStep = "CustomMapStep_%s_%s"  # 前端自定义场景阶段, 参数(mapID, lineID),对应 CustomMapStep_Fight ...
+Def_Player_Dict_FBStar = "FBStar_%s_%s"  # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
 Def_Player_Dict_FBPassLineID = "FBPassLineID_%s"  # 副本已过关到的lineID, 参数为副本ID
-Def_Player_Dict_EnterFbCntTotal = "EnterFbCntTotal_%s"  # 进入副本总累计次数, 参数为副本ID
-Def_Player_Dict_EnterFbCntDay = "EnterFbCntDay_%s"  # 今日进入副本次数, 参数为副本ID
-Def_Player_Dict_BuyFbCntDay = "BuyFbCntDay_%s" # 今日购买副本进入次数, 参数为副本ID
-Def_Player_Dict_RecoverFbCnt = "RecoverFbCnt_%s"  # 今日找回的副本次数, 参数为副本ID
-Def_Player_Dict_ItemAddFbCnt = "ItemAddFbCnt_%s"  # 使用物品增加的副本次数, 参数为副本ID
-Def_Player_Dict_RegainFbCnt = "RegainFbCnt_%s"  # 时间恢复增加的副本次数, 参数为副本ID
-Def_Player_Dict_EnterFbCntWeek = "EnterFbCntWeek_%s"  # 本周进入副本次数, 参数为副本ID
-Def_Player_Dict_FbCntRegainStartTime = "FbCntRegainStartTime_%s" # 副本次数恢复开始时间, 参数为副本ID
-Def_Player_Dict_FbCntRegainTotalTime = "FbCntRegainTotalTime_%s" # 副本次数恢复还需时间, 参数为副本ID
-Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s"  # 副本历史最高通关, 参数为副本ID
-Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s"  # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
-Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97"  # 刷新天书任务时的玩家等级
+Def_Player_Dict_FbEnterCnt = "FbEnterCnt_%s"  # 今日进入副本次数(获得奖励次数), 参数为副本ID
+Def_Player_Dict_FBBuyCnt = "FBBuyCnt_%s" # 今日购买副本进入次数, 参数为副本ID
+Def_Player_Dict_FBItemCnt = "FBItemCnt_%s"  # 今日使用物品增加的副本次数, 参数为副本ID
+Def_Player_Dict_FBADCnt = "FBADCnt_%s" # 今日已通过广告获得的次数, 参数为副本ID
 Def_Player_Dict_GameFuncFirstTouch = "GameFuncFirstTouch_%s"  # 服务端功能首次触发开启状态; 参数, key编号
 Def_Player_Dict_GameFuncAwardState = "GameFuncAwardState_%s"  # 服务端功能开启领奖状态; 参数, key编号
 Def_Player_Dict_MissionFinish = "MissionFinish_%s"  # 任务是否完成; 参数, 任务ID, 只会记录部分需要记录的任务ID 
@@ -3444,21 +3280,10 @@
 Def_Player_Dict_HasVIPClubNote = 'HasVIPClubNote_186'  # 是否提示过vip升级可加入贵宾俱乐部信息
 Def_Player_Dict_PyPlayerAction = 'PyPlayerAction_187'  # py自定义玩家状态
 Def_Player_Dict_FamilyLV = 'FamilyLV_189'  # 玩家帮会等级
-Def_Player_UpdatePlayerNameCnt = "UpdatePlayerNameCnt_196"  # 角色改名次数
-Def_Player_Dict_UpdatePlayerNameItemIndex = "UpdatePlayerNameItemIndex_198"  # 改名物品在背包的位置
-Def_Player_Dict_UpdatePlayerName = "UpdatePlayerName_199"  # 改名锁
-Def_Player_Dict_UpdateFamilyNameItemIndex = "UpdateFamilyNameItemIndex"  # 改名物品在背包的位置
-Def_Player_Dict_UpdateFamilyName = "UpdateFamilyName"  # 改名锁
-Def_Player_Dict_FamilyDayAward = "FamilyDayAward"  # 仙盟每日奖励领奖记录
-Def_Player_Dict_FamilyDonateRecord = "FamilyDonateRecord"  # 仙盟今日捐献记录,按位存储每种类型今日已捐献次数
-Def_Player_Dict_FamilyEmblemID = "FamilyEmblemID"  # 仙盟徽章ID
+Def_Player_Rename = "Rename"  # 是否已改名过
 Def_Player_Dict_FamilyZhenbaogeCut = "FamilyZhenbaogeCut" #珍宝阁今日是否已砍过价
 Def_Player_Dict_FamilyZhenbaogeBuy = "FamilyZhenbaogeBuy" #珍宝阁今日是否已购买过
-
-# 仙盟事务
-Def_Player_Dict_FamilyAffairRefreshFree = "FamilyAffairRefreshFree"  # 今日已免费刷新事务次数
-Def_Player_Dict_FamilyAffairInfo = "FamilyAffairStar_%s"  # 事务信息,星级*10+状态(0-无;1-进行中;2-已完成);参数(事务编号ID)
-Def_Player_Dict_FamilyAffairStartTime = "FamilyAffairStartTime_%s"  # 事务开始时间戳,参数(事务编号ID)
+Def_Player_Dict_FamilyDonateCnt = "FamilyDonateCnt_%s"  # 仙盟今日捐献次数,参数(捐献类型)
 
 Def_Player_Dict_DelPackIndex = "DelPackIndex215"  # 装备回购不重排,只记录最旧的一个物品
 
@@ -3471,14 +3296,13 @@
 
 Def_PDict_TreasureFreeCount = "TreasureFreeCount_%s"  # 寻宝今日已使用免费次数, 参数(寻宝类型)
 Def_PDict_TreasureCount = "TreasureCount_%s"  # 寻宝次数, 参数(寻宝类型)
+Def_PDict_TreasureCountEx = "TreasureCountEx_%s"  # 第x次x抽必出,按第x次单抽、10连抽记录, 参数(寻宝类型)
 Def_PDict_TreasureCountToday = "TreasureCountToday_%s"  # 今日寻宝次数, 参数(寻宝类型)
 Def_PDict_TreasureLuck = "TreasureLuck_%s"  # 寻宝当前幸运值, 参数(寻宝类型)
 Def_PDict_TreasureCntAward = "TreasureCntAward_%s"  # 累计寻宝次数对应物品奖励领奖状态, 参数(寻宝类型)
 Def_PDict_TreasureGridCnt = "TreasureGridCnt_%s_%s"  # 格子对应累计产出次数, 参数(寻宝类型, 格子编号)
 
 Def_Player_Dict_LastAutoOpenPackTick = "LastAutoOpenPackTick219_%s"   #上一次自动购买的tick<背包类型>
-
-Def_PDict_OnlinePrizeNote = "OnlinePrizeNote"  # 当日在线奖励领取信息
 
 Def_PDict_OpenSererDailyAward = "OpenSererDailyAward"  # 开服每日奖励记录
 Def_PDict_CreateRoleAwardState = "CreateRoleAwardState"  # 创角奖励领取记录
@@ -3487,6 +3311,7 @@
 Def_PDict_GoodGameAwardState = "GoodGameAwardState"  # 游戏好评领奖记录
 Def_PDict_LikeGameAwardState = "LikeGameAwardState"  # 游戏点赞领奖记录
 Def_PDict_RechargeDayAward = "RechargeDayAward"  # 累充每日奖励
+Def_PDict_ADCnt = "ADCnt_%s"  # 今日已领取广告奖励次数,参数(广告ID)
 Def_PDict_EquipViewCacheState = "EquipViewCacheState"  # 本次上线是否同步过装备缓存
 Def_PDict_PackDataSyncState = "PackDataSyncState"  # 本次上线打包数据同步状态,按位存储是否同步 0-本服,1-跨服
 Def_PDict_PackDataSyncFightPower = "PackDataSyncFightPower"  # 本次上线打包数据同步时的战力,用于对比,只对比求余亿部分即可
@@ -3507,26 +3332,13 @@
 Def_PDict_CTGSelectItemValue = "CTGSelectItemValue_%s"  # 充值自选选择记录,参数(CTG对应的商品记录ID) 每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
 Def_PDict_OnlineRechargeTHAward = "OnlineRechargeTHAward"  # 在线特惠充值额外奖励 - 是否已领取奖励
 Def_PDict_DayFreeGoldGiftState = "DayFreeGoldGiftState"  # 每日免费直购礼包领取记录
-Def_PDict_GoldGiftFirstRecord = "GoldGiftFirstRecord"  # 首充领取记录,按位记录首充第x天是否已领取
-Def_PDict_FirstGoldServerDay = "FirstGoldServerDay"  # 首充时的开服天
-Def_PDict_FirstGoldRemainTime = "FirstGoldRemainTime"  # 首充提示剩余时间
-Def_PDict_FirstGoldTipStartTime = "FirstGoldTipStartTime"     # 首充提示开始时间
-Def_PDict_FirstGoldTry = "FirstGoldTry"     # 首充试用状态 0-不可试用 1-可试用 2-已试用
-Def_PDict_SuperGiftStartTime = "SuperGiftStartTime"  # 超值礼包开始时间
+Def_PDict_FirstChargeRecord = "FirstChargeRecord_%s"  # 首充领取记录,按位记录首充第x天是否已领取,参数(首充ID)
+Def_PDict_FirstChargeTime = "FirstChargeTime_%s"  # 首充充值时间戳,参数(首充ID)
 Def_PDict_IsReBorn = "Def_PDict_IsReBorn"  # 是否回城复活
-Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward"  # 王者仙盟每日俸禄领取状态
-Def_PDict_Family_Contribution = "FamilyContribution"  #战盟贡献度
-Def_PDict_HasChange_FamilyActiveToContribution = "HasChangeContribution"  #战盟活跃度已转化过贡献度
-Def_PDict_KillPlayerAddActive = "KillPlayerAddActiveByDay"  # 杀人每日获得活跃度
 Def_PDict_LoginDayCnt = "PLoginDayCnt"  # 累计登陆天数
 Def_PDict_LoginDayAward = "PLoginDayAward"  # 累计登陆领取情况
 Def_PDict_CollNpcIDCollTime = "NPCIDCollTime_%s"   # 采集NPCID对应每日对应采集次数,%sNPCID
 Def_PDict_CollNpcIDCollTimeTotal = "NPCIDCollTimeTotal_%s"   # 采集NPCID对应对应采集总次数,%sNPCID
-Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s"   # 商店NPC商品已购买次数,itemIndex
-Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s"   # 神秘限购商品开卖时间,itemIndex
-Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s"   # 神秘商店商品ID,索引
-Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt"   # 神秘商店已手动刷新次数
-Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt"   # 神秘商店等级段刷新次数
 Def_PDict_MoneyMinus = "MoneyMinus_%s"  # 货币对应负值, 参数[货币类型]
 Def_PDict_Currency = "PlayerCurrency_%s"  # 自定义货币类型, 参数[自定义货币类型]
 Def_PDict_UseMoneyTotal = "UseMoneyTotal_%s"  # 累计消耗货币, 参数[货币类型]
@@ -3546,35 +3358,10 @@
 Def_PDict_NobleEndTime = "NobleEndTime_%s" # 贵族到期结束时间<单位s>, 参数为贵族等级, 从1开始
 Def_PDict_NobleExperState = "NobleExperState" # 体验贵族状态; 0-无效;1-有效; 2-可体验
 
-Def_PDict_RecoverFBCommonCnt = "RecoverFBCommonCnt_%s" # 资源找回副本普通次数  <%s-找回项索引>
-Def_PDict_RecoverFBRegainCnt = "RecoverFBRegainCnt_%s" # 资源找回副本时间恢复次数  <%s-找回项索引>
-Def_PDict_RecoverFBExtraCnt = "RecoverFBExtraCnt_%s" # 资源找回副本VIP额外次数  <%s-找回项索引>
-Def_PDict_RecoverFBBuyCnt = "RecoverFBBuyCnt_%s" # 资源找回副本购买次数  <%s-找回项索引>
-Def_PDict_RecoverFBItemAddCnt = "RecoverFBItemAddCnt_%s" # 资源找回副本物品增加次数  <%s-找回项索引>
-Def_PDict_RecoverFBNoBuyCnt = "RecoverFBNoBuyCnt_%s" # 资源找回副本未购买次数  <%s-找回项索引>
-Def_PDict_RecoverGainData = "RecoverGainData_%s" # 资源找回额外数据<%s-找回项索引>
-Def_PDict_RecoverGainDataEx = "RecoverGainDataEx_%s" # 资源找回额外数据<%s-找回项索引>
-Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引> 1:找回了普通  2:找回了vip  3:2个都有找回
-Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间
-
 Def_PDict_NPCKillCount = "NPCKillCount_%s"   # NPC已击杀次数, 参数(NPCID) CCBBAA, AA存储公共装备次数,BB存储公共ID次数,CC存储私有次数
 Def_PDict_NPCAttackCount = "NPCAttackCount_%s"   # NPC已攻击次数, 参数(NPCID)
 
-Def_PDict_RedPacketInviteGet = "RedPacketInviteGet"  # 红包邀请领取
-Def_PDict_RedPacketGetState = "RedPacketGetState"  # 红包领取状态
-Def_PDict_RedPacketGrabCnt = "RedPacketGrabCnt"  # 抢红包次数
-
 Def_PDict_ItemUseCntToday = "ItemUseCntToday_%s" # 物品今日使用次数, 参数为物品ID
-
-Def_PDict_DayLoginSignIsMulti = "SignIsMulti" # 是否第二月以后
-Def_PDict_DayLoginSignNum = "DayLoginSignNum" # 本轮已签到次数
-Def_PDict_TotalSignNum = "TotalSignNum" # 累计已签到次数
-Def_PDict_DayLoginSignState = "DayLoginSignState" # 当天登陆签到状态
-Def_PDict_DayLoginSignStartTime = "SignStartTime" # 本轮签到开始时间
-
-Def_PDict_GodWeaponLV = "GodWeaponLV_%s" # 神器等级, 参数神器索引
-Def_PDict_GodWeaponExp = "GodWeaponExp_%s" # 神器等级对应祝福值经验, 参数神器索引
-Def_PDict_GodWeaponState = "GodWeaponState" # 神器是否已经激活, 按索引位存储神器是否激活
 
 Def_PDict_ClothesSkinLV = "ClothesSkinLV_%s"  # 时装皮肤等级,参数时装索引
 Def_PDict_ClothesChestLV = "ClothesChestLV"  # 时装柜等级
@@ -3584,13 +3371,19 @@
 
 Def_PDict_IsAddReviveTired = "IsAddReviveTired"  # 死亡是否增加复活疲劳
 
-Def_PDict_DownloadAwardState = "DownloadAwardState"  # 分包包下载奖励状态 0-未领 >0-已领奖励编号
-Def_PDict_DownloadPatchAward = "DownloadPatchAward"  # 更新包下载奖励状态 0-未领 >0-已领奖励编号
-
 Def_PDict_ChestsOpenCount = "ChestsOpenCount_%s"  # 宝箱已开启次数, 参数(宝箱ID), 只有有开启次数额外奖励的才会记录
 
 Def_PDict_DropCountToday = "DropCountToday_%s" # 今日物品已掉落次数,参数(物品ID)
 Def_PDict_DropColorToday = "DropColorToday_%s" # 今日装备品质已掉落次数,参数(装备品质)
+
+#商城
+Def_PDict_ShopBuyCnt = "ShopBuyCnt_%s"  # 商店商品已购买次数,参数(商品ID)
+Def_PDict_ShopRandUnlock = "ShopRandUnlock_%s"  # 商店随机刷新解锁的商品ID解锁状态,参数(key编号)
+Def_PDict_ShopRefreshCnt = "ShopRefreshCnt_%s"  # 今日已刷新次数,参数(商店类型)
+
+# 签到
+Def_PDict_SignInState = "SignInState_%s" # 按位记录每日签到状态,参数(key编号),状态:0-不可签到;1-已签到;2-可补签;3-已领取
+Def_PDict_SignInLastDay = "SignInLastDay" # 最后一次签到是第x天
 
 # 跑环
 Def_PDict_RunTaskAwardState = "RunTaskAwardState_%s" # 是否已领取跑环本轮结束奖励 参数任务类型
@@ -3619,13 +3412,6 @@
 Def_PDict_LingQiTrainLV = "LingQiTrainLV_%s_%s" # 培养等阶,参数为(place, 培养类型)
 Def_PDict_LingQiTrainItemCount = "LingQiTrainItemCount_%s_%s" # 培养当前阶已吃培养丹个数,参数为(place, 培养类型)
 
-# 公共CD副本扫荡
-Def_PDict_PubCDFBS_Time = "PCDFBS_%s_Time" # 开始扫荡时间, 参数(公共组编号)
-Def_PDict_PubCDFBS_MapID = "PCDFBS_%s_MID" # 扫荡的地图, 参数(公共组编号)
-Def_PDict_PubCDFBS_LineID = "PCDFBS_%s_LID" # 扫荡的线路, 参数(公共组编号)
-Def_PDict_PubCDFBS_Cnt = "PCDFBS_%s_Cnt" # 扫荡次数, 参数(公共组编号)
-Def_PDict_PubCDFBS_DataEx = "PCDFBS_%s_DEx" # 扫荡次数, 参数(公共组编号)
-
 # 宠物
 Def_PDict_FightPetIndex = "FightPetIndex" # 出战的宠物索引
 Def_PDict_PetTrainLV = "PetTrainLV_%s"  # 灵宠培养等阶,参数(培养类型)
@@ -3635,29 +3421,25 @@
 Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV"  # 试炼之塔通关层数
 Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV"  # 试炼之塔昨日通关层数
 
-#仙盟打坐
-Def_Player_Dict_FamilySitExpRound = "FamilySitExpRound"  # 已给经验轮次
-Def_Player_Dict_FamilySitTotalExp = "FamilySitTotalExp"  # 获得的总经验
-Def_Player_Dict_FamilySitTotalExpPoint = "FamilySitTotalExpPoint"  # 获得的总经验点
+#公会讨伐
+Def_Player_Dict_FamilyTaofaCnt = "FamilyTaofaCnt" # 已讨伐次数
+Def_Player_Dict_FamilyTaofaItemAddCnt = "FamilyTaofaItemAddCnt" # 道具增加讨伐次数
+Def_Player_Dict_FamilyTaofaBuZhenState = "FamilyTaofaBuZhenState" # 是否已布阵
+Def_Player_Dict_FamilyTaofaAnger = "FamilyTaofaAnger" # 当前怒气
+Def_Player_Dict_FamilyTaofaBoxTotalGetCnt = "FamilyTaofaBoxTotalGetCnt" # 累计已领取宝箱奖励数
+Def_Player_Dict_FamilyTaofaBoxUnGetCnt = "FamilyTaofaBoxUnGetCnt" # 当前未领取的宝箱奖励数
+Def_Player_Dict_FamilyTaofaBoxLastTime = "FamilyTaofaBoxLastTime" # 上一次统计未领取宝箱时间戳,超过该时间戳的宝箱才可以再增加未领取
+Def_Player_Dict_FamilyTaofaBoxContribCnt = "FamilyTaofaBoxContribCnt" # 累计贡献的宝箱奖励数
+Def_Player_Dict_FamilyTaofaBoxHurt = "FamilyTaofaBoxHurt" # 宝箱奖励计算累计伤害,求余亿部分
+Def_Player_Dict_FamilyTaofaBoxHurtEx = "FamilyTaofaBoxHurtEx" # 宝箱奖励计算累计伤害,整除亿部分
+Def_Player_Dict_FamilyTaofaBoxHurtHis = "FamilyTaofaBoxHurtHis" # 历史最高累计伤害,求余亿部分
+Def_Player_Dict_FamilyTaofaBoxHurtHisEx = "FamilyTaofaBoxHurtHisEx" # 历史最高累计伤害,整除亿部分
 
 #虚拟背包物品数据
 Def_PDict_VPackItem = "VPackItem_%s_%s" # 虚拟背包物品数据, 参数(背包类型, 位置索引)
 
 #物品个数
 Def_PDict_ItemCount = "ItemCount_%s" # 存储不放在背包的物品个数, 参数(物品ID)
-
-#一次性最大充值
-Def_Player_RechargeOnce_Coin = "RechargeOnce_Coin"
-
-#悬赏任务
-Def_Player_Dict_ArrestTaskStar = "ArrestTaskStar"  # 悬赏任务星级
-Def_Player_Dict_ArrestTaskData = "ArrestTaskData_%s"  # 悬赏任务数据,参数索引
-Def_Player_Dict_ArrestTaskAwardRecord = "ArrestTaskAwardRecord"  # 悬赏任务积分奖励领取记录
-Def_Player_Dict_ArrestTaskFinishCnt = "ArrestTaskFinishCnt"  # 悬赏任务今日完成个数
-
-#封魔坛
-Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
-Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
 
 #极品白拿
 Def_PDict_FreeGoodsOpenTime = "FreeGoodsOpenTime" #极品白拿开启时间
@@ -3751,6 +3533,16 @@
 Def_PDict_WishingWellItem = "WishingWellItem_%s_%s"  # 物品ID,是否极品、是否绑定信息 参数(类型,物品数据)
 Def_PDict_WishingWellItemCnt = "WishingWellItemCnt_%s_%s"  # 物品数量记录 参数(类型,物品数据)
 
+# 称号
+Def_PDict_TitleState = "TitleState_%s"  # 称号状态,参数(key编号)
+Def_PDict_TitleEndTime = "TitleEndTime_%s"  # 称号到期时间戳,0为永久,参数(称号ID)
+Def_PDict_TitleStar = "TitleStar_%s"  # 称号星级,参数(称号ID)
+
+# 形象
+Def_PDict_ModelState = "ModelState_%s"  # 形象状态,参数(key编号)
+Def_PDict_ModelEndTime = "ModelEndTime_%s"  # 形象到期时间戳,0为永久,参数(形象ID)
+Def_PDict_ModelStar = "ModelStar_%s"  # 形象星级,参数(形象ID)
+
 #头像
 Def_PDict_FaceState = "FaceState_%s"  # 头像状态,参数(key编号)
 Def_PDict_FaceEndTime = "FaceEndTime_%s"  # 头像到期时间戳,0为永久,参数(头像ID)
@@ -3760,7 +3552,7 @@
 Def_PDict_FacePicStar = "FacePicStar_%s"  # 头像框星级,参数(头像框ID)
 
 #聊天气泡
-Def_PDict_ChatBubbleBoxState = "ChatBubbleBoxState_%s"  # 聊天气泡状态, 参数(key编号)
+Def_PDict_ChatBoxState = "ChatBoxState_%s"  # 聊天气泡状态, 参数(key编号)
 Def_PDict_ChatBoxEndTime = "ChatBoxEndTime_%s"  # 到期时间戳,0为永久,参数(气泡ID)
 Def_PDict_ChatBoxStar = "ChatBoxStar_%s"  # 星级,参数(气泡ID)
 Def_PDict_EmojiPackState = "EmojiPackState_%s"  # 表情包状态,参数(key编号)
@@ -3910,14 +3702,6 @@
 Def_PDict_FamilyGCZSQGridItemCnt = "FamilyGCZSQItemCnt_%s"  # 圣泉当前层格子抽中物品个数,参数(格子编号)
 #-------------------------------------------------------------------------------
 
-#开服活动,Def_PDictType_OpenServerCampaign
-#奖励记录 - 从低位到高位,每位表示:0-不可领;1-可领取;2-已领
-Def_PDict_OSC_BillAwardRecord = "OSCBillAwardRecord"  # 开服活动排行奖励记录, 按活动类型位存储是否领取/处理过
-Def_PDict_OSC_TagAwardRecord = "OSCTagAwardRecord_%s"  # 开服活动目标奖励记录, 参数(活动类型), 按奖励位存储是否领取
-Def_PDict_OSC_RecordData = "OSCRecordData_%s"  # 开服活动记录数值, 求余亿部分,参数(活动类型)
-Def_PDict_OSC_RecordDataEx = "OSCRecordDataEx_%s"  # 开服活动记录数值, 整除亿部分,参数(活动类型)
-Def_PDict_OSC_EndMailState = "EndMailState"  # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励;
-
 # 法器
 Def_PDict_FaQiLV = "FaQiLV"  # 法器等级
 Def_PDict_FaQiEatItemCount = "FaQiEatItemCount"  # 当前阶已吃丹个数
@@ -3939,9 +3723,6 @@
 Def_PDict_HorsePetSkinData = "HorsePetSkinData%d_%s"  #觉醒等级*100+外观索引  参数(类型,关联ID) 1-坐骑 2-灵宠
 Def_PDict_HorsePetSkinExp = "HorsePetSkinExp%d_%s"  #经验  参数(类型,关联ID) 1-坐骑 2-灵宠
 
-# 称号
-Def_PDict_TitleStar = "TitleStar_%s"  # 称号星级,参数(称号ID)
-
 # 符印
 Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState"  # 符印解锁状态
 Def_PDict_Rune_Data = "Rune_Data_%s"  # 符印镶嵌数据, 参数(第几孔)
@@ -3958,39 +3739,6 @@
 
 Def_PDict_FightPower_List = [Def_PDict_FightPower_Total, Def_PDict_FightPower_TotalEx]
 
-# 每日活跃度
-Def_PDict_Activity_FinishCnt = "Activity_FinishCnt_%s"  # 活跃度类型对应完成次数
-Def_PDict_Activity_AddTotal = "Activity_AddTotal_%s"  # 活跃度类型对应获得活跃度总
-Def_PDict_Activity_TotalPoint = "Activity_TotalPoint"  # 当前总活跃值(不可消耗)
-Def_PDict_ActivityAwardRecord = "ActivityAwardRecord"  # 活跃度奖励领取记录,按二进制位标识
-Def_PDict_Activity_AwardStage = "Activity_AwardStage"  # 当前活跃奖励阶段,对应不同境界段
-Def_PDict_Activity_ExtraRealmPoint = "Activity_ExtraRealmPoint"  # 多倍活动额外获得的修行点
-
-# 活跃放置
-Def_PDict_ActivityCountTotal = "ActivityCountTotal"  # 累计活跃放置修炼次数
-Def_PDict_ActivityCanCostTotalPoint = "ActivityCanCostTotalPoint"  # 当前总活跃值(可消耗)
-Def_PDict_ActivityPlaceStartTime = "ActivityPlaceStartTime" # 活跃放置开始time值
-Def_PDict_ActivityPlaceRemainCount = "ActivityPlaceRemainCount" # 活跃放置剩余进行次数
-Def_PDict_ActivityPlaceRewardCount = "ActivityPlaceRewardCount" # 活跃放置本次启动已累计奖励次数
-Def_PDict_ActivityPlaceRewardTotalCount = "ActivityPlaceRewardTotalCount" # 活跃放置历史总共累计奖励次数
-Def_PDict_ActivityPlaceRewardItem = "ActivityPlaceItem" # 奖励物品个数
-Def_PDict_ActivityPlaceRewardItemID = "ActivityPlaceItemID_%s" # 奖励物品ID,参数(index)
-Def_PDict_ActivityPlaceRewardItemCount = "ActivityPlaceItemCount_%s" # 奖励物品个数,参数(index)
-Def_PDict_ActivityPlaceExpCount = "ActivityPlaceExpCount" # 活跃放置获得exp次数
-Def_PDict_ActivityPlaceTodayExp = "ActivityPlaceTodayExp" # 活跃放置今日获得exp
-Def_PDict_ActivityPlaceTodayExpPoint = "ActivityPlaceTodayExpPoint" # 活跃放置昨日获得exp 扩展值
-Def_PDict_ActivityPlaceYestorDayExp = "ActivityPlaceYestorDayExp" # 活跃放置昨日获得exp
-Def_PDict_ActivityPlaceYestorDayExpPoint = "ActivityPlaceYestorDayExpP" # 活跃放置昨日获得exp 扩展值
-
-# 每日活动
-Def_PDict_DailyActionDayTimes = "DailyActionDayTimes_%s"  # 每日活动今日完成次数 参数每日活动ID
-Def_PDict_DailyActionDayBuyTimes = "DADayBuyTimes_%s"  # 每日活动今日购买次数 参数每日活动ID
-Def_PDict_DailyActionDayItemTimes = "DADayItemTimes_%s"  # 每日活动今日物品增加次数 参数每日活动ID
-Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s"  # 每日活动本周完成次数 参数每日活动ID
-#仙盟活跃
-Def_PDict_FamilyActivityFinishCnt = "FamilyActivityFinishCnt%s"  # 已完成次数
-Def_PDict_FamilyActivityAwardRecord = "FamilyActivityAwardRecord"  # 活跃度奖励领取记录,按二进制位标识
-
 # 投资理财
 Def_PDict_InvestTime = "InvestTime_%s"  # 投资时的时间,参数为投资类型
 Def_PDict_InvestProgress = "InvestProgress_%s_%s"  # 投资可领奖进度值,参数为(投资类型, key编号)
@@ -3999,13 +3747,8 @@
 Def_PDict_InvestKeyCount = 3 # key编号数
 
 # 成就 Def_PDictType_Success
-Def_PDict_Success_AwardRecord = "Succ_AwardRecord_%s" # 成就领奖记录,参数(key编号),按索引位存储0-未领,1-已领
-Def_PDict_Success_LastDay = "Succ_LastDay_%s" # 连续类型上一次更新进度时的开服天数,参数(成就编号)
-Def_PDict_Success_CntValue = "Su_%s_%s" # 当前次数值,参数(成就类型、条件)
-Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)
-Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本
-Def_PDict_Success_PassportAward = "Succ_PassportAward_%s" #成就通行证领奖状态,参数(key编号),按索引位存储0-未领,1-已领
-Def_PDict_Success_ScoreAward = "Succ_ScoreAward" # 成就积分奖励记录,按索引位存储0-未领,1-已领
+Def_PDict_SuccessValue = "Succ_%s_%s" # 当前次数值,参数(成就类型、条件)
+Def_PDict_SuccessAward = "Succ_Award_%s" # 成就领奖记录,按成就ID位存储0-未领,1-已领,参数(key编号)
 
 # 通天令
 Def_PDict_TTL_StartTime = "TTL_StartTime" # 本轮通天令开始时间戳
@@ -4057,19 +3800,6 @@
 Def_PDict_Boss_KillCntItemAddCnt = "Boss_KillCntItemAddCnt_%s" # 物品增加的当日可杀世界boss次数<%s-索引>
 Def_PDict_Boss_KillCntBuyCnt = "Boss_KillCntBuyCnt_%s" # 当日可杀世界boss次数的购买次数<%s-索引>
 
-#仙盟红包
-Def_PDict_FamilyRedPacketGoldLimit = "FmlRedPacketGoldLimit"  # 仙盟钻石红包已发额度
-Def_PDict_FamilyRedPacketCache = "FamilyRedPacketCache%s"  # 仙盟红包待发放记录参数索引
-Def_PDict_OSRedPacketGrabMoney = "OSRedPacketGrabMoney"  # 开服红包已抢数量
-Def_PDict_OSRedPacketCanGrabCnt = "OSRedPacketCanGrabCnt"  # 开服红包可抢次数
-Def_PDict_OSRedPacketStartTime = "OSRedPacketStartTime" #开服红包开始倒计时时间
-Def_PDict_ServerRedPacketGrabCnt = "ServerRedPacketGrabCnt"  # 今日已抢全服红包次数
-
-#节日红包
-Def_PDict_FeastRedPacketActID = "FeastRedPacketActID"  # 玩家身上的节日红包活动ID,唯一标识,取活动开始日期time值
-Def_PDict_FeastRedPacketGrabMoney = "FeastRedPacketGrabMoney"  # 节日红包已抢数量
-Def_PDict_FeastRedPacketCanGrabCnt = "FeastRedPacketCanGrabCnt"  # 节日红包可抢次数
-
 #境界
 Def_PDict_RealmTaskAwardState = "RealmTaskAwardState" #境界渡劫条件领奖状态,按二进制位存储是否已领取
 Def_PDict_RealmTaskValue = "RealmTaskValue_%s" #境界渡劫任务需要记录值,参数(任务ID)
@@ -4109,9 +3839,7 @@
 Def_PDict_CharmLV = "CharmLV"  # 魅力等级
 
 #古宝
-Def_PDict_GubaoLVInfo = "GubaoLVInfo_%s"  # 古宝等级信息,参数(古宝ID),等级*100+星级
-Def_PDict_GubaoItemEffValue = "GubaoItemEffValue_%s_%s"  # 古宝效果物品进度,参数(古宝ID, 效果类型)
-Def_PDict_GubaoPiece  = "GubaoPiece_%s"  # 古宝碎片数,参数(古宝ID)
+Def_PDict_GubaoInfo = "Gubao_%s"  # 古宝信息,参数(古宝ID),特殊效果层*100000 + 等级*100 + 星级
 
 #神通
 Def_PDict_ShentongLVInfo = "ShentongLVInfo_%s"  # 神通等级信息,参数(神通ID),阶级*100+等级
@@ -4129,11 +3857,23 @@
 Def_PDict_TreeFreeTimeCnt = "TreeFreeTimeCnt" # 今日已领取免费减时次数,过天重置
 Def_PDict_TreeFreeTimeLast = "TreeFreeTimeLast" # 今日上次领取免费减时时间戳,过天重置
 
+#历练秘笈
+Def_PDict_LLMJLVInfo = "LLMJLVInfo" # 秘笈等级,消耗战锤*100 + 秘笈等级
+Def_PDict_LLMJExp = "LLMJExp" # 秘笈今日已额外获得经验
+Def_PDict_LLMJDecompose = "LLMJDecompose" # 秘笈今日已额外获得分解货币
+
 #任务,每个任务组有且仅有一个进行中的任务
 Def_PDict_TaskIDLast = "TaskIDLast_%s" # 上一次完成的任务ID,参数(任务组)
 Def_PDict_TaskID = "TaskID_%s" # 当前进行中的任务ID,参数(任务组)
 Def_PDict_TaskValue = "TaskValue_%s" # 当前进行中的任务进度,参数(任务组)
 Def_PDict_TaskState = "TaskState_%s" # 当前进行中的任务状态 0-无;1-进行中;2-已完成,参数(任务组)
+
+#每日任务,按任务类型累加进度
+Def_PDict_DailyTaskValue = "DTaskV_%s_%s" # 任务类型进度,参数(任务类型, 条件信息)
+Def_PDict_DailyTaskState = "DTaskState" # 每日任务是否已领取奖励,按任务ID二进制位存储是否已领取
+Def_PDict_ActivityTotal = "ActivityTotal"  # 今日累计获得活跃度
+Def_PDict_ActivityAward = "ActivityAward"  # 活跃度奖励领取记录,按二进制位标识
+Def_PDict_ActivityWeek = "ActivityWeek"  # 每周活跃奖励第x轮,默认0第1轮
 
 #淘金
 Def_PDict_GoldRushCampState = "GoldRushCampState" # 已解锁营地状态,按营地ID二进制位运算判断是否已解锁
@@ -4155,13 +3895,20 @@
 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_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
 Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数,有3位小数,即 1234 实际为 1.234
 Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数,参数(itemID)
 Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量,参数(itemID)
+Def_PDict_AppointDropEquipCnt = "AppointDropEquipCnt" # 定制掉落装备掉落第x次,只记录到配置的最高次数
 
+#天子考验
+Def_PDict_TianziHisHurt = "TianziHisHurt_%s" # 历史最高伤害,求余亿部分,参数(bossID)
+Def_PDict_TianziHisHurtEx = "TianziHisHurtEx_%s" # 历史最高伤害,整除亿部分,参数(bossID)
+Def_PDict_TianziTodayHurt = "TianziTodayHurt" # 今日最高伤害,求余亿部分
+Def_PDict_TianziTodayHurtEx = "TianziTodayHurtEx" # 今日最高伤害,整除亿部分
 #-------------------------------------------------------------------------------
 
 #物品效果(ID或指定类型)对应的属性计算信息 {效果(ID/指定类型):[[属性索引, ...], 是否基础属性,(非)线性]}
@@ -4173,12 +3920,7 @@
 FuncNoLinearAttrDict = {}
 
 # 指定地图生效的非线性属性配置
-MapAttrInfoDict_Noline = {
-                          Def_FBMapID_FamilyWar:{
-                                                 TYPE_Calc_FamilyWarAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
-                                                 TYPE_Calc_FamilyWarHPPer:[TYPE_Calc_AttrMaxHP],
-                                                 }
-                          }
+MapAttrInfoDict_Noline = {}
 
 #属性线性索引
 CalcAttrIndexList = (
@@ -4210,7 +3952,7 @@
 Def_CalcAttrFunc_Pet, # 灵宠 9
 Def_CalcAttrFunc_Horse, # 坐骑 10
 Def_CalcAttrFunc_Prestige, # 境界 11
-Def_CalcAttrFunc_GodWeapon, # 神兵 12
+Def_CalcAttrFunc_12, # 神兵 12
 Def_CalcAttrFunc_Dienstgrad, # 称号 13
 Def_CalcAttrFunc_Rune, # 符印 14
 Def_CalcAttrFunc_15,
@@ -4278,15 +4020,29 @@
 TriggerWay_HeroActionStart, # 武将行动前    6
 TriggerWay_HeroActionEnd, # 武将行动后    7
 TriggerWay_CalcEffValue, # 统计计算效果值时  8
-TriggerWay_9, # 9
-TriggerWay_AttackOverDirect, # 直接攻击后 (非buff攻击)10
+TriggerWay_UseSkillOver, # 使用技能后(每个目标触发一次)9
+TriggerWay_AttackOverDirect, # 直接攻击后(除dot或buff外的攻击,每个目标触发一次)10
 TriggerWay_BeAttackedDirect, # 受到直接攻击时 (非buff攻击)11
 TriggerWay_ShieldBroken, # 承伤盾被击破时 12
 TriggerWay_CurSkillEff, # 本技能/buff释放后,一般用于本技能/buff释放后触发,仅该技能释放后有效 13
 TriggerWay_CurSkillEffLst, # 本持续buff结算后额外触发效果,仅该持续buff结算后有效 14
 TriggerWay_KillOneObj, # 击杀目标后(单次击杀多目标只触发一次) 15
 TriggerWay_KillTagObj, # 击杀每目标后(单次击杀多目标每个目标触发一次) 16
-) = range(1, 1 + 16)
+TriggerWay_BuffDel, # buff消失后  17
+TriggerWay_BeCombo, # 被连击时 18
+TriggerWay_BePursue, # 被追击时 19
+TriggerWay_UseSkillOverOne, # 使用技能后(多目标仅触发一次)20
+TriggerWay_AttackOverDirectOne, # 直接攻击后(除dot或buff外的攻击,多目标仅触发一次)21
+TriggerWay_BeAnyEffect, # 受到任意效果时(除直接攻击外的任意效果,如buff、dot、治疗、额外怒技)22
+TriggerWay_BuffAddByOwner, # buff添加时(施法者触发) 23
+TriggerWay_BeHurt, # 掉血时 24
+TriggerWay_BeDOTHurt, # 受到持续伤害 25
+TriggerWay_EnemyDie, # 敌方单位死亡时 26
+TriggerWay_FriendDie, # 己方单位死亡时 27
+) = range(1, 1 + 27)
+
+# 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
+TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
 
 # 被动触发有效来源
 TriggerSrc_Skill = 1    # 身上技能有效
@@ -4296,16 +4052,41 @@
 
 # 被动效果ID,属性类的直接使用属性ID当做效果ID
 PassiveEff_AddBuffLayerByWeight = 6001 # 根据权重随机添加buff层数 数值1-[[权重,层级], ...]
-PassiveEff_ChangeHurtType = 6002 # 变更伤害类型: 值1-伤害类型;值2-可附加验证处于xx状态 [状态1, 状态2, ...]
-PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值(可增可减): 值1-变更倍值;值2-可附加验证处于xx状态 [状态1, 状态2, ...]
-PassiveEff_AddSkillPer = 6004 # 增加本次技能万分比: 值1-增加的万分比;值2-可附加验证处于xx状态 [状态1, 状态2, ...]
+PassiveEff_ChangeHurtType = 6002 # 变更本次伤害类型
+PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值(可增可减)
+PassiveEff_AddSkillPer = 6004 # 增加本次技能万分比(验证目标状态)
+PassiveEff_AddSkillPerByDeadTeammate = 6005 # 增加本次技能万分比(按队友死亡数)
+PassiveEff_AddSkillPerByJob = 6006 # 增加本次技能万分比(验证目标职业)
+PassiveEff_AddSkillTagCnt = 6007 # 增加技能目标数
+PassiveEff_ImmuneControlBuff = 6008 # 生命值低于x%时免疫控制效果
+PassiveEff_MustSuperHit = 6009 # 生命值低于x%时必定暴击
+PassiveEff_AddSkillPerByHP = 6010 # 增加本次技能万分比(验证当前生命)
+PassiveEff_AddSkillPerByBuffLayer = 6011 # 增加本次技能万分比(根据buff层级)
+PassiveEff_AddBuffLayerMax = 6012 # 添加buff层级上限:  数值1-增加层级上限
+PassiveEff_AddFinalDamPer = 6013 # 增加最终增伤(根据属性转化)
+PassiveEff_AddSkillRate = 6014 # 增加技能概率
+PassiveEff_AddRicochetCnt = 6015 # 增加弹射次数
+PassiveEff_AddShieldHurtPer = 6016 # 对护盾造成伤害加成
+PassiveEff_SkillInvalid = 6017 # 使技能无效
+PassiveEff_AddAngerSkillPerByXP = 6018 # 增加怒气技能伤害(按消耗怒气值)
 
 # 被动效果ID有触发值时就返回的
-PassiveEffHappenValueList = [PassiveEff_ChangeHurtType]
+PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid]
 # 被动效果ID触发值取最大值的
-PassiveEffValueMaxList = []
+PassiveEffValueMaxList = [PassiveEff_ChangeHurtMulti]
 # 被动效果ID触发值取最小值的
 PassiveEffValueMinList = []
+
+# 技能效果 - 不需要配置触发方式的
+SkillEff_CureWayEx = 7001 # 额外治疗值计算(对CalcType、SkillPer治疗计算方式扩展): 值1-计算方式;值2-万分比
+SkillEff_HurtShare = 7002 # 均摊伤害
+SkillEff_ChangeTag = 7003 # 修改技能目标
+SkillEff_RandRicochetCnt = 7004 # 随机弹射次数(A~B随机,包含AB)
+SkillEff_MustHit = 7005 # 技能必命中
+SkillEff_ActionUseInvalid = 7006 # 行动时不可释放技能(可连击、反击、追击)
+SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
+SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
+SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4398,11 +4179,9 @@
 TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
 TriggerType_HitValue, # 记录命中个数 89
 TriggerType_ChangeSkillEff, # 改变技能特效广播 90
-) = range(1, 91)
+) = range(1001, 1091)
 
 
-#不可以佩戴翅膀的地图
-CanNotWearWingMapIDList = []
 #不可以佩戴武器时装的地图
 CanNotWearWeaponCoatMapIDList = []
 #不可以使用恢复物品或技能的地图
@@ -4450,11 +4229,6 @@
 ShareDefine.PlayerJob_Max : TYPE_CHAPLAIN,         #魔剑对应魔剑系
 }
 
-#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
-(
-Def_VerFix_LingGenShow, #灵根特效外观
-) = range(1)
-
 ##==================================================================================================
 #游戏消费点类型定义
 Def_CostType_List = (
@@ -4463,10 +4237,10 @@
 Def_Cost_BuyPack, # 购买背包格子
 Def_Cost_UseSpeaker, # 喇叭发言
 Def_Cost_Revive, # 复活
-Def_Cost_FBEncourage, # 副本鼓舞 5
+Def_Cost_5, # 副本鼓舞 5
 Def_Cost_GoldInvest, # 理财投资
 Def_Cost_Pray, # 祈祷
-Def_Cost_RecoverGain, # 资源找回
+Def_Cost_8, # 资源找回
 Def_Cost_BuyVIPItem, # 购买VIP礼包
 Def_Cost_GM, # GM 10
 Def_Cost_BourseBuy, # 交易所购买
@@ -4486,7 +4260,7 @@
 Def_Cost_Transport, # 传送 25
 Def_Cost_Treasure, # 寻宝
 Def_Cost_FamilyBroadcast, # 家族公告
-Def_Cost_FamilyRedPacket, # 发家族钻石红包
+Def_Cost_28, # 发家族钻石红包
 Def_Cost_EnterFB, # 进入副本
 Def_Cost_GameServer, # GameServer 30
 Def_Cost_FreeGoods, # 极品白拿
@@ -4496,15 +4270,15 @@
 Def_Cost_ResetGreatMasterSkill, # 重置天赋技能 35
 Def_Cost_BindJadeWheel, # 绑玉转盘
 Def_Cost_WishingWell, # 许愿池刷新
-Def_Cost_GodWeapon, # 神兵
+Def_Cost_38, # 神兵
 Def_Cost_FBHelpBattle, # 副本助战
 Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
 Def_Cost_CrossRealmPK, # 跨服PK
 Def_Cost_LuckyTreasure, #幸运鉴宝
-Def_Cost_MysteryShopRefresh, # 神秘商店刷新
+Def_Cost_43, # 神秘商店刷新
 Def_Cost_AuctionBid, # 拍卖行竞价
-Def_Cost_BuyDailyActionCnt, # 购买活动次数 45
-Def_Cost_FBBuyBuff, # 副本买buff
+Def_Cost_45, # 购买活动次数 45
+Def_Cost_46, # 副本买buff
 Def_Cost_CreatFamily, # 创建仙盟
 Def_Cost_BuyKillBossCnt, #购买boss次数
 Def_Cost_EquipStar, #装备升星
@@ -4531,13 +4305,13 @@
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
 # 消费返利不处理的消费类型列表
-CostRebate_DisableType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_FreeGoods, Def_Cost_FamilyRedPacket,
+CostRebate_DisableType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_FreeGoods,
                           Def_Cost_Unknown, "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
 
 # 可在跨服中消费的类型列表
-MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive, Def_Cost_FBEncourage]
+MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive]
 #内部仙玉不能用的消费类型列表
-UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket, Def_Cost_AuctionBid]
+UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_AuctionBid]
 # 消费类型对应信息字典{消费类型:[eventName, 中文说明reason_name, 发送给9377的数据是否分消费子类], }
 # 由于9377那边数据建议所有消费点总和最好不超过500个,故这里对部分发送给对方的数据进行归组为不分子类,或直接归属于商城分组
 #     .使用原价购买的物品统一归属为商城组,消费对应为AutoBuy的也归属于商城分组
@@ -4553,14 +4327,12 @@
 Def_Cost_Pray:"Pray",
 Def_Cost_Treasure:"Treasure",
 Def_Cost_OpenNoble:"OpenNoble",
-Def_Cost_RecoverGain:"RecoverGain",
 Def_Cost_EnterFB:"EnterFB",
 
 # 无消费对象子类的
 Def_Cost_BuyPack:"BuyPack",
 Def_Cost_UseSpeaker:"UseSpeaker",
 Def_Cost_Revive:"Revive",
-Def_Cost_FBEncourage:"FBEncourage",
 Def_Cost_RefreshArrestTask:"RefreshArrestTask",
 Def_Cost_RefreshTimeShop:"RefreshTimeShop",
 Def_Cost_ResetGreatMasterSkill:"ResetTalentSkill",
@@ -4588,22 +4360,17 @@
 Def_Cost_Rename:"Rename",
 Def_Cost_SkillLvUp:"SkillLvUp",
 Def_Cost_FamilyBroadcast:"FamilyBroadcast",
-Def_Cost_FamilyRedPacket:"FamilyRedPacket",
 Def_Cost_FreeGoods:"FreeGoods",
 Def_Cost_DogzEquipPlus:"DogzEquipPlus",
 Def_Cost_RuneHole:"RuneHole",
 Def_Cost_AlchemyPray:"AlchemyPray",
 Def_Cost_BindJadeWheel:"BindJadeWheel",
 Def_Cost_WishingWell:"WishingWell",
-Def_Cost_GodWeapon:"GodWeapon",
 Def_Cost_FBHelpBattle:"FBHelpBattle",
 Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
 Def_Cost_CrossRealmPK:"CrossRealmPK",
 Def_Cost_LuckyTreasure:"LuckyTreasure",
-Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
 Def_Cost_AuctionBid:"AuctionBid",
-Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
-Def_Cost_FBBuyBuff:"FBBuyBuff",
 Def_Cost_CreatFamily:"CreatFamily",
 Def_Cost_BuyKillBossCnt:"BuyKillBossCnt",
 Def_Cost_EquipStar:"EquipStar",
@@ -4632,8 +4399,8 @@
 Def_GiveMoney_Pickup, # 拾取
 Def_GiveMoney_Bourse, # 交易所 10
 Def_GiveMoney_GoldInvest, # 绑钻投资
-Def_GiveMoney_Recover, # 资源找回
-Def_GiveMoney_RedPacket, # 红包
+Def_GiveMoney_12, # 资源找回
+Def_GiveMoney_13, # 红包
 Def_GiveMoney_RefineGift, # 炼制奖励
 Def_GiveMoney_Mail, # 邮件(补偿) 15
 Def_GiveMoney_RuneDecompose, # 符印
@@ -4670,8 +4437,6 @@
 Def_GiveMoney_Pickup:"Pickup",
 Def_GiveMoney_Bourse:"Bourse",
 Def_GiveMoney_GoldInvest:"GoldInvest",
-Def_GiveMoney_Recover:"Recover",
-Def_GiveMoney_RedPacket:"RedPacket",
 Def_GiveMoney_RefineGift:"RefineGift",
 Def_GiveMoney_Mail:"Mail",
 Def_GiveMoney_RuneDecompose:"RuneDecompose",
@@ -4707,10 +4472,10 @@
 ItemGive_StonePickoff, # 摘除宝石 10
 ItemGive_EquipSuit, # 套装
 ItemGive_NPCDrop, # NPC掉落
-ItemGive_OpenServerCampaign, # 开服活动
+ItemGive_13, # 开服活动
 ItemGive_CTG, # CTG
 ItemGive_DiceEx, # 我要天机 15
-ItemGive_FamilyStore, # 仙盟宝库
+ItemGive_16, # 仙盟宝库
 ItemGive_Refine, # 炼丹
 ItemGive_Chests, # 宝箱
 ItemGive_TrialExchange, # 宗门兑换
@@ -4733,10 +4498,8 @@
                     ItemGive_StonePickoff:"StonePickoff",
                     ItemGive_EquipSuit:"EquipSuit",
                     ItemGive_NPCDrop:"NPCDrop",
-                    ItemGive_OpenServerCampaign:"OpenServerCampaign",
                     ItemGive_CTG:"CTG",
                     ItemGive_DiceEx:"DiceEx",
-                    ItemGive_FamilyStore:"FamilyStore",
                     ItemGive_Refine:"Refine",
                     ItemGive_Chests:"Chests",
                     ItemGive_TrialExchange:"TrialExchange",
@@ -4748,7 +4511,7 @@
 ItemDelTypeList = (
 ItemDel_Unknown, #未知 0
 ItemDel_SellPackItem, # 出售物品
-ItemDel_GodWeapon, # 神兵
+ItemDel_2, # 神兵
 ItemDel_EquipEnchase, # 宝石镶嵌
 ItemDel_Add_LimitingBuff, # 增加buff时间
 ItemDel_AddDienstgrad, # 增加称号 5
@@ -4766,9 +4529,9 @@
 ItemDel_AttrFruit, # 属性道具
 ItemDel_AddBourseItem, # 上架交易所
 ItemDel_EquipDecompose, # 装备分解
-ItemDel_FamilyStore, # 捐献装备 20
+ItemDel_20, # 捐献装备 20
 ItemDel_Treasure, # 寻宝
-ItemDel_WingExp, # 翅膀精炼经验
+ItemDel_22, # 翅膀精炼经验
 ItemDel_StoneUpgrade, # 宝石升级
 ItemDel_ItemCompound, # 合成
 ItemDel_Horse, # 坐骑 25
@@ -4799,7 +4562,6 @@
 ItemDelTypeDict = {
                    ItemDel_Unknown:"Unknown",
                    ItemDel_SellPackItem:"SellPackItem",
-                   ItemDel_GodWeapon:"GodWeapon",
                    ItemDel_EquipEnchase:"EquipEnchase",
                    ItemDel_Add_LimitingBuff:"Add_LimitingBuff",
                    ItemDel_AddDienstgrad:"AddDienstgrad",
@@ -4817,9 +4579,7 @@
                    ItemDel_AttrFruit:"AttrFruit",
                    ItemDel_AddBourseItem:"AddBourseItem",
                    ItemDel_EquipDecompose:"EquipDecompose",
-                   ItemDel_FamilyStore:"FamilyStore",
                    ItemDel_Treasure:"Treasure",
-                   ItemDel_WingExp:"WingExp",
                    ItemDel_StoneUpgrade:"StoneUpgrade",
                    ItemDel_ItemCompound:"ItemCompound",
                    ItemDel_Horse:"Horse",
@@ -4848,10 +4608,6 @@
 
 ##==================================================================================================
 
-# 前端自定义场景状态
-CustomMapStep_Over = 0 # 没有或已结束
-CustomMapStep_Fight = 1 # 战斗进行中
-
 # 副本参与类型
 FB_JoinType = (
 FB_JoinType_None, # 默认无
@@ -4859,53 +4615,6 @@
 FB_JoinType_Multi, # 多人
 FB_JoinType_Help, # 助战
 ) = range(4)
-
-# 自定义任务事件记录 custom_mission_event
-CME_Log_Type_List = (
-CME_Log_Start, # 开始
-CME_Log_End, # 结束
-CME_Log_Acceptable, # 可接, 仅在OnDay及功能开启的时候发送
-) = range(3)
-
-CME_Type_List = (
-CME_Known, # 未知 0
-CME_FB_XXX1, # 1
-CME_FB_XXX2, # 2
-CME_FB_3,
-CME_FB_XXX4, # 4
-CME_FB_XXX5, # 5
-CME_FB_XXX6, # 6
-CME_FB_XXX7, # 7
-CME_FB_XXX8, # 8
-CME_FB_XXX9, # 9
-CME_FB_XXX10, # 10
-CME_FB_XXX11, # 11
-CME_Class_Horse, # 坐骑阶级
-CME_Class_Wing, # 翅膀阶级
-CME_Class_Official, # 爵位阶级
-CME_Class_XXX15, # 废弃 15
-CME_Class_XXX16, # 废弃
-CME_FB_XXX17, #17
-CME_FB_XXX18, #18
-CME_FB_XXX19, #19
-CME_FB_XXX20,  #20
-CME_FB_XXX21,  #21
-CME_FB_XXX22,  #22
-CME_FB_RunDaily,  #日常跑环,只记录可接
-CME_FB_RunFamily,  #战盟跑环,只记录可接
-) = range(3,28) # 后台只收集ID改成从3开始,不然会和任务1冲突
-
-CME_Type_Dict = {
-CME_Known:"未知",
-CME_Class_Horse:"坐骑",
-CME_Class_Wing:"翅膀",
-CME_Class_Official:"爵位",
-CME_FB_RunDaily:"日常跑环",
-CME_FB_RunFamily:"战盟跑环",
-}
-
-# 需要发送到任务事件扩展记录的类型 ShareDefine.Def_UserAction_ExMissionLog
-CME_Ex_Log_List = [CME_Class_Horse, CME_Class_Wing, CME_Class_Official]
 
 # 竖杠
 Def_Str_Montant = "|"
@@ -4941,7 +4650,7 @@
 VIPPrivilege_20,    #20 暮光神庙购买次数
 VIPPrivilege_21,    #21 仙界秘境 - 副本总表统一处理
 VIPPrivilege_22,    #22 宗门试炼购买次数
-VIPPrivilege_FamilyGoldPack,    #23 仙盟钻石红包
+VIPPrivilege_23,    #23 仙盟钻石红包
 VIPPrivilege_BoursePwd,    #24 集市上架使用密码
 VIPPrivilege_25,    #25 封魔坛购买次数 - 副本总表统一处理
 VIPPrivilege_26,    #26 VIP被动技能孔——VIP4专属被动技能孔
@@ -5080,21 +4789,6 @@
 InvestType_Life, # 终身卡 12
 ) = range(7, 7 + 6)
 
-# 法宝特权
-MWPrivilegeList = (
-MWPrivilege_FixedAttr, # 本源之魂(固定属性)
-MWPrivilege_SealDemonAddAttr, # 封魔坛每进入1次增加攻击
-MWPrivilege_EquipPlus, # 强化之魂
-MWPrivilege_RuneDecompose, # 符印分解经验加成
-MWPrivilege_Horse, # 坐骑每提升5级攻击提升点数
-MWPrivilege_Pet, # 每激活1只宠物,生命上限提升
-MWPrivilege_MWSkillUp, # 每提升5级技能潜力,真实伤害+200(最高18000)
-MWPrivilege_WingHP, # 翅膀生命属性+30%
-MWPrivilege_EquipSuit, # 套装基础属性+20%
-MWPrivilege_EquipWash, # 每日免费领取50个洗练石
-MWPrivilege_SignDayAddAttr, # 每日签到加属性 11
-) = range(1,11+1)
-
 (
 tttLeaveMap, # 退出倒计时 0
 tttWaitStart, # 开始倒计时 1
@@ -5122,21 +4816,21 @@
 # 游戏功能奖励定义
 (
 Def_RewardType_Activity,  # 活跃度奖励 0
-Def_RewardType_FamilyActivity,  # 仙盟活跃度奖励 1
-Def_RewardType_ChampionFamilyDailyReward,  # 仙盟联赛冠军仙盟每日俸禄奖励 2
-Def_RewardType_XMZZWinCnt,  # 仙魔之争胜利场数奖励 3
-Def_RewardType_FamilyDayAward,  # 仙盟每日福利奖励 4
+Def_RewardType_DailyTask,  # 每日任务奖励 1
+Def_RewardType_LLMJLVUp,  # 历练秘笈升级 2
+Def_RewardType_FamilyTaofaBox,  # 公会讨伐领取宝箱奖励 3
+Def_RewardType_LineupRecommend,  # 阵容推荐奖励 4
 Def_RewardType_LVAward,  # 玩家等级奖励5
 Def_RewardType_XBXZ, # 仙宝寻主奖励6
 Def_RewardType_DayRealmPoint, # 每日任务修行点奖励7
-Def_RewardType_GoldGiftFirst, # 首充礼包奖励8
+Def_RewardType_FirstCharge, # 首充礼包奖励8
 Def_RewardType_MWSoulAward, # 法宝之魂奖励9 -废弃
 Def_RewardType_FreeGoods, # 极品白拿10
 Def_RewardType_CostRebate, # 消费返利11
 Def_RewardType_BossReborn, # BOSS复活12
 Def_RewardType_FCRecharge, # 仙界盛典充值大礼13
 Def_RewardType_FCParty, # 仙界盛典全民来嗨14
-Def_RewardType_DownLoad, # 分包下载奖励15
+Def_RewardType_15, # 分包下载奖励15
 Def_RewardType_WishingWell, # 许愿池奖励16
 Def_RewardType_OpenFunc, # 功能开启奖励17
 Def_RewardType_TotalRecharge, # 累计充值奖励18
@@ -5171,7 +4865,7 @@
 Def_RewardType_CritGodBoxCTG, #暴击神兵奖励 47
 Def_RewardType_GameNotice, #玩法前瞻奖励 48
 Def_RewardType_EnterGroup, #加群奖励49
-Def_RewardType_ShediaoRedpacket, #射雕红包奖励 50
+Def_RewardType_50, #射雕红包奖励 50
 Def_RewardType_ShediaoEquip, #射雕装备奖励 51
 Def_RewardType_CAAllRecharge, #跨服全民充值奖励 52
 Def_RewardType_CrossYaomoBossHurt, #跨服妖魔boss伤害奖励 53
@@ -5180,7 +4874,7 @@
 Def_RewardType_SponsorDaily, #赞助星级每日奖励 56
 Def_RewardType_SponsorStar, #赞助星级礼包奖励 57
 Def_RewardType_GubaoItemEff, #古宝特殊效果物品奖励 58
-Def_RewardType_SuccessScore, #成就积分奖励 59
+Def_RewardType_Success, #成就奖励 59
 Def_RewardType_BuyOne, #买一送多活动免费奖励 60
 Def_RewardType_CustomAward, #自定义奖励 61
 Def_RewardType_RealmXXZL, #境界修仙之路奖励 62
@@ -5298,7 +4992,7 @@
 Def_WPAct_Pet,  #激活某只灵宠 22
 Def_WPAct_Dogz,  #出战某只神兽 23
 Def_WPAct_Stone,  #宝石总等级 24
-Def_WPAct_GodWeapon,  #神兵总等级 25
+Def_WPAct_25,  #神兵总等级 25
 Def_WPAct_Rune,  #穿戴某品质符印 26
 Def_WPAct_Pray,  #祈愿 27
 Def_WPAct_FamilyBoss,  #仙盟Boss 28
@@ -5429,9 +5123,6 @@
     PowerDownType_GatherSoul:'GatherSoul',
     }
 
-# CTG ID 定义
-Def_CTGID_SuccessPassport = 117 # 成就通行证
-
 # 通天令任务类型定义
 TTLTaskTypeList = (
 TTLTaskType_Activity, # 获取日常活跃度x 1
@@ -5454,6 +5145,20 @@
 TTLTaskType_CrossBoss, # 跨服boss击杀x次 18
 ) = range(1, 1 + 18)
 
+# 每日任务类型
+DailyTaskList = (
+DailyTask_KillNPC, # 击败X只怪物 1
+DailyTask_EquipDecompose, # 分解装备x次 2
+DailyTask_HeroCall, # 武将招募 3
+DailyTask_Arena, # 演武场 4
+DailyTask_GoldRush, # 淘金 5
+DailyTask_CutTree, # 消耗X个战锤 6
+DailyTask_HeroLVUP, # 武将升级x次 7
+DailyTask_HeroStarUP, # 武将升星x次 8
+DailyTask_GetMoney, # 获得货币x个 9
+DailyTask_FBFinish, # 完成副本x次 10
+) = range(1, 1 + 10)
+
 # 任务类型定义
 TaskTypeList = (
 TaskType_MainLevel, # 主线过关到xxx 1

--
Gitblit v1.8.0