Fixed the handling of the power singleton attribute if no type is set

Author: DerKekser

Assets/Kekser/Example/GameManager.cs

@@ -1,4 +1,5 @@
-using Kekser.PowerSingleton.Attributes;
+using Kekser.PowerSingleton;
+using Kekser.PowerSingleton.Attributes;
 using UnityEngine;
 
 namespace Kekser.Example
@@ -9,6 +10,7 @@ public class GameManager : MonoBehaviour, IGameManager
         public void AddScore(int score)
         {
             Debug.Log($"GameManager: AddScore({score})");
+            Single<UIManager>.Instance.UpdateScore(score);
         }
     }
 }

Assets/Kekser/Example/ScoreExample.unity

@@ -123,6 +123,49 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &246422328
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 246422330}
+  - component: {fileID: 246422329}
+  m_Layer: 0
+  m_Name: UI Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &246422329
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 246422328}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7df6670f8fb69734c99359ba1d66a55b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &246422330
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 246422328}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &478411555
 GameObject:
   m_ObjectHideFlags: 0
@@ -134,7 +177,7 @@ GameObject:
   - component: {fileID: 478411557}
   - component: {fileID: 478411556}
   m_Layer: 0
-  m_Name: ScoreTicker
+  m_Name: Score Ticker
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -164,7 +207,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &665219491
 GameObject:

Assets/Kekser/Example/UIManager.cs

@@ -0,0 +1,14 @@
+using Kekser.PowerSingleton.Attributes;
+using UnityEngine;
+
+namespace Kekser.Example
+{
+    [PowerSingleton]
+    public class UIManager : MonoBehaviour
+    {
+        public void UpdateScore(int score)
+        {
+            Debug.Log($"UIManager: UpdateScore({score})");
+        }
+    }
+}

Assets/Kekser/Example/UIManager.cs.meta

@@ -66,10 +66,11 @@ private static void LookUpAttributes()
                     }
 
                     PowerSingletonAttribute attribute = (PowerSingletonAttribute) attributes[0];
-                    _powerSingletons.TryAddToDictionary(attribute.Type, new List<PowerSingletonData>());
-                    _powerSingletons[attribute.Type].Add(new PowerSingletonData
+                    Type attributeType = attribute.Type ?? type;
+                    _powerSingletons.TryAddToDictionary(attributeType, new List<PowerSingletonData>());
+                    _powerSingletons[attributeType].Add(new PowerSingletonData
                     {
-                        GenericType = attribute.Type,
+                        GenericType = attributeType,
                         Type = type,
                         Creation = attribute.Creation,
                         CreationName = attribute.CreationName,

Assets/Kekser/PowerSingleton/PowerSingletonManager.cs

@@ -2,7 +2,7 @@
     "name": "com.kekser.powersingleton",
     "displayName": "PowerSingleton",
     "author": { "name": "Kekser", "url": "https://github.com/DerKekser" },
-    "version": "1.2.0",
+    "version": "1.2.1",
     "unity": "2020.3",
     "description": "A simple singleton system for Unity",
     "keywords": [ "singleton" ],

Assets/Kekser/PowerSingleton/package.json

@@ -4,24 +4,26 @@
 
 ## Contents
 - [Simple Example](#simple-example)
-- [Interface](#interface)
-- [If Needed Creation](#if-needed-creation)
-- [Auto Creation](#auto-creation)
+- [Interface / Abstract Class](#interface--abstract-class)
+- [Creation](#creation)
+    - [If Needed Creation](#if-needed-creation)
+    - [Auto Creation](#auto-creation)
 - [DontDestroyOnLoad](#dontdestroyonload)
-- [Install via git URL](#install-via-git-url)
+- [Install](#install)
+    - [Install via Unity Package](#install-via-unity-package)
+    - [Install via git URL](#install-via-git-url)
 - [License](#license)
 
 ### Simple Example
 
 You can define a singleton by adding the `PowerSingleton` attribute to a class.
 The class must inherit from `MonoBehaviour` and the attribute must be applied to the class.
-The type of the singleton must be specified in the attribute.
 
 ```csharp
 using Kekser.PowerSingleton.Attributes;
 using UnityEngine;
 
-[PowerSingleton(typeof(GameManager))]
+[PowerSingleton]
 public class GameManager : MonoBehaviour
 {
     public void AddScore(int score)
@@ -39,9 +41,9 @@ using Kekser.PowerSingleton;
 
 Single<GameManager>.Instance.AddScore(10);
 ```
-### Interface
+### Interface / Abstract Class
 
-You can also define a singleton by an interface.
+You can also define a singleton by an interface or an abstract class.
 This widened flexibility allows you to use multiple Singleton classes, given they implement the specified interface. The system intuitively chooses the active class in the current scene.
 
 ```csharp
@@ -71,7 +73,9 @@ using Kekser.PowerSingleton;
 
 Single<IGameManager>.Instance.AddScore(10);
 ```
-### If Needed Creation
+### Creation
+
+#### If Needed Creation
 
 You can define that the singleton should only be created when it is needed.
 This is useful if you want to use the singleton in a scene where it is not yet present.
@@ -92,7 +96,7 @@ public class GameManager : MonoBehaviour
     // ...
 }
 ```
-### Auto Creation
+#### Auto Creation
 
 You can define that the singleton should be created automatically.
 This is useful if you want to use the singleton in a scene where it is not yet present.
@@ -132,7 +136,12 @@ public class GameManager : MonoBehaviour
     // ...
 }
 ```
-### Install via git URL
+### Install
+
+#### Install via Unity Package
+
+Download the latest [release](/releases) and import the package into your Unity project.
+#### Install via git URL
 
 You can add this package to your project by adding this git URL in the Package Manager:
 ```