feat: ResetOnPlay and RemoveFolder

Tr0sT · Tr0sT · commit d57d17d448fd · 2020-07-01T22:04:58.000+03:00
diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -14,6 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_DefaultGroup: 5060a785574c176439e3d88847148030
   m_BuildRemoteCatalog: 0
+  m_BundleLocalCatalog: 0
   m_DisableCatalogUpdateOnStart: 0
   m_UniqueBundleIds: 0
   m_RemoteCatalogBuildPath:
diff --git a/Packages/com.nuclearband.sodatabase/Runtime/DataNode.cs b/Packages/com.nuclearband.sodatabase/Runtime/DataNode.cs
@@ -1,8 +1,20 @@
-﻿using Sirenix.OdinInspector;
+﻿using System.Reflection;
+using Sirenix.OdinInspector;
 
 namespace NuclearBand
 {
     public class DataNode : SerializedScriptableObject
     {
+        protected virtual void OnEnable()
+        {
+            var typeInfo = GetType().GetTypeInfo();
+            var fields = typeInfo.GetFields(BindingFlags.NonPublic | BindingFlags.Instance);
+            foreach (var field in fields)
+            {
+                var attributes = field.GetCustomAttributes(typeof(ResetOnPlay), false);
+                if (attributes.Length > 0)
+                    field.SetValue(this, default);
+            }
+        }
     }
 }
diff --git a/Packages/com.nuclearband.sodatabase/Runtime/Holders/FolderHolder.cs b/Packages/com.nuclearband.sodatabase/Runtime/Holders/FolderHolder.cs
@@ -49,8 +49,7 @@ protected override void Clone()
 
         protected override void Remove()
         {
-            AssetDatabase.DeleteAsset(SODatabaseSettings.Path + Path + "/" + Name);
-            AssetDatabase.Refresh();
+            SODatabaseInternal.RemoveFolder(Path + "/" + Name);
         }
 #endif
 
diff --git a/Packages/com.nuclearband.sodatabase/Runtime/SODatabaseAttributes.cs b/Packages/com.nuclearband.sodatabase/Runtime/SODatabaseAttributes.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace NuclearBand
+{
+    [AttributeUsage(AttributeTargets.Field)]
+    public class ResetOnPlay : Attribute
+    {
+        
+    }
+}
diff --git a/Packages/com.nuclearband.sodatabase/Runtime/SODatabaseAttributes.cs.meta b/Packages/com.nuclearband.sodatabase/Runtime/SODatabaseAttributes.cs.meta
diff --git a/Packages/com.nuclearband.sodatabase/Runtime/SODatabaseInternal.cs b/Packages/com.nuclearband.sodatabase/Runtime/SODatabaseInternal.cs
@@ -53,6 +53,12 @@ public static T CreateModel<T>(string path, string name) where T : DataNode
             AssetDatabase.Refresh();
             return obj;
         }
+
+        public static void RemoveFolder(string path)
+        {
+            AssetDatabase.DeleteAsset(SODatabaseSettings.Path + "/" + path);
+            AssetDatabase.Refresh();
+        }
     }
 }
 #endif
diff --git a/Packages/com.nuclearband.sodatabase/Samples/Sample/Example1Scene.unity b/Packages/com.nuclearband.sodatabase/Samples/Sample/Example1Scene.unity
@@ -135,6 +135,7 @@ GameObject:
   - component: {fileID: 396960464}
   - component: {fileID: 396960463}
   - component: {fileID: 396960466}
+  - component: {fileID: 396960467}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -219,3 +220,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e0dfd423dfd9ac74c90087eba23b0b8f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &396960467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 396960462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d73ee2b3c89d77e40a3cf6bc38cc79be, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,19 +1,18 @@
 {
   "dependencies": {
-    "com.unity.2d.animation": "4.2.2",
-    "com.unity.2d.pixel-perfect": "3.0.2",
-    "com.unity.2d.psdimporter": "3.1.3",
+    "com.unity.2d.animation": "5.0.0",
+    "com.unity.2d.pixel-perfect": "4.0.0",
+    "com.unity.2d.psdimporter": "4.0.0",
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.spriteshape": "4.1.0",
+    "com.unity.2d.spriteshape": "5.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.addressables": "1.7.5",
-    "com.unity.collab-proxy": "1.3.7",
-    "com.unity.ide.rider": "2.0.2",
+    "com.unity.addressables": "1.9.2",
+    "com.unity.ide.rider": "2.0.5",
     "com.unity.ide.visualstudio": "2.0.1",
-    "com.unity.ide.vscode": "1.2.0",
-    "com.unity.test-framework": "1.1.13",
-    "com.unity.textmeshpro": "3.0.0-preview.1",
-    "com.unity.timeline": "1.4.0-preview.3",
+    "com.unity.ide.vscode": "1.2.1",
+    "com.unity.test-framework": "1.1.14",
+    "com.unity.textmeshpro": "3.0.0-preview.14",
+    "com.unity.timeline": "1.4.0",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.2.0a9
-m_EditorVersionWithRevision: 2020.2.0a9 (31beeaab9d72)
+m_EditorVersion: 2020.2.0a15
+m_EditorVersionWithRevision: 2020.2.0a15 (86048ae4b4bd)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,20 @@`
`1`		`-using Sirenix.OdinInspector;`
	`1`	`+using System.Reflection;`
	`2`	`+using Sirenix.OdinInspector;`
`2`	`3`
`3`	`4`	`namespace NuclearBand`
`4`	`5`	`{`
`5`	`6`	`public class DataNode : SerializedScriptableObject`
`6`	`7`	`{`
	`8`	`+ protected virtual void OnEnable()`
	`9`	`+ {`
	`10`	`+ var typeInfo = GetType().GetTypeInfo();`
	`11`	`+ var fields = typeInfo.GetFields(BindingFlags.NonPublic \| BindingFlags.Instance);`
	`12`	`+ foreach (var field in fields)`
	`13`	`+ {`
	`14`	`+ var attributes = field.GetCustomAttributes(typeof(ResetOnPlay), false);`
	`15`	`+ if (attributes.Length > 0)`
	`16`	`+ field.SetValue(this, default);`
	`17`	`+ }`
	`18`	`+ }`
`7`	`19`	`}`
`8`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ protected override void Clone()`
`49`	`49`
`50`	`50`	`protected override void Remove()`
`51`	`51`	`{`
`52`		`- AssetDatabase.DeleteAsset(SODatabaseSettings.Path + Path + "/" + Name);`
`53`		`- AssetDatabase.Refresh();`
	`52`	`+ SODatabaseInternal.RemoveFolder(Path + "/" + Name);`
`54`	`53`	`}`
`55`	`54`	`#endif`
`56`	`55`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,12 @@ public static T CreateModel<T>(string path, string name) where T : DataNode`
`53`	`53`	`AssetDatabase.Refresh();`
`54`	`54`	`return obj;`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ public static void RemoveFolder(string path)`
	`58`	`+ {`
	`59`	`+ AssetDatabase.DeleteAsset(SODatabaseSettings.Path + "/" + path);`
	`60`	`+ AssetDatabase.Refresh();`
	`61`	`+ }`
`56`	`62`	`}`
`57`	`63`	`}`
`58`	`64`	`#endif`