From 5318fdbf2db65e9fe8dc1eaa0fbc3039571ec441 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 20 六月 2019 17:06:32 +0800
Subject: [PATCH] 7320 【2.0】【后端】掉落记录置顶优先级变更
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
index 7272597..a7ba98e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
@@ -257,7 +257,7 @@
FBLogic.OnFBPickUpItem(curPlayer, singItem, tick)
equipInfo = [singItem.GetEquipPlace(), ItemCommon.GetItemClassLV(singItem), singItem.GetItemColor(),
- singItem.GetItemQuality(), singItem.GetUserData()]
+ singItem.GetSuiteID(), singItem.GetUserData()]
if not itemControl.PutInItem(packIndex, singItem, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":dropItemNPCID}]):
#物品不能放入
#PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [packIndex])
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