From 3c0d76d1ccbf1e1bd0014d4e2980ebf5b46b9d99 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 08 三月 2019 16:45:59 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单(支持掉落拍品)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

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 2e51f03..db1f752 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -4193,7 +4193,7 @@
             index += 1
             itemCnt = moneyValue if itemID == moneyID else 1
             isBind = dropItemBindDict.get(itemID, 1)
-            curItem = self.__CreateDropItem(curNPC, itemID, itemCnt, isBind)
+            curItem = self.__CreateDropItem(curNPC, itemID, itemCnt, isBind, dropPlayer)
             if not curItem:
                 continue
             self.__MapCreateItem(curItem, resultX, resultY, ChConfig.Def_NPCHurtTypePlayer, ownerID)
@@ -4281,7 +4281,7 @@
                 itemCnt = moneyValue if itemID == moneyID else 1
                 isBind = dropIDBindDict.get(itemID, 1)
             
-            curItem = self.__CreateDropItem(curNPC, itemID, itemCnt, isBind)
+            curItem = self.__CreateDropItem(curNPC, itemID, itemCnt, isBind, dropPlayer)
             if not curItem:
                 continue
             
@@ -5204,18 +5204,14 @@
         #self.__SetItemProtect(curMapItem, dropType, ownerID)
         return
     
-    def __CreateDropItem(self, curNPC, itemID, count, isBind):
+    def __CreateDropItem(self, curNPC, itemID, count, isBind, dropPlayer):
         ## 创建掉落的物品
-        curItem = ItemControler.GetOutPutItemObj(itemID)
+        if not isBind and not IpyGameDataPY.GetIpyGameDataNotLog("AuctionItem", itemID):
+            isBind = 1
+        isAuctionItem = not isBind
+        curItem = ItemControler.GetOutPutItemObj(itemID, count, isAuctionItem, curPlayer=dropPlayer)
         if not curItem:
             return
-        
-        curMapID = GameWorld.GetMap().GetMapID()
-        curMapID = FBCommon.GetRecordMapID(curMapID)
-        
-        # 掉落数量
-        curItem.SetCount(count)
-        curItem.SetIsBind(isBind)
         return curItem
     
 #---------------------------------------------------------------------

--
Gitblit v1.8.0