From 25ba977e81e2adbf551710c11d3725fcdef87007 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 31 七月 2023 16:45:35 +0800
Subject: [PATCH] 9788 【BT9】【后端】成就系统(增加成就积分) master 冲突

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |  563 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 442 insertions(+), 121 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 810b9f2..2ce90b3 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -146,6 +146,8 @@
 Def_Notify_WorldKey_MapServerScriptReloadVersion = 'MapServerScriptReloadVersion'  # MapServer 脚本重读版本标记
 Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime"  #启动服务器时间
 Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息,参数为运营活动名
+Def_Notify_WorldKey_CrossActInfo = "CrossActInfo_%s" # 跨服运营活动信息,参数为运营活动名
+Def_Notify_WorldKey_ActionBossRebornSign = "ActBossSign_%s" # 活动boss重生标记,参数为日常活动ID 或 运营活动名
 Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态,参数为日常活动ID
 Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态,参数为日常活动ID
 Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
@@ -167,16 +169,63 @@
 Def_Notify_WorldKey_FamilyBossOpenCount = "FamilyBossOpenCount"  # 仙盟boss开启次数
 
 Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo"  # 仙盟宴会数据
+Def_Notify_WorldKey_FamilyPartyAddFamilyActivity = "FamilyPartyAddFamilyActivity"  # 仙盟宴会地图成员增加仙盟活跃令
 
 Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem"  # 添加仙盟拍品
+Def_Notify_WorldKey_AddSystemAuctionItem = "AddSystemAuctionItem"  # 添加系统拍品
 
 Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState"  # 跨服服务器链接状态
 Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen"  # 跨服服务器是否开启中
 Def_Notify_WorldKey_CrossZoneName = "CrossZoneName"  # 跨服分区名
+Def_Notify_WorldKey_CrossServerTime = "CrossServerTime"  # 跨服时间
 
 Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID"  # 本服跨服PK所属赛区
 Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季
 Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
+
+Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo"  # 本服幸运云购最新一期信息
+
+Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
+
+CrossChampionshipState_Guess8 = 80 #8强竞猜
+CrossChampionshipState_Group64 = 641 #64强分组
+CrossChampionshipState_Enter64 = 642 #64强进场
+CrossChampionshipState_Fight64 = 643 #64强战斗
+CrossChampionshipState_Group32 = 321 #32强分组
+CrossChampionshipState_Enter32 = 322 #32强进场
+CrossChampionshipState_Fight32 = 323 #32强战斗
+CrossChampionshipState_Group16 = 161 #16强分组
+CrossChampionshipState_Enter16 = 162 #16强进场
+CrossChampionshipState_Fight16 = 163 #16强战斗
+CrossChampionshipState_Guess4 = 40 #4强竞猜
+CrossChampionshipState_Group8 = 81 #8强分组
+CrossChampionshipState_Enter8 = 82 #8强进场
+CrossChampionshipState_Fight8 = 83 #8强战斗
+CrossChampionshipState_GroupSemi = 41 #半决赛分组
+CrossChampionshipState_EnterSemi = 42 #半决赛进场
+CrossChampionshipState_FightSemi = 43 #半决赛战斗
+CrossChampionshipState_GroupFinal = 21 #决赛分组
+CrossChampionshipState_EnterFinal = 22 #决赛进场
+CrossChampionshipState_FightFinal = 23 #决赛战斗
+#跨服排位争霸赛状态流程列表,必须按顺序,中间不可跳过步骤
+CrossChampionshipStateList = [CrossChampionshipState_Guess8, 
+                              CrossChampionshipState_Group64, CrossChampionshipState_Enter64, CrossChampionshipState_Fight64,
+                              CrossChampionshipState_Group32, CrossChampionshipState_Enter32, CrossChampionshipState_Fight32,
+                              CrossChampionshipState_Group16, CrossChampionshipState_Enter16, CrossChampionshipState_Fight16,
+                              CrossChampionshipState_Guess4,
+                              CrossChampionshipState_Group8, CrossChampionshipState_Enter8, CrossChampionshipState_Fight8,
+                              CrossChampionshipState_GroupSemi, CrossChampionshipState_EnterSemi, CrossChampionshipState_FightSemi,
+                              CrossChampionshipState_GroupFinal, CrossChampionshipState_EnterFinal, CrossChampionshipState_FightFinal
+                              ]
+
+#跨服排位可进入战斗的状态信息 {状态:对应分组标识, ...}
+CrossChampionshipEnterStateInfo = {CrossChampionshipState_Enter64:64,
+                                   CrossChampionshipState_Enter32:32,
+                                   CrossChampionshipState_Enter16:16,
+                                   CrossChampionshipState_Enter8:8,
+                                   CrossChampionshipState_EnterSemi:4,
+                                   CrossChampionshipState_EnterFinal:2,
+                                   }
 
 Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s'   # 跨服世界boss重生, 参数为(zoneID, bossID)
 Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s'   # 世界boss重生, 参数为(bossID)
@@ -193,12 +242,25 @@
 Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput'  # 红包产出信息
 Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
 Def_Notify_WorldKey_FairyDomainLimit = "FairyDomainLimit"  # 缥缈仙域限制事件
+
+Def_Notify_WorldKey_AssistBoss = "AssistBoss"  # 协助boss
+
+Def_Notify_WorldKey_CoupleInfo = "CoupleInfo"  # 伴侣信息
+
+#活动类型定义
+ActTypeList = (
+ActType_OpenComm, # 开服及常规运营活动 1
+ActType_MixServer, # 合服活动 2
+ActType_Feast, # 节日活动 3
+) = range(1, 1 + 3)
+
 #运营活动表名定义
 OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
 OperationActionName_CostRebate = "ActCostRebate" # 消费返利活动
 OperationActionName_SpringSale = "ActSpringSale" # 限时特惠活动
 OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
+OperationActionName_DailyGiftbag = "ActDailyGiftbag" # 每日礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
 OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
 OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
@@ -209,33 +271,89 @@
 OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
 OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
 OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
-OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
+OperationActionName_CollectWords = "ActCollectWords" # 集字活动
 OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
+OperationActionName_RechargePrize = "ActRechargePrize" # 充值返利活动(节日活动)
+OperationActionName_RechargeRebateGold = "ActRechargeRebateGold" # 充值返利仙玉活动(活动结束邮件发放,节日活动)
+OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
+OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
+OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
+OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
+OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
+OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
+OperationActionName_Turntable = "ActTurntable" # 转盘活动
+OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
+OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
+OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
+OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
-FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
+                                OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
+                                OperationActionName_FeastLogin,
+                                OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                OperationActionName_RechargePrize,
+                                ]
 #所有的运营活动列表,含节日活动
 OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 
                            OperationActionName_BossReborn,OperationActionName_SpringSale, 
                            OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
                            OperationActionName_RealmPoint, OperationActionName_FlashSale,
