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

Commit fc7774f

Browse files
Tr0sTTr0sT
committed
fix: new unity version, serialization warning
1 parent 99c0f17 commit fc7774f

File tree

10 files changed

+71
-23
lines changed

10 files changed

+71
-23
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ private static void Open()
2828
[MenuItem("Tools/NuclearBand/ScriptableObjectDatabase-ClearSave")]
2929
private static async void ClearSave()
3030
{
31+
AssetDatabase.Refresh();
32+
3133
File.Delete(SODatabase.SavePath);
3234
await SODatabase.InitAsync(null, null);
3335
await SODatabase.LoadAsync();
@@ -56,11 +58,11 @@ private static void OpenSaveFolder()
5658
}
5759

5860
[InitializeOnEnterPlayMode]
59-
private static async void ResetOnPlay()
61+
private static void ResetOnPlay()
6062
{
61-
await SODatabase.InitAsync(null, null);
62-
await SODatabase.LoadAsync();
63-
var models = SODatabase.GetModels<DataNode>("", true);
63+
AssetDatabase.Refresh();
64+
65+
var models = SODatabaseInternal.GetModelsForEdit<DataNode>("");
6466
foreach (var model in models)
6567
{
6668
var typeInfo = model.GetType().GetTypeInfo();
@@ -244,6 +246,8 @@ protected override void OnBeginDrawEditors()
244246

245247
private void Save()
246248
{
249+
AssetDatabase.Refresh();
250+
247251
Flatten(MenuTree.MenuItems).ForEach(item =>
248252
{
249253
if (!(item.Value is DataNodeHolder dataNodeHolder))
@@ -256,7 +260,6 @@ private void Save()
256260
});
257261

258262
AssetDatabase.SaveAssets();
259-
AssetDatabase.Refresh();
260263
}
261264

262265
private static IEnumerable<OdinMenuItem> Flatten(IEnumerable<OdinMenuItem> collection)

‎Packages/com.nuclearband.sodatabase/Runtime/Holders/DataNodeHolder.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,33 @@ public DataNodeHolder(string path, string name, DataNode dataNode) : base(path,
1818

1919
protected override void Move()
2020
{
21+
AssetDatabase.Refresh();
2122
AssetDatabase.MoveAsset(SODatabaseSettings.Path + Path + "/" + Name + ".asset",
2223
SODatabaseSettings.Path + tempPath + "/" + Name + ".asset");
2324
AssetDatabase.SaveAssets();
24-
AssetDatabase.Refresh();
2525
}
2626

2727
protected override void Rename()
2828
{
29+
AssetDatabase.Refresh();
2930
AssetDatabase.RenameAsset(SODatabaseSettings.Path + Path + "/" + Name + ".asset", tempName + ".asset");
3031
Name = tempName;
3132
AssetDatabase.SaveAssets();
32-
AssetDatabase.Refresh();
3333
}
3434

3535
protected override void Clone()
3636
{
37+
AssetDatabase.Refresh();
3738
AssetDatabase.CopyAsset(SODatabaseSettings.Path + Path + "/" + Name + ".asset",
3839
AssetDatabase.GenerateUniqueAssetPath(SODatabaseSettings.Path + Path + "/" + Name + ".asset"));
3940
AssetDatabase.SaveAssets();
40-
AssetDatabase.Refresh();
4141
}
4242

4343
protected override void Remove()
4444
{
45-
AssetDatabase.DeleteAsset(SODatabaseSettings.Path + Path + "/" + Name + ".asset");
4645
AssetDatabase.Refresh();
46+
AssetDatabase.DeleteAsset(SODatabaseSettings.Path + Path + "/" + Name + ".asset");
47+
AssetDatabase.SaveAssets();
4748
}
4849
}
4950
}

‎Packages/com.nuclearband.sodatabase/Runtime/Holders/FolderHolder.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ public FolderHolder(string path, string name) : base(path, name)
2727

2828
protected override void Move()
2929
{
30+
AssetDatabase.Refresh();
3031
AssetDatabase.MoveAsset(SODatabaseSettings.Path + Path + "/" + Name, SODatabaseSettings.Path + tempPath + "/" + Name);
3132
AssetDatabase.SaveAssets();
32-
AssetDatabase.Refresh();
3333
}
3434

3535
protected override void Rename()
3636
{
37+
AssetDatabase.Refresh();
3738
AssetDatabase.RenameAsset(SODatabaseSettings.Path + Path + "/" + Name, tempName);
3839
Name = tempName;
3940
AssetDatabase.SaveAssets();
40-
AssetDatabase.Refresh();
4141
}
4242

4343
protected override void Clone()
4444
{
45+
AssetDatabase.Refresh();
4546
AssetDatabase.CopyAsset(SODatabaseSettings.Path + Path + "/" + Name,
4647
AssetDatabase.GenerateUniqueAssetPath(SODatabaseSettings.Path + Path + "/" + Name));
4748
AssetDatabase.SaveAssets();
48-
AssetDatabase.Refresh();
4949
}
5050

5151
protected override void Remove()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ public static async Task LoadAsync()
167167
LoadFolderHolder(root, string.Empty, dict);
168168
}
169169

