From 5b819bfc92a8a66ecae16bad1a0b307208747645 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 三月 2019 20:02:50 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（判断是否拍品函数）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 6 +++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py | 6 +++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py | 3 ++-
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.py
index 547a570..065254f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/AddLegendAttr.py
@@ -41,7 +41,7 @@
GameWorld.DebugAnswer(curPlayer, "非装备无法获得传奇属性!")
return
- if curItem.GetIsBind():
+ if ItemControler.GetIsAuctionItem(curItem):
GameWorld.DebugAnswer(curPlayer, "拍品无法生成传奇属性!")
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 90b7fcd..87eea65 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -30,6 +30,7 @@
import EventReport
import PlayerFamily
import PlayerActivity
+import ItemControler
import PlayerSuccess
import GameFuncComm
import PyGameData
@@ -601,7 +602,7 @@
continue
itemDict['ItemID'] = itemInfo.GetItemTypeID()
itemDict['Count'] = itemInfo.GetCount()
- itemDict['IsAuctionItem'] = itemInfo.GetIsBind()
+ itemDict['IsAuctionItem'] = ItemControler.GetIsAuctionItem(itemInfo)
#itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
itemDict['UserData'] = itemInfo.GetUserData()
jsonItemList.append(itemDict)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 661519b..51af11b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -70,7 +70,7 @@
return False
playerItemControl = ItemControler.PlayerItemControler(curPlayer)
- if curItem.GetIsBind():
+ if ItemControler.GetIsAuctionItem(curItem):
GameWorld.DebugLog("拍品无法穿戴!")
return False
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 2d78f3c..09402d2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
@@ -1531,7 +1531,7 @@
return
# 使用拍品
- if curItem.GetIsBind():
+ if ItemControler.GetIsAuctionItem(curItem):
GameWorld.DebugLog("玩家使用拍品: itemID=%s" % (curItem.GetItemTypeID()), curPlayer.GetPlayerID())
ItemControler.SetIsAuctionItem(curItem, False, curPlayer)
return
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 5613819..ced8e97 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1124,7 +1124,7 @@
packIndex = ChConfig.GetItemPackType(curItemData.GetType(), packIndex)
tagItemCount = GetItemCount(tagItem)
- isAuctionItem = tagItem.GetIsBind()
+ isAuctionItem = GetIsAuctionItem(tagItem)
if not self.CanPutInItem(packIndex, tagItem.GetItemTypeID(), tagItemCount, isAuctionItem, defaultPile):
GameWorld.DebugLog("背包满，不能放入物品 count = %d"%GetItemCount(tagItem))
tagItem.Clear()
@@ -1552,7 +1552,7 @@
#curItemGUID = curItem.GetGUID()
curItemCount = curItem.GetCount()
#curItemIsBind = curItem.GetIsBind()
- isAuctionItem = curItem.GetIsBind()
+ isAuctionItem = GetIsAuctionItem(curItem)
#toPackIndex = ChConfig.GetItemPackType(curItem.GetType(), toPackIndex)
# 常规物品转移到虚拟符印背包
@@ -2409,7 +2409,7 @@
'''获取生成到装备上的传奇属性
@return: None 或者 [[传奇属性效果ID列表], [属性值列表]]
'''
- if curItem.GetIsBind():
+ if GetIsAuctionItem(curItem):
#GameWorld.DebugLog("拍品无法生成传奇属性!")
return
itemID = curItem.GetItemTypeID()
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
index 7677daa..8ff7e12 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
@@ -42,7 +42,7 @@
curItem = playerPack.GetAt(itemIndex)
if curItem.IsEmpty():
return
- if not curItem.GetIsBind():
+ if not ItemControler.GetIsAuctionItem(curItem):
GameWorld.Log("非拍品，绑定无法上架!", playerID)
return
itemGUID = curItem.GetGUID()
@@ -127,7 +127,7 @@
curItem = playerPack.GetAt(itemIndex)
if curItem.IsEmpty():
return
- if not curItem.GetIsBind():
+ if not ItemControler.GetIsAuctionItem(curItem):
GameWorld.Log("非拍品，无法上架!", playerID)
return
curItemGUID = curItem.GetGUID()
@@ -184,7 +184,7 @@
if curPlayer and not familyID:
ItemCommon.DelItem(curPlayer, curItem, curItem.GetCount())
else:
- if not curItem.GetIsBind():
+ if not ItemControler.GetIsAuctionItem(curItem):
GameWorld.Log("非拍品，绑定无法上架!", playerID)
curItem.Clear()
continue
--
Gitblit v1.8.0