From fdc93e9592be7de1dff464c911aae6489f1a6eed Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 11 一月 2019 18:23:21 +0800
Subject: [PATCH] 5512 子 【开发】【1.4】跨服竞技场 / 【后端】【1.4】跨服竞技场开发 --  指定gameworld的npc管理

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 a4084ee..3784ef1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1095,6 +1095,15 @@
             PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Honor, itemCount)
         return True
     
+    def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):
+        ## 跨服获得物品
+        curPlayer = self.__Player
+        serverGroupID = PlayerControl.GetPlayerServerGroupID(curPlayer)
+        itemData = [tagItem.GetItemTypeID(), tagItem.GetCount(), tagItem.GetIsBind(), tagItem.GetUserData()]
+        itemMsg = {"PlayerID":curPlayer.GetPlayerID(), "ItemData":itemData, "PackIndex":packIndex, "Event":event}
+        GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_PutInItem, itemMsg, [serverGroupID])
+        return
+    
     ## 放入物品 
     #  @param packIndex 背包索引
     #  @param tagItem 物品
@@ -1111,6 +1120,11 @@
         curItemData = GameWorld.GetGameData().GetItemByTypeID(tagItem.GetItemTypeID())
         if not curItemData:
             return False
+        
+        if GameWorld.IsCrossServer():
+            self.__CrossServerPutInItem(packIndex, tagItem, event)
+            tagItem.Clear()
+            return True
         
         packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)
         
@@ -1278,7 +1292,7 @@
                     版本2:绝版属性数值调整,已获得的装备重新刷下
         '''
         curPlayer = self.__Player
-        checkVersion = 2
+        checkVersion = 20190103
         key = "LoginCheckEquipAttr"
         curVersion = curPlayer.NomalDictGetProperty(key)
         if curVersion == checkVersion:
@@ -1336,6 +1350,8 @@
     #  @return True or False
     #  @remarks 函数详细说明.
     def CanPutInItem(self, packIndex, curItemID, curItemCount, isBind, defaultPile=True):
+        if GameWorld.IsCrossServer():
+            return True
         checkRet, putIndex = self.CanPutInItemEx(packIndex, curItemID, curItemCount, isBind, defaultPile)
         return checkRet
     

--
Gitblit v1.8.0