From 2362341e2a9f8467408ac4b99e1108ace98036fa Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 9544906..18205d2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1094,13 +1094,8 @@
if not curItemData:
return False
- vPackItemDict = ChConfig.Def_VPackItem_Dict
+ packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)
- for pack, itemTypeList in vPackItemDict.items():
- if curItemData.GetType() in itemTypeList:
- packIndex = pack
- break
-
if not self.CanPutInItem(packIndex, tagItem.GetItemTypeID(), tagItem.GetCount(), tagItem.GetIsBind(), defaultPile):
GameWorld.DebugLog("背包满，不能放入物品 count = %d"%tagItem.GetCount())
tagItem.Clear()
@@ -1882,11 +1877,10 @@
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetSpecialItem, 1, [itemID])
return True
- vPackItemDict = ChConfig.Def_VPackItem_Dict
- for pack, itemTypeList in vPackItemDict.items():
- if curItemData.GetType() in itemTypeList:
- packIndexList = [pack]
- break
+ defaultPack = IPY_GameWorld.rptItem if not packIndexList else packIndexList[0]
+ packIndex = ChConfig.GetItemPackType(curItemData.GetType(), defaultPack)
+ if packIndex != defaultPack or not packIndexList:
+ packIndexList = [packIndex]
if not __Check_CanPutItemInPack(curPlayer, itemID, itemCount, itemIsBind, packIndexList, defaultPile):
#不可放入
--
Gitblit v1.8.0