From d68a7ed16e4f4507d8ad4bde0bfc97d0f9f8d385 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 22 十二月 2023 14:19:41 +0800
Subject: [PATCH] 5512 【主干】【港台】【砍树】邮件领取的物品信息多了空格
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py | 14 ++++++++++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py | 4 +---
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index eeaf5b2..5b4e008 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -2235,7 +2235,7 @@
if "UserData" in itemData:
userData = itemData["UserData"]
- equipItem.SetUserData(userData, len(userData))
+ ItemCommon.SetItemUserData(equipItem, userData)
if "EquipGS" in itemData:
equipGS = int(itemData["EquipGS"])
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 1667c9c..43a07fe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -359,6 +359,17 @@
#这里返回的是SingleItem , 如果创建了,未使用,会找出C++内存泄露!!!
return curSingleItem
+def SetItemUserData(curItem, dataInfo):
+ if isinstance(dataInfo, dict):
+ UserData = str(dataInfo)
+ elif isinstance(dataInfo, str):
+ pass
+ else:
+ return
+ UserData = UserData.replace(" ", "")
+ curItem.SetUserData(UserData, len(UserData))
+ return
+
def UpdateItemUserData(curItem, updateDict={}, delKeyList=[], isUpdateGS=False):
''' 更新物品UserData数据
@param curItem: IPY_SingleItem 或 IPY_RoleItem
@@ -392,8 +403,7 @@
continue
userDataDict['%s' % key] = valueList
- UserData = str(userDataDict).replace(" ", "")
- item.SetUserData(UserData, len(UserData))
+ SetItemUserData(item, userDataDict)
if isUpdateGS:
MakeEquipGS(curItem)
elif isRoleItem:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py
index 10bd97f..cd8921a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py
@@ -158,9 +158,7 @@
userDataCreateTime = 0
if curPackItem.UserDataLen:
UserDataDict = eval(curPackItem.UserData)
- #设置UserData
- UserData = "%s"%UserDataDict
- curCreateItem.SetUserData(UserData, len(UserData))
+ ItemCommon.SetItemUserData(curCreateItem, UserDataDict)
userDataCreateTime = curCreateItem.GetUserAttr(ShareDefine.Def_IudetAuctionItemCreateTime)
if isAuctionItem and auctionItemCreateTime and not userDataCreateTime:
--
Gitblit v1.8.0