From 7d3e1b11373f664833362b3887dfe96e44dbf0da Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 25 一月 2019 16:07:51 +0800
Subject: [PATCH] 2954 【1.5.100】【1.5.0】跨服竞技场地图报错 -- 男号技能极光琉璃的减攻速buff 被敌方反弹导致报错问题
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 388 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 248 insertions(+), 140 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index a5a58eb..96ab222 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 = 133
#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
TYPE_Calc_AttrList = (
#基础属性
@@ -214,6 +214,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 +264,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 +320,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 # 神兽装备经验
@@ -346,6 +357,21 @@
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_Item_Type_Horse = 1000036 #坐骑
@@ -353,23 +379,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
# 部位对应装备类型列表
@@ -422,9 +444,12 @@
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_ItemGiveGongXun = 1920 #使用道具给予功勋
-Def_Effect_ItemGiveHonorPoint = 1922 #使用道具给予荣誉积分
Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
Def_Effect_ItemGiveRuneSplinters = 1926 #使用道具给予符印碎片
Def_Effect_SuiteMark = 2838 #用于标示套装装备，过滤等使用
@@ -756,7 +781,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 +796,16 @@
Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
#装备类型
-Def_EquipItemType = xrange(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
+Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
#武器类型
Def_WeaponItemType = [Def_ItemType_retWeapon, Def_ItemType_retWeapon2]
#神兽装备类型
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
@@ -834,6 +865,10 @@
Def_PackCnt_DogzItem = 100
#初始化神兽装备格子数
Def_PackCnt_DogzEquip = 100
+#初始化诛仙背包格子数
+Def_PackCnt_ZhuXianItem = 100
+#初始化诛仙装备格子数
+Def_PackCnt_ZhuXianEquip = 12
#初始化装备栏2
Def_PackCnt_Equip2 = 0
#初始化回收站
@@ -1077,6 +1112,8 @@
ShareDefine.rptPet,
ShareDefine.rptDogzItem,
ShareDefine.rptDogzEquip,
+ ShareDefine.rptZhuXianItem,
+ ShareDefine.rptZhuXianEquip,
]
#装备可强化背包列表
@@ -1442,7 +1479,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 +1738,6 @@
Def_Player_RequestAddFamilyMaxCnt = 200 #玩家申请加入家族的最大数量 (目前无限制 配个大的数值)
#-------------------------------#副本相关#------------------------
-# 跨服中转地图ID
-Def_MergeTransMapID = 12075
#创角新手村地图ID列表
Def_CreatRoleMapIDList = [10000]
#PK周赛
@@ -1768,15 +1803,34 @@
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
+
+
+#注册上传跨服服务器数据后直接进入跨服服务器的地图
+RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
+#跨服地图
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
+#跨服对应分区配置表名
+Def_CrossZoneTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZone",
+ }
+
#副本关闭时未拾取的物品邮件发放给玩家
#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
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 +1838,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_MapID_LineIDToPropertyID
## 进入副本需要根据请求的功能线路处理的地图， hxp-改了进入模式，暂不需要了 180320
#Def_MapID_ReqFBFuncLine = [Def_FBMapID_KirinHome, Def_FBMapID_BZZD, Def_FBMapID_SealDemonEx,
@@ -1798,13 +1852,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_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]
+Def_NoLimitEnterCntMap = [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 +1913,10 @@
'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],#诛仙塔
}
#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -1873,6 +1930,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 +1976,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 +2212,6 @@
1000 * 60 * 10, #玩家称号时效
400, #吸血
400, #吸蓝
- 1000 * 5, # 恢复跨服PK连胜次数请求间隔
- 1000 * 5, # 跨服PK领奖间隔
- 1000 * 5, # 跨服王者争霸竞猜积分领奖间隔
1000 * 3, # 仓库整理间隔
1000 * 15, # 渡劫鼓舞间隔
1000 * 1, # vip体验时效
@@ -2227,9 +2285,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体验时效
@@ -2369,7 +2424,12 @@
Type_Equip_CanTake = ShareDefine.RoleEquipType
#装备物品位置,不需要重刷属性
-EquipItemNoRefreshState = []
+EquipItemNoRefreshState = [
+ ShareDefine.retHorse, #19 坐骑
+ ShareDefine.retWeaponSkin, #20 时装武器
+ ShareDefine.retClothesSkin, #21 时装衣服
+ ShareDefine.retWeapon2Skin, #22 时装副手
+ ]
# 需要广播外观的装备部位
Def_SyncEquipStateByIndex = [
@@ -2823,14 +2883,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)
@@ -2994,6 +3052,9 @@
#---SetDict 玩家字典KEY，不存于数据库---
# key的长度不能超过29个字节
+Def_PlayerKey_Zhansha = "zhansha" # 斩杀标志
+Def_PlayerKey_ZhuxianRate = "ZXRate" # 诛仙一击的概率
+Def_PlayerKey_ZhuxianHurtPer = "ZXHurtPer" # 诛仙一击的伤害%
Def_PlayerKey_LockHPSkillID = "LockHPSkillID" # 锁血功能的技能
Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD" # 神兵护盾被攻击前的值
Def_PlayerKey_curHurtValue = "curHurtValue" # 计算中的临时伤害值，技能特殊用
@@ -3230,9 +3291,9 @@
Def_PDictType_LVAward, # 等级奖励领取信息记录5
Def_PDictType_GoldGift, # 充值豪礼
Def_PDictType_OpenServerCampaign, # 开服活动
-Def_PDictType_8,
+Def_PDictType_WeekParty,
Def_PDictType_Family_Contribution, # 战盟贡献度
-Def_PDictType_10, # 10
+Def_PDictType_LoginAward, # 登录奖励运营活动
Def_PDictType_OfficialRank, # 官爵
Def_PDictType_Horse, # 坐骑
Def_PDictType_Wing, # 翅膀
@@ -3250,13 +3311,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点
@@ -3268,7 +3331,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
@@ -3298,6 +3360,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初始化成功(仅登陆一次)
@@ -3371,13 +3435,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" # 改名锁
@@ -3451,9 +3512,6 @@
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
@@ -3525,9 +3583,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等级奖励
@@ -3587,7 +3645,8 @@
#试炼之塔
Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数
-
+#诛仙塔
+Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔通关层数
#古神禁地
Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
Def_Player_Dict_GodArea_LastAddAngerTime = "GodArea_LastAddAngerTime" # 古神禁地上一次增加怒气值的时间
@@ -3609,9 +3668,6 @@
Def_Player_Dict_ArrestTaskData = "ArrestTaskData_%s" # 悬赏任务数据,参数索引
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" # 封魔坛是否双倍
@@ -3647,6 +3703,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_%s" #BOSS复活活动开启时世界等级
#仙界盛典
Def_PDict_FairyCeremonyID = "FairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
@@ -3689,6 +3746,21 @@
Def_PDict_HelpBattleCheckInCount = "HelpBattleCheckInCount" #助战登记次数, 登记次数*10+今日是否登记过
Def_PDict_HelpBattleTotalCount = "HelpBattleTotalCount" #累计助战次数
Def_PDict_FBRealHelpCount = "FBRealHelpCount_%s" #副本真实助战次数，仅针对真实进去打的副本，参数mapID
+
+#周狂欢
+Def_PDict_WeekPartyID = "WeekPartyID" # 玩家身上的BOSS复活活动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_LoginAwardID = "LoginAwardID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
+Def_PDict_LoginAwardCurTimes = "LoginAwardCurTimes_%s_%s" #当前完成次数 参数(第X天,模板ID)
+Def_PDict_LoginAwardGotTimes = "LoginAwardGotTimes_%s_%s" #当前已领次数 参数(第X天,模板ID)
+
+#诛仙BOSS
+Def_PDict_ZhuXianBossHelpCnt = "ZhuXianBossHelpCnt" # 协助次数
#-------------------------------------------------------------------------------
#类型 Def_PDictType_OnlinePrize
Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
@@ -3715,6 +3787,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
@@ -3803,21 +3878,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"
@@ -3848,6 +3929,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
@@ -4121,6 +4203,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],
@@ -4299,11 +4387,16 @@
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
+) = range(44)
# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
-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
]
@@ -4336,10 +4429,14 @@
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],
ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
}
@@ -4411,7 +4508,8 @@
TriggerType_LockHP, # 锁血触发技能 63
TriggerType_BeLuckyHit, # 被会心一击触发技能 64
TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
-) = range(1, 66)
+TriggerType_ZhongjiZhansha, # 终极斩杀 66
+) = range(1, 67)
# NPC功能类型定义
@@ -4466,50 +4564,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礼包的老号处理;
@@ -4517,7 +4571,11 @@
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删除中级神兵石;
+) = range(9)
##==================================================================================================
#游戏消费点类型定义
@@ -4562,6 +4620,8 @@
Def_Cost_WishingWell, # 许愿池刷新
Def_Cost_GodWeapon, # 神兵
Def_Cost_FBHelpBattle, # 副本助战
+Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
+Def_Cost_CrossRealmPK, # 跨服PK
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4569,10 +4629,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, # 购买摆摊物品
@@ -4582,7 +4638,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 59)
+) = range(2000, 2000 + 57)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4628,10 +4684,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",
@@ -4669,6 +4721,8 @@
Def_Cost_WishingWell:"WishingWell",
Def_Cost_GodWeapon:"GodWeapon",
Def_Cost_FBHelpBattle:"FBHelpBattle",
+Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
+Def_Cost_CrossRealmPK:"CrossRealmPK",
}
## -----------------------------------------------------
@@ -4698,9 +4752,10 @@
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
+) = range(1000, 1000 + 27)
Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
@@ -4732,6 +4787,7 @@
Def_GiveMoney_Truck:"Truck",
Def_GiveMoney_FreeGoods:"FreeGoods",
Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
+Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
}
##==================================================================================================
@@ -4821,7 +4877,10 @@
ItemDel_AddKillBossCnt, # 增加BOSS可击杀次数 32
ItemDel_DogzEquipPlus, # 神兽装备强化
ItemDel_ChatBubbleBox, # 激活聊天气泡框
-) = range(2000, 2000 + 35)
+ItemDel_GatherSoul, # 聚魂分解
+ItemDel_CoatDecompose, # 时装分解
+ItemDel_ZhuXianDecompose, # 诛仙装备分解
+) = range(2000, 2000 + 38)
# 物品扣除类型对应信息 {类型:eventName, ...}
ItemDelTypeDict = {
@@ -4859,6 +4918,10 @@
ItemDel_AddFBCnt:"AddFBCnt",
ItemDel_AddKillBossCnt:"AddKillBossCnt",
ItemDel_DogzEquipPlus:"DogzEquipPlus",
+ ItemDel_ChatBubbleBox:"ChatBubbleBox",
+ ItemDel_GatherSoul:"GatherSoul",
+ ItemDel_CoatDecompose:"CoatDecompose",
+ ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
}
##==================================================================================================
@@ -4961,7 +5024,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 娲皇遗迹购买次数 - 副本总表统一处理
@@ -4970,7 +5033,8 @@
VIPPrivilege_32, #32 封魔坛自动挑战
VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
-) = range(1, 35)
+VIPPrivilege_35, #35 诛仙BOSS购买次数 - 副本总表统一处理
+) = range(1, 36)
(
@@ -5013,7 +5077,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视野刷新
@@ -5053,11 +5118,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
@@ -5088,8 +5156,10 @@
tttFBAddTime, # 可挑战下一关倒计时 6
tttDeadTime, # 死亡倒计时(古神禁地) 7
tttPickupItem, # 拾取物品倒计时 8
+tttWaitPlayer, # 等待对手倒计时 9
+tttPlayerLeave, # 对手掉线倒计时 10
tttMax,
-) = range(10)
+) = range(12)
Def_FBPickupItemTime = 30000
@@ -5122,7 +5192,10 @@
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
+)= range(23)
#boss复活相关活动定义
@@ -5159,6 +5232,39 @@
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
+) = range(1, 26+1)
+
+#可提前完成的周狂欢活动
+AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]
+
# 套装枚举，普通套装，强化套装
(EquipSuitType_Normal,
EquipSuitType_Plus,
@@ -5185,7 +5291,8 @@
PowerDownType_Dogz, #神兽召回
PowerDownType_ResetPoint, #洗点
PowerDownType_ResetTalent, #大师天赋重置
-) = range(10)
+PowerDownType_GatherSoul, #聚魂替换
+) = range(11)
FightPowerDownRecordDict = {
PowerDownType_Rune:'Rune',
PowerDownType_LVUP:'LVUP',
@@ -5197,4 +5304,5 @@
PowerDownType_Dogz:'DogzState',
PowerDownType_ResetPoint:'ResetPoint',
PowerDownType_ResetTalent:'ResetTalent',
+ PowerDownType_GatherSoul:'GatherSoul',
}
\ No newline at end of file
--
Gitblit v1.8.0