added Default API and modified (GSIFrame and AgencyCenter)

michael811125 · Aug 5, 2023 · ddd8fc6 · ddd8fc6
1 parent c6725d5
commit ddd8fc6
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 221 deletions.
diff --git a/Assets/OxGFrame/AgencyCenter/Scripts/Editor/TplScripts/APICenter/TplAPICenter.cs.txt b/Assets/OxGFrame/AgencyCenter/Scripts/Editor/TplScripts/APICenter/TplAPICenter.cs.txt
@@ -3,33 +3,6 @@ using OxGFrame.AgencyCenter.APICenter;
 
 public class #SCRIPTNAME# : CenterBase<#SCRIPTNAME#, APIBase>
 {
-    #region Default API
-    public static void Add<T>() where T : APIBase, new()
-    {
-        GetInstance().Register<T>();
-    }
-
-    public static void Add<T>(int apiId) where T : APIBase, new()
-    {
-        GetInstance().Register<T>(apiId);
-    }
-
-    public static void Add(int apiId, APIBase apiBase)
-    {
-        GetInstance().Register(apiId, apiBase);
-    }
-
-    public static T Find<T>() where T : APIBase
-    {
-        return GetInstance().Get<T>();
-    }
-
-    public static T Find<T>(int apiId) where T : APIBase
-    {
-        return GetInstance().Get<T>(apiId);
-    }
-    #endregion
-
     public #SCRIPTNAME#()
     {
         /*

diff --git a/Assets/OxGFrame/AgencyCenter/Scripts/Editor/TplScripts/EventCenter/TplEventCenter.cs.txt b/Assets/OxGFrame/AgencyCenter/Scripts/Editor/TplScripts/EventCenter/TplEventCenter.cs.txt
@@ -3,33 +3,6 @@ using OxGFrame.AgencyCenter.EventCenter;
 
 public class #SCRIPTNAME# : CenterBase<#SCRIPTNAME#, EventBase>
 {
-    #region Default API
-    public static void Add<T>() where T : EventBase, new()
-    {
-        GetInstance().Register<T>();
-    }
-
-    public static void Add<T>(int eventId) where T : EventBase, new()
-    {
-        GetInstance().Register<T>(eventId);
-    }
-
-    public static void Add(int eventId, EventBase eventBase)
-    {
-        GetInstance().Register(eventId, eventBase);
-    }
-
-    public static T Find<T>() where T : EventBase
-    {
-        return GetInstance().Get<T>();
-    }
-
-    public static T Find<T>(int eventId) where T : EventBase
-    {
-        return GetInstance().Get<T>(eventId);
-    }
-    #endregion
-
     public #SCRIPTNAME#()
     {
         /*

diff --git a/Assets/OxGFrame/AgencyCenter/Scripts/Runtime/Common/CenterBase.cs b/Assets/OxGFrame/AgencyCenter/Scripts/Runtime/Common/CenterBase.cs
@@ -21,6 +21,33 @@ protected static TCenter GetInstance()
             return _instance;
         }
 
+        #region Default API
+        public static void Add<UClass>() where UClass : TClass, new()
+        {
+            GetInstance().Register<UClass>();
+        }
+
+        public static void Add<UClass>(int id) where UClass : TClass, new()
+        {
+            GetInstance().Register<UClass>(id);
+        }
+
+        public static void Add(int id, TClass @class)
+        {
+            GetInstance().Register(id, @class);
+        }
+
+        public static UClass Find<UClass>() where UClass : TClass
+        {
+            return GetInstance().Get<UClass>();
+        }
+
+        public static UClass Find<UClass>(int id) where UClass : TClass
+        {
+            return GetInstance().Get<UClass>(id);
+        }
+        #endregion
+
         public UClass Get<UClass>() where UClass : TClass
         {
             System.Type type = typeof(UClass);

diff --git a/Assets/OxGFrame/CHANGELOG.md b/Assets/OxGFrame/CHANGELOG.md
@@ -1,5 +1,41 @@
 # CHANGELOG
 
+## [2.7.1] - 2023-08-05
+- Added Default API in GSIManagerBase (protected GetInstance() method).
+```
+    public static int GetCurrentId()
+    
+    public static U GetStage<U>() where U : GSIBase
+    
+    public static U GetStage<U>(int id) where U : GSIBase
+    
+    public static void AddStage<U>() where U : GSIBase, new()
+    
+    public void AddStage<U>(int id) where U : GSIBase, new()
+    
+    public static void AddStage(int id, GSIBase gameStage)
+    
+    public static void ChangeStage<U>(bool force = false) where U : GSIBase
+    
+    public static void ChangeStage(int id, bool force = false)
+    
+    public static void Start()
+    
+    public static void Update(float dt = 0.0f)
+```
+- Added Default API in CenterBase (removed Default API from subtype).
+```
+    public static void Add<UClass>() where UClass : TClass, new()
+    
+    public static void Add<UClass>(int id) where UClass : TClass, new()
+    
+    public static void Add(int id, TClass @class)
+    
+    public static UClass Find<UClass>() where UClass : TClass
+    
+    public static UClass Find<UClass>(int id) where UClass : TClass
+```
+
 ## [2.7.0] - 2023-08-03
 - Added AssetPatcher.GetPresetAppPackages() method.
 - Added [Sort Tail Rules (A-Z)] ContextMenu for BindCodeSetting.

diff --git a/Assets/OxGFrame/GSIFrame/Scripts/Runtime/GSIManagerBase.cs b/Assets/OxGFrame/GSIFrame/Scripts/Runtime/GSIManagerBase.cs
@@ -12,7 +12,7 @@ namespace OxGFrame.GSIFrame
 
         private static readonly object _locker = new object();
         private static T _instance = null;
-        public static T GetInstance()
+        protected static T GetInstance()
         {
             if (_instance == null)
             {
@@ -24,10 +24,70 @@ public static T GetInstance()
             return _instance;
         }
 
+        #region Default API
+        public static int GetCurrentId()
+        {
+            return GetInstance()._currentId;
+        }
+
+        public static U GetStage<U>() where U : GSIBase
+        {
+            return GetInstance().GetGameStage<U>();
+        }
+
+        public static U GetStage<U>(int id) where U : GSIBase
+        {
+            return GetInstance().GetGameStage<U>(id);
+        }
+
+        public static void AddStage<U>() where U : GSIBase, new()
+        {
+            GetInstance().AddGameStage<U>();
+        }
+
+        public void AddStage<U>(int id) where U : GSIBase, new()
+        {
+            GetInstance().AddGameStage<U>(id);
+        }
+
+        public static void AddStage(int id, GSIBase gameStage)
+        {
+            GetInstance().AddGameStage(id, gameStage);
+        }
+
+        public static void ChangeStage<U>(bool force = false) where U : GSIBase
+        {
+            if (force) GetInstance().ChangeGameStageForce<U>();
+            else GetInstance().ChangeGameStage<U>();
+        }
+
+        public static void ChangeStage(int id, bool force = false)
+        {
+            if (force) GetInstance().ChangeGameStageForce(id);
+            else GetInstance().ChangeGameStage(id);
+        }
+
+        /// <summary>
+        /// Call by main MonoBehaviour (Start)
+        /// </summary>
+        public static void Start()
+        {
+            GetInstance().OnStart();
+        }
+
+        /// <summary>
+        /// Call by main MonoBehaviour (Update)
+        /// </summary>
+        /// <param name="dt"></param>
+        public static void Update(float dt = 0.0f)
+        {
+            GetInstance().OnUpdate(dt);
+        }
+        #endregion
+
         public GSIManagerBase()
         {
             this._dictGameStage = new Dictionary<int, GSIBase>();
-
             this._currentId = 0;
             this._currentGameStage = null;
         }
@@ -36,7 +96,6 @@ public GSIManagerBase()
         {
             this._dictGameStage.Clear();
             this._dictGameStage = null;
-
             this._currentGameStage = null;
         }
 
@@ -219,15 +278,15 @@ protected void ReleaseGameStage()
         }
 
         /// <summary>
-        /// 子類實作, 並且透過主要的 MonoBehaviour Start 調用
+        /// Call by Main MonoBehaviour (Start)
         /// </summary>
         public virtual void OnStart() { }
 
         /// <summary>
-        /// 子類實作, 並且透過主要的 MonoBehaviour Update 調用
+        /// Call by Main MonoBehaviour (Update)
         /// </summary>
         /// <param name="dt"></param>
-        public virtual void OnUpdate(float dt = 0.0f)
+        public virtual void OnUpdate(float dt)
         {
             this.UpdateGameStage(dt);
         }

diff --git a/Assets/OxGFrame/Samples~/APICenterDemo/Scripts/APICenterExample.cs b/Assets/OxGFrame/Samples~/APICenterDemo/Scripts/APICenterExample.cs
@@ -3,33 +3,6 @@
 
 public class APICenterExample : CenterBase<APICenterExample, APIBase>
 {
-    #region Default API
-    public static void Add<T>() where T : APIBase, new()
-    {
-        GetInstance().Register<T>();
-    }
-
-    public static void Add<T>(int apiId) where T : APIBase, new()
-    {
-        GetInstance().Register<T>(apiId);
-    }
-
-    public static void Add(int apiId, APIBase apiBase)
-    {
-        GetInstance().Register(apiId, apiBase);
-    }
-
-    public static T Find<T>() where T : APIBase
-    {
-        return GetInstance().Get<T>();
-    }
-
-    public static T Find<T>(int apiId) where T : APIBase
-    {
-        return GetInstance().Get<T>(apiId);
-    }
-    #endregion
-
     public APICenterExample()
     {
         // easy

diff --git a/Assets/OxGFrame/Samples~/EventCenterDemo/Scripts/EventCenterExample.cs b/Assets/OxGFrame/Samples~/EventCenterDemo/Scripts/EventCenterExample.cs
@@ -3,33 +3,6 @@
 
 public class EventCenterExample : CenterBase<EventCenterExample, EventBase>
 {
-    #region Default API
-    public static void Add<T>() where T : EventBase, new()
-    {
-        GetInstance().Register<T>();
-    }
-
-    public static void Add<T>(int eventId) where T : EventBase, new()
-    {
-        GetInstance().Register<T>(eventId);
-    }
-
-    public static void Add(int eventId, EventBase eventBase)
-    {
-        GetInstance().Register(eventId, eventBase);
-    }
-
-    public static T Find<T>() where T : EventBase
-    {
-        return GetInstance().Get<T>();
-    }
-
-    public static T Find<T>(int eventId) where T : EventBase
-    {
-        return GetInstance().Get<T>(eventId);
-    }
-    #endregion
-
     public EventCenterExample()
     {
         // easy

diff --git a/Assets/OxGFrame/Samples~/GSIFrameDemo/Scripts/GSIFrameDemo.cs b/Assets/OxGFrame/Samples~/GSIFrameDemo/Scripts/GSIFrameDemo.cs
@@ -7,12 +7,12 @@ public class GSIFrameDemo : MonoBehaviour
 
     void Start()
     {
-        GSIManagerExample.GetInstance().OnStart();
+        GSIManagerExample.Start();
     }
 
     void Update()
     {
-        GSIManagerExample.GetInstance().OnUpdate(Time.deltaTime);
+        GSIManagerExample.Update(Time.deltaTime);
 
         if (Keyboard.current.numpad0Key.wasReleasedThisFrame)
         {
@@ -24,32 +24,27 @@ void Update()
 
         if (Keyboard.current.numpad1Key.wasReleasedThisFrame)
         {
-            if (this.forceMode) GSIManagerExample.GetInstance().ChangeGameStageForce<StartupStageExample>();
-            else GSIManagerExample.GetInstance().ChangeGameStage<StartupStageExample>();
+            GSIManagerExample.ChangeStage<StartupStageExample>(this.forceMode);
         }
 
         if (Keyboard.current.numpad2Key.wasReleasedThisFrame)
         {
-            if (this.forceMode) GSIManagerExample.GetInstance().ChangeGameStageForce<LogoStageExample>();
-            else GSIManagerExample.GetInstance().ChangeGameStage<LogoStageExample>();
+            GSIManagerExample.ChangeStage<LogoStageExample>(this.forceMode);
         }
 
         if (Keyboard.current.numpad3Key.wasReleasedThisFrame)
         {
-            if (this.forceMode) GSIManagerExample.GetInstance().ChangeGameStageForce<PatchStageExample>();
-            else GSIManagerExample.GetInstance().ChangeGameStage<PatchStageExample>();
+            GSIManagerExample.ChangeStage<PatchStageExample>(this.forceMode);
         }
 
         if (Keyboard.current.numpad4Key.wasReleasedThisFrame)
         {
-            if (this.forceMode) GSIManagerExample.GetInstance().ChangeGameStageForce<LoginStageExample>();
-            else GSIManagerExample.GetInstance().ChangeGameStage<LoginStageExample>();
+            GSIManagerExample.ChangeStage<LoginStageExample>(this.forceMode);
         }
 
         if (Keyboard.current.numpad5Key.wasReleasedThisFrame)
         {
-            if (this.forceMode) GSIManagerExample.GetInstance().ChangeGameStageForce<EnterStageExample>();
-            else GSIManagerExample.GetInstance().ChangeGameStage<EnterStageExample>();
+            GSIManagerExample.ChangeStage<EnterStageExample>(this.forceMode);
         }
     }
 }
diff --git a/Assets/OxGFrame/package.json b/Assets/OxGFrame/package.json
@@ -2,7 +2,7 @@
   "name": "com.michaelo.oxgframe",
   "displayName": "OxGFrame",
   "description": "The OxGFrame is a framework based on Unity for accelerating game development. Supports multi-platform Win, Android, iOS, WebGL.",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "unity": "2021.3",
   "license": "MIT",
   "samples": [

diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json
@@ -1,5 +1,14 @@
 {
-    "templatePinStates": [],
+    "templatePinStates": [
+        {
+            "templateId": "Empty",
+            "isEnabled": false
+        },
+        {
+            "templateId": "Standard (URP)",
+            "isEnabled": true
+        }
+    ],
     "dependencyTypeInfos": [
         {
             "userAdded": false,