From 57a7f963e83329c191e135c8102b0614dea6d5b4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 19 十二月 2018 14:09:36 +0800
Subject: [PATCH] 5368 【后端】【1.4】聚魂功能开发

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index d439484..4e11f33 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -313,6 +313,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  # 神兽装备经验
 
@@ -354,6 +357,7 @@
 #虚拟背包最大格子数 功能配置表对应的key
 Def_VPackCnt_Dict = {
                      ShareDefine.rptRune:'RunePackageNum',
+                     ShareDefine.rptGatherSoul:'GatherSoulPackCount',
                      }
 
 #虚拟背包可以放入的物品字典
@@ -361,6 +365,7 @@
 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):
@@ -1774,6 +1779,8 @@
 Def_FBMapID_XMZZ = 31010
 #神兽副本
 Def_FBMapID_Dogz = 21110
+#聚魂副本
+Def_FBMapID_GatherSoul = 31340
 #副本关闭时未拾取的物品邮件发放给玩家
 #这里只有需要的副本才配置,不做默认逻辑,防止某些副本实际不能给导致刷物品,如麒麟之府
 Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial, 
@@ -1799,13 +1806,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_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]
 
 # 无玩家时不自动关闭的自伸缩副本
-Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap]
+Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
 
 # 不可切换PK模式的地图
 Def_CanNotChangeAtkModelMap = []
@@ -1861,6 +1868,7 @@
                 'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
                 'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
                 'Dogz':[Def_FBMapID_Dogz], #神兽副本
+                'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
                 }
 
 #特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -3718,6 +3726,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
 Def_PDict_LastEnterFBPropertyID = "LastEnterFBPropertyID_%s"  # 上次进入副本的propertyID%s副本id
@@ -4301,7 +4312,8 @@
 Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
 Def_CalcAttrFunc_DogzEquip, # 神兽装备37
 Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
-) = range(39)
+Def_CalcAttrFunc_GatherSoul, # 聚魂39
+) = range(40)
 
 
 # 在此列表中的功能属性,不享受百分比加成,--属性参与战力计算
@@ -4340,6 +4352,7 @@
                             ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
                             ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
                             ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
+                            ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
                             # 神兽战力同装备模块战力一致,受评分影响,装备评分相关的战力另外算
                             ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
                             ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
@@ -4566,6 +4579,7 @@
 Def_Cost_WishingWell, # 许愿池刷新
 Def_Cost_GodWeapon, # 神兵
 Def_Cost_FBHelpBattle, # 副本助战
+Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4586,7 +4600,7 @@
 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
 
@@ -4673,6 +4687,7 @@
 Def_Cost_WishingWell:"WishingWell",
 Def_Cost_GodWeapon:"GodWeapon",
 Def_Cost_FBHelpBattle:"FBHelpBattle",
+Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
 }
 ## -----------------------------------------------------
 
@@ -4704,7 +4719,8 @@
 Def_GiveMoney_Truck, # 运镖
 Def_GiveMoney_FreeGoods, # 极品白拿 25
 Def_GiveMoney_BindJadeWheel, # 绑玉转盘
-) = range(1000, 1000 + 26)
+Def_GiveMoney_GatherSoulDecompose, #聚魂分解
+) = range(1000, 1000 + 27)
 
 Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
 
@@ -4736,6 +4752,7 @@
 Def_GiveMoney_Truck:"Truck",
 Def_GiveMoney_FreeGoods:"FreeGoods",
 Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
+Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
 }
 
 ##==================================================================================================
@@ -4825,7 +4842,8 @@
 ItemDel_AddKillBossCnt, # 增加BOSS可击杀次数 32
 ItemDel_DogzEquipPlus, # 神兽装备强化
 ItemDel_ChatBubbleBox, # 激活聊天气泡框
-) = range(2000, 2000 + 35)
+ItemDel_GatherSoul, # 聚魂分解
+) = range(2000, 2000 + 36)
 
 # 物品扣除类型对应信息 {类型:eventName, ...}
 ItemDelTypeDict = {
@@ -5189,7 +5207,8 @@
 PowerDownType_Dogz, #神兽召回
 PowerDownType_ResetPoint, #洗点
 PowerDownType_ResetTalent, #大师天赋重置
-) = range(10)
+PowerDownType_GatherSoul, #聚魂替换
+) = range(11)
 FightPowerDownRecordDict = {
     PowerDownType_Rune:'Rune',
     PowerDownType_LVUP:'LVUP',
@@ -5201,4 +5220,5 @@
     PowerDownType_Dogz:'DogzState',
     PowerDownType_ResetPoint:'ResetPoint',
     PowerDownType_ResetTalent:'ResetTalent',
+    PowerDownType_GatherSoul:'GatherSoul',
     } 
\ No newline at end of file

--
Gitblit v1.8.0