Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
avvy
mobile-app
Commits
73cf80b3
Commit
73cf80b3
authored
3 years ago
by
Sally552sally
Browse files
Options
Download
Email Patches
Plain Diff
новые категории на тестовом окружении
parent
cbcaa689
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/AvvyLand/Scripts/Hybrid/ObjectClassProperties/ObjectDataProperty.cs
+2
-5
...cripts/Hybrid/ObjectClassProperties/ObjectDataProperty.cs
Assets/AvvyLand/Scripts/UI/Inventory/Menu2D/UIInventoryController.cs
+6
-6
...Land/Scripts/UI/Inventory/Menu2D/UIInventoryController.cs
with
8 additions
and
11 deletions
+8
-11
Assets/AvvyLand/Scripts/Hybrid/ObjectClassProperties/ObjectDataProperty.cs
View file @
73cf80b3
...
...
@@ -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
]
...
...
This diff is collapsed.
Click to expand it.
Assets/AvvyLand/Scripts/UI/Inventory/Menu2D/UIInventoryController.cs
View file @
73cf80b3
...
...
@@ -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
.
tag
s
)
.
ToDictionary
(
x
=>
x
.
Key
,
x
=>
x
.
Value
).
Values
.
SelectMany
(
x
=>
x
.
meta
.
category_name
.
Value
s
)
.
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
.
tag
s
;
var
category
=
ViewStorage
.
Instance
.
BlockManifestDictionary
[
_currentBlock
].
meta
.
category_name
.
Value
s
;
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
.
tag
s
.
SelectMany
(
objectClass
=>
ViewStorage
.
Instance
.
BlockManifestDictionary
[
objectClass
].
meta
.
category_name
.
Value
s
.
Select
(
tag
=>
new
KeyValuePair
<
ulong
,
string
>(
objectClass
,
tag
)))
.
Where
(
block
=>
block
.
Value
==
category
)
.
Distinct
()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help