-                           OperationActionName_WishingWell, OperationActionName_TotalRecharge, 
+                           OperationActionName_WishingWell, OperationActionName_TotalRecharge,
                            OperationActionName_WeekParty, OperationActionName_LoginAward, 
-                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
-                           + FeastOperationActionNameList
+                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
+                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
+                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
+                           OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
+                           OperationActionName_XianXiaMJ, OperationActionName_GodGift,
+                           ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
                                    OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
                                    OperationActionName_BossReborn, OperationActionName_TotalRecharge,
                                    OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
-                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure]
+                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
+                                   OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
+                                   OperationActionName_WeekParty, OperationActionName_Turntable,
+                                   OperationActionName_CollectWords, OperationActionName_GarbageSorting,
+                                   OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
+                                   OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   OperationActionName_GodGift,
+                                   ]
+
+#支持多活动分组编号的活动名
+MultiActNumOperationActNameList = [OperationActionName_TotalRecharge, OperationActionName_CollectWords,
+                                   OperationActionName_FlashGiftbag, OperationActionName_CostRebate,
+                                   OperationActionName_SpringSale, OperationActionName_FlashSale,
+                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
+                                   OperationActionName_XianXiaMJ, OperationActionName_GodGift,
+                                   ]
+
+#跨服运营活动表名定义
+CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
+CrossActName_AllRecharge = "CrossActAllRecharge" # 全民充值
+CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购
+
+#跨服运营活动列表
+CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy]
+#需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
+CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
 ActKey_State = "State" # 活动状态 0-未开启, >0开启中,也代表当日的第几个时间段
 ActKey_CfgID = "CfgID" # 活动表配置ID
-ActKey_DayIndex = "DayIndex" # 活动表配置ID
+ActKey_ActNum = "ActNum" # 活动分组编号
+ActKey_DayIndex = "DayIndex" # 当前活动天索引,0开始,代表第1天
+ActKey_TemplateID = "TemplateID" # 当前活动模板ID
 ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
 ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表
+ActKey_StartDateSync = "StartDateSync" # 特殊指定同步前端的开始日期
+
+ActKey_ServerIDRangeList = "ServerIDRangeList" # 活动服务器ID范围信息
+ActKey_IpyDataInfo = "IpyDataInfo" # 活动对应 IpyData 信息
+ActKey_DBInfo = "DBInfo" # 保存db的历史活动信息
 
 #答题类型枚举
 Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -274,7 +392,9 @@
     Def_ViewExpType_Sys        ,            #系统给经验-需要展示倍率,实际不享受 5
     Def_ViewExpType_RealmBuff,              #境界全服福利经验(玄女天花) 6
     Def_ViewExpType_SysEx,                  #系统给经验-不需要展示倍率 用来区别于类型0 7
-) = range(0, 8)
+    Def_ViewExpType_LYZS,                   #烈焰战神 特殊特效 8
+    Def_ViewExpType_Activity,               #活跃吸纳 9
+) = range(0, 10)
 
 
 #物品相关操作类型
@@ -324,9 +444,9 @@
 #增加%d体魄
 Def_Effect_CON = 4 
 #增加HP
-Def_Effect_MaxHP = 6 
+Def_Effect_MaxHP = 6
 #增加%d伤害值(物理和魔法的最大/小),只用到a值
-Def_Effect_Atk = 7 
+Def_Effect_Atk = 7
 #增加%d防御值
 Def_Effect_Def = 8 
 #命中(A值为具体值)
@@ -364,9 +484,9 @@
 #宠物伤害比例提升(A值万分率)
 Def_Effect_PetDamPer = 25
 #冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
-Def_Effect_IceAtk = 26 
+Def_Effect_IceAtk = 26
 #冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
-Def_Effect_IceDef = 27 
+Def_Effect_IceDef = 27
 #无视防御几率提升
 Def_Effect_IgnoreDefRate = 28 
 #无视防御抗性, 受击时减少对方的无视防御属性
@@ -506,13 +626,6 @@
 Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
 Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免
 
-Def_Effect_ZXCloakAttrPer = 96 # 诛仙披风属性加成百分比
-Def_Effect_ZXMaskAttrPer = 97 # 诛仙面具属性加成百分比
-Def_Effect_ZXGloveAttrPer = 98 # 诛仙手套属性加成百分比
-Def_Effect_ZXRuyiAttrPer = 99 # 诛仙如意属性加成百分比
-Def_Effect_ZXPendantAttrPer = 100 # 诛仙吊坠属性加成百分比
-Def_Effect_ZXRingAttrPer = 101 # 诛仙戒指属性加成百分比
-
 Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
 Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
 Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
@@ -529,11 +642,13 @@
 Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
 Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
 
-Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
-Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
-Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
-Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比
-
+## 技能伤害百分比增加的 属性ID 列表
+SkillAddPerAttrIDList = [Def_Effect_SkillAddPer1, Def_Effect_SkillAddPer2, Def_Effect_SkillAddPer3, Def_Effect_SkillAddPer4, 
+                         Def_Effect_SkillAddPer5, Def_Effect_SkillAddPer6, Def_Effect_SkillAddPer7]
+## 技能伤害百分比减少的 属性ID 列表
+SkillReducePerAttrIDList = [Def_Effect_SkillReducePer1, Def_Effect_SkillReducePer2, Def_Effect_SkillReducePer3, Def_Effect_SkillReducePer4, 
+                            Def_Effect_SkillReducePer5, Def_Effect_SkillReducePer6, Def_Effect_SkillReducePer7]
+    
 Def_Effect_Luck = 120 # 气运
 Def_Effect_LuckPer = 133 # 气运百分率
 
@@ -553,6 +668,21 @@
 Def_Effect_BurnValue = 146    # 灼烧固定伤害
 Def_Effect_BurnTimePer = 147    # 延长灼烧时间百分比
 Def_Effect_SubSpeedPer = 148    # 减移动速度百分比
+
+Def_Effect_ReduceSkillCDPer = 149   # 减少技能CD, a值为万分率
+
+Def_Effect_ZhuXianRate = 150   # 诛仙一击: 概率直接减少BOSS当前10%血量
+Def_Effect_ZhuXianReducePer = 151   # 诛仙护体: 受到BOSS伤害减免 万分率
+
+Def_Effect_HorseMaxHPPer = 152 # 坐骑生命加成
+Def_Effect_PetAtkPer = 153 # 灵宠攻击加成
+Def_Effect_HorseTrainAttrPer = 154 # 坐骑培养属性加成(攻防血)
+Def_Effect_PetTrainAttrPer = 155 # 灵宠培养属性加成(攻防血)
+Def_Effect_GuardTrainAttrPer = 156 # 守护培养属性加成(攻防血)
+Def_Effect_WingTrainAttrPer = 157 # 翅膀培养属性加成(攻防血)
+Def_Effect_PeerlessWeaponTrainAttrPer = 158 # 灭世培养属性加成(攻防血)
+Def_Effect_PeerlessWeapon2TrainAttrPer = 159 # 弑神培养属性加成(攻防血)
+Def_Effect_LianTiAttrPer = 160 # 炼体属性百分比(攻防血)
 
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
@@ -630,8 +760,8 @@
     Def_BT_Realm,                             #境界榜
     Def_BT_TotalRecharge,                     #充值排行榜 10
     
