v0.0.19.3 release

liangxiegame · Feb 12, 2019 · 88a6370 · 88a6370
1 parent e6e55de
commit 88a6370
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/Assets/QFramework/Framework/0.Core/Runtime/1.Singleton/MonoSingleton.cs b/Assets/QFramework/Framework/0.Core/Runtime/1.Singleton/MonoSingleton.cs
@@ -74,10 +74,4 @@ protected virtual void OnDestroy()
 			mInstance = null;
 		}
 	}
-
-	[System.Obsolete("弃用啦,请使用 MonoSingleton")]
-	public abstract class QMonoSingleton<T> : MonoSingleton<T> where T : QMonoSingleton<T>
-	{
-
-	}
 }
diff --git a/Assets/QFramework/Framework/0.Core/Runtime/1.Singleton/MonoSingletonCreator.cs b/Assets/QFramework/Framework/0.Core/Runtime/1.Singleton/MonoSingletonCreator.cs
@@ -40,7 +40,12 @@ public static T CreateMonoSingleton<T>() where T : MonoBehaviour, ISingleton
 			if (!IsUnitTestMode && !Application.isPlaying) return instance;
 			instance = Object.FindObjectOfType<T>();
 
-			if (instance != null) return instance;
+			if (instance != null)
+			{
+				instance.OnSingletonInit();
+				return instance;
+			}
+
 			MemberInfo info = typeof(T);
 			var attributes = info.GetCustomAttributes(true);
 			foreach (var atribute in attributes)
@@ -64,7 +69,6 @@ public static T CreateMonoSingleton<T>() where T : MonoBehaviour, ISingleton
 			}
 
 			instance.OnSingletonInit();
-
 			return instance;
 		}
 

diff --git a/Assets/QFramework/Framework/PackageVersion.json b/Assets/QFramework/Framework/PackageVersion.json
@@ -1,17 +1,18 @@
 {
-  "Version": "v0.0.18",
+  "Version": "v0.0.19",
   "Type": 0,
   "AccessRight": 0,
   "DownloadUrl": null,
   "InstallPath": "Assets/QFramework/Framework",
   "DocUrl": "http://qfdoc.liangxiegame.com/",
   "Readme": {
-    "version": "v0.0.18",
-    "content": "code gen improvement ",
+    "version": "v0.0.19",
+    "content": "fix export android's bug",
     "author": "liangxie",
-    "date": "2019 年 02 月 03 日 14:57"
+    "date": "2019 年 02 月 12 日 19:11",
+    "VersionNumber": 19
   },
   "Name": "Framework",
-  "VersionNumber": 18,
-  "FileName": "Framework_v0.0.18.unitypackage"
+  "VersionNumber": 19,
+  "FileName": "Framework_v0.0.19.unitypackage"
 }