From 8de6a6994a0dd623514899310e415269d42e4685 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 三月 2019 16:11:59 +0800
Subject: [PATCH] 6382 【后端】【2.0】功能是否绑定及拍品优化调整（部分绑定修改为是否拍品）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py | 11 ++++++-----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
index 1eed77b..98579a4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
@@ -240,14 +240,14 @@
curItemCount = singItem.GetCount()
curItemID = singItem.GetItemTypeID()
- curItemIsBind = singItem.GetIsBind()
+ curItemIsAuctionItem = ItemControler.GetIsAuctionItem(singItem)
isPutInTemp = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_PickupItemPutInTemp)
packIndex = ShareDefine.rptTempItem if isPutInTemp else IPY_GameWorld.rptItem
packIndex = ChConfig.GetItemPackType(singItem.GetType(), packIndex)
# 是否可放入
- if not itemControl.CanPutInItem(packIndex, curItemID, curItemCount, curItemIsBind):
+ if not itemControl.CanPutInItem(packIndex, curItemID, curItemCount, curItemIsAuctionItem):
PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [packIndex])
GameWorld.Log("拾取物品无法放入背包！mapItemID=%s,dropItemNPCID=%s,curItemID=%s,packIndex=%s"
% (mapItemID, dropItemNPCID, curItemID, packIndex), curPlayer.GetPlayerID())
@@ -1003,7 +1003,7 @@
PlayerControl.NotifyCode(curPlayer, "UseResLost10")
return False
- #绑定物品不可掉落
+ #绑定物品不可丢弃
if curItem.GetIsBind():
PlayerControl.NotifyCode(curPlayer, "UseResLost10")
return False
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 24050e1..73e4aa7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -1420,7 +1420,7 @@
curPack = curPlayer.GetItemManager().GetPack(packType)
for i in range(0, curPack.GetCount()):
curItem = curPack.GetAt(i)
- if not curItem:
+ if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
continue
if curItem.GetItemTypeID() != itemID:
@@ -1995,13 +1995,14 @@
if not curItem or curItem.IsEmpty():
return {}
+ isAuctionItem = ItemControler.GetIsAuctionItem(curItem)
if not CheckItemIsEquip(curItem):
- return [curItem.GetItemTypeID(), curItem.GetCount(), curItem.GetIsBind()]
+ return [curItem.GetItemTypeID(), curItem.GetCount(), isAuctionItem]
addItemDict = {}
addItemDict['ItemID'] = curItem.GetItemTypeID()
addItemDict['Count'] = curItem.GetCount()
- addItemDict['IsAuctionItem'] = curItem.GetIsBind()
+ addItemDict['IsAuctionItem'] = isAuctionItem
#addItemDict['IsBind'] = int(curItem.GetIsBind())
#addItemDict['EquipGS'] = GetEquipGearScore(curItem)
#addItemDict['ItemStarLV'] = curItem.GetItemStarLV()
@@ -2062,8 +2063,8 @@
itemDict["ItemID"] = itemInfo.GetItemTypeID()
if itemInfo.GetCount() > 1:
itemDict["Count"] = itemInfo.GetCount()
- if itemInfo.GetIsBind():
- itemDict["IsAuctionItem"] = int(itemInfo.GetIsBind())
+ if ItemControler.GetIsAuctionItem(itemInfo):
+ itemDict["IsAuctionItem"] = 1
if itemInfo.GetUserData():
itemDict["UserData"] = itemInfo.GetUserData()
return itemDict
--
Gitblit v1.8.0