-    Def_BT_Campaign_PlusLV,                   #强化等级(开服活动榜)
-    Def_BT_Campaign_HorseLV,                  #坐骑等级(开服活动榜)
+    Def_BT_Campaign_Plus,                     #强化战力(开服活动榜)
+    Def_BT_Campaign_Horse,                    #坐骑战力(开服活动榜)
     Def_BT_Campaign_StoneLV,                  #宝石等级(开服活动榜)
     Def_BT_Campaign_LV,                       #冲级排行(开服活动榜)
     Def_BT_Campaign_RealmLV,                  #境界等级(开服活动榜) 15
@@ -639,16 +769,40 @@
     
     Def_BT_FCCostGold,                        #消费排行榜(仙界盛典)
     Def_BT_Campaign_RuneLV,                   #符印等级(开服活动榜)
-    Def_BT_FBHelpBattle,                      #助战次数排行榜
+    Def_BT_19,
     Def_BT_Campaign_GodWeaponLV,              #神兵等级(开服活动榜) 20
     Def_BT_Campaign_Recharge,                 #累计充值(开服活动榜)
     Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)
     
     Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
+    Def_BT_Campaign_LingGen,                  #灵根总点(开服活动榜)
+    Def_BT_Campaign_StarLV,                   #升星等级(开服活动榜) 25
+    Def_BT_Campaign_Wash,                     #洗练战力(开服活动榜)
     
-    Def_BT_Max,                               #排行榜最大类型
-) = range(0, 23 + 2) 
+    Def_BT_SkyTower,                          #天星塔榜
+    Def_BT_Arena,                             #竞技场榜
+    Def_BT_Environment,                       #环保榜 (垃圾分类活动)
+    Def_BT_CharmTotal, #魅力总榜 30
+    Def_BT_CharmWeek, #魅力周榜
+    Def_BT_CharmDay, #魅力日榜
     
+    Def_BT_Max, #排行榜最大类型
+) = range(0, 32 + 2) 
+
+''' 跨服排行榜类型, 从 150 开始
+与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
+跨服榜单表(tagDBCrossBillboard)
+本服榜单表(tagDBBillboard)
+'''
+CrossBillboardTypeList = (
+Def_CBT_ActCTG, # 跨服运营活动 - 充值榜 150
+Def_CBT_BattlefieldWJoin, # 跨服战场每周参与榜  151
+Def_CBT_BattlefieldWCall, # 跨服战场每周召集榜  152
+Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜  153
+Def_CBT_BattlefieldWScoreLastWeek, # 跨服战场上周积分榜  154
+Def_CBT_YaomoBossHurt, # 跨服妖魔boss最新一次伤血排名  155
+) = range(150, 155 + 1)
+
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
                               PlayerJob_Warrior:Def_BT_FightPower_Warrior,
@@ -659,7 +813,7 @@
 #排行榜Value1存储境界信息的榜单列表
 BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin, 
                              Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
-                             Def_BT_FBHelpBattle,
+                             Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
                              ]
 
 ##---比率---
@@ -821,7 +975,7 @@
 CDBPlayerRefresh_RealmPoint,            # 境界修炼点
 CDBPlayerRefresh_Ysog,                  # 魔精
 CDBPlayerRefresh_FamilyActivity,        # 仙盟活跃令
-CDBPlayerRefresh_Xianyuancoin,          # 仙缘币
+CDBPlayerRefresh_174,
 CDBPlayerRefresh_PKState,               # 战斗状态 175
 CDBPlayerRefresh_BossState,             # boss状态
 CDBPlayerRefresh_BaseAtkMin,            # 基础最小攻击
@@ -862,7 +1016,40 @@
 CDBPlayerRefresh_FinalHurtReducePer,   # 最终伤害减少百分比 
 CDBPlayerRefresh_YinjiTime,   # 每X秒减少印记时间,毫秒
 CDBPlayerRefresh_YinjiCnt,   # 当前印记数 214
-) = range(146, 215)
+CDBPlayerRefresh_SkillAddPer1,   # 技能伤害增强1 215
+CDBPlayerRefresh_SkillAddPer2,   # 技能伤害增强2
+CDBPlayerRefresh_SkillAddPer3,   # 技能伤害增强3
+CDBPlayerRefresh_SkillAddPer4,   # 技能伤害增强4
+CDBPlayerRefresh_SkillAddPer5,   # 技能伤害增强5
+CDBPlayerRefresh_SkillAddPer6,   # 技能伤害增强6 220
+CDBPlayerRefresh_SkillAddPer7,   # 技能伤害增强7
+CDBPlayerRefresh_SkillReducePer1,   # 受到技能伤害减少1
+CDBPlayerRefresh_SkillReducePer2,   # 受到技能伤害减少2
+CDBPlayerRefresh_SkillReducePer3,   # 受到技能伤害减少3
+CDBPlayerRefresh_SkillReducePer4,   # 受到技能伤害减少4 225
+CDBPlayerRefresh_SkillReducePer5,   # 受到技能伤害减少5
+CDBPlayerRefresh_SkillReducePer6,   # 受到技能伤害减少6
+CDBPlayerRefresh_SkillReducePer7,   # 受到技能伤害减少7
+CDBPlayerRefresh_ExAttr17,          # ExAttr17 
+CDBPlayerRefresh_BossActScore, # boss 活动积分 230
+CDBPlayerRefresh_FuncSysPrivilege, # 功能特权令 231
+CDBPlayerRefresh_Environment, # 环保值 232
+CDBPlayerRefresh_MoneyMinusGold, # 仙玉 - 负值 233
+CDBPlayerRefresh_MoneyMinusGoldPaper, # 绑玉 - 负值 234
+CDBPlayerRefresh_MoneyMinusSilverPaper, # 神玉 - 负值 235
+CDBPlayerRefresh_AllCoinTotal, # 真实充值coin值 236
+CDBPlayerRefresh_ExAttr18, # ExAttr18 
+CDBPlayerRefresh_ExAttr19, # ExAttr19 
+CDBPlayerRefresh_CharmLV, # 魅力等级  239
+CDBPlayerRefresh_BTGMPoint, # BT版GM令  240
+CDBPlayerRefresh_GuShenMoney, # 古神币  241
+CDBPlayerRefresh_GongdePoint, # 功德点  242
+CDBPlayerRefresh_CashPoint, # 现金点  243
+CDBPlayerRefresh_ExAttr20, # ExAttr20 244
+CDBPlayerRefresh_JiYuan, # 机缘币  245
+CDBPlayerRefresh_BTGMYuE, # BTGM余额  246
+CDBPlayerRefresh_SuccessScore, # 成就积分  247
+) = range(146, 248)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -871,8 +1058,8 @@
 TYPE_Price_Ysog = 14    # 魔精
 TYPE_Price_FamilyActivity = 15    # 仙盟活跃令
 TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃
