From 84f9abc7067dde4e6b504a1ba2e9f0600a6de46b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 三月 2019 20:58:56 +0800
Subject: [PATCH] 4042 【后端】【2.0】邮件包含附件时不能删除邮件 - 服务端添加防范
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 464d62a..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
@@ -4296,8 +4296,7 @@
curItem.SetUserAttr(ShareDefine.Def_IudetSource, ShareDefine.Item_Source_VirtualItemDrop)
dropItemDataStr = ChItem.GetMapDropItemDataStr(curItem)
#可以放入背包
- if ItemControler.DoLogic_PutItemInPack(ownerPlayer, curItem, True, True,
- event=["NPCDrop", False, {"npcID":npcID}]):
+ if ItemControler.DoLogic_PutItemInPack(ownerPlayer, curItem, event=["NPCDrop", False, {"npcID":npcID}]):
#通知客户端
self.SendVirtualItemDrop(ownerPlayer, itemID, resultX, resultY, dropItemDataStr)
@@ -5205,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