From 09bc892c7283df8757a07b646d5af21ddaa263d1 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期四, 06 十一月 2025 18:22:34 +0800
Subject: [PATCH] 164 天子的考验-客户端
---
Main/System/KnapSack/Logic/ItemModel.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Main/System/KnapSack/Logic/ItemModel.cs b/Main/System/KnapSack/Logic/ItemModel.cs
index 4b926c8..fd5057e 100644
--- a/Main/System/KnapSack/Logic/ItemModel.cs
+++ b/Main/System/KnapSack/Logic/ItemModel.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using UnityEngine;
public class ItemModel
@@ -8,7 +9,7 @@
public ItemConfig config { get; private set; }
public ItemInfo itemInfo { get; private set; }
- public int score { get; private set; }
+ private int score;
public Dictionary<int, List<int>> useDataDict { get; private set; }
public string guid { get { return itemInfo == null ? string.Empty : itemInfo.guid; } }
@@ -76,6 +77,11 @@
itemInfo = info;
config = ItemConfig.Get(info.itemId);
+ if (config == null)
+ {
+ Debug.LogErrorFormat("ItemConfig.Get({0}) is null", info.itemId);
+ return;
+ }
useDataDict = ConfigParse.Analysis(info.userData);
var customCount = GetUseDataFirstValue((int)ItemUseDataKey.itemCount);
@@ -115,7 +121,7 @@
useDataDict.TryGetValue(key, out list);
}
- return list;
+ return list == null ? new List<int>() : list;
}
public int GetUseDataFirstValue(int key)
@@ -146,6 +152,7 @@
public string guid; //鐗╁搧鐨勫疄渚婭D
public int gearScore; //璇勫垎
+ public bool isLock; //鏄惁閿佸畾
public ItemInfo()
{
@@ -156,24 +163,27 @@
{
itemId = (int)serverItem.ItemID;
index = serverItem.ItemPlace;
- count = serverItem.ItemCount;
+ count = (int)serverItem.ItemCount;
remainHour = (int)serverItem.RemainHour;
- userData = serverItem.UserData;
- guid = serverItem.ItemGUID;
+ userData = serverItem.UserData.Trim().Replace("\0", "");
+ guid = serverItem.ItemGUID.Trim().Replace("\0", "");
isAuction = serverItem.IsBind;
gearScore = (int)serverItem.GearScore;
+ isLock = serverItem.IsLocked > 0;
}
public ItemInfo(H0704_tagRolePackRefresh serverItem)
{
itemId = (int)serverItem.ItemID;
index = serverItem.ItemPlace;
- count = serverItem.ItemCount;
+ count = (int)serverItem.ItemCount;
remainHour = (int)serverItem.RemainHour;
- userData = serverItem.UserData;
- guid = serverItem.ItemGUID;
+ //瀛楃涓插悗闈㈡湁绌哄瓧绗﹂棶棰橈紝缁忓父浼氬鑷翠笉鍙鏂欑殑bug
+ userData = serverItem.UserData.Trim().Replace("\0", "");
+ guid = serverItem.ItemGUID.Trim().Replace("\0", "");
isAuction = serverItem.IsBind;
gearScore = (int)serverItem.GearScore;
+ isLock = serverItem.IsLocked > 0;
}
}
--
Gitblit v1.8.0