negames/Neg_Utils
26
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better-ui-manager #2

Merged
BitterSmile merged 25 commits from better-ui-manager into main 2023-09-02 14:34:16 +02:00
Conversation 2 Commits 25 Files Changed 93 +2 -10
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aafd5dbc75 - Show all commits

1
NEG/UI/UnityUi/Buttons/BaseButton.cs
View File

@ -32,7 +32,6 @@ namespace NEG.UI.UnityUi.Buttons
[SerializeField, Child(Flag.Optional)] private Image icon; [SerializeField, Child(Flag.Optional)] private Image icon;
[SerializeField] private ButtonSettings groupButtonSettings; [SerializeField] private ButtonSettings groupButtonSettings;
//[SerializeField, Self(Flag.Optional)] private ButtonSettingOverride overrideSettings;
BitterSmile marked this conversation as resolved
Niikelion commented 2023-08-01 22:34:15 +02:00
Review
Copy Link

remove

remove
private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>(); private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>();

8
NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
View File

@ -69,13 +69,7 @@ namespace NEG.UI.UnityUi.Editor
} }
}; };
var label = new Label(name) var label = new Label(name);
{
style =
{
//
}
};
var enabler = new Toggle(); var enabler = new Toggle();
enabler.BindProperty(property.FindPropertyRelative("<Override>k__BackingField")); enabler.BindProperty(property.FindPropertyRelative("<Override>k__BackingField"));

1
NEG/UI/UnityUi/MonoUiManager.cs
View File

@ -42,7 +42,6 @@ namespace NEG.UI.UnityUi
var popupCanvas = Resources.Load<GameObject>("UI/PopupCanvas"); var popupCanvas = Resources.Load<GameObject>("UI/PopupCanvas");
var defaultPopup = Resources.Load<GameObject>("UI/DefaultPopupPrefab"); var defaultPopup = Resources.Load<GameObject>("UI/DefaultPopupPrefab");
//Addressables.LoadAssetsAsync<GameObject>(new List<string>() { "NEG/UI/PopupCanvas", "NEG/UI/DefaultPopupPrefab" }, (_) => { }, Addressables.MergeMode.Union).WaitForCompletion();
BitterSmile marked this conversation as resolved
Niikelion commented 2023-08-01 22:37:51 +02:00
Review
Copy Link

?

?
Assert.IsNotNull(popupCanvas,"No canvas prefab was provided. Please check MonoUiManager class documentation"); Assert.IsNotNull(popupCanvas,"No canvas prefab was provided. Please check MonoUiManager class documentation");
Assert.IsNotNull(defaultPopup,"No popup prefab was provided. Please check MonoUiManager class documentation"); Assert.IsNotNull(defaultPopup,"No popup prefab was provided. Please check MonoUiManager class documentation");