-TYPE_Price_XianyuanCoin = 17    # 仙缘币
 TYPE_Price_Honor = 18    # 荣誉
+TYPE_Price_BossActScore = 19    # boss活动积分,bt版用
 TYPE_Price_Rune = 23    # 符印精华点
 TYPE_Price_RuneSplinters = 24    # 符印碎片
 TYPE_Price_TreasureScore = 25    # 寻宝积分
@@ -881,7 +1068,23 @@
 TYPE_Price_SoulDust = 28    # 魂尘
 TYPE_Price_SoulSplinters = 29    # 聚魂碎片
 TYPE_Price_SoulCore = 30    # 核心环
+TYPE_Price_FuncSysPrivilege = 31    # 功能系统特权令
+TYPE_Price_Environment = 32    # 环保值
+TYPE_Price_BTGMPoint = 33    # BT版GM令
+TYPE_Price_GuShenMoney = 34    # 古神币
+TYPE_Price_GongdePoint = 35    # 功德点
+TYPE_Price_CashPoint = 36    # 现金点
+TYPE_Price_JiYuan = 37    # 机缘币
+TYPE_Price_BTGMYuE = 38    # GM余额
+TYPE_Price_SuccessSocre = 39    # 成就积分
 
+#key可用于遍历所有货币,value仅GM相关会用到
+MoneyNameDict = {
+                 1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令", 
+                 16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘", 
+                 29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点", 
+                 39:"成就积分"
+                 }
 
 #以下是旧的金钱类型
 TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分
@@ -899,13 +1102,25 @@
                            TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
                            TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
                            TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,
-                           TYPE_Price_XianyuanCoin:CDBPlayerRefresh_Xianyuancoin,
                            TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
                            TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
                            TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
                            TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
                            TYPE_Price_Honor:CDBPlayerRefresh_Honor,
+                           TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
+                           TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
+                           TYPE_Price_Environment:CDBPlayerRefresh_Environment,
+                           TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
+                           TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
+                           TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
+                           TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
                            }
+
+# 支持负值的货币及对应0418刷新类型
+MoneyMinusRefreshDict = {
+                         1:CDBPlayerRefresh_MoneyMinusGold,
+                         2:CDBPlayerRefresh_MoneyMinusGoldPaper,
+                         }
 
 # 高效战斗状态
 Def_Battle_Status = (
@@ -930,6 +1145,7 @@
 GameFuncID_Friend = 73          # 好友
 GameFuncID_SignDay = 81         # 签到
 GameFuncID_RefineStove = 87     # 炼丹炉
+GameFuncID_EquipWash = 91       # 洗练
 GameFuncID_Treasure = 99        # 寻宝
 GameFuncID_FirstGoldTip = 128      # 首充优势提示
 GameFuncID_EquipDecompose = 123 # 装备分解
@@ -941,7 +1157,12 @@
 GameFuncID_LittleHelper = 146   # 小助手
 GameFuncID_TJG = 147            # 脱机挂
 GameFuncID_SuperGift = 150      # 超值礼包
+GameFuncID_PenglaiBoss = 162    # 蓬莱仙境
 GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS
+GameFuncID_Arena = 195          # 竞技场
+GameFuncID_FaQi = 199           # 法器
+GameFuncID_LianTi = 207         # 炼体
+GameFuncID_Championship = 210   # 排位
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -996,10 +1217,9 @@
 rptPet,             # 宠物背包(用物品存储宠物的数据) 31
 rptDogzItem,        # 神兽物品背包 32
 rptDogzEquip,       # 神兽装备背包 33
-rptZhuXianItem,     # 诛仙物品背包 34
-rptZhuXianEquip,    # 诛仙装备背包 35
+rptGarbage,         # 垃圾分类背包 34
 rptMax,             # 最大背包类型数量,放在最后一个
-) = range(28, 28 + 9)  #C++定义的枚举到27
+) = range(28, 28 + 8)  #C++定义的枚举到27
 
 #虚拟背包类型, 从255递减
 Def_VPack_TypeList = (
@@ -1027,36 +1247,36 @@
                                 Def_UniversalGameRecType_YesterdayPlayerLVInfo,#昨日活跃玩家等级信息7
                                 Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,
                                 Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
-                                Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
+                                Def_UniversalGameRecType_SkyTowerPassPlayer, #天星塔过关玩家记录10
                                 Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
                                 Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
                                 Def_UniversalGameRecType_FairyDomain, #缥缈仙域事件次数记录13
                                 Def_UniversalGameRecType_Reward,    # 通用奖励表(TopBar)14
-                                Def_UniversalGameRecType_15,
-                                Def_UniversalGameRecType_16,
-                                Def_UniversalGameRecType_17,
-                                Def_UniversalGameRecType_18,
+                                Def_UniversalGameRecType_ArenaBattleRecord, # 竞技场玩家挑战记录 15
+                                Def_UniversalGameRecType_CrossActInfo, # 跨服运营活动信息记录 16
+                                Def_UniversalGameRecType_FeastWish, #节日祝福大奖记录17
+                                Def_UniversalGameRecType_ActWorldLVLimitInfo, # 运营活动世界等级限制开启信息 18
                                 Def_UniversalGameRecType_19,
                                 Def_UniversalGameRecType_20,
-                                Def_UniversalGameRecType_21,
-                                Def_UniversalGameRecType_22,
-                                Def_UniversalGameRecType_23,
+                                Def_UniversalGameRecType_LuckyCloudBuyNum, # 幸运云购购买号码记录 21
+                                Def_UniversalGameRecType_LuckyCloudBuyLottery, # 幸运云购开奖记录 22
+                                Def_UniversalGameRecType_CrossBattlefieldBuy, # 玩家购买的跨服战场 23
                                 Def_UniversalGameRecType_UpdatePlayerName,  # 玩家改名正在改名中的信息24
                                 Def_UniversalGameRecType_BossDropGoodItemInfo,  # boss掉落好物品信息记录25
                                 Def_UniversalGameRecType_26,
                                 Def_UniversalGameRecType_27,
                                 Def_UniversalGameRecType_28,
                                 Def_UniversalGameRecType_BossInfo,  # boss信息29
-                                Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息
-                                Def_UniversalGameRecType_31,
-                                Def_UniversalGameRecType_32,              
-                                Def_UniversalGameRecType_33,
-                                Def_UniversalGameRecType_34,
-                                Def_UniversalGameRecType_35,
-                                Def_UniversalGameRecType_36,
-                                Def_UniversalGameRecType_37,
-                                Def_UniversalGameRecType_38,
-                                Def_UniversalGameRecType_39,
+                                Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息 30
+                                Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
+                                Def_UniversalGameRecType_CrossCollect,  # 跨服采集记录信息 32             
+                                Def_UniversalGameRecType_CrossChampionshipGroup, # 跨服排位争霸赛分组信息 33
+                                Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
+                                Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
+                                Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
+                                Def_UniversalGameRecType_CrossActAllRecharge, # 跨服全服充值活动信息 37
+                                Def_UniversalGameRecType_CrossBattleChampionGroup, # 跨服战场冠军赛分组信息 38
+                                Def_UniversalGameRecType_CrossYaomoBossHurtInfo, # 跨服妖魔boss伤血信息 39
                                 Def_UniversalGameRecType_40,
                                 Def_UniversalGameRecType_RedPacketRecord,   # 红包产出结果记录41
                                 Def_UniversalGameRecType_42,
@@ -1161,8 +1381,8 @@
 
 # 开服活动类型标识, 不可超过32
 Def_Campaign_Type_List = (
-Def_Campaign_Type_PlusLV,           # 强化等级排行 1
-Def_Campaign_Type_HorseLV,          # 坐骑等级排行 2
+Def_Campaign_Type_Plus,             # 强化战力排行 1
+Def_Campaign_Type_Horse,            # 坐骑战力排行 2
 Def_Campaign_Type_StoneLV,          # 宝石等级排行 3
 Def_Campaign_Type_LV,               # 冲级等级排行 4
 Def_Campaign_Type_RealmLV,          # 境界等级排行 5
@@ -1171,12 +1391,15 @@
 Def_Campaign_Type_GodWeaponLV,      # 神兵等级排行 8
 Def_Campaign_Type_Recharge,         # 累计充值排行 9
 Def_Campaign_Type_PetLV,            # 灵宠等级排行 10
-) = range(1, 1 + 10)
+Def_Campaign_Type_LingGen,          # 灵根点数排行 11
+Def_Campaign_Type_StarLV,           # 升星等级排行 12
+Def_Campaign_Type_Wash,             # 洗练战力排行 13
+) = range(1, 1 + 13)
 
 # 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
 Def_Campaign_Billboard_Dict = {
-                               Def_Campaign_Type_PlusLV:Def_BT_Campaign_PlusLV,
-                               Def_Campaign_Type_HorseLV:Def_BT_Campaign_HorseLV,
+                               Def_Campaign_Type_Plus:Def_BT_Campaign_Plus,
+                               Def_Campaign_Type_Horse:Def_BT_Campaign_Horse,
                                Def_Campaign_Type_StoneLV:Def_BT_Campaign_StoneLV,
                                Def_Campaign_Type_LV:Def_BT_Campaign_LV,
                                Def_Campaign_Type_RealmLV:Def_BT_Campaign_RealmLV,
@@ -1185,6 +1408,9 @@
                                Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,
                                Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
                                Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
+                               Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
+                               Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
+                               Def_Campaign_Type_Wash:Def_BT_Campaign_Wash,
                                }
 
 #队伍最大人数
