From a4e9d95f1afee7c045a78e1bed3ede1867eb3a87 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 08 三月 2019 16:33:40 +0800
Subject: [PATCH] 6291 【后端】【2.0】限时仙盟boss

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.py
index cb41eb1..85de183 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.py
@@ -20,6 +20,7 @@
 import IpyGameDataPY
 import GameWorld
 import ChConfig
+import ItemCommon
 
 #---------------------------------------------------------------------
 #全局变量
@@ -61,7 +62,7 @@
     playerItemControler = ItemControler.PlayerItemControler(curPlayer)
     
     # 拍品
-    if auctionGroup:
+    if auctionGroup > 0:
         isAuctionItem = True
         ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
         if not ipyData:
@@ -70,9 +71,11 @@
         if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, auctionGroup, [IPY_GameWorld.rptItem], event=event):
             GameWorld.DebugAnswer(curPlayer, "###放入物品失败!")
     else:
+        auctionGroup = 0
         isAuctionItem = False
-        if itemData.GetPackCount() > 1:
-            __DoGMGivePlayerItem(curPlayer, playerItemControler, itemID, itemCount, isAuctionItem, isAllAttr, event)
+        if not ItemCommon.GetIsEquip(itemData):
+            if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, auctionGroup, [IPY_GameWorld.rptItem], event=event):
+                GameWorld.DebugAnswer(curPlayer, "###放入物品失败!")
         else:
             for _ in xrange(itemCount):
                 __DoGMGivePlayerItem(curPlayer, playerItemControler, itemID, 1, isAuctionItem, isAllAttr, event)

--
Gitblit v1.8.0