From cf6dd722bfc07a6ae19dd0378ecfda667d35ca67 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 09 一月 2019 09:52:43 +0800
Subject: [PATCH] 5730 【后端】【1.5】时装功能开发
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 167 ++++++++++++++++++++++---------------------------------
1 files changed, 67 insertions(+), 100 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 0f27dab..f5f6b9d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -262,8 +262,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 #所有类型
@@ -428,9 +433,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 #用于标示套装装备，过滤等使用
@@ -762,7 +770,8 @@
Def_HurtType_Miss, # 闪避 9
Def_HurtType_Immune, # 免疫 10
Def_HurtType_RealmSupress, # 境界压制 11
-) = range(1, 12)
+Def_HurtType_Zhansha, # 斩杀 12
+) = range(1, 13)
#Def_HurtType_SuckBlood, # 吸血
(
@@ -1707,8 +1716,6 @@
Def_Player_RequestAddFamilyMaxCnt = 200 #玩家申请加入家族的最大数量 (目前无限制 配个大的数值)
#-------------------------------#副本相关#------------------------
-# 跨服中转地图ID
-Def_MergeTransMapID = 12075
#创角新手村地图ID列表
Def_CreatRoleMapIDList = [10000]
#PK周赛
@@ -1783,6 +1790,12 @@
Def_FBMapID_GatherSoul = 31340
#跨服竞技场
Def_FBMapID_CrossRealmPK = 32010
+#跨服蓬莱仙境
+Def_FBMapID_CrossPenglai = 32020
+
+#注册上传跨服服务器数据后直接进入跨服服务器的地图
+RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
+
#副本关闭时未拾取的物品邮件发放给玩家
#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
@@ -1794,7 +1807,7 @@
# 副本中玩家下线就被踢出
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]
@@ -1871,6 +1884,8 @@
'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
'Dogz':[Def_FBMapID_Dogz], #神兽副本
'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
+ 'CrossPenglai':[Def_FBMapID_CrossPenglai], #跨服蓬莱仙境
+ 'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
}
#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -2163,9 +2178,6 @@
1000 * 60 * 10, #玩家称号时效
400, #吸血
400, #吸蓝
- 1000 * 5, # 恢复跨服PK连胜次数请求间隔
- 1000 * 5, # 跨服PK领奖间隔
- 1000 * 5, # 跨服王者争霸竞猜积分领奖间隔
1000 * 3, # 仓库整理间隔
1000 * 15, # 渡劫鼓舞间隔
1000 * 1, # vip体验时效
@@ -2239,9 +2251,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体验时效
@@ -2381,7 +2390,13 @@
Type_Equip_CanTake = ShareDefine.RoleEquipType
#装备物品位置,不需要重刷属性
-EquipItemNoRefreshState = []
+EquipItemNoRefreshState = [
+ ShareDefine.retHorse, #19 坐骑
+ ShareDefine.retWing, #11 翅膀
+ ShareDefine.retWeaponSkin, #20 时装武器
+ ShareDefine.retClothesSkin, #21 时装衣服
+ ShareDefine.retWeapon2Skin, #22 时装副手
+ ]
# 需要广播外观的装备部位
Def_SyncEquipStateByIndex = [
@@ -3208,6 +3223,9 @@
Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s" # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s" # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]
+Def_PlayerKey_CrossRegisterType = "CrossRegisterType" #跨服注册活动类型
+Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中
+
Def_PDict_QueryTechLVUPState = "QueryTechLVUPState" # 查询科技等级提升状态
Def_PDict_PKStateTick = "PKStateTick" # PK状态tick，只要有一方发起攻击，双方均进入PK状态
@@ -3262,8 +3280,8 @@
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)
@@ -3280,7 +3298,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
@@ -3388,8 +3405,6 @@
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" # 改名锁
@@ -3537,9 +3552,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等级奖励
@@ -3621,9 +3636,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" # 封魔坛是否双倍
@@ -3818,22 +3830,6 @@
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" # 今天过天时的积分
@@ -3842,7 +3838,18 @@
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_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"
@@ -3873,6 +3880,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
@@ -4325,11 +4333,13 @@
Def_CalcAttrFunc_DogzEquip, # 神兽装备37
Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
Def_CalcAttrFunc_GatherSoul, # 聚魂39
-) = range(40)
+Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
+Def_CalcAttrFunc_Coat, # 时装41
+) = range(42)
# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
-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
]
@@ -4362,9 +4372,11 @@
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_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
@@ -4493,50 +4505,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礼包的老号处理;
@@ -4546,7 +4514,8 @@
Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;
Def_VerFix_Horse, # 坐骑等级上限修改，对应技能触发修改;
Def_VerFix_Pet, # 灵宠等级上限修改，对应技能触发修改;
-) = range(7)
+Def_VerFix_AddPoint, # 老号属性点修复;
+) = range(8)
##==================================================================================================
#游戏消费点类型定义
@@ -4592,6 +4561,7 @@
Def_Cost_GodWeapon, # 神兵
Def_Cost_FBHelpBattle, # 副本助战
Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
+Def_Cost_CrossRealmPK, # 跨服PK
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4599,10 +4569,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, # 购买摆摊物品
@@ -4612,7 +4578,7 @@
Def_Cost_Trade, # 交易
Def_Cost_Rename, # 改名
Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 60)
+) = range(2000, 2000 + 57)
Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
@@ -4658,10 +4624,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",
@@ -4700,6 +4662,7 @@
Def_Cost_GodWeapon:"GodWeapon",
Def_Cost_FBHelpBattle:"FBHelpBattle",
Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
+Def_Cost_CrossRealmPK:"CrossRealmPK",
}
## -----------------------------------------------------
@@ -4729,9 +4692,9 @@
Def_GiveMoney_StallItem, # 摆摊
Def_GiveMoney_Trade, # 交易
Def_GiveMoney_Truck, # 运镖
-Def_GiveMoney_FreeGoods, # 极品白拿 25
-Def_GiveMoney_BindJadeWheel, # 绑玉转盘
-Def_GiveMoney_GatherSoulDecompose, #聚魂分解
+Def_GiveMoney_FreeGoods, # 极品白拿
+Def_GiveMoney_BindJadeWheel, # 绑玉转盘 25
+Def_GiveMoney_GatherSoulDecompose, #聚魂分解 26
) = range(1000, 1000 + 27)
Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
@@ -4855,7 +4818,8 @@
ItemDel_DogzEquipPlus, # 神兽装备强化
ItemDel_ChatBubbleBox, # 激活聊天气泡框
ItemDel_GatherSoul, # 聚魂分解
-) = range(2000, 2000 + 36)
+ItemDel_CoatDecompose, # 时装分解
+) = range(2000, 2000 + 37)
# 物品扣除类型对应信息 {类型:eventName, ...}
ItemDelTypeDict = {
@@ -4893,6 +4857,9 @@
ItemDel_AddFBCnt:"AddFBCnt",
ItemDel_AddKillBossCnt:"AddKillBossCnt",
ItemDel_DogzEquipPlus:"DogzEquipPlus",
+ ItemDel_ChatBubbleBox:"ChatBubbleBox",
+ ItemDel_GatherSoul:"GatherSoul",
+ ItemDel_CoatDecompose:"CoatDecompose",
}
##==================================================================================================
@@ -4995,7 +4962,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 娲皇遗迹购买次数 - 副本总表统一处理
--
Gitblit v1.8.0