@@ -1194,7 +1420,7 @@
 Def_List_EscapeSequence = ['\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\'', '\"', '\0']
 
 #阵营 三种 中立 正义 邪恶
-[
+CampTypeList = [
 CampType_Neutral,    #中立
 CampType_Justice,    #正义(与 Def_ID1Win 一致)
 CampType_Evil,       #邪恶(与 Def_ID2Win 一致)
@@ -1213,6 +1439,7 @@
 CrossServerMsg_PKOverInfo = "PKOverInfo"                # 跨服PK结果
 CrossServerMsg_PKSeasonInfo = "PKSeasonInfo"            # 跨服PK赛季信息
 CrossServerMsg_PKSyncBillboard = "PKSyncBillboard"      # 跨服PK同步排行榜 
+CrossServerMsg_SyncBillboard = "SyncBillboard"          # 跨服同步排行榜 
 CrossServerMsg_CrossBossInfo = "CrossBossInfo"          # 跨服Boss信息
 CrossServerMsg_CrossBossState = "CrossBossState"        # 跨服Boss状态
 CrossServerMsg_PutInItem = "PutInItem"                  # 获得物品
@@ -1222,10 +1449,32 @@
 CrossServerMsg_NPCInfoRet = "NPCInfoRet"                # 跨服地图NPC信息
 CrossServerMsg_CollectNPCOK = "CollectNPCOK"            # 采集NPC完成
 CrossServerMsg_EnterFBRet = "EnterFBRet"                # 请求进入跨服副本返回信息
+CrossServerMsg_EnterVSRoomRet = "EnterVSRoomRet"        # 请求进入跨服PK房间副本返回信息
 CrossServerMsg_FBEnd = "FBEnd"                          # 完成跨服副本
 CrossServerMsg_NPCAttackCount = "NPCAttackCount"        # 攻击NPC次数记录
-CrossServerMsg_SendMail = "SendMail"                    # 发送邮件
+CrossServerMsg_SendMail = "SendMail"                    # 发送邮件,已知玩家目标服务器,主动发送
 CrossServerMsg_FBPlayerCount = "FBPlayerCount"          # 副本功能线路人数同步
+CrossServerMsg_CrossActInfo = "CrossActInfo"            # 跨服运营活动信息
+CrossServerMsg_MailPlayerIDList = "MailPlayerIDList"    # 跨服邮件玩家ID通知,玩家目标服务器可能无法知道,被动推送
+CrossServerMsg_MailContent = "MailContent"              # 跨服邮件内容通知
+CrossServerMsg_LuckyCloudBuyNum = "LuckyCloudBuyNum"    # 幸运云购购买记录通知
+CrossServerMsg_LuckyCloudBuyLottery = "LuckyCloudBuyLottery"    # 幸运云购开奖记录通知
+CrossServerMsg_CrossServerTime = "CrossServerTime"      # 跨服时间同步
+CrossServerMsg_BattlefieldBuy = "BattlefieldBuy"        # 跨服战场购买信息
+CrossServerMsg_BattlefieldState = "BattlefieldState"    # 跨服战场状态信息
+CrossServerMsg_BattlefieldOver = "BattlefieldOver"      # 跨服战场结算信息
+CrossServerMsg_DebugAnswer = "DebugAnswer"              # DebugAnswer
+CrossServerMsg_ActDropSpecItem = "ActDropSpecItem"      # 特殊掉落验证返回
+CrossServerMsg_CrossAssist = "CrossAssist"              # 跨服协助
+CrossServerMsg_ChampionshipState = "ChampionshipState"  # 跨服排位争霸赛状态信息
+CrossServerMsg_ChampionshipPlayer = "ChampionshipPlayer"# 跨服排位争霸赛参赛玩家信息
+CrossServerMsg_ChampionshipGroup = "ChampionshipGroup"  # 跨服排位争霸赛分组信息
+CrossServerMsg_ChampionshipGuess = "ChampionshipGuess"  # 跨服排位争霸赛竞猜信息
+CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial"  # 跨服排位争霸赛官职信息
+CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial"  # 跨服排位争霸赛每日官职信息
+CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
+CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
+CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1233,17 +1482,38 @@
 ClientServerMsg_GMCMD = "GMCMD"                         # GM命令
 ClientServerMsg_ViewPlayerCache = "ViewPlayerCache"     # 查看跨服玩家信息
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
+ClientServerMsg_PKRobotOver = "PKRobotOver"             # 跨服PK机器人结算
 ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配
 ClientServerMsg_PKPrepareOK = "PKPrepareOK"             # 跨服PK准备完毕
 ClientServerMsg_PKBillboard = "PKBillboard"             # 跨服PK排行榜
+ClientServerMsg_QueryBillboard = "QueryBillboard"       # 跨服排行榜 - 查询、同步等
+ClientServerMsg_UpdateBillboard = "UpdateBillboard"     # 跨服排行榜 - 更新
+ClientServerMsg_MailContent = "MailContent"             # 跨服邮件内容同步 - 请求同步、汇报成功等
 ClientServerMsg_Reborn = "Reborn"                       # 复活
 ClientServerMsg_QueryNPCInfo = "QueryNPCInfo"           # 查询跨服地图NPC信息
 ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
 ClientServerMsg_CollectNPC = "CollectNPC"               # 采集NPC
 ClientServerMsg_EnterFB = "EnterFB"                     # 请求进入跨服副本
 ClientServerMsg_AddBuff = "AddBuff"                     # 添加BUFF
+ClientServerMsg_LuckyCloudBuy = "LuckyCloudBuy"         # 幸运云购
+ClientServerMsg_BattlefieldBuyOpen = "BattlefieldBuyOpen"   # 跨服战场购买召集
+ClientServerMsg_BattlefieldCallChange = "BattlefieldCallChange"  # 跨服战场召集 - 修改
+ClientServerMsg_BattlefieldCallJoin = "BattlefieldCallJoin"   # 跨服战场召集 - 加入
+ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick"   # 跨服战场召集 - 踢出
+ClientServerMsg_ActDropSpecItem = "ActDropSpecItem"     # 活动特殊掉落
+ClientServerMsg_CrossAssist = "CrossAssist"             # 跨服协助
+ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职
+ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应
+ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官
+ClientServerMsg_ChampionshipOfficialLeave = "ChampionshipOfficialLeave" # 跨服排位主动离任仙官
+ClientServerMsg_ChampionshipOfficialChallenge = "ChampionshipOfficialChallenge" # 跨服排位挑战仙官
+ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
+ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
+ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
+ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖
 
 #跨服广播类型定义
+CrossNotify_CrossAct = "CrossAct"
 CrossNotify_World = "World"
 CrossNotify_Family = "Family"
 CrossNotify_Player = "Player"
@@ -1275,13 +1545,19 @@
 Def_IudetMapLoaction = 15  # 物品记录地图坐标[mapid, posx, posy]
 Def_IudetLegendAttrID = 17  # 物品传奇属性ID列表
 Def_IudetLegendAttrValue = 19  # 物品传奇属性值列表
-Def_IudetOutOfPrintAttrID = 21  # 物品绝版属性ID列表
-Def_IudetOutOfPrintAttrValue = 23  # 物品绝版属性值列表
 Def_IudetPartSuiteLV = 25  # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
 Def_IudetWingMaterialItemID = 27  # 翅膀精炼材料ID列表
 Def_IudetWingMaterialItemCount = 29  # 翅膀精炼材料个数列表
 Def_IudetDogzEquipPlus = 31  # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
 Def_IudetItemDecompound = 33  # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
+Def_IudetLiantaiItemID = 35  # 合成该莲台的所有莲台ID [itemID, itemID, ...]
+Def_IudetAddSkillID = 37  # 可添加的技能ID列表  [skillID, skillID, ...]
+Def_IudetLegendAttrIDShen = 51  # 物品传奇属性ID列表 - 神
+Def_IudetLegendAttrValueShen = 61  # 物品传奇属性值列表 - 神
+Def_IudetLegendAttrIDXian = 53  # 物品传奇属性ID列表 - 仙
+Def_IudetLegendAttrValueXian = 63  # 物品传奇属性值列表 - 仙
+Def_IudetLegendAttrIDJi = 55  # 物品传奇属性ID列表 - 极
+Def_IudetLegendAttrValueJi = 65  # 物品传奇属性值列表 - 极
 
 Def_IudetItemColor = 16  # 物品颜色,如果该值没有就取物品
 Def_IudetItemCount = 18  # 物品个数,支持20亿,目前仅特殊转化物品会用到
@@ -1306,6 +1582,8 @@
 Def_IudetPet_QualityLV = 206  # 品质
 Def_IudetPet_Exp = 208  # 经验
 Def_IudetPet_Skill = 201  # 技能列表
+
+Def_IudetHorsePetSkinIndex = 210  # 骑宠觉醒外观索引
 # ----------------------------------------------------
 
 # 宠物物品数据状态
@@ -1337,14 +1615,14 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 26
+Def_MFPType_Max = 32
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
 Def_MFPType_Plus, # 强化 2
 Def_MFPType_Stone, # 宝石 3
 Def_MFPType_LingGen, # 灵根 4
-Def_MFPType_Wing, # 翅膀 5
+Def_MFPType_LingQi, # 灵器 5
 Def_MFPType_Wash, # 洗练 6
 Def_MFPType_Pet, # 灵宠 7
 Def_MFPType_Horse, # 坐骑 8
@@ -1359,11 +1637,17 @@
 Def_MFPType_MagicWeapon3, # 仙族法宝 17
 Def_MFPType_PetSoul, # 灵宠魂石 18
 Def_MFPType_HorseSoul, # 坐骑魂石 19
-Def_MFPType_20,
+Def_MFPType_FaQi, # 法器 20
 Def_MFPType_Dogz, # 神兽 21
 Def_MFPType_GatherSoul, # 聚魂 22
 Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Coat, # 时装 24
+Def_MFPType_Love, # 情缘 25
+Def_MFPType_Charm, # 魅力 26
+Def_MFPType_LianTi, # 炼体 27
+Def_MFPType_Enchant, # 附魔 28
+Def_MFPType_Gubao, # 古宝 29
+Def_MFPType_Shentong, # 神通 30
 Def_MFPType_Other, # 其他
 ) = range(Def_MFPType_Max)
 
@@ -1443,7 +1727,7 @@
 DailyActionID_EquipPlus, # 强化
 DailyActionID_FieldFight, # 野外挂机
 DailyActionID_OfflineFight, # 脱机挂机
-DailyActionID_RefineStove, # 炼丹材料消耗 6
+DailyActionID_RefineStove, # 炼丹材料消耗 6(废弃)
 DailyActionID_Dice, # 我要太极
 DailyActionID_Pray, # 祈愿
 DailyActionID_WorldBOSS, # 世界BOSS
@@ -1463,10 +1747,22 @@
 DailyActionID_SkyTower, # 天星塔  23
 DailyActionID_HorsePetBoss, # 骑宠BOSS  24
 DailyActionID_FairyDomain, # 缥缈仙域  25
-) = range(1, 25 + 1)
+DailyActionID_AuctionItem, # 拍卖行上架/竞拍  26
+DailyActionID_LeiFaBoss, # 雷罚boss 27
+DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
+DailyActionID_FamilyChuanGong, # 仙盟传功 29
+DailyActionID_FamilyParty, # 仙盟宴会 30
+DailyActionID_31, # 活跃修炼 31
+DailyActionID_SkyTreasureBox, # 天降宝箱 32
+DailyActionID_Arena, # 竞技场 33
+DailyActionID_CrossDemonLand, # 跨服魔化之地Boss 34
+DailyActionID_CrossBattlefield, # 跨服战场 35
+) = range(1, 35 + 1)
 
