From e05631e0aac32a465d10d9f98cee0616f78d5c89 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 08 八月 2024 12:12:29 +0800
Subject: [PATCH] 10223 【越南】【砍树】【主干】【港台】秘境寻宝(库外权重支持区分不同层)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |  353 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 321 insertions(+), 32 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index b4ee58c..467a6b7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -166,10 +166,9 @@
 Def_Notify_WorldKey_VSFamilyInfo = "VSFamilyInfo"  # 仙盟联赛对战仙盟信息
 Def_Notify_WorldKey_ChampionFamilyID = "ChampionFamilyID"  # 仙盟联赛上次冠军仙盟ID
 
-Def_Notify_WorldKey_FamilyBossOpenCount = "FamilyBossOpenCount"  # 仙盟boss开启次数
-
 Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo"  # 仙盟宴会数据
 Def_Notify_WorldKey_FamilyPartyAddFamilyActivity = "FamilyPartyAddFamilyActivity"  # 仙盟宴会地图成员增加仙盟活跃令
+Def_Notify_WorldKey_FamilyZhenfaInfo = "FamilyZhenfaInfo"  # 仙盟阵法数据
 
 Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem"  # 添加仙盟拍品
 Def_Notify_WorldKey_AddSystemAuctionItem = "AddSystemAuctionItem"  # 添加系统拍品
@@ -184,6 +183,51 @@
 Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
 
 Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo"  # 本服幸运云购最新一期信息
+
+Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
+Def_Notify_WorldKey_CrossBattlefieldSysCallBuyInfo = "CrossBattlefieldSysCallBuyInfo" # 跨服战场系统场次购买召集信息
+
+Def_Notify_WorldKey_FuncTeamMemIDInfo = "FuncTeamMemIDInfo" # 功能队伍成员ID信息
+
+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)
@@ -243,6 +287,13 @@
 OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
 OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
 OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
+OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
+OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
+OperationActionName_BossTrial = "ActBossTrial" # Boss历练
+OperationActionName_ActLoginNew = "ActLoginNew" # 登录活动-新
+OperationActionName_ActTask = "ActTask" # 活动任务
+OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
+OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
 #节日活动类型列表 - 该类型无视开服天,日期到了就开启
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
                                 OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -261,7 +312,10 @@
                            OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
                            OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
                            OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
-                           OperationActionName_XianXiaMJ,
+                           OperationActionName_XianXiaMJ, OperationActionName_GodGift,
+                           OperationActionName_BuyOne, OperationActionName_BossTrial,
+                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
                            ] + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
 NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
@@ -275,6 +329,7 @@
                                    OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
                                    OperationActionName_FeastWish, OperationActionName_FeastTravel,
                                    OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   OperationActionName_GodGift,
                                    ]
 
 #支持多活动分组编号的活动名
@@ -283,31 +338,46 @@
                                    OperationActionName_SpringSale, OperationActionName_FlashSale,
                                    OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
                                    OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
-                                   OperationActionName_XianXiaMJ,
+                                   OperationActionName_XianXiaMJ, OperationActionName_GodGift,
+                                   OperationActionName_BuyOne, OperationActionName_BossTrial,
+                                   OperationActionName_ActLoginNew, OperationActionName_ActTask,
+                                   OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
                                    ]
 
 #跨服运营活动表名定义
 CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
+CrossActName_AllRecharge = "CrossActAllRecharge" # 全民充值
 CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购
+CrossActName_BossTrial = "CrossActBossTrial" # Boss历练 - 跨服
+CrossActName_XianXiaMJ = "CrossActXianXiaMJ" # 仙匣秘境 - 跨服
 
 #跨服运营活动列表
-CrossActNameList = [CrossActName_CTGBillboard, CrossActName_LuckyCloudBuy]
+CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial, CrossActName_XianXiaMJ]
 #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
-CrossActLockServerGroupIDList = [CrossActName_CTGBillboard]
+CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
 ActKey_State = "State" # 活动状态 0-未开启, >0开启中,也代表当日的第几个时间段
