From ef58c3d388226b92c69c83e60e7c67a892e3d229 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 07 三月 2019 14:23:05 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（GetOutPutItemObj 默认都给非拍品）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 4 ++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
index fd41cfc..040d5b8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
@@ -732,7 +732,7 @@
itemControl = ItemControler.PlayerItemControler(curPlayer)
for itemID, itemCount, isBind in totalItemList:
- curItemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, isBind)
+ curItemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, False)
if not curItemObj:
continue
userData = curItemObj.GetUserData()
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
index 8d930b2..9ba8d97 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.py
@@ -615,7 +615,7 @@
def __GivePlayerCompoundItem(curPlayer, packType, newItemID, itemCount, isBind, wingItemExpInfo, dogzEquipPlusExp, decompoundItemInfo, expireTime):
playerID = curPlayer.GetPlayerID()
- curSingleItem = ItemControler.GetOutPutItemObj(newItemID, itemCount, isBind, expireTime)
+ curSingleItem = ItemControler.GetOutPutItemObj(newItemID, itemCount, False, expireTime)
if not curSingleItem:
GameWorld.ErrLog("创造物品失败, give item itemid:%s,count:%s" % (newItemID, itemCount), playerID)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.py
index bd1d3cd..7bd532f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_Chests.py
@@ -91,7 +91,7 @@
# 给奖励
syncItemList = []
for itemID, itemCount in jobAwardItemList:
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, False)
if not curItem:
GameWorld.ErrLog("宝箱创建奖励物品异常!chestsItemID=%s,useCnt=%s,itemID=%s,itemCount=%s,isBind=%s"
% (chestsItemID, useCnt, itemID, itemCount, isBind), curPlayer.GetPlayerID())
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index c17651a..0120100 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -495,7 +495,7 @@
if ItemCommon.GetIsEquip(itemData):
for _ in xrange(itemCount):
- curItem = ItemControler.GetOutPutItemObj(itemID, isBind=isBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID)
if curItem:
needSpace += 1
prizeItemList.append(curItem)
@@ -541,7 +541,7 @@
index += 1
if isinstance(curItem, list):
itemID, itemCount, isBind = curItem
- curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, False)
if not curItem:
continue
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
index 1010489..5ef22bc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.py
@@ -519,7 +519,7 @@
GameWorld.Log(' 试用首充武器 卸下原装备失败！！', curPlayer.GetID())
return
- tryItem = ItemControler.GetOutPutItemObj(tryItemID, 1, 1)
+ tryItem = ItemControler.GetOutPutItemObj(tryItemID)
if ChEquip.DoPlayerEquipItem(curPlayer, tryItem, ItemCommon.GetEquipPackIndex(tryItem), tick):
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FirstGoldTry, 2)
else:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
index 6b14a22..76e3ac9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.py
@@ -503,7 +503,7 @@
## 装备一件件给
if ItemCommon.GetIsEquip(curItemData):
for _ in xrange(dropCount):
- curItem = ItemControler.GetOutPutItemObj(itemID, 1, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, 1, False)
if not curItem:
continue
if not itemControl.PutInItem(IPY_GameWorld.rptItem, curItem, event=[ChConfig.ItemGive_TJGDropItem, False, {}]):
@@ -512,7 +512,7 @@
#记录紫橙装数量用于通知
NoteEquip(curPlayer, curItemData.GetItemColor())
else:
- curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, isDropBind)
+ curItem = ItemControler.GetOutPutItemObj(itemID, dropCount, False)
if not curItem:
continue
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
index fb196d0..8148ac4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -337,7 +337,7 @@
mailItemList = []
itemControl = ItemControler.PlayerItemControler(curPlayer)
for gridNum, itemID, itemCount, isBind in treasureResult:
- itemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, isBind)
+ itemObj = ItemControler.GetOutPutItemObj(itemID, itemCount, False)
mailItemDict = ItemCommon.GetMailItemDict(itemObj)
if int(gridNum) in goodGridNumList:
--
Gitblit v1.8.0