-
-
+# 跨服每日活动编号定义, 从150开始
+CrossDailyActionIDList = (
+CrossDailyActionID_YaomoBoss, # 妖魔boss 150
+) = range(150, 150 + 1)
 
 # 成就类型定义
 SuccessTypeList = (
@@ -1479,7 +1775,7 @@
 SuccType_KirinHomeEx, #通关麒麟之府X次成就7
 SuccType_GodWeapon, # x神器达到X级成就8
 SuccType_XXX9, # 废弃9
-SuccType_HorseAllLV, # X坐骑等级达到XX级 10
+SuccType_HorseAllLV, # 坐骑等级达到X级 10
 SuccType_XXX11, # 废弃11
 SuccType_KillBossHomeBoss, # BOSS之家BOSS击杀成就12
 SuccType_XXX13, # 废弃13
@@ -1495,8 +1791,8 @@
 SuccType_XXX23 , # 废弃23
 SuccType_XXX24 , # 废弃24
 SuccType_XXX25, # 废弃25
-SuccType_EquipPlus, # 强化x次成就26
-SuccType_EquipPlusLV, # x件装备强化等级达到x级27 (已废弃)
+SuccType_EquipPlus, # x件x阶x强化等级 26
+SuccType_XXX27, # 废弃27
 SuccType_KillWorldBoss, # 击杀世界bossx次成就(有伤害就算)28
 SuccType_XXX29, # 废弃29
 SuccType_PassWagicWeapon, # 通关法宝副本30
@@ -1507,8 +1803,8 @@
 SuccType_Pray, # 祈祷x次35
 SuccType_KillSpecificNPC, # 击杀特定NPC36
 SuccType_XXX37, # 废弃37
-SuccType_XXX38, # 废弃38
-SuccType_EquipColorItem, #穿戴某阶某品质的装备成就39
+SuccType_EquipPlace, # x件x阶x部位 38
+SuccType_EquipColorItem, # x件x阶x品质 39
 SuccType_XXX40, #废弃40
 SuccType_XXX41, #废弃41
 SuccType_PassRuneTower, #通关符印塔成就42
@@ -1539,9 +1835,9 @@
 SuccType_ChaosDemon, #混乱妖域X人以上队伍X评级通关67
 SuccType_XXX68, #废弃68
 SuccType_CompoundItemEx, #物品X的合成成功X次69
-SuccType_EquipWashLV1, #武器洗练X级(主手+副手)70
-SuccType_EquipWashLV2, #防具洗练X级(防具5件)71
-SuccType_EquipWashLV3, #仙器洗练X级(仙器3件)72
+SuccType_EquipWash, #x件x阶x洗练等级 70
+SuccType_XXX71, #废弃71
+SuccType_XXX72, #废弃72
 SuccType_XXX73, #废弃73
 SuccType_XXX74, #废弃74
 SuccType_XXX75, #废弃75
@@ -1551,17 +1847,17 @@
 SuccType_DujieFBHelpPass, #渡劫助战成功X次 79
 SuccType_XXX80, #废弃 80
 SuccType_FBEncourage, #x副本累计鼓舞X次 81
-SuccType_EquipArmor, #穿戴X颜色X星级X阶防具一套(5件防具) 82
-SuccType_EquipWeapon, #穿戴X颜色X星级X阶武器一套(主手+副手) 83
+SuccType_EquipStar, #x件x阶x星 82
+SuccType_XXX83, #废弃 83
 SuccType_XXX84, #废弃 84
 SuccType_XXX85, #废弃85
 SuccType_XXX86, #废弃 86
 SuccType_XXX87, #废弃 87
 SuccType_XXX88, #废弃 88
-SuccType_XXX89, #仙盟宴会答题X题 89
-SuccType_EquipWing, #穿戴X阶X品质羽翼 90
+SuccType_XXX89, #废弃 89
+SuccType_XXX90, #废弃 90
 SuccType_MWSkillUp, #X法宝潜力技能提升X级 91
-SuccType_EquipSuit, #套装 X件X阶普通(强化)防具套装 92
+SuccType_EquipSuit, # X件X阶套装 92
 SuccType_TalkFamily, # 仙盟频道发言93
 SuccType_UseItem, # 使用X物品X次94
 SuccType_XXX95, # 废弃95
@@ -1612,7 +1908,40 @@
 SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次  140
 SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次  141
 SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次  142
-) = range(1, 143)
+SuccType_PassSkyTower, #通关天星塔 143
+SuccType_Battlefield_Join, # 古神战场 - 参与 x次  144
+SuccType_Battlefield_CallOpen, # 古神战场 - 召集开启 x次  145
+SuccType_Battlefield_Called, # 古神战场 - 当被召集人 x次  146
+SuccType_Battlefield_WinJ, # 古神战场 - 道家获胜 x次  147
+SuccType_Battlefield_WinE, # 古神战场 - 佛家获胜 x次  148
+SuccType_Battlefield_KillCnt, # 古神战场 - 击败玩家 x次  149
+SuccType_Battlefield_CKillCnt, # 古神战场 - 连续击败y玩家 x次  150
+SuccType_Battlefield_KillBoss, # 古神战场 - 阵营击败boss x次  151
+SuccType_Battlefield_KillScoreKing, # 古神战场 - 不同场次击败积分王 x次  152
+SuccType_Battlefield_KillGuard, # 古神战场 - 击败守卫  x次  153
+SuccType_Battlefield_Score, # 古神战场 - 累计获得个人积分 xx  154
+SuccType_Battlefield_ScoreMore, # 古神战场 - 单场个人积分超过yy积分 x次  155
+SuccType_Battlefield_AuraScore, # 古神战场 - 累计在积分光环中获得积分 xx  156
+SuccType_Battlefield_SuperItem, # 古神战场 - 累计获得古神大奖 x次  157
+SuccType_Battlefield_FactionBuff, # 古神战场 - 累计采集阵营buff x次  158
+SuccType_Battlefield_PersonBuff, # 古神战场 - 累计获得个人buff x次  159
+SuccType_Battlefield_Crystal, # 古神战场 - 累计采集占领资源 x次  160
+SuccType_Battlefield_Wall, # 古神战场 - 累计采集积分墙 x次  161
+SuccType_Battlefield_BillFirst, # 古神战场 - 任意周榜榜首 x次  162
+SuccType_Battlefield_BillIn, # 古神战场 - 结算时累计上榜 x次  163
+SuccType_ActivityPlace, # 活跃放置x次 164
+SuccType_UseStoveByType, # 使用丹药X枚 165
+SuccType_Arena, # 参与竞技场x次 166
+SuccType_KillCrossPenglaiBoss, # 击杀蓬莱仙境bossx只 167
+SuccType_KillCrossDemonLandBoss, # 击杀魔化之地bossx只 168
+SuccType_EquipPlusClass, # X阶装备强化总等级X级 169
+SuccType_EquipStarClass, # X阶装备升星总等级X星 170
+SuccType_EquipStoneClass, # X阶装备宝石总等级X级 171
+SuccType_EquipWashClass, # X阶装备洗炼总等级X级 172
+SuccType_EquipPlusTotal, # 全身强化总等级X级 173
+SuccType_EquipStarTotal, # 全身升星总星数X星 174
+SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
+) = range(1, 176)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1622,28 +1951,43 @@
 
 # 不向下适配检查的成就类型(指相对较高成就条件不会增加较低成就条件的进度)
 UnDownCheckSuccessTypeList = [
-                              SuccType_EquipPlusLV, SuccType_GodWeapon,
+                              SuccType_GodWeapon,
                               SuccType_MainTaskNode,SuccType_PassWagicWeapon,
-                              SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
+                              SuccType_KillSpecificNPC, SuccType_UseStoveBylv, SuccType_UseStoveByType,
                               SuccType_Pray,SuccType_PetClassLV,
-                              SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
-                              SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
+                              SuccType_QueenRelics,SuccType_XMZZConWin,
+                              SuccType_Collect,SuccType_DogzBattle,
                               SuccType_UseItem,SuccType_FamilyTechLV,
                               SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
                               SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
                               SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
                               ]
