From 5fa02b1adbf1900358ab44a915cd9e841dcdf45f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 09 十月 2022 16:20:47 +0800
Subject: [PATCH] 9687 【后端】【越南】【主干】【BT7】野外根据境界动态刷怪

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |  275 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 232 insertions(+), 43 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 232d6ef..21e3601 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -177,10 +177,55 @@
 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)
@@ -200,6 +245,15 @@
 
 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" # 消费返利活动
@@ -213,56 +267,81 @@
 OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
 OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
-OperationActionName_TotalRecharge2 = "ActTotalRecharge2" # 累计充值活动
 OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
 OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
 OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
 OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
 OperationActionName_CollectWords = "ActCollectWords" # 集字活动
-OperationActionName_CollectWords2 = "ActCollectWords2" # 集字活动2
 OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
-OperationActionName_RechargePrize = "ActRechargePrize" # 充值返利活动
+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" # 仙匣秘境活动
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
 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_TotalRecharge2,
+                           OperationActionName_WishingWell, OperationActionName_TotalRecharge,
                            OperationActionName_WeekParty, OperationActionName_LoginAward, 
                            OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
-                           OperationActionName_DailyGiftbag, OperationActionName_RechargePrize, 
-                           OperationActionName_CollectWords, OperationActionName_CollectWords2] \
-                           + FeastOperationActionNameList
+                           OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
+                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
+                           OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
+                           OperationActionName_XianXiaMJ,
+                           ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
                                    OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
-                                   OperationActionName_BossReborn, OperationActionName_TotalRecharge, OperationActionName_TotalRecharge2,
+                                   OperationActionName_BossReborn, OperationActionName_TotalRecharge,
                                    OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
                                    OperationActionName_SpringSale, OperationActionName_LuckyTreasure,
                                    OperationActionName_DailyGiftbag, OperationActionName_GrowupBuy,
-                                   OperationActionName_WeekParty,
-                                   OperationActionName_CollectWords, OperationActionName_CollectWords2,
-                                   OperationActionName_FeastLogin,
+                                   OperationActionName_WeekParty, OperationActionName_Turntable,
+                                   OperationActionName_CollectWords, OperationActionName_GarbageSorting,
+                                   OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
+                                   OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   ]
+
+#支持多活动分组编号的活动名
+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,
                                    ]
 
 #跨服运营活动表名定义
 CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
+CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购
 
 #跨服运营活动列表
-CrossActNameList = [CrossActName_CTGBillboard]
+CrossActNameList = [CrossActName_CTGBillboard, CrossActName_LuckyCloudBuy]
+#需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
+CrossActLockServerGroupIDList = [CrossActName_CTGBillboard]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
 ActKey_State = "State" # 活动状态 0-未开启, >0开启中,也代表当日的第几个时间段
 ActKey_CfgID = "CfgID" # 活动表配置ID
+ActKey_ActNum = "ActNum" # 活动分组编号
 ActKey_DayIndex = "DayIndex" # 当前活动天索引,0开始,代表第1天
 ActKey_TemplateID = "TemplateID" # 当前活动模板ID
 ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
@@ -588,6 +667,19 @@
 
 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
 #增加%d魔法伤害值,其中a值为伤害值
@@ -685,9 +777,13 @@
     
     Def_BT_SkyTower,                          #天星塔榜
     Def_BT_Arena,                             #竞技场榜
