From 204d8acbaa515c7f667891da888d778916e84db8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 22 十二月 2018 16:40:47 +0800
Subject: [PATCH] 5512 子 【开发】【1.4】跨服竞技场 / 【后端】【1.4】跨服竞技场开发  --新增向子服务器组发送消息的接口

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index a4bcf8a..23cecfd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1029,6 +1029,8 @@
         if packIndex == ShareDefine.rptRune:
             runeSource = tagItem.GetUserAttr(ShareDefine.Def_IudetRuneSource) or 1
             setItemKeyData = GetRuneItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetRuneLV), source=runeSource)
+        elif packIndex == ShareDefine.rptGatherSoul:
+            setItemKeyData = GetGatherSoulItemKeyData(tagItem.GetItemTypeID(), tagItem.GetUserAttr(ShareDefine.Def_IudetGatherSoulLV))
 
         refreshPlaceList = []
         for place in xrange(ItemCommon.GetVPackCnt(packIndex)):
@@ -1083,7 +1085,12 @@
             GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'AddBossRebornPoint', msgStr, len(msgStr))
         elif itemID == ChConfig.Def_ItemID_Ysog:
             PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, itemCount)
-        
+        elif itemID == ChConfig.Def_ItemID_SoulDust:
+            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulDust, itemCount)
+        elif itemID == ChConfig.Def_ItemID_SoulSplinters:
+            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulSplinters, itemCount)
+        elif itemID == ChConfig.Def_ItemID_SoulCore:
+            PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_SoulCore, itemCount)
         return True
     
     ## 放入物品 
@@ -1138,7 +1145,7 @@
         isBind = tagItem.GetIsBind()
         isNeedRecord = False
         # 目前暂只记录放入背包的
-        if packIndex in [IPY_GameWorld.rptItem, ShareDefine.rptTreasure, ShareDefine.rptRune]:
+        if packIndex in [IPY_GameWorld.rptItem, ShareDefine.rptTreasure, ShareDefine.rptRune, ShareDefine.rptGatherSoul]:
             isNeedRecord = ItemNeedRecord(tagItem) or isForceEvent
         putResult = False
         
@@ -1378,6 +1385,14 @@
 def IsRuneItemNeedRecord(curItem, plusLV):
     return plusLV > 0 or curItem.GetItemColor() >= ChConfig.Def_Quality_Orange
 
+# 聚魂物品存储字典数值数据结构: 前5位为物品ID, 6~8位为强化等级
+def GetGatherSoulItemKeyData(itemID, GatherSoulLV):
+    return min(GatherSoulLV, 999) * 100000 + itemID
+def GetGatherSoulItemID(keyData): return keyData % 100000
+def GetGatherSoulItemPlusLV(keyData): return keyData % 100000000 / 100000
+def IsGatherSoulItemNeedRecord(curItem, plusLV):
+    return plusLV > 0 or curItem.GetItemColor() >= ChConfig.Def_Quality_Orange
+
 def SetVPackItemKeyData(curPlayer, packIndex, place, keyData, isSync=True):
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_VPackItem % (packIndex, place), keyData)
     if isSync:

--
Gitblit v1.8.0