+
+# 部分参数不向下适配检查的成就类型,此配置的类型不能在 UnDownCheckSuccessTypeList 里 {类型:[不向下适配的参数索引, ...], ...}
+PartUnDownCheckSuccessTypeInfo = {
+                                  SuccType_EquipSuit:[0], # 阶不向下适配
+                                  SuccType_EquipPlace:[0,1], # 阶、部位不向下适配
+                                  SuccType_EquipColorItem:[0], # 阶不向下适配
+                                  SuccType_EquipPlus:[0], # 阶不向下适配
+                                  SuccType_EquipWash:[0], # 阶不向下适配
+                                  SuccType_EquipStar:[0], # 阶不向下适配
+                                  SuccType_EquipPlusClass:[0], # 阶不向下适配
+                                  SuccType_EquipStarClass:[0], # 阶不向下适配
+                                  SuccType_EquipStoneClass:[0], # 阶不向下适配
+                                  SuccType_EquipWashClass:[0], # 阶不向下适配
+                                  }
+
 #传进来的条件满足配置的条件列表中的一个就行的成就类型
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
 
 #传进来的条件是配置条件的整数倍的成就类型
-MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill]
+MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill, SuccType_Battlefield_CKillCnt]
 
 #增加进度前需要重置的成就类型
 NeedResetSuccessTypeList = [
-                            SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
-                            SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
-                            SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,SuccType_InlayGatherSoul,
+                            SuccType_InlayStone1,SuccType_InlayStone2,SuccType_InlayRune,
+                            SuccType_DogzEquipPlus,
+                            SuccType_PetClassLV,SuccType_InlayGatherSoul,
                             ]
 
 # 聊天类型, 从100开始, 前100个给c++用
