diff --git a/Assets/QFramework/Example/LibsExample/CatlibExample/CatlibExample.cs b/Assets/QFramework/Example/LibsExample/CatlibExample/CatlibExample.cs index ed86c2dde..de638e0d1 100644 --- a/Assets/QFramework/Example/LibsExample/CatlibExample/CatlibExample.cs +++ b/Assets/QFramework/Example/LibsExample/CatlibExample/CatlibExample.cs @@ -9,9 +9,8 @@ namespace QFramework.Example public class CatlibExample : MonoBehaviour { // Use this for initialization - IEnumerator Start() - { - + private IEnumerator Start() + { var application = new Application(); application.Bootstrap(); application.Register(new FileSystemProvider()); @@ -20,7 +19,6 @@ IEnumerator Start() yield return new WaitForEndOfFrame(); App.Make().HelloWorld(); - } diff --git a/Assets/QFramework/Example/PackageVersion.json b/Assets/QFramework/Example/PackageVersion.json index ee6e8fa87..7c42be41b 100755 --- a/Assets/QFramework/Example/PackageVersion.json +++ b/Assets/QFramework/Example/PackageVersion.json @@ -1,16 +1,16 @@ { - "Version": "v0.0.39", + "Version": "v0.0.40", "Type": 0, "AccessRight": 0, "DownloadUrl": null, "InstallPath": "Assets/QFramework/Example/", "Readme": { - "version": "v0.0.39", - "content": "add catlib example", + "version": "v0.0.40", + "content": "support 5.6", "author": "liangxie", - "date": "2019 年 01 月 21 日 10:32" + "date": "2019 年 01 月 25 日 12:39" }, "Name": "Example", - "VersionNumber": 39, - "FileName": "Example_v0.0.39.unitypackage" + "VersionNumber": 40, + "FileName": "Example_v0.0.40.unitypackage" } \ No newline at end of file diff --git a/Assets/QFramework/Framework/0.Core/9.PackageManager/Framework.cs b/Assets/QFramework/Framework/0.Core/9.PackageManager/Framework.cs deleted file mode 100644 index 6e5eb158d..000000000 --- a/Assets/QFramework/Framework/0.Core/9.PackageManager/Framework.cs +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** - * Copyright (c) 2017 ~ 2018.5 liangxie - * - * http://qframework.io - * https://github.com/liangxiegame/QFramework - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - ****************************************************************************/ - -namespace QFramework -{ - using UnityEngine.Events; - - /// - /// - /// 全局唯一继承于MonoBehaviour的单例类，保证其他公共模块都以App的生命周期为准 - /// 这个东西很基类，没什么用。概念也不太清晰 - /// - [QMonoSingletonPath("[Framework]/QFramework")] - public class Framework : QMgrBehaviour, ISingleton - { - /// - /// 组合的方式实现单例的模板 - /// - /// The instance. - public static Framework Instance - { - get { return MonoSingletonProperty.Instance; } - } - - public override int ManagerId - { - get { return QMgrID.Framework; } - } - - public void OnSingletonInit() - { - } - - public void Dispose() - { - } - - private Framework() - { - } - - #region 全局生命周期回调 - - public UnityAction OnUpdateEvent = delegate { }; - public UnityAction OnFixedUpdateEvent = delegate { }; - public UnityAction OnLateUpdateEvent = delegate { }; - public UnityAction OnGUIEvent = delegate { }; - public UnityAction OnDestroyEvent = delegate { }; - public UnityAction OnApplicationQuitEvent = delegate { }; - - private void Update() - { - OnUpdateEvent.InvokeGracefully(); - } - - private void FixedUpdate() - { - OnFixedUpdateEvent.InvokeGracefully(); - } - - private void LateUpdate() - { - OnLateUpdateEvent.InvokeGracefully(); - } - - private void OnGUI() - { - OnGUIEvent.InvokeGracefully(); - } - - protected override void OnDestroy() - { - OnDestroyEvent.InvokeGracefully(); - } - - private void OnApplicationQuit() - { - OnApplicationQuitEvent.InvokeGracefully(); - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/QFramework/Framework/0.Core/9.PackageManager/Framework.cs.meta b/Assets/QFramework/Framework/0.Core/9.PackageManager/Framework.cs.meta deleted file mode 100644 index b5cf4e133..000000000 --- a/Assets/QFramework/Framework/0.Core/9.PackageManager/Framework.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 930ede85623034d9589396b113cfd073 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Framework/0.Core/PackageVersion.json b/Assets/QFramework/Framework/0.Core/PackageVersion.json index 1069e752b..b021d2e56 100644 --- a/Assets/QFramework/Framework/0.Core/PackageVersion.json +++ b/Assets/QFramework/Framework/0.Core/PackageVersion.json @@ -1,16 +1,16 @@ { - "Version": "v0.0.3", + "Version": "v0.0.5", "Type": 0, "AccessRight": 0, "DownloadUrl": null, "InstallPath": "Assets/QFramework/Framework/0.Core/", "Readme": { - "version": "v0.0.3", - "content": "add markdown document", + "version": "v0.0.5", + "content": "support 5.6", "author": "liangxie", - "date": "2019 年 01 月 23 日 11:40" + "date": "2019 年 01 月 25 日 12:40" }, "Name": "0.Core", - "VersionNumber": 3, - "FileName": "0.Core_v0.0.3.unitypackage" + "VersionNumber": 5, + "FileName": "0.Core_v0.0.5.unitypackage" } \ No newline at end of file diff --git a/Assets/QFramework/Framework/PackageVersion.json b/Assets/QFramework/Framework/PackageVersion.json index aff292587..d4270ed83 100644 --- a/Assets/QFramework/Framework/PackageVersion.json +++ b/Assets/QFramework/Framework/PackageVersion.json @@ -1,16 +1,16 @@ { - "Version": "v0.0.13", + "Version": "v0.0.14", "Type": 0, "AccessRight": 0, "DownloadUrl": null, "InstallPath": "Assets/QFramework/Framework", "Readme": { - "version": "v0.0.13", - "content": "ActionKit 集成到 Core 里", + "version": "v0.0.14", + "content": "suprot 5.6", "author": "liangxie", - "date": "2019 年 01 月 24 日 10:05" + "date": "2019 年 01 月 25 日 12:40" }, "Name": "Framework", - "VersionNumber": 13, - "FileName": "Framework_v0.0.13.unitypackage" + "VersionNumber": 14, + "FileName": "Framework_v0.0.14.unitypackage" } \ No newline at end of file