From 7b9266e078ebcb0459ff2840ab92dda4b7500098 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 一月 2019 00:04:11 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（修复跨服区域频道能看到不同跨服分区的聊天信息bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 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..a92a141 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 物品
@@ -1112,6 +1121,13 @@
if not curItemData:
return False
+ if GameWorld.IsCrossServer():
+ self.__CrossServerPutInItem(packIndex, tagItem, event)
+ tagItem.Clear()
+ return True
+ if CheckChangeOldItem(curPlayer, tagItem):
+ tagItem.Clear()
+ return True
packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)
if not self.CanPutInItem(packIndex, tagItem.GetItemTypeID(), GetItemCount(tagItem), tagItem.GetIsBind(), defaultPile):
@@ -1278,7 +1294,7 @@
版本2：绝版属性数值调整，已获得的装备重新刷下
'''
curPlayer = self.__Player
- checkVersion = 2
+ checkVersion = 20190103
key = "LoginCheckEquipAttr"
curVersion = curPlayer.NomalDictGetProperty(key)
if curVersion == checkVersion:
@@ -1336,6 +1352,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
@@ -2611,3 +2629,54 @@
return
+def CheckChangeOldItem(curPlayer, tagItem):
+ ##替换旧物品
+ itemID = tagItem.GetItemTypeID()
+ changeOldItemDict = IpyGameDataPY.GetFuncEvalCfg('ChangeOldItem', 1, {})
+ if itemID not in changeOldItemDict:
+ return
+ itemCnt = GetItemCount(tagItem)
+ isBind = tagItem.GetIsBind()
+ toItemID, toCnt, mailKey = changeOldItemDict[itemID]
+ giveCnt = itemCnt * toCnt
+ PlayerControl.SendMailByKey(mailKey, [curPlayer.GetPlayerID()], [[toItemID, giveCnt, isBind]])
+ return True
+
+def LoginCheckChangeOldItem(curPlayer):
+ ##登录检查替换旧物品
+ if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_GodWeaponItem):
+ return
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_GodWeaponItem, 1)
+ giveItemDict = {}
+ mailDict = {}
+ for packIndex in [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]:
+ curPack = curPlayer.GetItemManager().GetPack(packIndex)
+ for i in xrange(curPack.GetCount()):
+ curItem = curPack.GetAt(i)
+ if not curItem:
+ continue
+ itemID = curItem.GetItemTypeID()
+ changeOldItemDict = IpyGameDataPY.GetFuncEvalCfg('ChangeOldItem', 1, {})
+ if itemID not in changeOldItemDict:
+ continue
+ isBind = curItem.GetIsBind()
+ itemCount = curItem.GetCount()
+ toItemID, toCnt, mailKey = changeOldItemDict[itemID]
+ giveCnt = itemCount * toCnt
+ keyStr = '%s_%s'%(toItemID, isBind)
+ giveItemDict[keyStr] = giveItemDict.get(keyStr, 0) + giveCnt
+ ItemCommon.DelItem(curPlayer, curItem, itemCount, False, "ChangeOldItem")
+ if mailKey not in mailDict:
+ mailDict[mailKey] = [keyStr]
+ if keyStr not in mailDict[mailKey]:
+ mailDict[mailKey].append(keyStr)
+ for mailKey, keyStrList in mailDict.items():
+ itemList = []
+ for keyStr in keyStrList:
+ if keyStr not in giveItemDict:
+ continue
+ giveCnt = giveItemDict[keyStr]
+ itemID, isBind = keyStr.split('_')
+ itemList.append([int(itemID), giveCnt, int(isBind)])
+ PlayerControl.SendMailByKey(mailKey, [curPlayer.GetID()], itemList)
+ return
\ No newline at end of file
--
Gitblit v1.8.0