AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-05-10 21:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename external => menuasset

Browse Source
This commit is contained in:
bd_ 2023-02-22 23:03:59 +09:00
parent 557b4619ae
commit ee6929cee5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs
View File

@ -347,7 +347,7 @@ namespace modular_avatar_tests.VirtualMenuTests
var item_a = installer_a.gameObject.AddComponent<ModularAvatarMenuItem>(); var item_a = installer_a.gameObject.AddComponent<ModularAvatarMenuItem>();
item_a.Control = GenerateTestControl(); item_a.Control = GenerateTestControl();
item_a.Control.type = VRCExpressionsMenu.Control.ControlType.SubMenu; item_a.Control.type = VRCExpressionsMenu.Control.ControlType.SubMenu;
item_a.MenuSource = SubmenuSource.External; item_a.MenuSource = SubmenuSource.MenuAsset;
item_a.Control.subMenu = menu_a; item_a.Control.subMenu = menu_a;
installer_b.menuToAppend = menu_b; installer_b.menuToAppend = menu_b;

2
Packages/nadena.dev.modular-avatar/Editor/MenuGeneration/VirtualMenu.cs
View File

@ -353,7 +353,7 @@ namespace nadena.dev.modular_avatar.core.editor.menu
switch (item.MenuSource) switch (item.MenuSource)
{ {
case SubmenuSource.External: case SubmenuSource.MenuAsset:
{ {
if (item.Control.subMenu != null) if (item.Control.subMenu != null)
{ {

4
Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs
View File

@ -27,7 +27,7 @@ namespace nadena.dev.modular_avatar.core
public enum SubmenuSource public enum SubmenuSource
{ {
External, MenuAsset,
Children, Children,
} }
@ -60,7 +60,7 @@ namespace nadena.dev.modular_avatar.core
List<VRCExpressionsMenu.Control> controls = null; List<VRCExpressionsMenu.Control> controls = null;
switch (MenuSource) switch (MenuSource)
{ {
case SubmenuSource.External: case SubmenuSource.MenuAsset:
controls = Control.subMenu?.controls?.ToList(); controls = Control.subMenu?.controls?.ToList();
break; break;
case SubmenuSource.Children: case SubmenuSource.Children: