From 921ba9c6e954f2f1377cb08d5a8476c9e6c2b30e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 17:44:27 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（给非拍卖物品为拍品时优化）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 755 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 479 insertions(+), 276 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index fa23d8c..e180657 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -68,7 +68,7 @@
Def_BuffValue_Count = 3 # buff记录的value个数
#游戏对象属性--------------------------------------------
-Def_Calc_AllAttrType_MAX = 130
+Def_Calc_AllAttrType_MAX = 127
#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
TYPE_Calc_AttrList = (
#基础属性
@@ -188,12 +188,6 @@
TYPE_Calc_BaseDefAddPer, # 基础防御百分比
TYPE_Calc_BaseHitAddPer, # 基础命中百分比
TYPE_Calc_BaseMissAddPer, # 基础闪避百分比
-TYPE_Calc_HorcruxBasePer, # 魂器基础百分比
-TYPE_Calc_EquipBaseAddPer, # 装备基础百分比 105
-TYPE_Calc_WeaponAtkAddPer, # 武器基础攻击百分比
-TYPE_Calc_RelicsAtkAddPer, # 圣器基础攻击百分比
-TYPE_Calc_ArmorMaxHPAddPer, # 防具基础生命百分比
-TYPE_Calc_ArmorDefAddPer, # 防具基础防御百分比
TYPE_Calc_GodWeaponMaxHPPer, # 神兵生命百分比 110
TYPE_Calc_GodWeaponAtkPer, # 神兵攻击百分比
TYPE_Calc_StoneMaxHPPer, # 宝石生命百分比
@@ -214,6 +208,9 @@
TYPE_Calc_WingHPPer, # 翅膀生命百分比
TYPE_Calc_SuiteBasePer, # 套装基础属性百分比
TYPE_Calc_PlusBaseAtkPer, # 强化基础攻击百分比
+TYPE_Calc_ProDef, # 当前防护值 130
+TYPE_Calc_ZhuxianRate, # 诛仙一击的概率
+TYPE_Calc_ZhuxianHurtPer, # 诛仙一击的伤害比
) = range(1, Def_Calc_AllAttrType_MAX)
@@ -261,8 +258,13 @@
Def_ItemID_RealmPoint = 24 # 直接给修行点
Def_ItemID_BossReborn = 21 # 直接给boss复活点
Def_ItemID_Ysog = 4306 # 直接给符印融合石
+Def_ItemID_SoulDust = 700 # 直接给魂尘
+Def_ItemID_SoulSplinters = 701 # 直接给聚魂碎片
+Def_ItemID_SoulCore = 702 # 直接给核心环
+Def_ItemID_Honor = 2141 # 直接给荣誉
Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
- Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog]
+ Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
+ Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor]
#---------------------------------------------------------------------
#写死的物品类型都放这边
Def_ItemType_All = -1 #所有类型
@@ -312,6 +314,9 @@
Def_ItemType_FamilyBossFood = 50 #仙盟兽粮
Def_ItemType_SuccessItem = 53 # 用于完成成就的物品，不存在背包
Def_ItemType_ResetAttrPoint = 59 #洗点卷轴 使用后将某个属性一定值变为未分配属性
+Def_ItemType_GatherSoulExp = 61 #聚魂精华材料
+Def_ItemType_GatherSoul = 62 #普通聚魂
+Def_ItemType_GatherSoulCore = 63 #聚魂核心
Def_ItemType_DogzEquipExp = 70 # 神兽装备经验
@@ -329,23 +334,38 @@
Def_ItemType_retBelt = 105 #5 腰带
Def_ItemType_retTrousers = 106 #6 裤子
Def_ItemType_retShoes = 107 #7 鞋子
-Def_ItemType_retNeck = 108 #8 项链
-Def_ItemType_retFairyCan = 109 #9 仙器
-Def_ItemType_retFairyCan2 = 110 #10 仙器
-Def_ItemType_retWing = 111 #11 翅膀
-Def_ItemType_retGuard = 112 #12 守护
-Def_ItemType_retBaldric1 = 113 #13 佩饰
-Def_ItemType_retBaldric2 = 114 #14 佩饰
-Def_ItemType_retBaldric3 = 115 #15 佩饰
-Def_ItemType_retBaldric4 = 116 #16 佩饰
-Def_ItemType_retBaldric5 = 117 #17 佩饰
-Def_ItemType_retBaldric6 = 118 #18 佩饰
+Def_ItemType_retGlove = 108 #8 手套
+Def_ItemType_retNeck = 109 #9 项链
+Def_ItemType_retFairyCan = 110 #10 仙器1
+Def_ItemType_retFairyCan2 = 111 #11 仙器2
+Def_ItemType_retJade = 112 #12 玉佩
+Def_ItemType_retWing = 113 #13 翅膀
+Def_ItemType_retGuard1 = 114 #14 守护1
+Def_ItemType_retGuard2 = 115 #15 守护2
+Def_ItemType_retPeerlessWeapon = 116 #16 绝世武器
+Def_ItemType_retPeerlessWeapon2 = 117 #17 绝世副手
Def_ItemType_DogzEquipHorn = 119 # 神兽兽角
Def_ItemType_DogzEquipEye = 120 # 神兽魔眼
Def_ItemType_DogzEquipTooth = 121 # 神兽獠牙
Def_ItemType_DogzEquipClaw = 122 # 神兽兽爪
Def_ItemType_DogzEquipScute = 123 # 神兽鳞甲
+Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数
+
+Def_ItemType_ZXCloak = 128 # 诛仙披风
+Def_ItemType_ZXMask = 129 # 诛仙面具
+Def_ItemType_ZXGlove = 130 # 诛仙手套
+Def_ItemType_ZXRuyi = 131 # 诛仙如意
+Def_ItemType_ZXPendant = 132 # 诛仙吊坠
+Def_ItemType_ZXRing = 133 # 诛仙戒指
+Def_ItemType_ZXWeapon1 = 134 # 诛仙剑1
+Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
+Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
+Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
+Def_ItemType_ZhuXianStuff = 138 # 诛仙材料
+
+Def_ItemType_DogzStuff = 139 # 神兽材料
+Def_ItemType_ZhuXianStone = 140 # 诛仙宝石
#以下定义物品类型下次删除
Def_Item_Type_Horse = 1000036 #坐骑
@@ -353,23 +373,19 @@
#虚拟背包最大格子数 功能配置表对应的key
Def_VPackCnt_Dict = {
ShareDefine.rptRune:'RunePackageNum',
+ ShareDefine.rptGatherSoul:'GatherSoulPackCount',
}
-
-#虚拟背包可以放入的物品字典
-Def_PackItemTypeList_Dict = {
-ShareDefine.rptRune:[Def_ItemType_Rune, Def_ItemType_RuneExp],
-ShareDefine.rptDogzItem:[Def_ItemType_DogzEquipExp, Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipEye,
- Def_ItemType_DogzEquipTooth, Def_ItemType_DogzEquipClaw, Def_ItemType_DogzEquipScute],
- }
def GetItemPackType(itemType, defaultPack=IPY_GameWorld.rptItem):
## 获取物品类型对应存放的默认背包类型
if defaultPack in [ShareDefine.rptTreasure, ShareDefine.rptTempItem]:
#寻宝背包、临时背包不做处理
return defaultPack
+ import IpyGameDataPY
+ Def_PackItemTypeList_Dict = IpyGameDataPY.GetFuncEvalCfg("PutInItemPack", 1, {})
for pack, itemTypeList in Def_PackItemTypeList_Dict.items():
if itemType in itemTypeList:
- return pack
+ return int(pack)
return defaultPack
# 部位对应装备类型列表
@@ -381,17 +397,14 @@
ShareDefine.retBelt:[Def_ItemType_retBelt],
ShareDefine.retTrousers:[Def_ItemType_retTrousers],
ShareDefine.retShoes:[Def_ItemType_retShoes],
+ ShareDefine.retGlove:[Def_ItemType_retGlove],
ShareDefine.retNeck:[Def_ItemType_retNeck],
- ShareDefine.retFairyCan:[Def_ItemType_retFairyCan, Def_ItemType_retFairyCan2],
- ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan, Def_ItemType_retFairyCan2],
+ ShareDefine.retFairyCan:[Def_ItemType_retFairyCan],
+ ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan2],
+ ShareDefine.retJade:[Def_ItemType_retJade],
ShareDefine.retWing:[Def_ItemType_retWing],
- ShareDefine.retGuard:[Def_ItemType_retGuard],
- ShareDefine.retBaldric1:[Def_ItemType_retBaldric1],
- ShareDefine.retBaldric2:[Def_ItemType_retBaldric2],
- ShareDefine.retBaldric3:[Def_ItemType_retBaldric3],
- ShareDefine.retBaldric4:[Def_ItemType_retBaldric4],
- ShareDefine.retBaldric5:[Def_ItemType_retBaldric5],
- ShareDefine.retBaldric6:[Def_ItemType_retBaldric6],
+ ShareDefine.retGuard1:[Def_ItemType_retGuard1],
+ ShareDefine.retGuard2:[Def_ItemType_retGuard2],
}
#---------------------------------------------------------------------
#写死的物品效果ID都放这边------请按数值顺序存放
@@ -422,9 +435,14 @@
Def_Effect_AddMagicWeaponUpExp = 236 # 增加法宝升星经验 A值法宝ID B值X经验
Def_Effect_ChatBubbleBox = 237 # 激活聊天气泡框，A值气泡框ID
Def_Effect_ItemGiveRealmPoint = 238 #使用道具给予修行点
+Def_Effect_ItemGiveSoulDust = 239 # 使用道具给予魂尘
+Def_Effect_ItemGiveSoulSplinters = 240 # 使用道具给予聚魂碎片
+Def_Effect_ItemGiveSoulCore = 241 #使用道具给予核心环
+Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
+Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
+Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
#----以下未使用或代码依然存在的---
Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
-Def_Effect_ItemGiveHonorPoint = 1922 #使用道具给予荣誉积分
Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
Def_Effect_ItemGiveRuneSplinters = 1926 #使用道具给予符印碎片
Def_Effect_SuiteMark = 2838 #用于标示套装装备，过滤等使用
@@ -555,6 +573,7 @@
Def_Skill_Effect_AbsorbShield = 801 # A值记录吸收伤害值，B值记录吸收值上限为xx%血量上限值 C值为释放的爆炸技能ID 如麒麟盾
Def_Skill_Effect_AbsorbShieldXMZJ = 802 # 须弥真界 神兵技能吸收伤害 百分比
Def_Skill_Effect_BoomSeedHurt = 804 # BUFF种子单层伤害
+Def_Skill_Effect_StoreBlood = 809 # 将期间受到的伤害总值，用于最后回血，不影响伤害
Def_Skill_Effect_AttackReplace = 1009 #攻击计算，野外小怪伤害替换1010 (2018-03-07增加精英怪)
Def_Skill_Effect_Attack = 1010 #攻击计算
Def_Skill_Effect_LayerCnt = 1011 # BUFF层级数量 A值层数，B值层数处理方式0递增1递减
@@ -614,7 +633,7 @@
#---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
-Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ]
+Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ, Def_Skill_Effect_StoreBlood]
#-------------------------------------------------------------------------
#基础属性效果ID
@@ -756,7 +775,10 @@
Def_HurtType_Miss, # 闪避 9
Def_HurtType_Immune, # 免疫 10
Def_HurtType_RealmSupress, # 境界压制 11
-) = range(1, 12)
+Def_HurtType_Zhansha, # 斩杀 12
+Def_HurtType_Zhuxian, # 诛仙一击 13
+Def_HurtType_ZhognjiZhansha, # 终极斩杀 14
+) = range(1, 15)
#Def_HurtType_SuckBlood, # 吸血
(
@@ -768,13 +790,13 @@
Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
#装备类型
-Def_EquipItemType = xrange(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
-
-#武器类型
-Def_WeaponItemType = [Def_ItemType_retWeapon, Def_ItemType_retWeapon2]
+Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
#神兽装备类型
Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)
+
+#诛仙装备类型
+Def_ZhuXianEquiipType = xrange(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
# 技能造成实质性伤害的类型
Def_RealAttack_Type = [Def_HurtType_Normal, # 普通伤害 1
@@ -808,6 +830,8 @@
#大额度交易记录
Def_LargeTrade_Gold = 50 * 1000
Def_LargeTrade_Silver = 1000 * 1000
+#初始化装备背包格子数
+Def_PackCnt_Equip = 130
#主角交易栏最大格数
Def_PlayerTradeMaxItemCount = 20
#主角刚登陆游戏开启背包格子数
@@ -834,6 +858,10 @@
Def_PackCnt_DogzItem = 100
#初始化神兽装备格子数
Def_PackCnt_DogzEquip = 100
+#初始化诛仙背包格子数
+Def_PackCnt_ZhuXianItem = 100
+#初始化诛仙装备格子数
+Def_PackCnt_ZhuXianEquip = 12
#初始化装备栏2
Def_PackCnt_Equip2 = 0
#初始化回收站
@@ -1077,6 +1105,8 @@
ShareDefine.rptPet,
ShareDefine.rptDogzItem,
ShareDefine.rptDogzEquip,
+ ShareDefine.rptZhuXianItem,
+ ShareDefine.rptZhuXianEquip,
]
#装备可强化背包列表
@@ -1442,7 +1472,7 @@
#自动恢复计算间隔
Def_HPRestoreInterval = 5000
#允许重置的背包索引
-Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]
+Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptZhuXianItem]
#仓库分页个数
Def_ItemReset_WarehousePageCnt = 56
#玩家捡起物品的距离 8
@@ -1701,8 +1731,6 @@
Def_Player_RequestAddFamilyMaxCnt = 200 #玩家申请加入家族的最大数量 (目前无限制 配个大的数值)
#-------------------------------#副本相关#------------------------
-# 跨服中转地图ID
-Def_MergeTransMapID = 12075
#创角新手村地图ID列表
Def_CreatRoleMapIDList = [10000]
#PK周赛
@@ -1768,15 +1796,35 @@
Def_FBMapID_SealDemon = 52010
#单人封魔坛
Def_FBMapID_SealDemonEx = 52020
-
+#诛仙BOSS
+Def_FBMapID_ZhuXianBoss = 31380
+#诛仙塔
+Def_FBMapID_ZhuXianTower = 31370
#仙魔之争
Def_FBMapID_XMZZ = 31010
#神兽副本
Def_FBMapID_Dogz = 21110
+#聚魂副本
+Def_FBMapID_GatherSoul = 31340
+#跨服竞技场
+Def_FBMapID_CrossRealmPK = 32010
+#跨服蓬莱仙境
+Def_FBMapID_CrossPenglai = 32020
+#多仙盟Boss
+Def_FBMapID_AllFamilyBoss = 31260
+
+#注册上传跨服服务器数据后直接进入跨服服务器的地图
+RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
+#跨服地图
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
+#跨服分区对应地图配置表名
+Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+ }
+
#副本关闭时未拾取的物品邮件发放给玩家
#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
- Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx]
+ Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx, Def_FBMapID_ZhuXianBoss]
#金钱不掉物品直接给玩家的地图
Def_GiveMoneyMapIDList = []
@@ -1784,13 +1832,13 @@
# 副本中玩家下线就被踢出
Def_DisconnectExit_FBID = []
#会有阵营的地图
-Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar]
+Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar, Def_FBMapID_GatherSoul, Def_FBMapID_CrossRealmPK]
# 进入副本需要根据请求lineID动态分配虚拟分线属性的地图
Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]
# 进入副本需要发送到GameServer的地图
-Def_MapID_SendToGameServer = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_SealDemon, Def_FBMapID_FamilyWar] + Def_MapID_LineIDToPropertyID
+Def_MapID_SendToGameServer = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_SealDemon, Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + Def_MapID_LineIDToPropertyID
## 进入副本需要根据请求的功能线路处理的地图， hxp-改了进入模式，暂不需要了 180320
#Def_MapID_ReqFBFuncLine = [Def_FBMapID_KirinHome, Def_FBMapID_BZZD, Def_FBMapID_SealDemonEx,
@@ -1798,13 +1846,13 @@
# + Def_FBMapID_ClearDevil
# 刷新标识点在无玩家的情况下也需要刷新的地图
-Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome]
+Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]
# 可重复进的副本
-Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]
+Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]
# 无玩家时不自动关闭的自伸缩副本
-Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap]
+Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
# 不可切换PK模式的地图
Def_CanNotChangeAtkModelMap = []
@@ -1859,7 +1907,11 @@
'Guard':[Def_FBMapID_Guard], #守护副本
'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
- 'Dogz':[Def_FBMapID_Dogz], #神兽副本
+ 'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
+ 'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
+ 'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
+ 'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
+ 'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
}
#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -1873,6 +1925,7 @@
Def_FB_NotifyFBHelpTick = 'NotifyFBHelpTick' # 广播副本帮助信息tick
Def_FB_NPCStrengthenAverageLV = 'NPCStrengthenAverageLV' # 当前线路成长NPC平均等级
Def_FB_NPCStrengthenMaxLV = 'NPCStrengthenMaxLV' # 当前线路成长NPC最大等级
+Def_FB_NPCStrengthenMinLV = 'NPCStrengthenMinLV' # 当前线路成长NPC最小等级
Def_FB_NPCStrengthenPlayerCnt = 'NPCStrengthenPlayerCnt' # 当前线路成长NPC对应玩家数
Def_FB_TeamPlayerCount = 'TeamPlayerCount' # 组队副本参与玩家数 - 非实时人数，只是进入时的那个人数
Def_FB_DropDoCountRate = 'DropDoCountRate' # 怪物掉落执行次数万分率
@@ -1918,6 +1971,9 @@
Def_RMark_HasRefreshPoint = 'RMark_HasRefreshPoint_%s' #该点是否已经刷新 参数 刷怪点在地图中的索引
Def_RMark_TimePassCnt = 'Def_RMark_TimePassCnt' #时间超过刷新个数
Def_RMark_RefreshStep = 'Def_RMark_RefreshStep' #刷怪波数
+
+Def_RMark_RandomRefreshNPCTick = 'RandomRefreshNPCTick' # 地图自定义随机刷怪，上次检查时间
+Def_RMark_RandomRefreshNPCNumTime = 'RandomRefreshNPCNumTime_%s' # 地图自定义随机刷怪，刷怪编号上次检查时间，参数（编号）
Map_FBDict_NotifyOpen = "Map_FB_NTOpen" # 副本开启提示
Map_FBDict_NotifyStart = "Map_FB_NTStart" # 副本开始提示
@@ -2151,9 +2207,6 @@
1000 * 60 * 10, #玩家称号时效
400, #吸血
400, #吸蓝
- 1000 * 5, # 恢复跨服PK连胜次数请求间隔
- 1000 * 5, # 跨服PK领奖间隔
- 1000 * 5, # 跨服王者争霸竞猜积分领奖间隔
1000 * 3, # 仓库整理间隔
1000 * 15, # 渡劫鼓舞间隔
1000 * 1, # vip体验时效
@@ -2227,9 +2280,6 @@
TYPE_Player_Tick_Dienstgrad, #玩家称号时效
TYPE_Player_Tick_SuckBlood, #吸血
TYPE_Player_Tick_SuckMagic, #吸蓝
-TYPE_Player_Tick_RecoverMergePKWin, #恢复跨服PK连胜次数请求间隔
-TYPE_Player_Tick_MergePKAward, #跨服PK领奖间隔
-TYPE_Player_Tick_MergeKingSupport, #跨服王者争霸竞猜积分奖励间隔
TYPE_Player_Tick_WareHouseSort, # 仓库整理间隔
TYPE_Player_Tick_DuJieInspire, # 渡劫鼓舞间隔
TYPE_Player_Tick_VIPExperience, #vip体验时效
@@ -2252,6 +2302,7 @@
TYPE_Map_Tick_ProcessMinute = 10 #每分钟触发事件
TYPE_Map_Tick_ProcessFiveMinute = 11 #五分钟触发事件
TYPE_Map_Tick_BossAITick = 12 #BOSSAI间隔，此处不包含召唤兽，外层控制
+TYPE_Map_Tick_PetAITick = 13 #宠物AI间隔特殊处理
TYPE_Map_Tick_Time = [
1000 * 60 * 3 , #0 回报当前地图活跃人数(3分钟一次)
@@ -2266,7 +2317,8 @@
1000 * 10 , #9 战盟战10秒刷新排行榜
1000 * 60 , #10 每分钟触发事件
1000 * 60 * 5 , #11 五分钟触发事件
- 800, #12 BOSS 宠物 镖车的AI间隔
+ 800, #12 BOSS 镖车的AI间隔
+ 3000, #13 宠物AI特殊处理间隔
]
TYPE_Map_Tick_Count = len( TYPE_Map_Tick_Time )
@@ -2326,18 +2378,6 @@
#数据中的装备位置和程序中的装备位置对照表
#参考 ShareDefine.RoleEquipType
-#武器装备栏位置列表
-Def_WeaponRetList = [ShareDefine.retWeapon, ShareDefine.retWeapon2]
-
-#仙器, 装备栏位置列表
-Def_FairyCanList = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
-
-
-#攻击类装备, 装备栏位置列表
-Def_AttackEquipRetList = [ShareDefine.retWeapon]
-#防御类装备, 装备栏位置列表
-Def_DefenceEquipRetList = [ShareDefine.retClothes]
-
# 可操作强化洗练等功能的公共装备部位索引
Pack_EquipPart_CanPlusStar = {
IPY_GameWorld.rptEquip:[
@@ -2348,42 +2388,37 @@
ShareDefine.retBelt, #5 腰带
ShareDefine.retTrousers, #6 裤子
ShareDefine.retShoes, #7 鞋子
- ShareDefine.retNeck, #8 项链
- ShareDefine.retFairyCan, #9 仙器
- ShareDefine.retFairyCan2, #10 仙器
+ ShareDefine.retGlove, #8 手套
+ ShareDefine.retNeck, #9 项链
+ ShareDefine.retFairyCan, #10 仙器1
+ ShareDefine.retFairyCan2, #11 仙器2
+ ShareDefine.retJade, #12 玉佩
],
-
}
-## 基础装备位 - 武器
-BaseEquipPlace_Weapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2]
-## 基础装备位 - 防具
-BaseEquipPlace_Armor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retBelt, ShareDefine.retTrousers, ShareDefine.retShoes]
-## 基础装备位 - 圣器
-BaseEquipPlace_Relics = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
-BaseEquipPlaceList = BaseEquipPlace_Weapon + BaseEquipPlace_Armor + BaseEquipPlace_Relics
-
-#玩家当前可装备的装备类型
-Type_Equip_CanTake = ShareDefine.RoleEquipType
+## 装备位 - 基础攻击类
+EquipPlace_BaseWeapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2, ShareDefine.retBelt, ShareDefine.retGlove]
+## 装备位 - 基础防具类
+EquipPlace_BaseArmor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retTrousers, ShareDefine.retShoes]
+## 装备位 - 仙器
+EquipPlace_Relics = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
+## 装备位 - 特殊
+EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
+## 装备位 - 所有基础
+EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor
#装备物品位置,不需要重刷属性
-EquipItemNoRefreshState = []
+EquipItemNoRefreshState = [
+ ShareDefine.retHorse, #19 坐骑
+ ShareDefine.retWeaponSkin, #20 时装武器
+ ShareDefine.retClothesSkin, #21 时装衣服
+ ShareDefine.retWeapon2Skin, #22 时装副手
+ ]
-# 需要广播外观的装备部位
+# 需要广播外观的装备部位(除了境界装备3部位)
Def_SyncEquipStateByIndex = [
-
- ShareDefine.retWeapon, #1 主手
- ShareDefine.retWeapon2, #2 副手
- ShareDefine.retHat, #3 帽子
- ShareDefine.retClothes, #4 衣服
- ShareDefine.retBelt, #5 腰带
- ShareDefine.retTrousers, #6 裤子
- ShareDefine.retShoes, #7 鞋子
- ShareDefine.retNeck, #8 项链
- ShareDefine.retFairyCan, #9 仙器
- ShareDefine.retFairyCan2, #10 仙器
ShareDefine.retWing, #11 翅膀
- ShareDefine.retGuard, #12 守护
+ ShareDefine.retGuard1, #14 守护1
ShareDefine.retHorse, #19 坐骑
]
@@ -2821,14 +2856,12 @@
Def_RebornPos_Area_Range = 3
#复活类型(需要和C++统一)
-RebornTypeCount = 8
+RebornTypeCount = 6
Def_RebornTypeList = [
-rebornType_City, #回城虚弱复活
-rebornType_Skill, #技能复活
-rebornType_Health, #原地健康复活
-rebornType_UseItem, #使用还阳咒复活
-rebornType_FBGold, #副本元宝复活
-rebornType_FBUseItem, #副本使用道具复活
+rebornType_City, #回城虚弱复活 0
+rebornType_Skill, #技能复活 1
+rebornType_Health, #原地健康复活 2
+rebornType_UseItem, #使用道具复活 3
rebornType_MainCity, #回主城复活
rebornType_System, #系统复活
] = range(0, RebornTypeCount)
@@ -2985,19 +3018,27 @@
Def_PlayerState_LoseBlood2, # 职业2持续掉血状态 14
Def_PlayerState_LoseBlood3, # 职业3持续掉血状态 15
Def_PlayerState_MissSneerAtk, # 对嘲讽攻击免疫表现为miss 16
-) = range(17)
+ Def_PlayerState_BeInAir, # 浮空（做法同眩晕类） 17
+) = range(18)
#---SetDict 含NPC字典KEY，不存于数据库---
Def_GameObjKey_InheritOwner = "InheritOwner" # 类暴风雪计算时用主人属性
#---SetDict 玩家字典KEY，不存于数据库---
# key的长度不能超过29个字节
+Def_PlayerKey_AddBuffLayer = "addBuffLayer" # buff当前层数
+Def_PlayerKey_BuffHurtCnt = "BuffHurtCnt" # 持续buff掉血次数
+Def_PlayerKey_Zhansha = "zhansha" # 斩杀标志
+Def_PlayerKey_ZhuxianRate = "ZXRate" # 诛仙一击的概率
+Def_PlayerKey_ZhuxianHurtPer = "ZXHurtPer" # 诛仙一击的伤害%
+Def_PlayerKey_LockHPSkillID = "LockHPSkillID" # 锁血功能的技能
Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD" # 神兵护盾被攻击前的值
Def_PlayerKey_curHurtValue = "curHurtValue" # 计算中的临时伤害值，技能特殊用
Def_PlayerKey_DefenderObjID = "DefenderObjID" # 后续触发技能需要用到的对象ID，暂用于玩家
Def_PlayerKey_SomersaultTime = "Somersault" # 翻滚一定时间内无敌，表现为MISS
Def_PlayerKey_CopyFuncAttr = "CopyFuncAttr%s" # 玩家属性刷新中的计算属性缓存，便于buff刷新计算
Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff" # 玩家属性刷新功能属性缓存，便于buff刷新计算, 间隔刷新
+Def_PlayerKey_ClientCustomScene = "ClientCustomScene" # 客户端自定义场景状态
Def_PlayerKey_ChangeMapID = "ChangeMapID" # 请求切换的地图ID
Def_PlayerKey_ResetFBLinePosX = "ResetFBLinePosX" # 请求切换副本多合一地图功能线路ID
Def_PlayerKey_ResetFBLinePosY = "ResetFBLinePosY" # 请求切换副本多合一地图功能线路ID
@@ -3048,7 +3089,6 @@
Def_PlayerKey_AtkInterval = "NormalAtkInterval_%s" # 公共技能CD类型
Def_PlayerKey_AtkTick = "NormalAtkTick_%s" # 公共技能CD类型
Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState" # 查询开服奖励状态
-Def_PlayerKey_QueryMixServerAwardState = "QueryMixServerAwardState" # 查询合服奖励状态
Def_PlayerKey_QueryFamilyStoreTick = "QueryFamilyStoreTick" # 战盟仓库操作tick
Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex' # 指定账号生成卡类型
@@ -3062,6 +3102,7 @@
Def_PlayerKey_ComboBuffProcessState = "ComboBuffProcessState" #持续性buff连击处理状态
Def_PlayerKey_LvAwardQueryState = 'LvAwardQueryState' # 等级奖励领奖查询状态
Def_PlayerKey_StoreQueryState = 'StoreQueryState' # 商店全服购买次数查询状态
+Def_PlayerKey_MysticalShopLastTime = 'MysticalShopLastTime' # 神秘商店刷新时间
#===============================================================================
# # 持续性buff伤害处理连击技能ID列表
# # 因为释放一次技能后一段时间内是持续性的, 故连接判断效果仅处理一次, 持续时间内均受此效果影响, 不重复处理连击
@@ -3138,6 +3179,7 @@
Def_PlayerKey_IgnoreDefRateReduce = "IgnoreDefRateReduce" # 抗无视防御概率
Def_PlayerKey_LastHurtValue = "LastHurtValue" # 最后一次伤害值
Def_PlayerKey_LastHurtNPCObjID = "LastHurtNPCObjID" # 最后攻击的NPCObjID
+Def_PlayerKey_LastAttackerObjID = "LastAttackerObjID" # 被攻击者记录的最近攻击玩家ID
Def_PlayerKey_ReduceSkillCDPer = "ReduceSkillCDPer" # 减技能CD万分率
Def_PlayerKey_CommMapExpRate = "CommMapExpRate" # 常规地图经验倍率加成
Def_PlayerKey_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
@@ -3159,12 +3201,6 @@
Def_PlayerKey_BaseDefAddPer = "BaseDefAddPer" # 基础防御百分比
Def_PlayerKey_BaseHitAddPer = "BaseHitAddPer" # 基础命中百分比
Def_PlayerKey_BaseMissAddPer = "BaseMissAddPer" # 基础闪避百分比
-Def_PlayerKey_HorcruxBasePer = "HorcruxBasePer" # 魂器基础百分比
-Def_PlayerKey_EquipBaseAddPer = "EquipBaseAddPer" # 装备基础百分比
-Def_PlayerKey_WeaponAtkAddPer = "WeaponAtkAddPer" # 武器基础攻击百分比
-Def_PlayerKey_RelicsAtkAddPer = "RelicsAtkAddPer" # 圣器基础攻击百分比
-Def_PlayerKey_ArmorMaxHPAddPer = "ArmorMaxHPAddPer" # 防具基础生命百分比
-Def_PlayerKey_ArmorDefAddPer = "ArmorDefAddPer" # 防具基础防御百分比
Def_PlayerKey_GodWeaponMaxHPPer = "GodWeaponMaxHPPer" # 神兵生命百分比
Def_PlayerKey_GodWeaponAtkPer = "GodWeaponAtkPer" # 神兵攻击百分比
Def_PlayerKey_StoneMaxHPPer = "StoneMaxHPPer" # 宝石生命百分比
@@ -3187,10 +3223,8 @@
#功能索引ShareDefine.Def_AttrFruitFuncList
Def_PlayerKey_FruitAttr = "FruitAttr_%s_%s" # 属性果实增加的属性，参数为(功能索引, 物品效果id)
+Def_PlayerKey_FruitFightPowerEx = "FruitFightPowerEx_%s" # 属性果实增加的附加战力，参数为(功能索引)
Def_PlayerKey_FamilyLVLeave = "FamilyLVLeave" # 离开的最后一个家族的等级
-
-Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s" # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
-Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s" # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]
Def_PDict_QueryTechLVUPState = "QueryTechLVUPState" # 查询科技等级提升状态
@@ -3226,9 +3260,9 @@
Def_PDictType_LVAward, # 等级奖励领取信息记录5
Def_PDictType_GoldGift, # 充值豪礼
Def_PDictType_OpenServerCampaign, # 开服活动
-Def_PDictType_8,
-Def_PDictType_Family_Contribution, # 战盟贡献度
-Def_PDictType_10, # 10
+Def_PDictType_WeekParty, #周狂欢
+Def_PDictType_FeastWeekParty, # 节日巡礼
+Def_PDictType_LoginAward, # 登录奖励运营活动
Def_PDictType_OfficialRank, # 官爵
Def_PDictType_Horse, # 坐骑
Def_PDictType_Wing, # 翅膀
@@ -3246,13 +3280,15 @@
Def_PDictType_Reincarnation, # 转生
Def_PDictType_GreatMaster, # 大师
Def_PDictType_BloodElf, # 血魔
-Def_PDictType_MergePK, # 跨服匹配PK
-Def_PDictType_MergeKing, # 跨服王者争霸
+Def_PDictType_28,
+Def_PDictType_29,
Def_PDictType_QQ, # QQ相关
) = range(31)
# 玩家字典key定义规则, key的长度不能超过29个字节, 注意尽量避免命名重复
# 新增参数TYPE 用于字典分类，默认0
+Def_QuDao_DoubleBillGold = "qddbGold" # 渠道返利的仙玉
+Def_QuDao_DoubleBillCount = "qddbCount" # 渠道返利的仙玉领取次数 日期+次数组合数字
Def_PDict_GeTuiSet = "GetuiSet" # 推送提醒的设置
Def_PDict_NoGeTuiTime = "NoGetuiTime" # 推送提醒免打扰时间，将字符串组合数字
Def_PlayerKey_TJGNPC = "TJGNPC" # 脱机挂机NPC点
@@ -3264,7 +3300,6 @@
Def_PDict_OnDayEx = "OnDayEx" # 特殊时间点凌晨X点过天
Def_PDict_OnWeekEx = "OnWeekEx" # 特殊时间点凌晨X点过周
Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
-Def_Player_Dict_ServerGroupID = "ServerGroupID" # 合服/混服时所属游戏服务器组ID
Def_Player_Dict_PlayerFromPID = "PlayerFromPID" # pid
Def_Player_Dict_Account_Type = "account_type" # account_type
Def_Player_Dict_TencentPF = "tencentPF" # 腾讯平台来源pf
@@ -3294,6 +3329,8 @@
Def_Player_Dict_FromPosY = 'FromPosY' # 最后一次离开的非中立常规地图，坐标X
Def_Player_Dict_FromLineID = 'FromLineID' # 最后一次离开的非中立常规地图，线路ID
+Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap" #跨服注册活动地图, dataMapID
+Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中
Def_Player_Dict_FamilyTechLV = "FamilyTechLV_%s" #家族科技等级, 参数(科技ID)
Def_Player_Dict_RouteServerInitOK = "RouteServerInitOK_33" #RouteServer初始化成功(仅登陆一次)
@@ -3321,6 +3358,7 @@
Def_Player_Dict_TeamFBMaxLV = "TeamFBMaxLV" # 请求进入的组队副本最大等级, 临时用，进入副本设置完后删除
Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用，进入副本设置完后删除
Def_Player_Dict_ReqFBMissionID = "ReqFBMissionID" # 请求进入副本的任务ID
+Def_Player_Dict_ReqFBMissionType = "ReqFBMissionType" # 请求进入副本的任务类型
Def_Player_Dict_PlayerFBStar_MapId = "FBStar_%s_%s" # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
Def_Player_Dict_EnterFbCntDay = "EnterFbCntDay_%s" # 今日进入副本次数, 参数为副本ID
Def_Player_Dict_BuyFbCntDay = "BuyFbCntDay_%s" # 今日购买副本进入次数, 参数为副本ID
@@ -3366,13 +3404,10 @@
Def_Player_Dict_SignDayCnt = "SignDayCnt_151" # 签到次数
Def_Player_Dict_ForbidFamilyAction = 'ForbidFamilyAction_168' # 玩家是否能参加家族活动
Def_Player_Dict_ForbidFamilyAward = "ForbidFamilyAward" # 当日家族相关活动是否领奖受限, 按位存储
-Def_Player_Dict_RoomID = 'RoomID_184' # 房间ID
Def_Player_Dict_HasApplyVIPClub = 'HasApplyVIPClub_185' # 是否申请过贵宾俱乐部
Def_Player_Dict_HasVIPClubNote = 'HasVIPClubNote_186' # 是否提示过vip升级可加入贵宾俱乐部信息
Def_Player_Dict_PyPlayerAction = 'PyPlayerAction_187' # py自定义玩家状态
Def_Player_Dict_FamilyLV = 'FamilyLV_189' # 玩家帮会等级
-Def_Player_Dict_MergeWarRegisterTime = 'MergeWarRegisterTime_190' # 上传数据至万国服务器cd
-Def_Player_Dict_MergeRegisterTime = 'MergeRegisterTime%s_194' # 活动的上传数据时间
Def_Player_UpdatePlayerNameCnt = "UpdatePlayerNameCnt_196" # 角色改名次数
Def_Player_Dict_UpdatePlayerNameItemIndex = "UpdatePlayerNameItemIndex_198" # 改名物品在背包的位置
Def_Player_Dict_UpdatePlayerName = "UpdatePlayerName_199" # 改名锁
@@ -3417,6 +3452,7 @@
Def_PDict_OnlineStartTick = "OnlineStartTime" # 在线计算时间
Def_PDict_LVAwardGetRecord = "LVAwardGetRecord" # 等级奖励领取信息记录，按二进制位标示
Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord" # 等级奖励vip领取信息记录，按二进制位标示
+Def_PDict_CTGCountResetTime = "CTGCountResetTime" # CTG次数重置时间time值
Def_PDict_TodayCTGCount = "TodayCTGCount_%s" # 当日充值次数，参数(CTG对应的商品记录ID)
Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s" # 对应充值商品已购买次数，参数(CTG对应的商品记录ID)
Def_PDict_GoldGiftGetRecord = "GoldGiftGetRecord" # 充值豪礼领取信息记录，按二进制位标示
@@ -3431,8 +3467,6 @@
Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen" # 超值礼包是否开过
Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord" # 天天首充领奖记录，0-不可领；1-可领；2-已领
Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt" # 当日已充值数
-Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex" # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
-Def_PDict_UnlimitedGoldGiftCnt = "UnlimitedGoldGiftCnt" # 当日无限领取礼包已领取次数
Def_PDict_IsReBorn = "Def_PDict_IsReBorn" # 是否回城复活
Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward" # 王者仙盟每日俸禄领取状态
Def_PDict_Family_Contribution = "FamilyContribution" #战盟贡献度
@@ -3445,12 +3479,12 @@
Def_PDict_FreshmanGuideSpeakerCntToday = "FreshmanGuideSpeakerCntDay" # 新手指导员今日已免费传音次数
Def_PDict_LoginDayCnt = "PLoginDayCnt" # 累计登陆天数
Def_PDict_LoginDayAward = "PLoginDayAward" # 累计登陆领取情况
-Def_PDict_CollNpcCollTotalCnt = "CollNpcCollTotalCnt_%s" # 采集NPC累计采集次数，参数为NPCID
-Def_PDict_CollNpcCollTime = "CollNpcCollTime_%s" # 采集NPC功能号对应每日对应采集次数，%sNPC功能号
-Def_PDict_CollNpcBuyTime = "CollNpcBuyTime_%s" # 采集NPC功能号对应每日购买采集次数，%sNPC功能号
Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s" # 商店NPC商品已购买次数，itemIndex
Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s" # 神秘限购商品开卖时间，itemIndex
+Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s" # 神秘商店商品ID，索引
+Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt" # 神秘商店已手动刷新次数
+Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt" # 神秘商店等级段刷新次数
Def_PDict_ShopItemBuyCnt = "ShopItemBuyCnt_%s_%s" # 自定义商品已购买次数，(shopID, itemIndex)
Def_PDict_ShopItemOpenState = "ShopItemOpenState_%s_%s" # 自定义神秘商店物品开启状态，(shopID, keyNum)
Def_PDict_TimeShopRefreshCnt = "TimeShopRefreshCnt_%s" # 自定义神秘商店已手动刷新次数，(shopID)
@@ -3464,7 +3498,6 @@
Def_PDict_HighLadder_IsRelCD = "HighLadderIsRelCD" #天梯是否进入真正挑战冷却
Def_PDict_HighLadder_WinningStreak = "HighLadderWinningStreak" #天梯连胜场次
Def_PDict_HighLadder_HistoryMaxOrder = "HighLadderMaxOrder" #天梯历史最高排名
-Def_PDict_MixLoginDayState = "PMixLoginDayState" # 合服天登陆状态<按登陆天从低位起0-未领1-可领2-已领>
Def_PDict_FestivalLoginState = "FestivalLoginState_%s" # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
Def_PDict_Currency = "PlayerCurrency_%s" # 自定义货币类型, 参数[自定义货币类型]
Def_PDict_TJGSet = "TJGSet" # 脱机挂系统设定
@@ -3475,9 +3508,7 @@
Def_PDict_LoginClientType = "LoginClientType" # 客户端登录类型
-Def_PDict_ReUpdBillboardSign = "ReUpdBillboardSign" # 重新同步排行表标记
-Def_PDict_MSFirstLogin_UpdBillboard = "MSFirstLogin_UpdBillboard" # 合服首登同步排行榜信息
-Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记
+Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记天
Def_PDict_ExcActionItemCnt = "ExcI_%s_%s" # 活动兑换物品已兑换次数,参数(活动key,兑换物品对应次数编号标识)
@@ -3519,9 +3550,9 @@
Def_PDict_GodWeaponExp = "GodWeaponExp_%s" # 神器等级对应祝福值经验, 参数神器索引
Def_PDict_GodWeaponState = "GodWeaponState" # 神器是否已经激活, 按索引位存储神器是否激活
-Def_PDict_ClothesSkinOpenState = "ClothesSkinOpenState" # 时装皮肤激活状态
Def_PDict_ClothesSkinLV = "ClothesSkinLV_%s" # 时装皮肤等级,参数时装索引
-Def_PDict_ClothesSkinCurBless = "ClothesSkinCurBless_%s" # 时装皮肤祝福值,参数时装索引
+Def_PDict_ClothesChestLV = "ClothesChestLV" # 时装柜等级
+Def_PDict_ClothesChestEXP = "ClothesChestEXP" # 时装柜经验
Def_PDict_CostVIPExp = "CostVIPExp" # 消费VIP经验
Def_PDict_CostVIPLVReward = "CostVIPLVReward" # 消费VIP等级奖励
@@ -3544,12 +3575,13 @@
Def_PDict_RunTaskAwardState = "RunTaskAwardState_%s" # 是否已领取跑环本轮结束奖励 参数任务类型
Def_PDict_RunTaskAwardRecord = "RunTaskAwardRecord_%s" # 跑环本轮结束奖励记录 参数任务类型
Def_PDict_RunTaskNextMissionID = "RunTaskNextMissionID_%s" # 跑环本轮结束下个任务ID 参数任务类型
-# 宝石
-Def_PDict_EquipPartStarLV = "EPStarLV_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
+#强化
+Def_PDict_EquipPartPlusLV = "EPPlusLV_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
Def_PDict_EquipActiveStarLV = "EquipActiveStarLV" #装备已激活总强化等级
-Def_PDict_EquipPartProficiency = "EPProf_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
-Def_PDict_EquipActiveStars = "EquipActiveStars" #装备已激活总强化星级
+Def_PDict_EquipPartProficiency = "EPProf_%s_%s" # 装备部位对应公共强化熟练度，参数为(packType, index)
+Def_PDict_EquipPartPlusEvolveLV = "EPPlusEvolveLV_%s_%s" # 装备部位对应公共强化进化等级，参数为(packType, index)
+# 宝石
Def_PDict_EquipPartStoneID = "StoneID_%s_%s" # 装备位_孔位存储宝石ID*10+是(1)否(0)绑定
# 装备洗练, 暂不区分背包类型，如果有不同背包，策划设定不同的装备位
@@ -3581,6 +3613,10 @@
#试炼之塔
Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数
+#诛仙塔
+Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
+Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
+Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间
#古神禁地
Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
@@ -3604,9 +3640,6 @@
Def_Player_Dict_ArrestTaskAwardRecord = "ArrestTaskAwardRecord" # 悬赏任务积分奖励领取记录
Def_Player_Dict_ArrestTaskFinishCnt = "ArrestTaskFinishCnt" # 悬赏任务今日完成个数
-#跨服boss
-Def_PDict_MergeBoss_FirstJoinAwardRecord = "MergeBossFstAward" # 首次参与跨服boss奖励状态 0-不可领；1-可领；2-已领
-
#封魔坛
Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
@@ -3620,12 +3653,14 @@
Def_PDict_CostRebateTemplateID = "CostRebateTemplateID" # 玩家身上的消费返利模板ID
Def_PDict_CostRebateGold = "CostRebateGold" # 消费返利总累计消费仙玉
Def_PDict_CostRebateAwardRecord = "CostRebateAwardRecord" # 消费返利领奖记录
+Def_PDict_CostRebateWorldLV = "CostRebateWorldLV" #消费返利活动开启时世界等级
#累计充值活动
Def_PDict_TotalRechargeID = "TotalRechargeID" # 玩家身上的累计充值活动ID，唯一标识，取活动开始日期time值
Def_PDict_TotalRechargeTemplateID = "TotalRechargeTemplateID" # 玩家身上的累计充值模板ID
-Def_PDict_TotalRechargeGold = "TotalRechargeGold" # 消费返利总累计充值仙玉
+Def_PDict_TotalRechargeGold = "TotalRechargeGold" # 消费返利总累计充值X元
Def_PDict_TotalRechargeAwardRecord = "TotalRechargeAwardRecord" # 累计充值领奖记录
+Def_PDict_TotalRechargeWorldLV = "TotalRechargeWorldLV" #累计充值活动开启时世界等级
#限时特惠活动
Def_PDict_SpringSaleID = "SpringSaleID" # 玩家身上的限时特惠活动ID，唯一标识，取活动开始日期time
@@ -3641,6 +3676,7 @@
Def_PDict_BossRebornTemplateID = "BossRebornTemplateID" # 玩家身上的BOSS复活模板ID
Def_PDict_BRActionCurTimes = "BRActionCurTimes_%s" #当前完成次数 参数BOSS复活活动ID
Def_PDict_BRActionGotTimes = "BRActionGotTimes_%s" #当前已领次数 参数BOSS复活活动ID
+Def_PDict_BRActionWorldLV = "BRActionWorldLV" #BOSS复活活动开启时世界等级
#仙界盛典
Def_PDict_FairyCeremonyID = "FairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
@@ -3650,6 +3686,15 @@
Def_PDict_FCPartyCurPoint = "FCPartyCurPoint" #全民来嗨活动当前总点数
Def_PDict_FCPartyAwardRecord = "FCPartyAwardRecord" #全民来嗨活动领奖记录
Def_PDict_FCCostGold = "FCCostGold" # 绝版降临总累计消费仙玉
+
+#新仙界盛典
+Def_PDict_NewFairyCeremonyID = "NewFairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
+Def_PDict_NewFCActionWorldLV = "NewFCActionWorldLV" #玩家身上的仙界盛典时的世界等级
+Def_PDict_NewFCRechargeState = "NewFCRechargeState" # 充值大礼状态 0-不可领 1-可领 2-已领取
+Def_PDict_NewFCPartyCurCnt = "NewFCPartyCurCnt_%s" #全民来嗨活动当前完成次数 参数活动ID
+Def_PDict_NewFCPartyCurPoint = "NewFCPartyCurPoint" #全民来嗨活动当前总点数
+Def_PDict_NewFCPartyAwardRecord = "NewFCPartyAwardRecord" #全民来嗨活动领奖记录
+Def_PDict_NewFCCostGold = "NewFCCostGold" # 绝版降临总累计消费仙玉
#绑玉转盘
Def_PDict_BindJadeWheelCurCnt = "BindJadeWheelCurCnt" # 今日已转次数
@@ -3683,6 +3728,35 @@
Def_PDict_HelpBattleCheckInCount = "HelpBattleCheckInCount" #助战登记次数, 登记次数*10+今日是否登记过
Def_PDict_HelpBattleTotalCount = "HelpBattleTotalCount" #累计助战次数
Def_PDict_FBRealHelpCount = "FBRealHelpCount_%s" #副本真实助战次数，仅针对真实进去打的副本，参数mapID
+
+#周狂欢
+Def_PDict_WeekPartyID = "WeekPartyID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
+Def_PDict_WeekPartyCurTimes = "WeekPartyCurTimes_%s_%s" #当前完成次数 参数(第X天,模板ID)
+Def_PDict_WeekPartyGotTimes = "WeekPartyGotTimes_%s_%s" #当前已领次数 参数(第X天,模板ID)
+Def_PDict_WeekPartyAwardRecord = "WeekPartyAwardRecord_%s" #积分领奖记录 参数(第X天)
+Def_PDict_WeekPartyPoint = "WeekPartyPoint_%s" #当天积分 参数(第X天)
+
+#节日巡礼周狂欢
+Def_PDict_FeastWeekPartyID = "FeastWeekPartyID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
+Def_PDict_FeastWeekPartyCurTimes = "FeastWPCurTimes_%s_%s" #当前完成次数 参数(第X天,模板ID)
+Def_PDict_FeastWeekPartyGotTimes = "FeastWPGotTimes_%s_%s" #当前已领次数 参数(第X天,模板ID)
+Def_PDict_FeastWeekPartyAwardRecord = "FeastWPAward_%s" #积分领奖记录 参数(第X天)
+Def_PDict_FeastWeekPartyPoint = "FeastWPPoint_%s" #当天积分 参数(第X天)
+
+#登录奖励运营活动
+Def_PDict_LoginAwardID = "LoginAwardID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
+Def_PDict_LoginAwardCurTimes = "LoginAwardCurTimes_%s_%s" #当前完成次数 参数(第X天,模板ID)
+Def_PDict_LoginAwardGotTimes = "LoginAwardGotTimes_%s_%s" #当前已领次数 参数(第X天,模板ID)
+Def_PDict_LoginAwardWorldLV = "LoginAwardWorldLV%s" #活动开启时世界等级参数(第X天)
+
+#诛仙BOSS
+Def_PDict_ZhuXianBossHelpCnt = "ZhuXianBossHelpCnt" # 协助次数
+
+#幸运鉴宝
+Def_PDict_LuckyTreasureID = "LuckyTreasureID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
+Def_PDict_LuckyTreasureFree = "LuckyTreasureFree" #是否免费过
+Def_PDict_LuckyTreasurePoint = "LuckyTreasurePoint" #幸运值
+Def_PDict_LuckyTreasureCnt = "LuckyTreasureCnt" #鉴宝次数
#-------------------------------------------------------------------------------
#类型 Def_PDictType_OnlinePrize
Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
@@ -3697,10 +3771,6 @@
Def_PDict_OSC_RecordData = "OSCRecordData_%s" # 开服活动记录数值, 参数(活动类型)
Def_PDict_OSC_EndMailState = "EndMailState" # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励；
-Def_PDict_MixServerCampaign_AwardRecord = "MSCAwardRecord_%s" # 合服活动奖励记录
-Def_PDict_MixServerCampaign_RecordData = "MSCRecordData_%s" # 合服活动记录数值
-Def_PDict_MixServerCampaign_MailState = "MSCMailState" # 合服活动结束补发未领奖记录邮件状态, 按类型位二进制存储状态
-
# 坐骑 Def_PDictType_Horse
Def_PDict_Horser_LV = "Horser_LV_%d" # 坐骑等级 0代表未激活 1代表1级
Def_PDict_Horser_Exp = "Horser_Exp_%d" # 坐骑经验
@@ -3709,6 +3779,9 @@
# 符印
Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState" # 符印解锁状态
Def_PDict_Rune_Data = "Rune_Data_%s" # 符印镶嵌数据, 参数(第几孔)
+
+# 聚魂
+Def_PDict_GatherSoulHoleData = "GatherSoulHoleData_%s" # 聚魂镶嵌数据, 参数(第几孔)
# 副本 Def_PDictType_FB
Def_PDict_FamilyBossFBAwardState = "FamilyBossFBAwardState_%s" # 家族boss副本领奖状态%s副本id
@@ -3797,21 +3870,27 @@
Def_PDict_Master_ExpPoint = "Master_ExpPoint" # 当前大师经验点
Def_PDict_Master_FreeSkillPoint = "Master_FreeSkillPoint" # 当前剩余大师技能点
-# 跨服匹配PK Def_PDictType_MergePK
-Def_PDict_MergePK_ID = "PD_%s" # 跨服PK玩家ID值, 参数(世界key)
-Def_PDict_MergePK_Cnt = "PD_MergePK_Cnt" # 跨服PK, 今日已PK次数
-Def_PDict_MergePK_BuyCnt = "PD_MergePK_BuyCnt" # 跨服PK, 今日已购买PK次数
-Def_PDict_MergePK_UnUsedBuyCnt = "PD_MergePK_UnUsedBuyCnt" # 跨服PK, 未使用的购买PK次数，永久保存
-Def_PDict_MergePK_WinsReward = "PD_MergePK_WinsReward" # 连胜奖励领取状态
-Def_PDict_MergePK_ScoreReward = "PD_MergePK_ScoreReward" # 积分奖励领取状态
-Def_PDict_MergePK_FirstWinCntReward = "PD_MergePK_FWinCntReward" # 首次胜利奖励领取状态, 领奖状态不重置, 赛季次数重新计算
-
-# 跨服王者争霸 Def_PDictType_MergeKing
-Def_PDict_MergeKing_ID = "PD_%s" # 跨服王者争霸玩家ID值, 参数(世界key)
-Def_PDict_MergeKing_ServerHonourAward = "PD_MergePK_ServerHonourAward" # 跨服王者争霸玩家全服荣耀奖励领取记录
-Def_PDict_MergeKing_RankAward = "PD_MergePK_RankAward" # 跨服王者争霸玩家晋级排名奖励领取记录
-Def_PDict_MergeKing_SupportAward = "PD_MergePK_SupportAward" # 跨服王者争霸玩家竞猜积分奖励领取记录
-Def_PDict_MergeKing_Worship = "PD_MergePK_Worship" # 跨服王者争霸玩家每日膜拜记录
+# 跨服竞技场
+Def_PDict_CrossPK_TotalScore = "CrossPK_TotalScore" # 当前总积分
+Def_PDict_CrossPK_OnDayScore = "CrossPK_OnDayScore" # 今天过天时的积分
+Def_PDict_CrossPK_DanLV = "CrossPK_DanLV" # 当前段位
+Def_PDict_CrossPK_PKCount = "CrossPK_PKCount" # 当前总PK次数
+Def_PDict_CrossPK_WinCount = "CrossPK_WinCount" # 当前胜利次数
+Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 跨当前连胜次数
+Def_PDict_CrossPK_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
+Def_PDict_CrossPK_TodayWinCount = "CrossPK_TodayWinCount" # 今日已胜利次数
+Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
+Def_PDict_CrossPK_ItemAddCount = "CrossPK_ItemAddCount" # 今日道具增加PK次数
+Def_PDict_CrossPK_DayPKCountAwardState = "CrossPK_DayPKCountAwardState" # 每日匹配次数奖励记录，二进制位存储是否已领取，按匹配次数升序排序索引代表奖励位
+Def_PDict_CrossPK_DayWinCountAwardState = "CrossPK_DayWinCountAwardState" # 每日胜利次数奖励记录，二进制位存储是否已领取，按胜利次数升序排序索引代表奖励位
+Def_PDict_CrossPK_DanLVAwardState = "CrossPK_DanLVAwardState" # 段位达标奖励记录，二进制位存储是否已领取，按段位代表奖励位
+Def_PDict_CrossPK_SeasonAwardState = "CrossPK_SeasonAwardState" # 赛季结算奖励是否已领取，优先排名奖励，未上榜可领段位奖励
+Def_PDict_CrossPK_ZoneID = "CrossPK_ZoneID" # 玩家上次参与的赛区ID
+Def_PDict_CrossPK_SeasonID = "CrossPK_SeasonID" # 玩家上次参与的赛季ID
+Def_PDict_CrossPK_SeasonDanLV = "CrossPK_SeasonDanLV_%s" # 历史赛季段位，参数，赛季ID
+Def_PDict_CrossPK_SeasonScore = "CrossPK_SeasonScore_%s" # 历史赛季积分，参数，赛季ID
+Def_PDict_CrossPK_SeasonOrder = "CrossPK_SeasonOrder_%s" # 历史赛季名次，参数，赛季ID
+Def_PDict_CrossPK_SeasonAwardLV = "CrossPK_SeasonAwardLV_%s" # 历史赛季奖励等级（一般是段位等级，排行奖励的在最高段位等级基础上增加），参数，赛季ID
#自动战斗设置记录
Def_PDict_AutoFightSetting = "AFSetting_%s_%s"
@@ -3829,6 +3908,11 @@
Def_PDict_OSRedPacketCanGrabCnt = "OSRedPacketCanGrabCnt" # 开服红包可抢次数
Def_PDict_OSRedPacketStartTime = "OSRedPacketStartTime" #开服红包开始倒计时时间
+#节日红包
+Def_PDict_FeastRedPacketActID = "FeastRedPacketActID" # 玩家身上的节日红包活动ID，唯一标识，取活动开始日期time值
+Def_PDict_FeastRedPacketGrabMoney = "FeastRedPacketGrabMoney" # 节日红包已抢数量
+Def_PDict_FeastRedPacketCanGrabCnt = "FeastRedPacketCanGrabCnt" # 节日红包可抢次数
+
#境界
Def_PDict_RealmFBIsOpen = "RealmFBIsOpen" #渡劫副本是否开启 0未开启 1已开启 2可升级境界
Def_PDict_RealmFBAttrAdd = "RealmFBAttrAdd_%s" #渡劫副本属性加成 参数属性ID
@@ -3842,6 +3926,7 @@
Def_PDict_MagicWeaponExp = "MagicWeaponExp_%s" #法宝经验 参数法宝ID
Def_PDict_MagicWeaponIsActive = "MagicWeaponIsActive_%s_%s" #法宝激活状态 参数(法宝类型, key编号)
Def_PDict_MagicWeaponIsClick = "MagicWeaponIsClick_%s_%s" #法宝点击状态 参数(法宝类型, key编号)
+Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s_%s" #法宝佩戴状态 参数(法宝类型, key编号)
Def_PDict_MagicWeaponRefineLV = "MagicWeaponRefineLV_%s" #法宝精炼等级 参数法宝ID
Def_PDict_XBXZAwardRecord = "XBXZAwardRecord_%s" #仙宝寻主领奖记录 参数ID
Def_PDict_MagicWeaponLV = "MagicWeaponLV_%s" #法宝等级 参数法宝ID
@@ -3883,11 +3968,15 @@
#套装
Def_PDict_EquipPartSuiteLV = "EQPartSuiteLV_%s_%s" #部位套装等级 参数 部位、套装类型
-Def_PDict_EquipPartSuiteNotify = "EQPartSuiteNotify_%s_%s_%s" #部位套装提示记录 参数 组合类型、套装类型、X件
+Def_PDict_EquipPartSuiteNotify = "EQPartSuiteNotify_%s" #部位套装提示记录 参数 标记
#神兽
Def_PDict_DogzFightState = "DogzFightState_%s" # 神兽助战状态，参数为key编号，按神兽ID二进制位存储
Def_PDict_DogzBuyHelpbattleCount = "DogzBuyHelpbattleCount" # 额外购买的神兽助战位
+
+#装备部位星数
+Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数 参数 装备背包格子索引
+
#-------------------------------------------------------------------------------
#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
@@ -4115,6 +4204,12 @@
AttrName_SuperHit:[[TYPE_Calc_SuperHit], False, TYPE_Linear],
AttrName_NPCHurtAddPer:[[TYPE_Calc_NPCHurtAddPer], False, TYPE_Linear],
ShareDefine.Def_Effect_NPCHurtAddPer:[[TYPE_Calc_NPCHurtAddPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_JobAHurtAddPer:[[TYPE_Calc_JobAHurtAddPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_JobBHurtAddPer:[[TYPE_Calc_JobBHurtAddPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_JobCHurtAddPer:[[TYPE_Calc_JobCHurtAddPer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_JobAAtkReducePer:[[TYPE_Calc_JobAAtkReducePer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_JobBAtkReducePer:[[TYPE_Calc_JobBAtkReducePer], False, TYPE_Linear],
+ ShareDefine.Def_Effect_JobCAtkReducePer:[[TYPE_Calc_JobCAtkReducePer], False, TYPE_Linear],
AttrName_JobAHurtAddPer:[[TYPE_Calc_JobAHurtAddPer], False, TYPE_Linear],
AttrName_JobBHurtAddPer:[[TYPE_Calc_JobBHurtAddPer], False, TYPE_Linear],
AttrName_JobCHurtAddPer:[[TYPE_Calc_JobCHurtAddPer], False, TYPE_Linear],
@@ -4186,13 +4281,6 @@
ShareDefine.Def_Effect_BaseDefAddPer:[[TYPE_Calc_BaseDefAddPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_BaseHitAddPer:[[TYPE_Calc_BaseHitAddPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_BaseMissAddPer:[[TYPE_Calc_BaseMissAddPer], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_HorcruxBasePer:[[TYPE_Calc_HorcruxBasePer], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_EquipBaseAddPer:[[TYPE_Calc_WeaponAtkAddPer, TYPE_Calc_RelicsAtkAddPer,
- TYPE_Calc_ArmorMaxHPAddPer, TYPE_Calc_ArmorDefAddPer], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_WeaponAtkAddPer:[[TYPE_Calc_WeaponAtkAddPer], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_RelicsAtkAddPer:[[TYPE_Calc_RelicsAtkAddPer], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_ArmorMaxHPAddPer:[[TYPE_Calc_ArmorMaxHPAddPer], False, TYPE_NoLinear],
- ShareDefine.Def_Effect_ArmorDefAddPer:[[TYPE_Calc_ArmorDefAddPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_GodWeaponMaxHPPer:[[TYPE_Calc_GodWeaponMaxHPPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_GodWeaponAtkPer:[[TYPE_Calc_GodWeaponAtkPer], False, TYPE_NoLinear],
ShareDefine.Def_Effect_StoneMaxHPPer:[[TYPE_Calc_StoneMaxHPPer], False, TYPE_NoLinear],
@@ -4213,14 +4301,6 @@
TYPE_Calc_BaseDefAddPer:[TYPE_Calc_AttrDEF],
TYPE_Calc_BaseHitAddPer:[TYPE_Calc_AttrHit],
TYPE_Calc_BaseMissAddPer:[TYPE_Calc_AttrMiss],
- TYPE_Calc_HorcruxBasePer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
- TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
- TYPE_Calc_EquipBaseAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
- TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
- TYPE_Calc_WeaponAtkAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
- TYPE_Calc_RelicsAtkAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
- TYPE_Calc_ArmorMaxHPAddPer:[TYPE_Calc_AttrMaxHP],
- TYPE_Calc_ArmorDefAddPer:[TYPE_Calc_AttrDEF],
TYPE_Calc_GodWeaponMaxHPPer:[TYPE_Calc_AttrMaxHP],
TYPE_Calc_GodWeaponAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
TYPE_Calc_StoneMaxHPPer:[TYPE_Calc_AttrMaxHP],
@@ -4235,6 +4315,27 @@
TYPE_Calc_AttrMaxHP],
TYPE_Calc_PlusBaseAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
}
+
+# 对装备基础属性加成配置 {属性ID:[影响部位信息, [影响的计算属性列表]], ...}
+# 影响部位信息: 大于0-指定部位; -1-所有部位; -2-基础部位
+EquipBassAttrAddInfoSet = {
+ ShareDefine.Def_Effect_EquipBaseAddPer: [-1, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
+ ShareDefine.Def_Effect_BaseEquipAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
+ ShareDefine.Def_Effect_BaseEquipAtkAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_BaseEquipMaxHPAddPer: [-2, [ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_WeaponAddPer: [ShareDefine.retWeapon, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_Weapon2AddPer: [ShareDefine.retWeapon2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_BeltAddPer: [ShareDefine.retBelt, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_GloveAddPer: [ShareDefine.retGlove, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
+ ShareDefine.Def_Effect_ClothesAddPer: [ShareDefine.retClothes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
+ ShareDefine.Def_Effect_HatAddPer: [ShareDefine.retHat, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
+ ShareDefine.Def_Effect_TrousersAddPer: [ShareDefine.retTrousers, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
+ ShareDefine.Def_Effect_ShoesAddPer: [ShareDefine.retShoes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
+ ShareDefine.Def_Effect_FairyCanAddPer: [ShareDefine.retFairyCan, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_FairyCan2AddPer: [ShareDefine.retFairyCan2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_NeckAddPer: [ShareDefine.retNeck, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ ShareDefine.Def_Effect_JadeAddPer: [ShareDefine.retJade, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
+ }
#属性线性索引
CalcAttrIndexList = (
@@ -4255,14 +4356,14 @@
#刷属性功能分类索引
CalcAttrFuncList = (
Def_CalcAttrFunc_RoleBase, # 角色基础 0
-Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1
-Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2
-Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3
-Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4
-Def_CalcAttrFunc_PlusBase, # 装备位强化基础 5
-Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6
+Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1 - 废弃
+Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2 - 废弃
+Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3 - 废弃
+Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4 - 废弃
+Def_CalcAttrFunc_Plus, # 装备位强化 5
+Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6 - 废弃
Def_CalcAttrFunc_Stone, # 装备宝石 7
-Def_CalcAttrFunc_Suit, # 套装 8
+Def_CalcAttrFunc_Suit, # 套装 8 - 废弃
Def_CalcAttrFunc_Wing, # 翅膀 9
Def_CalcAttrFunc_Wash, # 洗练 10
Def_CalcAttrFunc_Pet, # 灵宠 11
@@ -4271,10 +4372,10 @@
Def_CalcAttrFunc_GodWeapon, # 神兵 14
Def_CalcAttrFunc_Dienstgrad, # 称号 15
Def_CalcAttrFunc_Rune, # 符印 16
-Def_CalcAttrFunc_Horcrux, # 魂器 17
+Def_CalcAttrFunc_17, #
Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
-Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20
+Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20 - 废弃
Def_CalcAttrFunc_Success, # 成就属性 21
Def_CalcAttrFunc_VIP, # VIP属性 22
Def_CalcAttrFunc_Stove, # 炼丹炉 23
@@ -4293,11 +4394,32 @@
Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
Def_CalcAttrFunc_DogzEquip, # 神兽装备37
Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
-) = range(39)
-
+Def_CalcAttrFunc_GatherSoul, # 聚魂39
+Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
+Def_CalcAttrFunc_Coat, # 时装41
+Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
+Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43 - 废弃
+Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44 - 废弃
+Def_CalcAttrFunc_45,
+Def_CalcAttrFunc_Equip1, # 境界装备1阶 46
+Def_CalcAttrFunc_Equip2, # 境界装备2阶 47
+Def_CalcAttrFunc_Equip3, # 境界装备3阶 48
+Def_CalcAttrFunc_Equip4, # 境界装备4阶 49
+Def_CalcAttrFunc_Equip5, # 境界装备5阶 50
+Def_CalcAttrFunc_Equip6, # 境界装备6阶 51
+Def_CalcAttrFunc_Equip7, # 境界装备7阶 52
+Def_CalcAttrFunc_Equip8, # 境界装备8阶 53
+Def_CalcAttrFunc_Equip9, # 境界装备9阶 54
+Def_CalcAttrFunc_Equip10, # 境界装备10阶 55
+Def_CalcAttrFunc_Equip11, # 境界装备11阶 56
+Def_CalcAttrFunc_Equip12, # 境界装备12阶 57
+Def_CalcAttrFunc_Equip13, # 境界装备13阶 58
+Def_CalcAttrFunc_Equip14, # 境界装备14阶 59
+Def_CalcAttrFunc_Equip15, # 境界装备15阶 60
+) = range(61)
# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
-CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3,
+CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP, Def_CalcAttrFunc_PetSoul, Def_CalcAttrFunc_HorseSoul,
Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_MagicWeaponSoul
]
@@ -4309,13 +4431,9 @@
#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
-# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipBaseWeapon, Def_CalcAttrFunc_EquipBaseRelics,
-# Def_CalcAttrFunc_EquipBaseArmor, Def_CalcAttrFunc_Equip,
-# Def_CalcAttrFunc_EquipOutOfPrint, Def_CalcAttrFunc_EquipAllStars],
- ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipAllStars],
- ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_PlusBase, Def_CalcAttrFunc_PlusEx],
+# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipOutOfPrint],
+ ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
- ShareDefine.Def_MFPType_Suit:[Def_CalcAttrFunc_Suit],
ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign],
@@ -4326,14 +4444,32 @@
ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
ShareDefine.Def_MFPType_Dienstgrad:[Def_CalcAttrFunc_Dienstgrad],
ShareDefine.Def_MFPType_Rune:[Def_CalcAttrFunc_Rune],
- ShareDefine.Def_MFPType_Horcrux:[Def_CalcAttrFunc_Horcrux],
ShareDefine.Def_MFPType_MagicWeapon1:[Def_CalcAttrFunc_MagicWeapon1],
ShareDefine.Def_MFPType_MagicWeapon2:[Def_CalcAttrFunc_MagicWeapon2],
ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
+ ShareDefine.Def_MFPType_MagicWeapon4:[Def_CalcAttrFunc_MagicWeapon4],
ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
- # 神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
+ ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
+ ShareDefine.Def_MFPType_Coat:[Def_CalcAttrFunc_Coat],
+ # 诛仙装备战力、神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
+ #ShareDefine.Def_MFPType_ZhuXian:[Def_CalcAttrFunc_ZXEquipSuit, Def_CalcAttrFunc_ZXEquipStone],
+ ShareDefine.Def_MFPType_Equip1:[Def_CalcAttrFunc_Equip1],
+ ShareDefine.Def_MFPType_Equip2:[Def_CalcAttrFunc_Equip2],
+ ShareDefine.Def_MFPType_Equip3:[Def_CalcAttrFunc_Equip3],
+ ShareDefine.Def_MFPType_Equip4:[Def_CalcAttrFunc_Equip4],
+ ShareDefine.Def_MFPType_Equip5:[Def_CalcAttrFunc_Equip5],
+ ShareDefine.Def_MFPType_Equip6:[Def_CalcAttrFunc_Equip6],
+ ShareDefine.Def_MFPType_Equip7:[Def_CalcAttrFunc_Equip7],
+ ShareDefine.Def_MFPType_Equip8:[Def_CalcAttrFunc_Equip8],
+ ShareDefine.Def_MFPType_Equip9:[Def_CalcAttrFunc_Equip9],
+ ShareDefine.Def_MFPType_Equip10:[Def_CalcAttrFunc_Equip10],
+ ShareDefine.Def_MFPType_Equip11:[Def_CalcAttrFunc_Equip11],
+ ShareDefine.Def_MFPType_Equip12:[Def_CalcAttrFunc_Equip12],
+ ShareDefine.Def_MFPType_Equip13:[Def_CalcAttrFunc_Equip13],
+ ShareDefine.Def_MFPType_Equip14:[Def_CalcAttrFunc_Equip14],
+ ShareDefine.Def_MFPType_Equip15:[Def_CalcAttrFunc_Equip15],
ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
}
@@ -4402,7 +4538,14 @@
TriggerType_SummonDie, #自身召唤兽死亡触发技能 60
TriggerType_GiftReduceCD, # 天赋用的减CD 61
TriggerType_ProDefValue, # 神兵护盾值下降时 62
-) = range(1, 63)
+TriggerType_LockHP, # 锁血触发技能 63
+TriggerType_BeLuckyHit, # 被会心一击触发技能 64
+TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
+TriggerType_ZhongjiZhansha, # 终极斩杀 66
+TriggerType_SuperHitSubLayer, # 暴击减层 67
+TriggerType_SuperHitSkipCD, # 暴击无冷却 68
+TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
+) = range(1, 70)
# NPC功能类型定义
@@ -4457,50 +4600,6 @@
ShareDefine.PlayerJob_Max : TYPE_CHAPLAIN, #魔剑对应魔剑系
}
-#跨服服务器广播类型, 与GameServer一致
-(
-Def_PreeSetPlayer, #添加跨服预选赛参赛人员 0
-Def_PreeSetBattleInfo, #添加跨服预选赛对战表1
-Def_PreeBattleIDOver, #每场跨服预选赛的结果2
-Def_SetPlayer, #添加参赛人员3
-Def_SetBattleInfo, #添加跨服预选赛对战表4
-Def_BattleIDOver, #每场跨服预选赛的结果5
-Def_PlayerChange, #人员表信息变更6
-Def_EliminationReword, #万国淘汰赛参数奖励7
-Def_MergeServerOpenActionDay, #万国开启的活动到现在的天数8
-Def_MergeServerOpenActionState, #万国开启的活动状态9
-Def_MergeWarStartTime, #万国活动激活时间10
-Def_MergeDictKeyValue, #跨服GameWorld字典key值11
-Def_MergeBossKilled, #跨服boss单boss击杀结果12
-Def_MergeBossResult, #跨服boss结果13
-Def_MergePKMatchResult, #跨服PK匹配信息14
-Def_MergePKReadyOKRoomList, #跨服PK已准备好的房间列表15
-Def_MergePKSyncBillboard, #跨服PK同步排行榜16
-Def_MergePKLuckyItem, #跨服PK同步排行榜17
-Def_MergePKActionState, #跨服PK活动状态变更18
-Def_MergePKTopPlayerView, #跨服PK活动高手榜玩家展示信息19
-Def_RecoverMergePKWinCost, #跨服PK恢复连胜扣费信息20
-Def_MergeWorldNotify, #跨服全服广播21
-Def_MergeLoudspeaker, #跨服全服喇叭22
-Def_MergePKKing, #跨服王者争霸23
-Def_MergePKUnNotifyOverInfo, #跨服PK未同步的PK结果24
-Def_MergeOnLinePlayer, #跨服在线玩家25
-Def_Merge26, #26
-Def_MergePlayerEvent, #跨服玩家事件27
-Def_MaxType,
-) = range(29)
-
-#子服务器发送信息到跨服服务器, 与GameServer一致
-(
-Def_RequestMergePKMatch, #跨服PK匹配请求0
-Def_CancelMergePKMatch, #跨服PK取消匹配1
-Def_MergePKPrepareOK, #跨服PK准备完毕2
-Def_SendGMCMD, #发送GM命令3
-Def_RecoverMergePKWin, #跨服PK恢复连胜4
-Def_SendMergeLoudspeaker, #发送跨服喇叭5
-Def_ClientServerInitOK, #跨服子服启动成功6
-) = range(7)
-
#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
(
Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具，针对已购买过VIP礼包的老号处理;
@@ -4508,7 +4607,12 @@
Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
Def_VerFix_FMTDouble, # 1.3版本VIP特权变更，记录切换版本前的VIP特权(封魔坛双倍挑战);
Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;
-) = range(5)
+Def_VerFix_Horse, # 坐骑等级上限修改，对应技能触发修改;
+Def_VerFix_Pet, # 灵宠等级上限修改，对应技能触发修改;
+Def_VerFix_AddPoint, # 老号属性点修复;
+Def_VerFix_GodWeaponItem, # 1.5删除中级神兵石;
+Def_VerFix_ZXTower, # 诛仙塔奖励变更补偿;
+) = range(10)
##==================================================================================================
#游戏消费点类型定义
@@ -4553,6 +4657,11 @@
Def_Cost_WishingWell, # 许愿池刷新
Def_Cost_GodWeapon, # 神兵
Def_Cost_FBHelpBattle, # 副本助战
+Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
+Def_Cost_CrossRealmPK, # 跨服PK
+Def_Cost_LuckyTreasure, #幸运鉴宝
+Def_Cost_MysteryShopRefresh, # 神秘商店刷新
+Def_Cost_AuctionBid, # 拍卖行竞价
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4560,10 +4669,6 @@
Def_Cost_FinishTruck, # 完成镖车
Def_Cost_RefreshTimeShop, # 刷新神秘商店
Def_Cost_OpenNoble, # 开通贵族
-Def_Cost_BuyMergePKCnt, # 购买跨服PK次数
-Def_Cost_RecoverMergePKWin, # 恢复跨服PK连胜
-Def_Cost_MergeKingSupport, # 押注
-Def_Cost_MergeKingBribe, # 贿赂
Def_Cost_HighLadder, # 天梯竞技场
Def_Cost_Reincarnation, # 转生
Def_Cost_BuyStallItem, # 购买摆摊物品
@@ -4573,24 +4678,24 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 59)
+) = range(2000, 2000 + 60)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
# 消费返利不处理的消费类型列表
CostRebate_DisableType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_FreeGoods, Def_Cost_FamilyRedPacket,
- Def_Cost_Unknown, "GMSetMoney", "Warehouse"]
+ Def_Cost_Unknown, "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
CostProfit_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
- "GMSetMoney", "Warehouse"]
+ "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
# 消费VIP不处理的消费类型列表
CostVIP_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
- "GMSetMoney", "Warehouse"]
+ "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
# 可在跨服中消费的类型列表
MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive, Def_Cost_FBEncourage]
#内部仙玉不能用的消费类型列表
-UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket]
+UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket, Def_Cost_AuctionBid]
# 消费类型对应信息字典{消费类型:[eventName, 中文说明reason_name, 发送给9377的数据是否分消费子类], }
# 由于9377那边数据建议所有消费点总和最好不超过500个，故这里对部分发送给对方的数据进行归组为不分子类，或直接归属于商城分组
# .使用原价购买的物品统一归属为商城组，消费对应为AutoBuy的也归属于商城分组
@@ -4619,10 +4724,6 @@
Def_Cost_RefreshArrestTask:"RefreshArrestTask",
Def_Cost_RefreshTimeShop:"RefreshTimeShop",
Def_Cost_ResetGreatMasterSkill:"ResetTalentSkill",
-Def_Cost_BuyMergePKCnt:"BuyMergePKCnt",
-Def_Cost_RecoverMergePKWin:"RecoverMergePKWin",
-Def_Cost_MergeKingSupport:"MergeKingSupport",
-Def_Cost_MergeKingBribe:"MergeKingBribe",
Def_Cost_GM:"GM",
Def_Cost_BourseBuy:"BourseBuy",
Def_Cost_BourseCharge:"BourseCharge",
@@ -4660,6 +4761,11 @@
Def_Cost_WishingWell:"WishingWell",
Def_Cost_GodWeapon:"GodWeapon",
Def_Cost_FBHelpBattle:"FBHelpBattle",
+Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
+Def_Cost_CrossRealmPK:"CrossRealmPK",
+Def_Cost_LuckyTreasure:"LuckyTreasure",
+Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
+Def_Cost_AuctionBid:"AuctionBid",
}
## -----------------------------------------------------
@@ -4689,9 +4795,12 @@
Def_GiveMoney_StallItem, # 摆摊
Def_GiveMoney_Trade, # 交易
Def_GiveMoney_Truck, # 运镖
-Def_GiveMoney_FreeGoods, # 极品白拿 25
-Def_GiveMoney_BindJadeWheel, # 绑玉转盘
-) = range(1000, 1000 + 26)
+Def_GiveMoney_FreeGoods, # 极品白拿
+Def_GiveMoney_BindJadeWheel, # 绑玉转盘 25
+Def_GiveMoney_GatherSoulDecompose, #聚魂分解 26
+Def_GiveMoney_AuctionBidReturn, #拍卖竞价返还
+Def_GiveMoney_AuctionGain, #拍卖获得利润
+) = range(1000, 1000 + 29)
Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
@@ -4723,6 +4832,9 @@
Def_GiveMoney_Truck:"Truck",
Def_GiveMoney_FreeGoods:"FreeGoods",
Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
+Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
+Def_GiveMoney_AuctionBidReturn:"AuctionBidReturn",
+Def_GiveMoney_AuctionGain:"AuctionGain",
}
##==================================================================================================
@@ -4749,7 +4861,8 @@
ItemGive_Refine, # 炼丹
ItemGive_Chests, # 宝箱
ItemGive_TrialExchange, # 宗门兑换
-) = range(1000, 1000 + 20)
+ItemGive_LuckyTreasure, #幸运鉴宝
+) = range(1000, 1000 + 21)
# 物品获得类型对应信息 {类型:eventName, ...}
ItemGiveTypeDict = {
@@ -4773,6 +4886,7 @@
ItemGive_Refine:"Refine",
ItemGive_Chests:"Chests",
ItemGive_TrialExchange:"TrialExchange",
+ ItemGive_LuckyTreasure:"LuckyTreasure",
}
## 物品扣除类型定义，与获得类型不重复，类型定义为 2000 ~ 2999
@@ -4812,7 +4926,12 @@
ItemDel_AddKillBossCnt, # 增加BOSS可击杀次数 32
ItemDel_DogzEquipPlus, # 神兽装备强化
ItemDel_ChatBubbleBox, # 激活聊天气泡框
-) = range(2000, 2000 + 35)
+ItemDel_GatherSoul, # 聚魂分解
+ItemDel_CoatDecompose, # 时装分解
+ItemDel_ZhuXianDecompose, # 诛仙装备分解
+ItemDel_EquipStarUp, # 装备升星
+ItemDel_EquipPlusEvolve, # 装备强化进化
+) = range(2000, 2000 + 40)
# 物品扣除类型对应信息 {类型:eventName, ...}
ItemDelTypeDict = {
@@ -4850,6 +4969,12 @@
ItemDel_AddFBCnt:"AddFBCnt",
ItemDel_AddKillBossCnt:"AddKillBossCnt",
ItemDel_DogzEquipPlus:"DogzEquipPlus",
+ ItemDel_ChatBubbleBox:"ChatBubbleBox",
+ ItemDel_GatherSoul:"GatherSoul",
+ ItemDel_CoatDecompose:"CoatDecompose",
+ ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
+ ItemDel_EquipStarUp:"EquipStarUp",
+ ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
}
##==================================================================================================
@@ -4952,7 +5077,7 @@
VIPPrivilege_FamilyGoldPack, #23 仙盟钻石红包
VIPPrivilege_BoursePwd, #24 集市上架使用密码
VIPPrivilege_25, #25 封魔坛购买次数 - 副本总表统一处理
-VIPPrivilege_BoursePwd, #26 VIP被动技能孔——VIP4专属被动技能孔
+VIPPrivilege_26, #26 VIP被动技能孔——VIP4专属被动技能孔
VIPPrivilege_BOSSHomeKillLimit, #27 BOSS之家疲劳值上限
VIPPrivilege_FMTDouble, #28 封魔坛双倍击杀
VIPPrivilege_29, #29 娲皇遗迹购买次数 - 副本总表统一处理
@@ -4961,7 +5086,8 @@
VIPPrivilege_32, #32 封魔坛自动挑战
VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
-) = range(1, 35)
+VIPPrivilege_35, #35 诛仙BOSS购买次数 - 副本总表统一处理
+) = range(1, 36)
(
@@ -4984,10 +5110,11 @@
ntPet,
ntTouchKill, #触碰后自杀类 17
ntUndeath, #不死类型 18
-ntRobot, #上古战场机器人类型 19
+ntDestructible, #场景内可破坏的 19
ntHelpBattleRobot, #助战机器人 20
+ntRobot, #机器人21
ntMax
-) = range(22)
+) = range(23)
(Def_SkillFuncType_Common, #0为通用技能
@@ -5003,7 +5130,8 @@
Def_SkillFuncType_SkillRoll, #10为翻滚 服务端未用到
Def_SkillFuncType_RealmSuppress, #11为境界压制 目前是NPC在用
Def_SkillFuncType_Dogz, #12 神兽技能
-) = range(13)
+Def_SkillFuncType_ZhuXian, #13 诛仙技能
+) = range(14)
# 受技能效果完全影响的怪， 对应 Def_BattleRelationType_CommNoBoss
Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
@@ -5043,11 +5171,14 @@
GoldInvestType_Month, # 月卡投资
GoldInvestType_VIP, # vip投资
GoldInvestType_Gold, # 仙玉投资
-) = range(1,3+1)
+GoldInvestType_Gold2, # 仙玉投资2
+GoldInvestType_Gold3, # 仙玉投资3
+) = range(1,5+1)
#可以循环投资的类型
CanRepeatInvestType = [GoldInvestType_Month, GoldInvestType_VIP]
-
+#仙玉投资类型
+InvestGoldTypeList = [GoldInvestType_Gold, GoldInvestType_Gold2, GoldInvestType_Gold3]
#前端特殊新手引导存储标记
GuideState_BZZDShow = 202
@@ -5078,8 +5209,10 @@
tttFBAddTime, # 可挑战下一关倒计时 6
tttDeadTime, # 死亡倒计时(古神禁地) 7
tttPickupItem, # 拾取物品倒计时 8
+tttWaitPlayer, # 等待对手倒计时 9
+tttPlayerLeave, # 对手掉线倒计时 10
tttMax,
-) = range(10)
+) = range(12)
Def_FBPickupItemTime = 30000
@@ -5112,7 +5245,14 @@
Def_RewardType_OpenFunc, # 功能开启奖励17
Def_RewardType_TotalRecharge, # 累计充值奖励18
Def_RewardType_IceLodeStar, # 冰晶矿脉星级奖励19
-)= range(20)
+Def_RewardType_WeekPartyAct, # 领取周狂欢活动奖励20
+Def_RewardType_WeekPartyPoint, # 领取周狂欢积分奖励21
+Def_RewardType_ActLoginAwardAct, # 领取登录奖励活动奖励22
+Def_RewardType_NewFairyCRecharge, # 新仙界盛典充值大礼23
+Def_RewardType_NewFairyCParty, # 新仙界盛典全民来嗨24
+Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
+Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
+)= range(27)
#boss复活相关活动定义
@@ -5149,6 +5289,63 @@
Def_PPAct_VIPBoss, #vipBOSS 13
) = range(1, 13+1)
+#周狂欢活动定义
+WeekPartyActIDList = (
+Def_WPAct_RunTask, #师门悬赏 1
+Def_WPAct_XJMJ, #仙境秘境 2
+Def_WPAct_KirinHome, #麒麟之府 3
+Def_WPAct_QueenRelices, #娲皇遗迹 4
+Def_WPAct_IceLode, #冰晶矿脉 5
+Def_WPAct_Tower, #符印塔 6
+Def_WPAct_WorldBOSS, #世界boss 7
+Def_WPAct_BOSSHome, #boss之家 8
+Def_WPAct_FMT, #封魔坛 9
+Def_WPAct_GodArea, #古神禁地 10
+Def_WPAct_CrossPK, #跨服pk 11
+Def_WPAct_Recharge, #充值X仙玉 12
+Def_WPAct_GiftBag, #购买限时礼包 13
+Def_WPAct_FamilyRobBoss, #boss争夺战 14
+Def_WPAct_SWRH, #守卫人皇 15
+Def_WPAct_ElderBattlefield, #上古战场 16
+Def_WPAct_ChaosDemon, #混乱妖域 17
+Def_WPAct_XMZZ, #仙魔之争 18
+Def_WPAct_FamilyWar, #仙魔联赛 19
+Def_WPAct_Login, #每日登录 20
+Def_WPAct_Horse, #激活某只坐骑 21
+Def_WPAct_Pet, #激活某只灵宠 22
+Def_WPAct_Dogz, #出战某只神兽 23
+Def_WPAct_Stone, #宝石总等级 24
+Def_WPAct_GodWeapon, #神兵总等级 25
+Def_WPAct_Rune, #穿戴某品质符印 26
+Def_WPAct_Pray, #祈愿 27
+) = range(1, 27+1)
+
+#可提前完成的周狂欢活动
+AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]
+
+#登录奖励活动定义
+LoginAwardActIDList = (
+Def_LoginAct_Login, #每日登录1
+Def_LoginAct_Pray, #祈愿2
+Def_LoginAct_TowerSweep, #符印塔扫荡 3
+Def_LoginAct_KirinHome, #麒麟之府 4
+Def_LoginAct_RunTask, #师门悬赏5
+Def_LoginAct_XJMJ, #仙境秘境 6
+Def_LoginAct_FMT, #封魔坛7
+Def_LoginAct_MunekadoTrial, #宗门试炼8
+Def_LoginAct_FamilyParty, #仙盟宴会9
+Def_LoginAct_WorldBOSS, #世界boss 10
+Def_LoginAct_QueenRelices, #娲皇遗迹 11
+Def_LoginAct_IceLode, #冰晶矿脉 12
+Def_LoginAct_GodArea, #古神禁地 13
+Def_LoginAct_ZhuXianTower, #诛仙塔挑战 14
+Def_LoginAct_ZhuXianBOSS, #诛仙boss 15
+Def_LoginAct_Alchemy, #炼丹 16
+Def_LoginAct_EquipPlus, #强化 17
+Def_LoginAct_EquipWash, #洗炼 18
+) = range(1, 18+1)
+
+
# 套装枚举，普通套装，强化套装
(EquipSuitType_Normal,
EquipSuitType_Plus,
@@ -5173,7 +5370,10 @@
PowerDownType_EquipWash, #洗练
PowerDownType_Title, #称号过期
PowerDownType_Dogz, #神兽召回
-) = range(7)
+PowerDownType_ResetPoint, #洗点
+PowerDownType_ResetTalent, #大师天赋重置
+PowerDownType_GatherSoul, #聚魂替换
+) = range(11)
FightPowerDownRecordDict = {
PowerDownType_Rune:'Rune',
PowerDownType_LVUP:'LVUP',
@@ -5183,4 +5383,7 @@
PowerDownType_EquipWash:'EquipWash',
PowerDownType_Title:'DelTitle',
PowerDownType_Dogz:'DogzState',
+ PowerDownType_ResetPoint:'ResetPoint',
+ PowerDownType_ResetTalent:'ResetTalent',
+ PowerDownType_GatherSoul:'GatherSoul',
}
\ No newline at end of file
--
Gitblit v1.8.0