From 6daa53975a6cdd735a5941ddb935cfdb23841976 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2024 16:37:35 +0800
Subject: [PATCH] 10178 【越南】【香港】【主干】挂机奖励(屏蔽跨服上线通知:古宝、神通、战令、福地、挂机)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |  187 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 166 insertions(+), 21 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 21e3601..2feeb94 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"  # 添加系统拍品
@@ -285,6 +284,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,
@@ -303,7 +309,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, 
@@ -317,6 +326,7 @@
                                    OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
                                    OperationActionName_FeastWish, OperationActionName_FeastTravel,
                                    OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+                                   OperationActionName_GodGift,
                                    ]
 
 #支持多活动分组编号的活动名
@@ -325,27 +335,34 @@
                                    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历练 - 跨服
 
 #跨服运营活动列表
-CrossActNameList = [CrossActName_CTGBillboard, CrossActName_LuckyCloudBuy]
+CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial]
 #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
-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 信息
@@ -390,7 +407,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)
 
 
 #物品相关操作类型
@@ -419,7 +438,8 @@
     Def_mitRuneCompound,      # 符印合成
     Def_mitGatherSoulCompound,# 聚魂合成
     Def_mitGatherSoulDecompose,# 聚魂分解
-) = range(1, 25)
+    Def_mitCutTreeEquipOP,    # 砍树装备操作
+) = range(1, 26)
 
 #---写死的技能ID---
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
@@ -680,6 +700,24 @@
 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_ComboDefRate = 210 # 抗连击概率
+Def_Effect_AtkBackRate = 211 # 反击概率
+Def_Effect_AtkBackDefRate = 212 # 抗反击概率
+Def_Effect_SuckHPPer = 213 # 吸血比率
+Def_Effect_SuckHPDefPer = 214 # 抗吸血比率
+Def_Effect_CurePer = 215 # 强化治疗
+Def_Effect_CureDefPer = 216 # 弱化治疗
+Def_Effect_PetStrengthenPer = 217 # 强化灵兽
+Def_Effect_PetWeakenPer = 218 # 弱化灵兽
+Def_Effect_SuperHitHurtPer = 219 # 强化暴伤
+Def_Effect_SuperHitHurtDefPer = 220 # 弱化暴伤
+
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
 #增加%d魔法伤害值,其中a值为伤害值
@@ -781,9 +819,14 @@
     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_Max, #排行榜最大类型
