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

Apply pr comments

Browse Source
This commit is contained in:
Hubert Mattusch 2023-09-02 01:12:42 +02:00
parent fb90337a3f
commit aafd5dbc75
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>(); private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>();

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

@ -68,14 +68,8 @@ namespace NEG.UI.UnityUi.Editor
flexGrow = 1 flexGrow = 1
} }
}; };
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();
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");