From 0d95c26257bf4ab291356b1adb6ad2064e6b2969 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 13 四月 2019 10:51:05 +0800
Subject: [PATCH] 3278 【BUG】【2.0】宗门试炼,点击扫荡没反应

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MakeItemCount.py |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 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..973cb4a 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
@@ -17,9 +17,9 @@
 
 import IPY_GameWorld
 import ItemControler
-import IpyGameDataPY
 import GameWorld
 import ChConfig
+import ItemCommon
 
 #---------------------------------------------------------------------
 #全局变量
@@ -38,7 +38,7 @@
     
     #输入命令格式错误
     if len(msgList) < 1:
-        GameWorld.DebugAnswer(curPlayer, "MakeItemCount ID (个数  拍品分组 全部传奇属性)")
+        GameWorld.DebugAnswer(curPlayer, "MakeItemCount ID (个数  拍品组数 全部传奇属性)")
         return
     
     event = [ChConfig.ItemGive_GMMake, False, {"CMD":"MakeItemCount"}]
@@ -61,21 +61,17 @@
     playerItemControler = ItemControler.PlayerItemControler(curPlayer)
     
     # 拍品
-    if auctionGroup:
-        isAuctionItem = True
-        ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
-        if not ipyData:
-            GameWorld.DebugAnswer(curPlayer, "非可拍卖物品itemID=%s" % (itemID))
-            return
-        if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, auctionGroup, [IPY_GameWorld.rptItem], event=event):
-            GameWorld.DebugAnswer(curPlayer, "###放入物品失败!")
+    if auctionGroup > 0:
+        for _ in xrange(auctionGroup):
+            if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, True, [IPY_GameWorld.rptItem], event=event):
+                GameWorld.DebugAnswer(curPlayer, "###放入物品失败!")
     else:
-        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, False, [IPY_GameWorld.rptItem], event=event):
+                GameWorld.DebugAnswer(curPlayer, "###放入物品失败!")
         else:
             for _ in xrange(itemCount):
-                __DoGMGivePlayerItem(curPlayer, playerItemControler, itemID, 1, isAuctionItem, isAllAttr, event)
+                __DoGMGivePlayerItem(curPlayer, playerItemControler, itemID, 1, False, isAllAttr, event)
     return
 
 def __DoGMGivePlayerItem(curPlayer, playerItemControler, itemID, count, isAuctionItem, isAllAttr, event):

--
Gitblit v1.8.0