From 4ea8fcf48ca7e7d0476be948e0d018920592099d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 六月 2019 17:23:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 822ccdc..a5dc5b4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -663,7 +663,7 @@
itemID = itemObj.GetItemTypeID()
mailItem = ItemCommon.GetMailItemDict(itemObj)
equipInfo = [itemObj.GetEquipPlace(), ItemCommon.GetItemClassLV(itemObj), itemObj.GetItemColor(),
- itemObj.GetItemQuality(), itemObj.GetUserData()]
+ itemObj.GetSuiteID(), itemObj.GetUserData()]
packIndex = ChConfig.GetItemPackType(itemObj.GetType())
if not itemControl.PutInItem(packIndex, itemObj, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":npcID}]):
mailItemList.append(mailItem)
@@ -6252,13 +6252,14 @@
needRecord = True
weightValue = recSpecialItemIDList.index(itemID) + 10000
else:
- equipPlace, itemClassLV, itemColor, itemQuality, itemUserData = equipInfo
- weightValue = itemColor*1000+itemQuality*100+itemClassLV
+ equipPlace, itemClassLV, itemColor, suiteID, itemUserData = equipInfo
+ isSuit = 1 if suiteID else 0
+ weightValue = itemColor*1000+isSuit*100+itemClassLV
recordCondition = GameWorld.GetDictValueByKey(recDropEquipInfoDict, equipPlace)
if recordCondition:
- needClassLV, needItemColor, needItemQuality = recordCondition
- if itemClassLV >= needClassLV and itemColor >= needItemColor and itemQuality >= needItemQuality:
+ needClassLV, needItemColor, needItemSuite = recordCondition
+ if itemClassLV >= needClassLV and itemColor >= needItemColor and isSuit >= needItemSuite:
needRecord = True
if not needRecord:
return
--
Gitblit v1.8.0