+ActKey_StateJoin = "StateJoin" # 活动某些功能可参与状态 0-还不可参与, >0可参与,一般可参与时该状态等于state
 ActKey_CfgID = "CfgID" # 活动表配置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的历史活动信息
+
+#活动参与状态
+(
+ActStateJoin_None, # 参与前或未开启 0
+ActStateJoin_Start, # 开启参与中 1
+ActStateJoin_End, # 参与结束,仅有配置参与时间段的活动有该状态 2
+) = range(3)
 
 #答题类型枚举
 Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -348,7 +418,9 @@
     Def_ViewExpType_SysEx,                  #系统给经验-不需要展示倍率 用来区别于类型0 7
     Def_ViewExpType_LYZS,                   #烈焰战神 特殊特效 8
     Def_ViewExpType_Activity,               #活跃吸纳 9
-) = range(0, 10)
+    Def_ViewExpType_Chuangong,              #传功经验10
+    Def_ViewExpType_Guaji,                  #挂机收益11
+) = range(0, 12)
 
 
 #物品相关操作类型
@@ -636,6 +708,15 @@
 Def_Effect_WingTrainAttrPer = 157 # 翅膀培养属性加成(攻防血)
 Def_Effect_PeerlessWeaponTrainAttrPer = 158 # 灭世培养属性加成(攻防血)
 Def_Effect_PeerlessWeapon2TrainAttrPer = 159 # 弑神培养属性加成(攻防血)
+Def_Effect_LianTiAttrPer = 160 # 炼体属性百分比(攻防血)
+
+Def_Effect_AffairSpeedPer = 161 # 仙盟事务速度加成
+Def_Effect_FamilyBossHurtPer = 162 # 仙盟BOSS伤害加成
+Def_Effect_FamilyWarHPPer = 163 # 仙盟联赛生命加成
+Def_Effect_FamilyWarAtkPer = 164 # 仙盟联赛攻击加成
+Def_Effect_FamilySitExpPer = 165 # 仙盟打坐经验加成
+
+Def_Effect_BossFinalHurtPer = 166   # Boss最终伤害万分率
 
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
@@ -738,9 +819,15 @@
     Def_BT_CharmTotal, #魅力总榜 30
     Def_BT_CharmWeek, #魅力周榜
     Def_BT_CharmDay, #魅力日榜
+    Def_BT_BossTrialSubmit,                   #提交boss凭证榜 (boss历练活动)
+    Def_BT_AlineInvade,                       #异兽入侵
+    Def_BT_BossTrialSubmitBak,                #提交boss凭证榜 (boss历练活动 - 上一期) 35
+    Def_BT_BossTrialSubmitFamily,             #提交boss凭证仙盟榜 (boss历练活动)
+    Def_BT_BossTrialSubmitFamilyBak,          #提交boss凭证仙盟榜 (boss历练活动 - 上一期)
+    Def_BT_XianXiaMJScore,                    #仙匣秘境积分榜 (仙匣秘境活动)
     
     Def_BT_Max, #排行榜最大类型
