Commit 73cf80b3 authored by Sally552sally's avatar Sally552sally
Browse files

новые категории на тестовом окружении

parent cbcaa689
No related merge requests found
Showing with 8 additions and 11 deletions
+8 -11
......@@ -17,7 +17,7 @@ namespace AvvyLand.Scripts.Hybrid.ObjectClassProperties
public ulong id;
public string name;
public List<string> tags;
public CategoryName category_name;
public Dictionary<string, string> category_name;
public string category;
public string description;
public string size;
......@@ -27,10 +27,7 @@ namespace AvvyLand.Scripts.Hybrid.ObjectClassProperties
public string preview;
}
public class CategoryName
{
public List<string> category;
}
[Serializable]
......
......@@ -230,7 +230,7 @@ namespace AvvyLand.Scripts.UI.Inventory.Menu2D
var categories =
ViewStorage.Instance.BlockManifestDictionary
.Where(x => !x.Value.properties.is_avatar && classesNativeArray.Contains(x.Key))
.ToDictionary(x => x.Key, x => x.Value).Values.SelectMany(x => x.meta.tags)
.ToDictionary(x => x.Key, x => x.Value).Values.SelectMany(x => x.meta.category_name.Values)
.Distinct()
.ToList();
......@@ -244,17 +244,17 @@ namespace AvvyLand.Scripts.UI.Inventory.Menu2D
{
if (ViewStorage.Instance.BlockManifestDictionary.ContainsKey(_currentBlock))
{
var tags = ViewStorage.Instance.BlockManifestDictionary[_currentBlock].meta.tags;
var category = ViewStorage.Instance.BlockManifestDictionary[_currentBlock].meta.category_name.Values;
if (tags.Count == 0)
if (category.Count == 0)
{
_actualCategory = categories[0];
}
else if (tags.Contains(_actualCategory))
else if (category.Contains(_actualCategory))
{ }
else
{
_actualCategory = tags[0];
_actualCategory = category.ElementAt(0);
}
}
else
......@@ -273,7 +273,7 @@ namespace AvvyLand.Scripts.UI.Inventory.Menu2D
var blocks = classesNativeArray.ToArray();
var blockList = blocks
.SelectMany(objectClass => ViewStorage.Instance.BlockManifestDictionary[objectClass].meta.tags
.SelectMany(objectClass => ViewStorage.Instance.BlockManifestDictionary[objectClass].meta.category_name.Values
.Select(tag => new KeyValuePair<ulong, string>(objectClass, tag)))
.Where(block => block.Value == category)
.Distinct()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment