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 | 145 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 106 insertions(+), 39 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index f7e8220..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 = 131
+Def_Calc_AllAttrType_MAX = 133
#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
TYPE_Calc_AttrList = (
#基础属性
@@ -214,7 +214,9 @@
TYPE_Calc_WingHPPer, # 翅膀生命百分比
TYPE_Calc_SuiteBasePer, # 套装基础属性百分比
TYPE_Calc_PlusBaseAtkPer, # 强化基础攻击百分比
-TYPE_Calc_ProDef, # 当前防护值
+TYPE_Calc_ProDef, # 当前防护值 130
+TYPE_Calc_ZhuxianRate, # 诛仙一击的概率
+TYPE_Calc_ZhuxianHurtPer, # 诛仙一击的伤害比
) = range(1, Def_Calc_AllAttrType_MAX)
@@ -355,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 #坐骑
@@ -365,22 +382,16 @@
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],
-ShareDefine.rptGatherSoul:[Def_ItemType_GatherSoulExp, Def_ItemType_GatherSoul, Def_ItemType_GatherSoulCore],
- }
-
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
# 部位对应装备类型列表
@@ -771,7 +782,9 @@
Def_HurtType_Immune, # 免疫 10
Def_HurtType_RealmSupress, # 境界压制 11
Def_HurtType_Zhansha, # 斩杀 12
-) = range(1, 13)
+Def_HurtType_Zhuxian, # 诛仙一击 13
+Def_HurtType_ZhognjiZhansha, # 终极斩杀 14
+) = range(1, 15)
#Def_HurtType_SuckBlood, # 吸血
(
@@ -783,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
@@ -849,6 +865,10 @@
Def_PackCnt_DogzItem = 100
#初始化神兽装备格子数
Def_PackCnt_DogzEquip = 100
+#初始化诛仙背包格子数
+Def_PackCnt_ZhuXianItem = 100
+#初始化诛仙装备格子数
+Def_PackCnt_ZhuXianEquip = 12
#初始化装备栏2
Def_PackCnt_Equip2 = 0
#初始化回收站
@@ -1092,6 +1112,8 @@
ShareDefine.rptPet,
ShareDefine.rptDogzItem,
ShareDefine.rptDogzEquip,
+ ShareDefine.rptZhuXianItem,
+ ShareDefine.rptZhuXianEquip,
]
#装备可强化背包列表
@@ -1457,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
@@ -1781,7 +1803,10 @@
Def_FBMapID_SealDemon = 52010
#单人封魔坛
Def_FBMapID_SealDemonEx = 52020
-
+#诛仙BOSS
+Def_FBMapID_ZhuXianBoss = 31380
+#诛仙塔
+Def_FBMapID_ZhuXianTower = 31370
#仙魔之争
Def_FBMapID_XMZZ = 31010
#神兽副本
@@ -1792,6 +1817,7 @@
Def_FBMapID_CrossRealmPK = 32010
#跨服蓬莱仙境
Def_FBMapID_CrossPenglai = 32020
+
#注册上传跨服服务器数据后直接进入跨服服务器的地图
RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
@@ -1804,7 +1830,7 @@
#副本关闭时未拾取的物品邮件发放给玩家
#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
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 = []
@@ -1818,7 +1844,7 @@
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,
@@ -1826,10 +1852,10 @@
# + Def_FBMapID_ClearDevil
# 刷新标识点在无玩家的情况下也需要刷新的地图
-Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul]
+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_FBMapID_GatherSoul]
@@ -1887,10 +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], #跨服竞技场
- 'CrossPenglai':[Def_FBMapID_CrossPenglai], #跨服蓬莱仙境
'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
+ 'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
+ 'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
}
#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -1950,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" # 副本开始提示
@@ -2397,7 +2426,6 @@
#装备物品位置,不需要重刷属性
EquipItemNoRefreshState = [
ShareDefine.retHorse, #19 坐骑
- ShareDefine.retWing, #11 翅膀
ShareDefine.retWeaponSkin, #20 时装武器
ShareDefine.retClothesSkin, #21 时装衣服
ShareDefine.retWeapon2Skin, #22 时装副手
@@ -3024,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" # 计算中的临时伤害值，技能特殊用
@@ -3262,7 +3293,7 @@
Def_PDictType_OpenServerCampaign, # 开服活动
Def_PDictType_WeekParty,
Def_PDictType_Family_Contribution, # 战盟贡献度
-Def_PDictType_10, # 10
+Def_PDictType_LoginAward, # 登录奖励运营活动
Def_PDictType_OfficialRank, # 官爵
Def_PDictType_Horse, # 坐骑
Def_PDictType_Wing, # 翅膀
@@ -3287,6 +3318,8 @@
# 玩家字典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点
@@ -3328,7 +3361,6 @@
Def_Player_Dict_FromLineID = 'FromLineID' # 最后一次离开的非中立常规地图，线路ID
Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap" #跨服注册活动地图, dataMapID
-Def_PlayerKey_CrossMapID = "CrossMapID" #玩家所在跨服地图ID
Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中
Def_Player_Dict_FamilyTechLV = "FamilyTechLV_%s" #家族科技等级, 参数(科技ID)
@@ -3480,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
@@ -3616,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" # 古神禁地上一次增加怒气值的时间
@@ -3723,6 +3753,14 @@
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" # 新手在线已领取奖励次数
@@ -3850,6 +3888,7 @@
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" # 段位达标奖励记录，二进制位存储是否已领取，按段位代表奖励位
@@ -4164,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],
@@ -4345,7 +4390,9 @@
Def_CalcAttrFunc_GatherSoul, # 聚魂39
Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
Def_CalcAttrFunc_Coat, # 时装41
-) = range(42)
+Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
+Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43
+) = range(44)
# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
@@ -4387,8 +4434,9 @@
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],
}
@@ -4460,7 +4508,8 @@
TriggerType_LockHP, # 锁血触发技能 63
TriggerType_BeLuckyHit, # 被会心一击触发技能 64
TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
-) = range(1, 66)
+TriggerType_ZhongjiZhansha, # 终极斩杀 66
+) = range(1, 67)
# NPC功能类型定义
@@ -4525,7 +4574,7 @@
Def_VerFix_Horse, # 坐骑等级上限修改，对应技能触发修改;
Def_VerFix_Pet, # 灵宠等级上限修改，对应技能触发修改;
Def_VerFix_AddPoint, # 老号属性点修复;
-Def_VerFix_ReamlvFix, # 老号境界等级变更;
+Def_VerFix_GodWeaponItem, # 1.5删除中级神兵石;
) = range(9)
##==================================================================================================
@@ -4830,7 +4879,8 @@
ItemDel_ChatBubbleBox, # 激活聊天气泡框
ItemDel_GatherSoul, # 聚魂分解
ItemDel_CoatDecompose, # 时装分解
-) = range(2000, 2000 + 37)
+ItemDel_ZhuXianDecompose, # 诛仙装备分解
+) = range(2000, 2000 + 38)
# 物品扣除类型对应信息 {类型:eventName, ...}
ItemDelTypeDict = {
@@ -4871,6 +4921,7 @@
ItemDel_ChatBubbleBox:"ChatBubbleBox",
ItemDel_GatherSoul:"GatherSoul",
ItemDel_CoatDecompose:"CoatDecompose",
+ ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
}
##==================================================================================================
@@ -4982,7 +5033,8 @@
VIPPrivilege_32, #32 封魔坛自动挑战
VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
-) = range(1, 35)
+VIPPrivilege_35, #35 诛仙BOSS购买次数 - 副本总表统一处理
+) = range(1, 36)
(
@@ -5025,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视野刷新
@@ -5065,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
@@ -5138,7 +5194,8 @@
Def_RewardType_IceLodeStar, # 冰晶矿脉星级奖励19
Def_RewardType_WeekPartyAct, # 领取周狂欢活动奖励20
Def_RewardType_WeekPartyPoint, # 领取周狂欢积分奖励21
-)= range(22)
+Def_RewardType_ActLoginAwardAct, # 领取登录奖励活动奖励22
+)= range(23)
#boss复活相关活动定义
@@ -5196,7 +5253,17 @@
Def_WPAct_ChaosDemon, #混乱妖域 17
Def_WPAct_XMZZ, #仙魔之争 18
Def_WPAct_FamilyWar, #仙魔联赛 19
-) = range(1, 19+1)
+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,
--
Gitblit v1.8.0