170-
171170
static void LoadFolderHolder(FolderHolder folderHolder, string path, Dictionary<string, string> data)
172171
{
173172
foreach (var dataNodePair in folderHolder.DataNodes)

‎Packages/com.nuclearband.sodatabase/Runtime/SODatabaseInternal.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ public static T GetModelForEdit<T>(string path) where T : DataNode
1818

1919
public static List<T> GetModelsForEdit<T>(string path) where T : DataNode
2020
{
21-
var modelGUIDs = AssetDatabase.FindAssets($"t:{typeof(T).Name}",new [] {SODatabaseSettings.Path + path});
21+
var searchPath = (SODatabaseSettings.Path + path).TrimEnd('/');
22+
var modelGUIDs = AssetDatabase.FindAssets($"t:{typeof(T).Name}",new [] {searchPath});
2223

2324
return modelGUIDs.Select(model => AssetDatabase.LoadAssetAtPath<T>(AssetDatabase.GUIDToAssetPath(model))).ToList();
2425
}
2526

2627
public static void CreateFolder(string path)
2728
{
29+
AssetDatabase.Refresh();
2830
var folders = path.Split('/');
2931
var fullPath = SODatabaseSettings.Path.TrimEnd('/');
3032
foreach (var folder in folders)
@@ -39,7 +41,6 @@ public static void CreateFolder(string path)
3941

4042
}
4143
AssetDatabase.SaveAssets();
42-
AssetDatabase.Refresh();
4344
}
4445

4546
public static T CreateModel<T>(string path, string name) where T : DataNode
@@ -51,12 +52,13 @@ public static T CreateModel<T>(string path, string name) where T : DataNode
5152
}
5253
catch{}
5354

55+
AssetDatabase.Refresh();
5456
CreateFolder(path);
5557
var obj = (ScriptableObject.CreateInstance(typeof(T)) as T)!;
5658
var fullPath = SODatabaseSettings.Path + path + "/" + name;
5759
AssetDatabase.CreateAsset(obj, fullPath + ".asset");
5860
AssetDatabase.SaveAssets();
59-
AssetDatabase.Refresh();
61+
6062
return obj;
6163
}
6264

‎Packages/com.nuclearband.sodatabase/Runtime/SODatabaseSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public static SODatabaseSettings Instance
2121
#if UNITY_EDITOR
2222
if (instance == null)
2323
{
24+
AssetDatabase.Refresh();
2425
instance = CreateInstance<SODatabaseSettings>();
2526
AssetDatabase.CreateFolder("Assets", "com.nuclearband.sodatabase");
2627
AssetDatabase.CreateFolder("Assets/com.nuclearband.sodatabase", "Resources");
2728
const string destination = "Assets/com.nuclearband.sodatabase/Resources/";
2829
AssetDatabase.CreateAsset(instance, (destination + "SODatabaseSettings.asset"));
2930
AssetDatabase.SaveAssets();
30-
AssetDatabase.Refresh();
3131
}
3232
#endif
3333
return instance;

‎Packages/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.addressables": "1.11.2",
4+
"com.unity.addressables": "1.14.2",
55
"com.unity.ide.rider": "2.0.7",
66
"com.unity.ide.visualstudio": "2.0.2",
77
"com.unity.ide.vscode": "1.2.1",

‎Packages/packages-lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"dependencies": {}
1717
},
1818
"com.unity.addressables": {
19-
"version": "1.11.2",
19+
"version": "1.14.2",
2020
"depth": 0,
2121
"source": "registry",
2222
"dependencies": {
23-
"com.unity.scriptablebuildpipeline": "1.8.6",
23+
"com.unity.scriptablebuildpipeline": "1.11.1",
2424
"com.unity.modules.assetbundle": "1.0.0",
2525
"com.unity.modules.unitywebrequest": "1.0.0",
2626
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
@@ -65,7 +65,7 @@
6565
"url": "https://packages.unity.com"
6666
},
6767
"com.unity.scriptablebuildpipeline": {
68-
"version": "1.8.6",
68+
"version": "1.11.1",
6969
"depth": 1,
7070
"source": "registry",
7171
"dependencies": {},

‎ProjectSettings/PackageManagerSettings.asset‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_EnablePreviewPackages: 0
16+
m_EnablePackageDependencies: 0
17+
m_AdvancedSettingsExpanded: 1
18+
m_ScopedRegistriesSettingsExpanded: 1
19+
oneTimeWarningShown: 0
20+
m_Registries:
21+
- m_Id: main
22+
m_Name:
23+
m_Url: https://packages.unity.com
24+
m_Scopes: []
25+
m_IsDefault: 1
26+
m_Capabilities: 7
27+
m_UserSelectedRegistryName:
28+
m_UserAddingNewScopedRegistry: 0
29+
m_RegistryInfoDraft:
30+
m_ErrorMessage:
31+
m_Original:
32+
m_Id:
33+
m_Name:
34+
m_Url:
35+
m_Scopes: []
36+
m_IsDefault: 0
37+
m_Capabilities: 0
38+
m_Modified: 0
39+
m_Name:
40+
m_Url:
41+
m_Scopes:
42+
-
43+
m_SelectedScopeIndex: 0

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.2.0a19
2-
m_EditorVersionWithRevision: 2020.2.0a19 (8037ac78137e)
1+
m_EditorVersion: 2020.2.0b2
2+
m_EditorVersionWithRevision: 2020.2.0b2 (90b2443a8df1)

0 commit comments

Comments
 (0)