+    Def_BT_Environment,                       #环保榜 (垃圾分类活动)
+    Def_BT_CharmTotal, #魅力总榜 30
+    Def_BT_CharmWeek, #魅力周榜
+    Def_BT_CharmDay, #魅力日榜
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 28 + 2) 
+) = range(0, 32 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -696,7 +792,10 @@
 '''
 CrossBillboardTypeList = (
 Def_CBT_ActCTG, # 跨服运营活动 - 充值榜 150
-) = range(150, 150 + 1)
+Def_CBT_BattlefieldWJoin, # 跨服战场每周参与榜  151
+Def_CBT_BattlefieldWCall, # 跨服战场每周召集榜  152
+Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜  153
+) = range(150, 153 + 1)
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -708,7 +807,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_SkyTower,
+                             Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
                              ]
 
 ##---比率---
@@ -926,7 +1025,20 @@
 CDBPlayerRefresh_SkillReducePer6,   # 受到技能伤害减少6
 CDBPlayerRefresh_SkillReducePer7,   # 受到技能伤害减少7
 CDBPlayerRefresh_ExAttr17,          # ExAttr17 
-) = range(146, 230)
+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
+) = range(146, 243)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -936,6 +1048,7 @@
 TYPE_Price_FamilyActivity = 15    # 仙盟活跃令
 TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃
 TYPE_Price_Honor = 18    # 荣誉
+TYPE_Price_BossActScore = 19    # boss活动积分,bt版用
 TYPE_Price_Rune = 23    # 符印精华点
 TYPE_Price_RuneSplinters = 24    # 符印碎片
 TYPE_Price_TreasureScore = 25    # 寻宝积分
@@ -944,7 +1057,11 @@
 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_Magic_Integral = 101      # 魔方寻宝积分
@@ -967,7 +1084,19 @@
                            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,
                            }
+
+# 支持负值的货币及对应0418刷新类型
+MoneyMinusRefreshDict = {
+                         1:CDBPlayerRefresh_MoneyMinusGold,
+                         2:CDBPlayerRefresh_MoneyMinusGoldPaper,
+                         }
 
 # 高效战斗状态
 Def_Battle_Status = (
@@ -1004,8 +1133,12 @@
 GameFuncID_LittleHelper = 146   # 小助手
 GameFuncID_TJG = 147            # 脱机挂
 GameFuncID_SuperGift = 150      # 超值礼包
+GameFuncID_PenglaiBoss = 162    # 蓬莱仙境
 GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS
-GameFuncID_Arena = 189          # 竞技场
+GameFuncID_Arena = 195          # 竞技场
+GameFuncID_FaQi = 199           # 法器
+GameFuncID_LianTi = 207         # 炼体
+GameFuncID_Championship = 210   # 排位
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1060,8 +1193,9 @@
 rptPet,             # 宠物背包(用物品存储宠物的数据) 31
 rptDogzItem,        # 神兽物品背包 32
 rptDogzEquip,       # 神兽装备背包 33
+rptGarbage,         # 垃圾分类背包 34
 rptMax,             # 最大背包类型数量,放在最后一个
-) = range(28, 28 + 7)  #C++定义的枚举到27
+) = range(28, 28 + 8)  #C++定义的枚举到27
 
 #虚拟背包类型, 从255递减
 Def_VPack_TypeList = (
@@ -1096,13 +1230,13 @@
                                 Def_UniversalGameRecType_Reward,    # 通用奖励表(TopBar)14
                                 Def_UniversalGameRecType_ArenaBattleRecord, # 竞技场玩家挑战记录 15
                                 Def_UniversalGameRecType_CrossActInfo, # 跨服运营活动信息记录 16
-                                Def_UniversalGameRecType_17,
-                                Def_UniversalGameRecType_18,
+                                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,
@@ -1111,11 +1245,11 @@
                                 Def_UniversalGameRecType_BossInfo,  # boss信息29
                                 Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息 30
                                 Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
-                                Def_UniversalGameRecType_32,              
-                                Def_UniversalGameRecType_33,
-                                Def_UniversalGameRecType_34,
-                                Def_UniversalGameRecType_35,
-                                Def_UniversalGameRecType_36,
+                                Def_UniversalGameRecType_CrossCollect,  # 跨服采集记录信息 32             
+                                Def_UniversalGameRecType_CrossChampionshipGroup, # 跨服排位争霸赛分组信息 33
+                                Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
+                                Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
+                                Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
                                 Def_UniversalGameRecType_37,
                                 Def_UniversalGameRecType_38,
                                 Def_UniversalGameRecType_39,
@@ -1262,7 +1396,7 @@
 Def_List_EscapeSequence = ['\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\'', '\"', '\0']
 
 #阵营 三种 中立 正义 邪恶
-[
+CampTypeList = [
 CampType_Neutral,    #中立
 CampType_Justice,    #正义(与 Def_ID1Win 一致)
 CampType_Evil,       #邪恶(与 Def_ID2Win 一致)
@@ -1291,6 +1425,7 @@
 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"                    # 发送邮件,已知玩家目标服务器,主动发送
@@ -1298,6 +1433,21 @@
 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"  # 跨服排位争霸赛每日官职信息
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1318,6 +1468,20 @@
 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" # 跨服排位膜拜
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"
@@ -1422,7 +1586,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 26
+Def_MFPType_Max = 29
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1444,11 +1608,14 @@
 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_Other, # 其他
 ) = range(Def_MFPType_Max)
 
@@ -1553,9 +1720,12 @@
 DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
 DailyActionID_FamilyChuanGong, # 仙盟传功 29
 DailyActionID_FamilyParty, # 仙盟宴会 30
-) = range(1, 30 + 1)
-
-
+DailyActionID_31, # 活跃修炼 31
+DailyActionID_SkyTreasureBox, # 天降宝箱 32
+DailyActionID_Arena, # 竞技场 33
+DailyActionID_CrossDemonLand, # 跨服魔化之地Boss 34
+DailyActionID_CrossBattlefield, # 跨服战场 35
+) = range(1, 35 + 1)
 
 
 # 成就类型定义
@@ -1703,7 +1873,27 @@
 SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次  141
 SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次  142
 SuccType_PassSkyTower, #通关天星塔 143
-) = range(1, 144)
+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
+) = range(1, 164)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1739,7 +1929,7 @@
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
 
 #传进来的条件是配置条件的整数倍的成就类型
-MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill]
+MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill, SuccType_Battlefield_CKillCnt]
 
 #增加进度前需要重置的成就类型
 NeedResetSuccessTypeList = [
@@ -1845,10 +2035,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