-) = range(0, 32 + 2) 
+) = range(0, 37 + 2) 
 
 ''' 跨服排行榜类型, 从 150 开始
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -795,7 +838,21 @@
 Def_CBT_BattlefieldWJoin, # 跨服战场每周参与榜  151
 Def_CBT_BattlefieldWCall, # 跨服战场每周召集榜  152
 Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜  153
-) = range(150, 153 + 1)
+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
+) = range(150, 161 + 1)
+
+# 跨服榜单最大数据名次,没有设置的默认100
+CrossBillboard_MaxDataCount = {
+                               Def_CBT_BossTrialSubmit:1000,
+                               Def_CBT_BossTrialSubmitBak:1000,
+                               }
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -807,7 +864,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_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
+                             Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay, Def_BT_AlineInvade
                              ]
 
 ##---比率---
@@ -1038,7 +1095,27 @@
 CDBPlayerRefresh_BTGMPoint, # BT版GM令  240
 CDBPlayerRefresh_GuShenMoney, # 古神币  241
 CDBPlayerRefresh_GongdePoint, # 功德点  242
-) = range(146, 243)
+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
+) = range(146, 263)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1062,6 +1139,23 @@
 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_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:"成就积分", 41:"仙桃", 42:"灵玉", 43:"凭证积分", 99:"代币"
+                 }
 
 #以下是旧的金钱类型
 TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分
@@ -1090,6 +1184,10 @@
                            TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
                            TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
                            TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
+                           TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
+                           TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
+                           TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
+                           TYPE_Price_BossTrial:CDBPlayerRefresh_BossTrial,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1139,6 +1237,8 @@
 GameFuncID_FaQi = 199           # 法器
 GameFuncID_LianTi = 207         # 炼体
 GameFuncID_Championship = 210   # 排位
+GameFuncID_MineArea = 227       # 福地
+GameFuncID_Guaji = 228          # 挂机
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -1250,9 +1350,9 @@
                                 Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
                                 Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
                                 Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
-                                Def_UniversalGameRecType_37,
-                                Def_UniversalGameRecType_38,
-                                Def_UniversalGameRecType_39,
+                                Def_UniversalGameRecType_CrossActAllRecharge, # 跨服全服充值活动信息 37
+                                Def_UniversalGameRecType_CrossBattleChampionGroup, # 跨服战场冠军赛分组信息 38
+                                Def_UniversalGameRecType_CrossYaomoBossHurtInfo, # 跨服妖魔boss伤血信息 39
                                 Def_UniversalGameRecType_40,
                                 Def_UniversalGameRecType_RedPacketRecord,   # 红包产出结果记录41
                                 Def_UniversalGameRecType_42,
@@ -1307,12 +1407,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-事件类型
@@ -1448,6 +1550,11 @@
 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历练仙盟奖励结算
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1482,6 +1589,9 @@
 ClientServerMsg_ChampionshipOfficialChallenge = "ChampionshipOfficialChallenge" # 跨服排位挑战仙官
 ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
 ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
+ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
+ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖
+ClientServerMsg_BossTrialSubmit = "BossTrialSubmit" # boss凭证提交
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"
@@ -1516,6 +1626,8 @@
 Def_IudetMapLoaction = 15  # 物品记录地图坐标[mapid, posx, posy]
 Def_IudetLegendAttrID = 17  # 物品传奇属性ID列表
 Def_IudetLegendAttrValue = 19  # 物品传奇属性值列表
+Def_IudetBaseAttrID = 21  # 物品基础属性ID列表,适用于随机范围基础属性(非物品表配置的固定属性)
+Def_IudetBaseAttrValue = 23  # 物品基础属性值列表
 Def_IudetPartSuiteLV = 25  # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
 Def_IudetWingMaterialItemID = 27  # 翅膀精炼材料ID列表
 Def_IudetWingMaterialItemCount = 29  # 翅膀精炼材料个数列表
@@ -1533,6 +1645,7 @@
 Def_IudetItemColor = 16  # 物品颜色,如果该值没有就取物品
 Def_IudetItemCount = 18  # 物品个数,支持20亿,目前仅特殊转化物品会用到
 Def_IudetCancelUseLimit = 20  # 物品取消使用限制
+Def_IudetItemLV = 22  # 物品等级,适用于动态物品等级(非物品表配置的固定等级)
 Def_IudetSource = 24  # 物品来源
 Def_IudetSuiteLV = 30  # 套装等级
 Def_IudetHasOpenCnt = 32  # 物品累积开启次数
@@ -1552,9 +1665,13 @@
 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  # 骑宠觉醒外观索引
+
+# 以下为自定义的设置物品属性key
+Def_CItemKey_AppointID = "AppointID"
 # ----------------------------------------------------
 
 # 宠物物品数据状态
@@ -1586,7 +1703,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 29
+Def_MFPType_Max = 33
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1616,6 +1733,10 @@
 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_Other, # 其他
 ) = range(Def_MFPType_Max)
 
@@ -1725,8 +1846,13 @@
 DailyActionID_Arena, # 竞技场 33
 DailyActionID_CrossDemonLand, # 跨服魔化之地Boss 34
 DailyActionID_CrossBattlefield, # 跨服战场 35
-) = range(1, 35 + 1)
+DailyActionID_FamilySit, # 跨服战场 36
+) = range(1, 36 + 1)
 
+# 跨服每日活动编号定义, 从150开始
+CrossDailyActionIDList = (
+CrossDailyActionID_YaomoBoss, # 妖魔boss 150
+) = range(150, 150 + 1)
 
 # 成就类型定义
 SuccessTypeList = (
@@ -1893,7 +2019,22 @@
 SuccType_Battlefield_Wall, # 古神战场 - 累计采集积分墙 x次  161
 SuccType_Battlefield_BillFirst, # 古神战场 - 任意周榜榜首 x次  162
 SuccType_Battlefield_BillIn, # 古神战场 - 结算时累计上榜 x次  163
-) = range(1, 164)
+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
+) = range(1, 179)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1905,7 +2046,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,
@@ -1923,6 +2064,10 @@
                                   SuccType_EquipPlus:[0], # 阶不向下适配
                                   SuccType_EquipWash:[0], # 阶不向下适配
                                   SuccType_EquipStar:[0], # 阶不向下适配
+                                  SuccType_EquipPlusClass:[0], # 阶不向下适配
+                                  SuccType_EquipStarClass:[0], # 阶不向下适配
+                                  SuccType_EquipStoneClass:[0], # 阶不向下适配
+                                  SuccType_EquipWashClass:[0], # 阶不向下适配
                                   }
 
 #传进来的条件满足配置的条件列表中的一个就行的成就类型

--
Gitblit v1.8.0