@@ -1696,28 +2040,6 @@
     dogzetScute,    # 神兽鳞甲
 ) = range(101, 101 + 5)
 
-# 诛仙装备位定义
-ZhuXianEquipPlace = (
-    zxetCloak,      # 诛仙披风 121
-    zxetMask,       # 诛仙面具 122
-    zxetGlove,      # 诛仙手套 123
-    zxetGlove2,     # 诛仙手套 124
-    zxetRuyi,       # 诛仙如意 125
-    zxetPendant,    # 诛仙吊坠 126
-    zxetRing,       # 诛仙戒指 127
-    zxetRing2,      # 诛仙戒指 128
-    zxetWeapon1,    # 诛仙剑1 129
-    zxetWeapon2,    # 诛仙剑2 130
-    zxetWeapon3,    # 诛仙剑3 131
-    zxetWeapon4,    # 诛仙剑4 132
-) = range(121, 121 + 12)
-
-# 共享通用装备位,可装备同一类型装备
-ShareEquipPlace = [
-                   [zxetGlove, zxetGlove2],
-                   [zxetRing, zxetRing2],
-                   ]
-
 # 请求进入副本通用检查结果,优先提示的放前面(即索引越大,提示优先级越低)
 EnterFBAskResult = (
     EntFBAskRet_OK,             # 0 可以进入 
@@ -1765,10 +2087,9 @@
 RedPackType_FeastSysBig = 31 # 节日系统大红包
 RedPackType_FeastSysSmall = 32 # 节日系统小红包
 RedPackType_FeastSucc = 33 # 节日成就红包
-# 节日红包类型
-FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
-# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
-RedPackMaxCountDict = {1:[RedPackType_OpenServer],
-                       2:[RedPackType_FeastSucc],
-                       }
+RedPackType_Server = 36 # 全服红包
 
+# 红包类型分类定义
+RedPackWayType_Family = "1" # 仙盟红包
+RedPackWayType_Server = "2" # 全服红包
+RedPackWayType_Feast = "3" # 节日红包

--
Gitblit v1.8.0