From 2e677ecbfa2408d951e25bcadb22123e0375233c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 三月 2021 14:53:55 +0800
Subject: [PATCH] 8848 【主干】【BT2】【后端】所有活动中，不能配置活动开启等级的，补充该配置(每日礼包AA25、充值返利AA27、累计充值返利仙玉AA29、成长必买AA31、节日登录AA42、节日祝福AA43、节日游历AA46);
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 247 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 177 insertions(+), 70 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 0bc1f5c..53dde27 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列表
@@ -195,12 +197,23 @@
Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志
Def_Notify_WorldKey_FairyDomainLimit = "FairyDomainLimit" # 缥缈仙域限制事件
+
+Def_Notify_WorldKey_AssistBoss = "AssistBoss" # 协助boss
+
+#活动类型定义
+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" # 多倍修行点活动
@@ -211,33 +224,69 @@
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" # 节日游历活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
-FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
+ OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
+ OperationActionName_FeastLogin,
+ OperationActionName_FeastWish, OperationActionName_FeastTravel,
+ ]
#所有的运营活动列表，含节日活动
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] \
+ OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure,
+ OperationActionName_DailyGiftbag, OperationActionName_RechargePrize,
+ OperationActionName_CollectWords] \
+ 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_CollectWords,
+ OperationActionName_FeastLogin,
+ OperationActionName_FeastWish, OperationActionName_FeastTravel,
+ ]
+
+#支持多活动分组编号的活动名
+MultiActNumOperationActNameList = [OperationActionName_TotalRecharge, OperationActionName_CollectWords,
+ OperationActionName_FlashGiftbag, OperationActionName_CostRebate,
+ OperationActionName_SpringSale, OperationActionName_FlashSale,
+ ]
+
+#跨服运营活动表名定义
+CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
+
+#跨服运营活动列表
+CrossActNameList = [CrossActName_CTGBillboard]
#活动信息字典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_ServerIDRangeList = "ServerIDRangeList" # 活动服务器ID范围信息
+ActKey_IpyDataInfo = "IpyDataInfo" # 活动对应 IpyData 信息
+ActKey_DBInfo = "DBInfo" # 保存db的历史活动信息
#答题类型枚举
Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -276,8 +325,9 @@
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
- Def_ViewExpType_LYZS, #烈焰战神 特殊特效
-) = range(0, 9)
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效 8
+ Def_ViewExpType_Activity, #活跃吸纳 9
+) = range(0, 10)
#物品相关操作类型
@@ -327,15 +377,9 @@
#增加%d体魄
Def_Effect_CON = 4
#增加HP
-Def_Effect_MaxHP = 6
-Def_Effect_MaxHP_ShenPin = 152 # 神品
-Def_Effect_MaxHP_XianPin = 153 # 仙品
-Def_Effect_MaxHP_JiPin = 154 # 极品
+Def_Effect_MaxHP = 6
#增加%d伤害值（物理和魔法的最大/小）,只用到a值
-Def_Effect_Atk = 7
-Def_Effect_Atk_ShenPin = 149 # 神品
-Def_Effect_Atk_XianPin = 150 # 仙品
-Def_Effect_Atk_JiPin = 151 # 极品
+Def_Effect_Atk = 7
#增加%d防御值
Def_Effect_Def = 8
#命中(A值为具体值)
@@ -373,15 +417,9 @@
#宠物伤害比例提升（A值万分率）
Def_Effect_PetDamPer = 25
#冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
-Def_Effect_IceAtk = 26
-Def_Effect_IceAtk_ShenPin = 155 # 神品
-Def_Effect_IceAtk_XianPin = 156 # 仙品
-Def_Effect_IceAtk_JiPin = 157 # 极品
+Def_Effect_IceAtk = 26
#冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
-Def_Effect_IceDef = 27
-Def_Effect_IceDef_ShenPin = 158 # 神品
-Def_Effect_IceDef_XianPin = 159 # 仙品
-Def_Effect_IceDef_JiPin = 160 # 极品
+Def_Effect_IceDef = 27
#无视防御几率提升
Def_Effect_IgnoreDefRate = 28
#无视防御抗性, 受击时减少对方的无视防御属性
@@ -451,14 +489,8 @@
Def_Effect_IceDefPer = 62
#基础装备生命百分比
Def_Effect_BaseEquipMaxHPAddPer = 63
-Def_Effect_BaseEquipMaxHPAddPer_ShenPin = 164 # 神品
-Def_Effect_BaseEquipMaxHPAddPer_XianPin = 165 # 仙品
-Def_Effect_BaseEquipMaxHPAddPer_JiPin = 166 # 极品
#基础装备攻击百分比
Def_Effect_BaseEquipAtkAddPer = 65
-Def_Effect_BaseEquipAtkAddPer_ShenPin = 161 # 神品
-Def_Effect_BaseEquipAtkAddPer_XianPin = 162 # 仙品
-Def_Effect_BaseEquipAtkAddPer_JiPin = 163 # 极品
#防具防御百分比 - 废弃
Def_Effect_ArmorDefAddPer = 66
#主手基础属性值 百分比
@@ -527,6 +559,29 @@
Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免
+Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
+Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
+Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
+Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
+Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
+Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
+Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7
+
+Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
+Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
+Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
+Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
+Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
+Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
+Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
+
+## 技能伤害百分比增加的 属性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 # 气运百分率
@@ -546,6 +601,8 @@
Def_Effect_BurnValue = 146 # 灼烧固定伤害
Def_Effect_BurnTimePer = 147 # 延长灼烧时间百分比
Def_Effect_SubSpeedPer = 148 # 减移动速度百分比
+
+Def_Effect_ReduceSkillCDPer = 149 # 减少技能CD, a值为万分率
#增加%d物理伤害值,其中a值为伤害值
Def_Effect_AddAtk = 1005
@@ -623,8 +680,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
@@ -632,7 +689,7 @@
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, #灵宠等级(开服活动榜)
@@ -640,10 +697,23 @@
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
Def_BT_Campaign_StarLV, #升星等级(开服活动榜) 25
+ Def_BT_Campaign_Wash, #洗练战力(开服活动榜)
- Def_BT_Max, #排行榜最大类型
-) = range(0, 25 + 2)
+ Def_BT_SkyTower, #天星塔榜
+ Def_BT_Arena, #竞技场榜
+ Def_BT_Max, #排行榜最大类型
+) = range(0, 28 + 2)
+
+''' 跨服排行榜类型, 从 150 开始
+与本服榜单存储的是不一样的数据库表格，理论上类型可以和本服榜单类型重复，为了做下区分防误导，跨服榜单从 150 开始
+跨服榜单表(tagDBCrossBillboard)
+本服榜单表(tagDBBillboard)
+'''
+CrossBillboardTypeList = (
+Def_CBT_ActCTG, # 跨服运营活动 - 充值榜 150
+) = range(150, 150 + 1)
+
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
PlayerJob_Warrior:Def_BT_FightPower_Warrior,
@@ -654,7 +724,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,
]
##---比率---
@@ -816,7 +886,7 @@
CDBPlayerRefresh_RealmPoint, # 境界修炼点
CDBPlayerRefresh_Ysog, # 魔精
CDBPlayerRefresh_FamilyActivity, # 仙盟活跃令
-CDBPlayerRefresh_Xianyuancoin, # 仙缘币
+CDBPlayerRefresh_174,
CDBPlayerRefresh_PKState, # 战斗状态 175
CDBPlayerRefresh_BossState, # boss状态
CDBPlayerRefresh_BaseAtkMin, # 基础最小攻击
@@ -857,7 +927,22 @@
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
+) = range(146, 230)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -866,7 +951,6 @@
TYPE_Price_Ysog = 14 # 魔精
TYPE_Price_FamilyActivity = 15 # 仙盟活跃令
TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃
-TYPE_Price_XianyuanCoin = 17 # 仙缘币
TYPE_Price_Honor = 18 # 荣誉
TYPE_Price_Rune = 23 # 符印精华点
TYPE_Price_RuneSplinters = 24 # 符印碎片
@@ -894,7 +978,6 @@
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,
@@ -925,6 +1008,7 @@
GameFuncID_Friend = 73 # 好友
GameFuncID_SignDay = 81 # 签到
GameFuncID_RefineStove = 87 # 炼丹炉
+GameFuncID_EquipWash = 91 # 洗练
GameFuncID_Treasure = 99 # 寻宝
GameFuncID_FirstGoldTip = 128 # 首充优势提示
GameFuncID_EquipDecompose = 123 # 装备分解
@@ -937,6 +1021,7 @@
GameFuncID_TJG = 147 # 脱机挂
GameFuncID_SuperGift = 150 # 超值礼包
GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
+GameFuncID_Arena = 189 # 竞技场
# 以下为暂时无用的
GameFuncID_Truck = 33 # 运镖
GameFuncID_RunDaily = 34 # 日常跑环
@@ -1020,14 +1105,14 @@
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_ArenaBattleRecord, # 竞技场玩家挑战记录 15
+ Def_UniversalGameRecType_CrossActInfo, # 跨服运营活动信息记录 16
+ Def_UniversalGameRecType_FeastWish, #节日祝福大奖记录17
Def_UniversalGameRecType_18,
Def_UniversalGameRecType_19,
Def_UniversalGameRecType_20,
@@ -1154,8 +1239,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
@@ -1166,12 +1251,13 @@
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
Def_Campaign_Type_LingGen, # 灵根点数排行 11
Def_Campaign_Type_StarLV, # 升星等级排行 12
-) = range(1, 1 + 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,
@@ -1182,6 +1268,7 @@
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,
}
#队伍最大人数
@@ -1210,6 +1297,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" # 获得物品
@@ -1221,8 +1309,11 @@
CrossServerMsg_EnterFBRet = "EnterFBRet" # 请求进入跨服副本返回信息
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" # 跨服邮件内容通知
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
@@ -1234,6 +1325,9 @@
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" # 玩家属性数值更新
@@ -1242,6 +1336,7 @@
ClientServerMsg_AddBuff = "AddBuff" # 添加BUFF
#跨服广播类型定义
+CrossNotify_CrossAct = "CrossAct"
CrossNotify_World = "World"
CrossNotify_Family = "Family"
CrossNotify_Player = "Player"
@@ -1490,7 +1585,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
@@ -1506,8 +1601,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
@@ -1518,8 +1613,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
@@ -1550,9 +1645,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
@@ -1562,17 +1657,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
@@ -1623,7 +1718,8 @@
SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次 140
SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次 141
SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次 142
-) = range(1, 143)
+SuccType_PassSkyTower, #通关天星塔 143
+) = range(1, 144)
# 节日红包成就类型
FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -1633,17 +1729,28 @@
# 不向下适配检查的成就类型(指相对较高成就条件不会增加较低成就条件的进度)
UnDownCheckSuccessTypeList = [
- SuccType_EquipPlusLV, SuccType_GodWeapon,
+ SuccType_GodWeapon,
SuccType_MainTaskNode,SuccType_PassWagicWeapon,
SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
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], # 阶不向下适配
+ }
+
#传进来的条件满足配置的条件列表中的一个就行的成就类型
ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
@@ -1652,9 +1759,9 @@
#增加进度前需要重置的成就类型
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++用
--
Gitblit v1.8.0