-) = range(0, 32 + 2) 
+) = range(0, 38 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -749,7 +836,30 @@
 '''
 CrossBillboardTypeList = (
 Def_CBT_ActCTG, # 跨服运营活动 - 充值榜 150
-) = range(150, 150 + 1)
+Def_CBT_BattlefieldWJoin, # 跨服战场每周参与榜  151
+Def_CBT_BattlefieldWCall, # 跨服战场每周召集榜  152
+Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜  153
+Def_CBT_BattlefieldWScoreLastWeek, # 跨服战场上周积分榜  154
+Def_CBT_YaomoBossHurt, # 跨服妖魔boss最新一次伤血排名  155
+Def_CBT_FamilyFlagwar, # 逐鹿万界 - 单场榜  156
+Def_CBT_FamilyFlagwarWeek, # 逐鹿万界 - 周总榜  157
+Def_CBT_BossTrialSubmit, # boss凭证 - 个人榜  158
+Def_CBT_BossTrialSubmitBak, # boss凭证 - 个人榜 上一期  159
+Def_CBT_BossTrialSubmitFamily, # boss凭证 - 仙盟榜  160
+Def_CBT_BossTrialSubmitFamilyBak, # boss凭证 - 仙盟榜 上一期  161
+Def_CBT_XianXiaMJScore, # 仙匣秘境积分 - 个人榜  162
+) = range(150, 162 + 1)
+
+# 跨服榜单最大数据名次,没有设置的默认100
+CrossBillboard_MaxDataCount = {
+                               Def_CBT_BattlefieldWJoin:1000,
+                               Def_CBT_BattlefieldWCall:1000,
+                               Def_CBT_BattlefieldWScore:1000,
+                               Def_CBT_BattlefieldWScoreLastWeek:1000,
+                               Def_CBT_BossTrialSubmit:1000,
+                               Def_CBT_BossTrialSubmitBak:1000,
+                               Def_CBT_XianXiaMJScore:1000,
+                               }
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -989,7 +1099,32 @@
 CDBPlayerRefresh_ExAttr18, # ExAttr18 
 CDBPlayerRefresh_ExAttr19, # ExAttr19 
 CDBPlayerRefresh_CharmLV, # 魅力等级  239
-) = range(146, 240)
+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
+CDBPlayerRefresh_FamilyFlagWarPoint, # 成就积分  248
+CDBPlayerRefresh_ComboDefRate, # 抗连击概率 249
+CDBPlayerRefresh_AtkBackRate, # 反击概率 250
+CDBPlayerRefresh_AtkBackDefRate, # 抗反击概率 251
+CDBPlayerRefresh_SuckHPPer, # 吸血比率 252
+CDBPlayerRefresh_SuckHPDefPer, # 抗吸血比率 253
+CDBPlayerRefresh_Xiantao, # 仙桃  254
+CDBPlayerRefresh_CurePer, # 强化治疗 255
+CDBPlayerRefresh_CureDefPer, # 弱化治疗 256
+CDBPlayerRefresh_PetStrengthenPer, # 强化灵兽 257
+CDBPlayerRefresh_PetWeakenPer, # 弱化灵兽 258
+CDBPlayerRefresh_SuperHitHurtPer, # 强化暴伤 259
+CDBPlayerRefresh_SuperHitHurtDefPer, # 弱化暴伤 260
+CDBPlayerRefresh_Lingyu, # 灵玉 261
+CDBPlayerRefresh_BossTrial, # 凭证积分 262
+CDBPlayerRefresh_GatherSoul, # 聚魂精华 263
+CDBPlayerRefresh_BossFinalHurtPer,  # Boss最终输出伤害百分比 264
+) = range(146, 265)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1010,6 +1145,27 @@
 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    # 成就积分
+TYPE_Price_FamilyFlagWarPoint = 40    # 万界积分
+TYPE_Price_Xiantao = 41    # 仙桃
+TYPE_Price_Lingyu = 42    # 灵玉
+TYPE_Price_BossTrial = 43    # boss历练凭证积分
+TYPE_Price_GatherSoul = 44    # 聚魂精华
+TYPE_Price_PayCoin = 99    # 代币
+
+#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:"成就积分", 40:"万界积分", 43:"凭证积分", 44:"聚魂精华", 99:"代币"
+                 }
 
 #以下是旧的金钱类型
 TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分
@@ -1035,6 +1191,13 @@
                            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,
+                           TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
+                           TYPE_Price_BossTrial:CDBPlayerRefresh_BossTrial,
+                           TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1078,9 +1241,14 @@
 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_MineArea = 227       # 福地
+GameFuncID_Guaji = 228          # 挂机
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1153,7 +1321,23 @@
 Def_Weapon_Dual_Hands,  # 双持(左右手可互换)
 ) = range(3)
 
-#玩家通用信息记录类型
+#膜拜类型
+Def_WorshipTypeList = (
+                       Def_WorshipType_ServerNaming, # 服务器冠名 1
+                       Def_WorshipType_CrossChampionship, # 跨服排位冠军 2
+                       ) = range(1, 1 + 2)
+
+#跨服膜拜类型
+Def_WorshipTypeCross = [Def_WorshipType_CrossChampionship]
+
+#玩家记录类型
+Def_PlayerRecTypeList = (
+                         Def_PlayerRecType_WorshipPlayer, # 被膜拜的玩家 1
+                         Def_PlayerRecType_WorshipDaily, # 玩家每日膜拜记录 2
+                         Def_PlayerRecType_PayCoin, # 代币记录 3
+                         ) = range(1, 1 + 3)
+
+#通用信息记录类型
 Def_UniversalGameRecTypeList = (
                                 Def_UniversalGameRecType_XMZZPKInfoRecord, # 仙魔之争信息记录0
                                 Def_UniversalGameRecType_HijackTruck,   # 劫镖1
@@ -1178,7 +1362,7 @@
                                 Def_UniversalGameRecType_20,
                                 Def_UniversalGameRecType_LuckyCloudBuyNum, # 幸运云购购买号码记录 21
                                 Def_UniversalGameRecType_LuckyCloudBuyLottery, # 幸运云购开奖记录 22
-                                Def_UniversalGameRecType_23,
+                                Def_UniversalGameRecType_CrossBattlefieldBuy, # 玩家购买的跨服战场 23
                                 Def_UniversalGameRecType_UpdatePlayerName,  # 玩家改名正在改名中的信息24
                                 Def_UniversalGameRecType_BossDropGoodItemInfo,  # boss掉落好物品信息记录25
                                 Def_UniversalGameRecType_26,
@@ -1187,14 +1371,14 @@
                                 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_37,
-                                Def_UniversalGameRecType_38,
-                                Def_UniversalGameRecType_39,
+                                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,
@@ -1249,12 +1433,14 @@
                       Def_ActionType_LeaderImpeachTime,  # 族长下线了多久5
                       Def_ActionType_FamilyBossFB,    #记录家族boss副本信息6
                       Def_ActionType_FamilyStore,    #记录战盟仓库操作记录7
-                      Def_ActionType_XXX8,    #8
+                      Def_ActionType_FamilyZhenfa,    #仙盟阵法8
                       Def_ActionType_XXX9,    #9
                       Def_ActionType_XXX10,    #10
                       Def_ActionType_OfficerModelEquip,    #记录家族有职位的成员模型装备信息11
                       Def_ActionType_FamilyEvent,    #记录家族事件12
-                      ) = range(0, 13)
+                      Def_ActionType_BossTrialSubmit,    #boss凭证提交 13
+                      Def_ActionType_FamilyCTGAssist,    #仙盟充值协助活动 14
+                      ) = range(0, 15)
 
 # 家族行为事件类型定义; Def_ActionType_FamilyEvent; 存与事件记录Value1
 # 通用:time-时间;name-玩家;value1-事件类型
@@ -1338,7 +1524,7 @@
 Def_List_EscapeSequence = ['\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\'', '\"', '\0']
 
 #阵营 三种 中立 正义 邪恶
-[
+CampTypeList = [
 CampType_Neutral,    #中立
 CampType_Justice,    #正义(与 Def_ID1Win 一致)
 CampType_Evil,       #邪恶(与 Def_ID2Win 一致)
@@ -1367,6 +1553,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"                    # 发送邮件,已知玩家目标服务器,主动发送
@@ -1377,6 +1564,27 @@
 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玩家伤害信息
+CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver"  # 逐鹿万界结算信息
+CrossServerMsg_CrossBossTrialFamilyAward = "CrossBossTrialFamilyAward"  # 跨服boss历练仙盟奖励结算
+CrossServerMsg_Worship = "Worship"  # 膜拜信息
+CrossServerMsg_FuncTeamInfo = "FuncTeamInfo"  # 功能队伍信息同步
+CrossServerMsg_FuncTeamDel = "FuncTeamDel"  # 功能队伍删除同步
+CrossServerMsg_FuncTeamList = "FuncTeamList"  # 功能队伍列表同步
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1398,6 +1606,27 @@
 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玩家伤害领奖
+ClientServerMsg_BossTrialSubmit = "BossTrialSubmit" # boss凭证提交
+ClientServerMsg_XianXiaMJScore = "XianXiaMJScore" # 仙匣秘境积分
+ClientServerMsg_CreateFuncTeam = "CreateFuncTeam"   # 创建功能队伍
+ClientServerMsg_ChangeFuncTeam = "ChangeFuncTeam"   # 修改功能队伍
+ClientServerMsg_FuncTeamMemOP = "FuncTeamMemOP"   # 功能队伍成员操作
+ClientServerMsg_QueryFuncTeam = "QueryFuncTeam"   # 查询功能队伍
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"
@@ -1468,6 +1697,7 @@
 Def_IudetPet_State = 204  # 当前状态, 对应 Def_PetStateList
 Def_IudetPet_QualityLV = 206  # 品质
 Def_IudetPet_Exp = 208  # 经验
+Def_IudetPet_Star = 210  # 星级
 Def_IudetPet_Skill = 201  # 技能列表
 
 Def_IudetHorsePetSkinIndex = 210  # 骑宠觉醒外观索引
@@ -1502,7 +1732,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 34
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1531,6 +1761,12 @@
 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_FamilyZhenfa, # 阵法 31
+Def_MFPType_GatherTheSoul, # 聚魂新 32
 Def_MFPType_Other, # 其他
 ) = range(Def_MFPType_Max)
 
@@ -1635,10 +1871,19 @@
 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
+DailyActionID_FamilySit, # 跨服战场 36
+) = range(1, 36 + 1)
 
-
-
+# 跨服每日活动编号定义, 从150开始
+CrossDailyActionIDList = (
+CrossDailyActionID_YaomoBoss, # 妖魔boss 150
+CrossDailyActionID_FamilyWarFlag, # 跨服仙盟夺旗战/逐鹿万界 151
+) = range(150, 150 + 2)
 
 # 成就类型定义
 SuccessTypeList = (
@@ -1785,7 +2030,44 @@
 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
+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
+SuccType_CrossPK, # 跨服PK x次  176
+SuccType_FamilyZhenfaExp, # 仙盟阵法捐献累计经验 177
+SuccType_PassAdventure, #通关冒险 178
+SuccType_GatherTheSoulColor, #聚魂激活x品质x个 179
+SuccType_GatherTheSoulLV, #聚魂总等级x 180
+) = range(1, 181)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1797,7 +2079,7 @@
 UnDownCheckSuccessTypeList = [
                               SuccType_GodWeapon,
                               SuccType_MainTaskNode,SuccType_PassWagicWeapon,
-                              SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
+                              SuccType_KillSpecificNPC, SuccType_UseStoveBylv, SuccType_UseStoveByType,
                               SuccType_Pray,SuccType_PetClassLV,
                               SuccType_QueenRelics,SuccType_XMZZConWin,
                               SuccType_Collect,SuccType_DogzBattle,
@@ -1815,13 +2097,18 @@
                                   SuccType_EquipPlus:[0], # 阶不向下适配
                                   SuccType_EquipWash:[0], # 阶不向下适配
                                   SuccType_EquipStar:[0], # 阶不向下适配
+                                  SuccType_EquipPlusClass:[0], # 阶不向下适配
+                                  SuccType_EquipStarClass:[0], # 阶不向下适配
+                                  SuccType_EquipStoneClass:[0], # 阶不向下适配
+                                  SuccType_EquipWashClass:[0], # 阶不向下适配
+                                  SuccType_GatherTheSoulColor:[0], # 品质不向下适配
                                   }
 
 #传进来的条件满足配置的条件列表中的一个就行的成就类型
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
 
 #传进来的条件是配置条件的整数倍的成就类型
-MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill]
+MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill, SuccType_Battlefield_CKillCnt]
 
 #增加进度前需要重置的成就类型
 NeedResetSuccessTypeList = [
@@ -1929,5 +2216,7 @@
 RedPackType_FeastSucc = 33 # 节日成就红包
 RedPackType_Server = 36 # 全服红包
 
-# 节日红包类型
-FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 红包类型分类定义
+RedPackWayType_Family = "1" # 仙盟红包
+RedPackWayType_Server = "2" # 全服红包
+RedPackWayType_Feast = "3" # 节日红包

--
Gitblit v1.8.0