From 7e7e179561de1a07ad4ee77c5cc8c7a81483654c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 22 十二月 2018 16:42:06 +0800
Subject: [PATCH] 5368 【后端】【1.4】聚魂功能开发(分解回包)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 3 ++-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py | 4 ++++
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 5 +++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 024ff96..39eebb9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -313,7 +313,8 @@
Def_mitDogzEquipPlus, # 神兽装备强化
Def_mitRuneCompound, # 符印合成
Def_mitGatherSoulCompound,# 聚魂合成
-) = range(1, 24)
+ Def_mitGatherSoulDecompose,# 聚魂分解
+) = range(1, 25)
#---写死的技能ID---
Def_SkillID_AutoTruck = 62220 # 自动运镖buff
@@ -1198,7 +1199,7 @@
CrossServerMsg_Notify = "Notify" # 提示信息
CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
-CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList" # 跨服PK已准备好的房间列表
+CrossServerMsg_PKReadyOKRoomList = "PKMatchResult" # 跨服PK已准备好的房间列表
CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList" # 跨服PK已超时的房间列表
CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果
CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py
index 69cf4e5..750dbcf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py
@@ -345,6 +345,8 @@
totalSoulDust += soulDust
delPlaceDict[place] = [GatherSoulData, soulidList, int(soulDust), soulSplinters, soulCore]
+ if not delPlaceDict:
+ return
if delPlaceDict:
ItemCommon.DelVPackItem(curPlayer, packIndex, delPlaceDict.keys(), ChConfig.ItemDel_GatherSoul)
addDataDict = {"delPlaceDict":delPlaceDict, "isAuto":isAuto}
@@ -371,6 +373,8 @@
for itemID, itemCnt in giveMaterialDict.items():
ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [ShareDefine.rptGatherSoul])
GameWorld.DebugLog("聚魂分解: isAuto=%s,PlaceIndexList=%s, delPlaceDict=%s, giveMaterialDict=%s" % (isAuto, placeList, delPlaceDict, giveMaterialDict))
+ if not isAuto:
+ curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitGatherSoulDecompose, 1)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index dbc52cf..39eebb9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -313,7 +313,8 @@
Def_mitDogzEquipPlus, # 神兽装备强化
Def_mitRuneCompound, # 符印合成
Def_mitGatherSoulCompound,# 聚魂合成
-) = range(1, 24)
+ Def_mitGatherSoulDecompose,# 聚魂分解
+) = range(1, 25)
#---写死的技能ID---
Def_SkillID_AutoTruck = 62220 # 自动运镖buff
--
Gitblit v1.8.0