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

clean up

Browse Source
This commit is contained in:
Kamila Stawarska 2025-03-03 19:17:05 +01:00
parent b3c1d2fd14
commit f7a7427610
14 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AutoSceneChanger.cs
View File

@ -1,5 +1,4 @@
using UnityEngine;
using UnityEngine.SceneManagement;
namespace NEG.Utils
{

2
Editor/BuildingUtils.cs
View File

@ -185,8 +185,10 @@ public static class BuildingUtils
string command =
$"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && push_build.bat";
if (demo)
{
command =
$"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && push_demo.bat";
}
var processInfo = new ProcessStartInfo("cmd.exe", $"/c {command}")
{

2
Editor/ToolsWindowBase.cs
View File

@ -102,8 +102,10 @@ namespace NegUtils.Editor
return;
if (EditorPrefs.GetBool("GoToCurrentSceneAfterPlay"))
{
EditorSceneManager.LoadSceneInPlayMode(EditorPrefs.GetString("LastOpenedScenePath"),
new LoadSceneParameters(LoadSceneMode.Single));
}
else if (EditorPrefs.GetBool("GoToFirstSceneAfterPlay"))
SceneManager.LoadScene(1);
}

2
KeyBasedFactory.cs
View File

@ -31,8 +31,10 @@ namespace NEG.Utils
var methodFields =
type.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
for (int i = 0; i < methodFields.Length; i++)
{
if (Attribute.GetCustomAttribute(methodFields[i], typeof(FactoryRegistration)) != null)
methodFields[i].Invoke(null, Array.Empty<object>());
}
}
}

22
NEG/UI/PriorityQueue.cs
View File

@ -248,8 +248,10 @@ namespace System.Collections.Generic
public PriorityQueue(int initialCapacity, IComparer<TPriority>? comparer)
{
if (initialCapacity < 0)
{
throw new ArgumentOutOfRangeException(
nameof(initialCapacity), initialCapacity, SR.ArgumentOutOfRange_NeedNonNegNum);
}
_nodes = new (TElement, TPriority)[initialCapacity];
_comparer = InitializeComparer(comparer);
@ -508,9 +510,8 @@ namespace System.Collections.Generic
if (_size > 1) Heapify();
}
else
{
foreach (var (element, priority) in items) Enqueue(element, priority);
}
foreach (var (element, priority) in items)
Enqueue(element, priority);
}
/// <summary>
@ -554,9 +555,8 @@ namespace System.Collections.Generic
if (i > 1) Heapify();
}
else
{
foreach (var element in elements) Enqueue(element, priority);
}
foreach (var element in elements)
Enqueue(element, priority);
}
/// <summary>
@ -684,11 +684,15 @@ namespace System.Collections.Generic
int lastParentWithChildren = GetParentIndex(_size - 1);
if (_comparer == null)
{
for (int index = lastParentWithChildren; index >= 0; --index)
MoveDownDefaultComparer(nodes[index], index);
}
else
{
for (int index = lastParentWithChildren; index >= 0; --index)
MoveDownCustomComparer(nodes[index], index);
}
}
/// <summary>
@ -715,9 +719,7 @@ namespace System.Collections.Generic
nodeIndex = parentIndex;
}
else
{
break;
}
}
nodes[nodeIndex] = node;
@ -748,9 +750,7 @@ namespace System.Collections.Generic
nodeIndex = parentIndex;
}
else
{
break;
}
}
nodes[nodeIndex] = node;
@ -894,8 +894,10 @@ namespace System.Collections.Generic
if (array.GetLowerBound(0) != 0) throw new ArgumentException(SR.Arg_NonZeroLowerBound, nameof(array));
if (index < 0 || index > array.Length)
{
throw new ArgumentOutOfRangeException(nameof(index), index,
SR.ArgumentOutOfRange_IndexMustBeLessOrEqual);
}
if (array.Length - index < _queue._size) throw new ArgumentException(SR.Argument_InvalidOffLen);

2
NEG/UI/UnityUi/Area/MonoArea.cs
View File

@ -29,7 +29,7 @@ namespace NEG.UI.Area
private void OnDestroy()
{
if(UiManager.Instance == null)
if (UiManager.Instance == null)
return;
if (ReferenceEquals(UiManager.Instance.CurrentArea, this))
UiManager.Instance.CurrentArea = null;

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

@ -43,10 +43,7 @@ namespace NEG.UI.UnityUi.Buttons
private void Start() => OnDeselect(null);
private void OnValidate()
{
this.ValidateRefs();
}
private void OnValidate() => this.ValidateRefs();
public void OnDeselect(BaseEventData eventData) => OnDeselected?.Invoke(eventData is SilentEventData);

3
NEG/UI/UnityUi/Buttons/Reactions/ExitGame.cs
View File

@ -1,3 +1,4 @@
using UnityEditor;
using UnityEngine;
namespace NEG.UI.UnityUi.Buttons.Reactions
@ -7,7 +8,7 @@ namespace NEG.UI.UnityUi.Buttons.Reactions
protected override void OnClicked()
{
#if UNITY_EDITOR
UnityEditor.EditorApplication.isPlaying = false;
EditorApplication.isPlaying = false;
#endif
Application.Quit();
}

2
NEG/UI/UnityUi/MonoUiInputManger.cs
View File

@ -74,10 +74,12 @@ namespace NEG.UI.UnityUi
var data = new PointerEventData(EventSystem.current);
var currentSelected = EventSystem.current.currentSelectedGameObject;
if (currentSelected != null)
{
for (var current = EventSystem.current.currentSelectedGameObject.transform;
current != null;
current = current.parent)
ExecuteEvents.Execute(current.gameObject, data, ExecuteEvents.pointerExitHandler);
}
EventSystem.current.SetSelectedGameObject(currentSelected);
}

2
NEG/UI/UnityUi/Window/MonoWindow.cs
View File

@ -27,7 +27,7 @@ namespace NEG.UI.UnityUi.Window
private void OnDestroy()
{
if(UiManager.Instance == null)
if (UiManager.Instance == null)
return;
if (IsOpened)
UiManager.Instance.OnWindowClosed(this);

1
NEG/Utils/ReadOnlyAttribute.cs
View File

@ -5,5 +5,4 @@ namespace NEG.Utils
public class ReadOnlyAttribute : PropertyAttribute
{
}
}

5
UiToolkit/MultiSelectChips/MultiSelectChips.cs
View File

@ -10,9 +10,8 @@ namespace NEG.Utils.UiToolkits
{
public class MultiSelectChips : VisualElement
{
private readonly List<MultiSelectChipItem> spawnedItems = new();
private readonly VisualTreeAsset itemPrefab;
private readonly List<MultiSelectChipItem> spawnedItems = new();
private ICollection<IMultiSelectChipItem> itemsSource;
@ -86,8 +85,10 @@ namespace NEG.Utils.UiToolkits
List<IMultiSelectChipItem> itemsToAdd = new(itemsSource);
foreach (var item in spawnedItems)
{
if (itemsToAdd.Contains(item.ChipItem))
itemsToAdd.Remove(item.ChipItem);
}
foreach (var item in itemsToAdd)
{

2
UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml
View File

@ -1,4 +1,4 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements"
<ui:UXML xmlns:ui="UnityEngine.UIElements"
xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements"
noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:VisualElement name="VisualElement" class="unity-button"

2
UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml
View File

@ -1,4 +1,4 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements"
<ui:UXML xmlns:ui="UnityEngine.UIElements"
xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements"
noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:VisualElement style="flex-direction: row; flex-wrap: wrap;">