Skip to content
This repository was archived by the owner on Aug 15, 2024. It is now read-only.

Commit f957a28

Browse files
committed
fix: warning
1 parent f72d57f commit f957a28

File tree

4 files changed

+26
-37
lines changed

4 files changed

+26
-37
lines changed

Assets/Plugins/NuclearBand.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Packages/com.nuclearband.sodatabase/Editor/ScriptableObjectDatabaseEditorWindow.cs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace NuclearBand.Editor
1313
public class ScriptableObjectDatabaseEditorWindow : OdinMenuEditorWindow
1414
{
1515
private bool inSettings = false;
16+
1617
[MenuItem("Tools/NuclearBand/ScriptableObjectDatabase")]
1718
private static void Open()
1819
{
@@ -34,9 +35,9 @@ protected override OdinMenuTree BuildMenuTree()
3435
tree.AddMenuItemAtPath(new HashSet<OdinMenuItem>(), "", new OdinMenuItem(tree, "Settings", SODatabaseSettings.Instance));
3536
return tree;
3637
}
37-
38+
3839
AddAllAssetsAtPath(tree, SODatabaseSettings.Path, typeof(DataNode));
39-
Texture folderIcon = (Texture2D)AssetDatabase.LoadAssetAtPath("Packages/com.nuclearband.sodatabase/Editor/folderIcon.png", typeof(Texture2D));
40+
Texture folderIcon = (Texture2D) AssetDatabase.LoadAssetAtPath("Packages/com.nuclearband.sodatabase/Editor/folderIcon.png", typeof(Texture2D));
4041
tree.EnumerateTree().AddIcons<FolderHolder>(x => folderIcon);
4142
tree.SortMenuItemsByName();
4243
tree.Selection.SelectionChanged += SelectionChanged;
@@ -45,26 +46,18 @@ protected override OdinMenuTree BuildMenuTree()
4546

4647
private void SelectionChanged(SelectionChangedType obj)
4748
{
48-
try
49+
switch (obj)
4950
{
50-
switch (obj)
51-
{
52-
case SelectionChangedType.ItemAdded:
53-
(MenuTree.Selection.SelectedValue as Holder).Select();
54-
break;
55-
case SelectionChangedType.ItemRemoved:
56-
break;
57-
case SelectionChangedType.SelectionCleared:
58-
break;
59-
default:
60-
throw new ArgumentOutOfRangeException(nameof(obj), obj, null);
61-
}
51+
case SelectionChangedType.ItemAdded:
52+
(MenuTree.Selection.SelectedValue as Holder).Select();
53+
break;
54+
case SelectionChangedType.ItemRemoved:
55+
break;
56+
case SelectionChangedType.SelectionCleared:
57+
break;
58+
default:
59+
throw new ArgumentOutOfRangeException(nameof(obj), obj, null);
6260
}
63-
catch (Exception e)
64-
{
65-
66-
}
67-
6861
}
6962

7063
void AddAllAssetsAtPath(
@@ -73,6 +66,7 @@ void AddAllAssetsAtPath(
7366
Type type)
7467
{
7568
var strings = AssetDatabase.GetAllAssetPaths().Where(x => x.StartsWith(assetFolderPath, StringComparison.InvariantCultureIgnoreCase));
69+
7670
var odinMenuItemSet = new HashSet<OdinMenuItem>();
7771
foreach (var str1 in strings)
7872
{
@@ -99,7 +93,7 @@ void AddAllAssetsAtPath(
9993
if (name == "")
10094
continue;
10195
tree.AddMenuItemAtPath(odinMenuItemSet, path, new OdinMenuItem(tree, name, new FolderHolder(path, name)));
102-
96+
10397
continue;
10498
}
10599

@@ -120,12 +114,14 @@ void AddAllAssetsAtPath(
120114
private static void SplitMenuPath(string menuPath, out string path, out string name)
121115
{
122116
menuPath = menuPath.Trim('/');
117+
123118
int length = menuPath.LastIndexOf('/');
124119
if (length == -1)
125120
{
126121
path = "";
127122
name = menuPath;
128123
}
124+
129125
else
130126
{
131127
path = menuPath.Substring(0, length);
@@ -143,6 +139,7 @@ protected override void OnBeginDrawEditors()
143139
Close();
144140
Open();
145141
}
142+
146143
return;
147144
}
148145

@@ -176,7 +173,7 @@ protected override void OnBeginDrawEditors()
176173
{
177174
var uniqName = AssetDatabase.GenerateUniqueAssetPath(path + "/" + "New");
178175
uniqName = uniqName.Substring(uniqName.LastIndexOf('/') + 1);
179-
176+
180177
AssetDatabase.CreateFolder(path, uniqName);
181178
AssetDatabase.Refresh();
182179
}

Packages/com.nuclearband.sodatabase/Runtime/SODatabase.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ namespace NuclearBand
1111
{
1212
public static class SODatabase
1313
{
14-
private static FolderHolder root;
15-
14+
private static FolderHolder root;
15+
1616
public static async Task Init(Action<float> onProgress, Action onComplete)
1717
{
1818
var loadHandler = Addressables.LoadResourceLocationsAsync(SODatabaseSettings.Label);
19+
#pragma warning disable 4014
1920
Task.Run(async () =>
2021
{
2122
while (!loadHandler.IsDone)
@@ -26,8 +27,9 @@ public static async Task Init(Action<float> onProgress, Action onComplete)
2627

2728
onProgress?.Invoke(loadHandler.PercentComplete);
2829
});
30+
#pragma warning restore 4014
2931
var resourceLocations = await loadHandler.Task;
30-
32+
3133
var loadTasks = resourceLocations.ToDictionary(resourceLocation => resourceLocation.PrimaryKey.Substring(SODatabaseSettings.Label.Length + 1), resourceLocation => Addressables.LoadAssetAsync<DataNode>(resourceLocation).Task);
3234
await Task.WhenAll(loadTasks.Values);
3335
root = new FolderHolder("", "");
@@ -76,7 +78,5 @@ public static List<T> GetModels<T>(string path) where T : DataNode
7678
#if UNITY_EDITOR
7779
public static T GetModelForEdit<T>(string path) where T : DataNode => AssetDatabase.LoadAssetAtPath(SODatabaseSettings.Path + path + ".asset", typeof(T)) as T;
7880
#endif
79-
8081
}
81-
}
82-
82+
}

Packages/com.nuclearband.sodatabase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.nuclearband.sodatabase",
33
"displayName": "Scriptable Objest database",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"dependencies": {},
66
"author": {
77
"name": "Tr0sT",

0 commit comments

Comments
 (0)