From 609e16921fd14b577cb7e4f56777a839b408b311 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:04 +0800
Subject: [PATCH] Merge commit '444a48bf8875c1c4295871d48eee7433ac700734'

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 5930ffe..0f70343 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -308,7 +308,8 @@
     Def_mitEquipDecompose,    # 装备分解
     Def_mitRefine,            # 炼丹
     Def_mitMWUpLevel,         # 法宝进阶
-) = range(1, 20)
+    Def_mitRecycleAttrFruit,  # 回收魂石
+) = range(1, 21)
 
 #---写死的技能ID---
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
@@ -1295,7 +1296,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 23
+Def_MFPType_Max = 24
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1317,6 +1318,7 @@
 Def_MFPType_MagicWeapon3, # 仙族法宝 17
 Def_MFPType_PetSoul, # 灵宠魂石 18
 Def_MFPType_HorseSoul, # 坐骑魂石 19
+Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
 Def_MFPType_Other, # 其他
 
 #以下暂时没用到，改时再处理
@@ -1461,7 +1463,7 @@
 DailyActionID_TowerSD, # 符印塔扫荡
 DailyActionID_XXX12, # 废弃12
 DailyActionID_Tower, # 符印塔
-DailyActionID_MagicWeapon, # 觉醒法宝
+DailyActionID_MagicWeapon, # 法宝集魂
 DailyActionID_FBHelp, # 助战副本
 DailyActionID_BOSSHome, # BOSS之家
 ) = range(1, 16 + 1)

--
Gitblit v1.8.0