From 3caca95a705f26b0d40a8ae88093c8e2c8ca4f6f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 19 一月 2019 11:55:46 +0800
Subject: [PATCH] 2908 【1.5.0】【1.5.100】组队进入跨服boss打boss异常情况
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 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 3784ef1..2b18d39 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1097,6 +1097,9 @@
def __CrossServerPutInItem(self, packIndex, tagItem, event=["", False, {}]):
## 跨服获得物品
+ if packIndex not in [IPY_GameWorld.rptItem, ShareDefine.rptDogzItem]:
+ #GameWorld.DebugLog("跨服获得物品不同步, packIndex=%s" % (packIndex))
+ return
curPlayer = self.__Player
serverGroupID = PlayerControl.GetPlayerServerGroupID(curPlayer)
itemData = [tagItem.GetItemTypeID(), tagItem.GetCount(), tagItem.GetIsBind(), tagItem.GetUserData()]
@@ -1125,7 +1128,9 @@
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):
@@ -2627,3 +2632,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