From 23a19f492a066151b6ed1ff21d6a17b391a6b8af Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 二月 2019 14:11:25 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单(封包)

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

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..27b7ad0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGatherSoul.py
@@ -78,7 +78,7 @@
         
     soulGrade = ipyData.GetSoulGrade()
     exp *= float(IpyGameDataPY.GetFuncEvalCfg('GatherSoulLevelUp', 5, {}).get(soulGrade, 1))
-    return exp
+    return int(exp)
 
 
 ## 获取聚魂属性数值
@@ -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
 
 
@@ -489,6 +493,7 @@
         RefreshGatherSoulAttr(curPlayer)
         PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
     #返还多余魂尘
+    totalPoint = int(totalPoint)
     if totalPoint > 0:
         PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulDust, totalPoint)
     #给新物品
@@ -516,8 +521,8 @@
         itemData = GameWorld.GetGameData().GetItemByTypeID(GatherSoulItemID)
         if not itemData:
             continue
-        if itemData.GetType() == ChConfig.Def_ItemType_GatherSoulCore:
-            continue
+#        if itemData.GetType() == ChConfig.Def_ItemType_GatherSoulCore:
+#            continue
         itemColor = itemData.GetItemColor()
         GatherSoulItemPlusLV = ItemControler.GetGatherSoulItemPlusLV(GatherSoulData) + 1 #客户端1开始
         totalLV += GatherSoulItemPlusLV

--
Gitblit v1.8.0