diff --git a/QFramework/QFramework.Unity.Runtime/ActionKit/Timeline/KeyEventAction.cs b/QFramework/QFramework.Unity.Runtime/ActionKit/Timeline/KeyEventAction.cs new file mode 100644 index 000000000..12e4f5baf --- /dev/null +++ b/QFramework/QFramework.Unity.Runtime/ActionKit/Timeline/KeyEventAction.cs @@ -0,0 +1,66 @@ +/**************************************************************************** + * Copyright (c) 2021.3 liangxie + * + * https://qframework.cn + * https://github.com/liangxiegame/QFramework + * https://gitee.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 +{ + public class KeyEventAction : ActionKitAction, IPoolable + { + private Timeline mTimeline; + private string mEventName; + + public static KeyEventAction Allocate(string eventName, Timeline timeline) + { + var keyEventAction = SafeObjectPool.Instance.Allocate(); + + keyEventAction.mEventName = eventName; + keyEventAction.mTimeline = timeline; + + return keyEventAction; + } + + protected override void OnBegin() + { + base.OnBegin(); + + mTimeline.OnKeyEventsReceivedCallback.InvokeGracefully(mEventName); + + Finish(); + } + + protected override void OnDispose() + { + SafeObjectPool.Instance.Recycle(this); + } + + public void OnRecycled() + { + mTimeline = null; + mEventName = null; + } + + public bool IsRecycled { get; set; } + } +} \ No newline at end of file diff --git a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/MaterialExtensions.cs b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/MaterialExtensions.cs new file mode 100644 index 000000000..f7f34478f --- /dev/null +++ b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/MaterialExtensions.cs @@ -0,0 +1,49 @@ +/**************************************************************************** + * Copyright (c) 2017 ~ 2021.3 liangxie + * + * https://qframework.cn + * https://github.com/liangxiegame/QFramework + * https://gitee.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. + ****************************************************************************/ + +using UnityEngine; + +namespace QFramework +{ + public static class MaterialExtensions + { + /// + /// 参考资料: https://blog.csdn.net/qiminixi/article/details/78402505 + /// + /// + public static void SetStandardMaterialToTransparentMode(this Material self) + { + self.SetFloat("_Mode", 3); + self.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha); + self.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); + self.SetInt("_ZWrite", 0); + self.DisableKeyword("_ALPHATEST_ON"); + self.EnableKeyword("_ALPHABLEND_ON"); + self.DisableKeyword("_ALPHAPREMULTIPLY_ON"); + self.renderQueue = 3000; + } + } +} \ No newline at end of file diff --git a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/QFramework.CSharpExtension.cs b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/QFramework.CSharpExtension.cs index 885f56d35..594e443b9 100644 --- a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/QFramework.CSharpExtension.cs +++ b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/QFramework.CSharpExtension.cs @@ -2591,22 +2591,5 @@ public static T GetRandomWithPower(this Dictionary powersDict) } - public static class MaterialExtensions - { - /// - /// 参考资料: https://blog.csdn.net/qiminixi/article/details/78402505 - /// - /// - public static void SetStandardMaterialToTransparentMode(this Material self) - { - self.SetFloat("_Mode", 3); - self.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha); - self.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha); - self.SetInt("_ZWrite", 0); - self.DisableKeyword("_ALPHATEST_ON"); - self.EnableKeyword("_ALPHABLEND_ON"); - self.DisableKeyword("_ALPHAPREMULTIPLY_ON"); - self.renderQueue = 3000; - } - } + } \ No newline at end of file diff --git a/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/TextureExtensions.cs b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/TextureExtensions.cs new file mode 100644 index 000000000..faf9f3b45 --- /dev/null +++ b/QFramework/QFramework.Unity.Runtime/Core/CSharpExtension/TextureExtensions.cs @@ -0,0 +1,38 @@ +/**************************************************************************** + * Copyright (c) 2021.3 liangxie + * + * https://qframework.cn + * https://github.com/liangxiegame/QFramework + * https://gitee.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. + ****************************************************************************/ + +using UnityEngine; + +namespace QFramework +{ + public static class TextureExtensions + { + public static Sprite CreateSprite(this Texture2D self) + { + return Sprite.Create(self, new Rect(0, 0, self.width, self.height), Vector2.one * 0.5f); + } + } +} \ No newline at end of file diff --git a/QFramework/QFramework.Unity.Runtime/QFramework.Unity.Runtime.csproj b/QFramework/QFramework.Unity.Runtime/QFramework.Unity.Runtime.csproj index e2036d037..6fc9b148a 100644 --- a/QFramework/QFramework.Unity.Runtime/QFramework.Unity.Runtime.csproj +++ b/QFramework/QFramework.Unity.Runtime/QFramework.Unity.Runtime.csproj @@ -99,6 +99,7 @@ + @@ -163,7 +164,9 @@ + + @@ -277,6 +280,7 @@ + diff --git a/QFramework/QFramework.Unity.Runtime/ResKit/ManagementModel/ResLoader/ResLoader.cs b/QFramework/QFramework.Unity.Runtime/ResKit/ManagementModel/ResLoader/ResLoader.cs index 64f080dd1..7866e4470 100755 --- a/QFramework/QFramework.Unity.Runtime/ResKit/ManagementModel/ResLoader/ResLoader.cs +++ b/QFramework/QFramework.Unity.Runtime/ResKit/ManagementModel/ResLoader/ResLoader.cs @@ -30,13 +30,13 @@ namespace QFramework using UnityEngine; using Object = UnityEngine.Object; - public class ResLoader : DisposableObject,IResLoader + public class ResLoader : DisposableObject, IResLoader { - [Obsolete("请使用 ResLoader.Allocate() 获取 ResLoader 对象",true)] + [Obsolete("请使用 ResLoader.Allocate() 获取 ResLoader 对象", true)] public ResLoader() { - } + /// /// ID:RKRL001 申请ResLoader对象 ResLoader.Allocate（IResLoaderStrategy strategy = null) /// @@ -44,7 +44,7 @@ public ResLoader() /// public static ResLoader Allocate() { - return SafeObjectPool.Instance.Allocate(); + return SafeObjectPool.Instance.Allocate(); } /// @@ -52,9 +52,36 @@ public static ResLoader Allocate() /// public void Recycle2Cache() { + if (mObject2Unload != null) + { + foreach (var o in mObject2Unload) + { + if (o) + { + ResUnloadHelper.DestroyObject(o); + } + } + + mObject2Unload.Clear(); + + mObject2Unload = null; + } + SafeObjectPool.Instance.Recycle(this); } + private List mObject2Unload; + + public void AddObjectForDestroyWhenRecycle2Cache(Object obj) + { + if (mObject2Unload == null) + { + mObject2Unload = new List(); + } + + mObject2Unload.Add(obj); + } + /// /// ID:RKRL003 同步加载AssetBundle里的资源 ResLoader.LoadSync(string ownerBundle,string assetBundle) /// @@ -64,7 +91,7 @@ public void Recycle2Cache() /// public T LoadSync(string ownerBundle, string assetName) where T : Object { - var resSearchKeys = ResSearchKeys.Allocate(assetName,ownerBundle,typeof(T)); + var resSearchKeys = ResSearchKeys.Allocate(assetName, ownerBundle, typeof(T)); var retAsset = LoadResSync(resSearchKeys); resSearchKeys.Recycle2Cache(); return retAsset.Asset as T; @@ -83,7 +110,7 @@ public T LoadSync(string assetName) where T : Object resSearchKeys.Recycle2Cache(); return retAsset.Asset as T; } - + /// /// ID:RKRL003 只通过资源名字进行同步加载, @@ -105,10 +132,11 @@ public IRes LoadResSync(ResSearchKeys resSearchKeys) var res = ResMgr.Instance.GetRes(resSearchKeys, false); if (res == null) - { - Log.E("Failed to Load Res:" + resSearchKeys); + { + Log.E("Failed to Load Res:" + resSearchKeys); return null; } + return res; } @@ -135,7 +163,7 @@ private void LoadSync() class CallBackWrap { private readonly Action mListener; - private readonly IRes mRes; + private readonly IRes mRes; public CallBackWrap(IRes r, Action l) { @@ -154,14 +182,14 @@ public bool IsRes(IRes res) } } - private readonly List mResList = new List(); - private readonly LinkedList mWaitLoadList = new LinkedList(); - private System.Action mListener; + private readonly List mResList = new List(); + private readonly LinkedList mWaitLoadList = new LinkedList(); + private System.Action mListener; + + private int mLoadingCount; - private int mLoadingCount; + private LinkedList mCallbackRecordList; - private LinkedList mCallbackRecordList; - public float Progress { @@ -209,15 +237,15 @@ public void Add2Load(string assetName, Action listener = null, bool lastOrder = true) { var searchRule = ResSearchKeys.Allocate(assetName); - Add2Load(searchRule,listener,lastOrder); + Add2Load(searchRule, listener, lastOrder); searchRule.Recycle2Cache(); } - + public void Add2Load(string assetName, Action listener = null, bool lastOrder = true) { - var searchRule = ResSearchKeys.Allocate(assetName,null,typeof(T)); - Add2Load(searchRule,listener,lastOrder); + var searchRule = ResSearchKeys.Allocate(assetName, null, typeof(T)); + Add2Load(searchRule, listener, lastOrder); searchRule.Recycle2Cache(); } @@ -225,20 +253,20 @@ public void Add2Load(string assetName, Action listener = null, public void Add2Load(string ownerBundle, string assetName, Action listener = null, bool lastOrder = true) { - var searchRule = ResSearchKeys.Allocate(assetName,ownerBundle); + var searchRule = ResSearchKeys.Allocate(assetName, ownerBundle); Add2Load(searchRule, listener, lastOrder); searchRule.Recycle2Cache(); } - + public void Add2Load(string ownerBundle, string assetName, Action listener = null, bool lastOrder = true) { - var searchRule = ResSearchKeys.Allocate(assetName,ownerBundle,typeof(T)); + var searchRule = ResSearchKeys.Allocate(assetName, ownerBundle, typeof(T)); Add2Load(searchRule, listener, lastOrder); searchRule.Recycle2Cache(); } - + private void Add2Load(ResSearchKeys resSearchKeys, Action listener = null, bool lastOrder = true) { @@ -274,10 +302,10 @@ private void Add2Load(ResSearchKeys resSearchKeys, Action listener = { foreach (var depend in depends) { - var searchRule = ResSearchKeys.Allocate(depend,null,typeof(AssetBundle)); - + var searchRule = ResSearchKeys.Allocate(depend, null, typeof(AssetBundle)); + Add2Load(searchRule); - + searchRule.Recycle2Cache(); } } @@ -286,13 +314,11 @@ private void Add2Load(ResSearchKeys resSearchKeys, Action listener = } - private readonly Dictionary mCachedSpriteDict = new Dictionary(); public Sprite LoadSprite(string bundleName, string spriteName) { - if (FromUnityToDll.Setting.SimulationMode) { if (mCachedSpriteDict.ContainsKey(spriteName)) @@ -340,7 +366,6 @@ public void LoadAsync(System.Action listener = null) public void ReleaseRes(string resName) { - if (string.IsNullOrEmpty(resName)) { return; @@ -360,7 +385,7 @@ public void ReleaseRes(string resName) var res = ResMgr.Instance.GetRes(resSearchRule); resSearchRule.Recycle2Cache(); - + if (res == null) { return; @@ -472,7 +497,7 @@ public void Dump() Log.I(res.AssetName); } } - + private void DoLoadAsync() { @@ -572,11 +597,11 @@ private void OnResLoadFinish(bool result, IRes res) private void AddRes2Array(IRes res, bool lastOrder) { - var searchRule = ResSearchKeys.Allocate(res.AssetName,res.OwnerBundleName,res.AssetType); + var searchRule = ResSearchKeys.Allocate(res.AssetName, res.OwnerBundleName, res.AssetType); //再次确保队列中没有它 var oldRes = FindResInArray(mResList, searchRule); - + searchRule.Recycle2Cache(); if (oldRes != null) diff --git a/QFramework/QFramework.Unity.Runtime/ResKit/Res.cs b/QFramework/QFramework.Unity.Runtime/ResKit/Res.cs index 83c95a739..25f784275 100644 --- a/QFramework/QFramework.Unity.Runtime/ResKit/Res.cs +++ b/QFramework/QFramework.Unity.Runtime/ResKit/Res.cs @@ -271,14 +271,7 @@ protected virtual void OnReleaseRes() //如果Image 直接释放了，这里会直接变成NULL if (mAsset != null) { - if (mAsset is GameObject) - { - - } - else - { - Resources.UnloadAsset(mAsset); - } + ResUnloadHelper.UnloadRes(mAsset); mAsset = null; } diff --git a/QFramework/QFramework.Unity.Runtime/ResKit/ResUnloadHelper.cs b/QFramework/QFramework.Unity.Runtime/ResKit/ResUnloadHelper.cs new file mode 100644 index 000000000..84ebf6a7d --- /dev/null +++ b/QFramework/QFramework.Unity.Runtime/ResKit/ResUnloadHelper.cs @@ -0,0 +1,53 @@ +/**************************************************************************** + * Copyright (c) 2021.3 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. + ****************************************************************************/ + +using System; +using UnityEngine; +using Object = UnityEngine.Object; + +namespace QFramework +{ + /// + /// 资源卸载 Helper + /// + public static class ResUnloadHelper + { + public static void UnloadRes(Object asset) + { + if (asset is GameObject) + { + } + else + { + Resources.UnloadAsset(asset); + } + } + + public static void DestroyObject(Object asset) + { + Object.Destroy(asset); + } + } +} \ No newline at end of file diff --git a/Unity2017/Assembly-CSharp.csproj b/Unity2017/Assembly-CSharp.csproj index f73c36537..7d3b2f8bb 100644 --- a/Unity2017/Assembly-CSharp.csproj +++ b/Unity2017/Assembly-CSharp.csproj @@ -185,6 +185,7 @@ + @@ -208,7 +209,6 @@ - @@ -217,6 +217,8 @@ + + diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/PackageVersion.json deleted file mode 100755 index 9e4d6d6a2..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.2.0","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFrameworkExample/0.PackageKitExample/IOCExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.2.0","content":"添加 IOC Framework 架构示例","author":"liangxie","date":"2020 年 02 月 05 日 15:39","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/PackageVersion.json.meta deleted file mode 100755 index 48fe196ab..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/PackageVersion.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: eaf1e977d11554d8db636363d7c29514 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/PackageVersion.json deleted file mode 100644 index 63ddc1b74..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.0.2","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFramework/Examples/FrameworkExamples/0.PackageKitExample/TypeEventSystemExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.0.2","content":"更改一下目录","author":"liangxie","date":"2020 年 08 月 12 日 13:03","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline.meta similarity index 77% rename from Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline.meta index 3c822687b..24f6fa2a0 100644 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event.meta +++ b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91e378bf3061443b38d7900e9f413d83 +guid: 0d6577a0f9c7246b2b1ca9ad28d58127 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/New Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/Scene.unity similarity index 75% rename from Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/New Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/Scene.unity index 4c08d57bc..4040525d9 100644 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/New Scene.unity +++ b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/Scene.unity @@ -24,9 +24,9 @@ RenderSettings: m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 + m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -43,7 +43,7 @@ RenderSettings: LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 11 - m_GIWorkflowMode: 0 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -51,8 +51,8 @@ LightmapSettings: m_AlbedoBoost: 1 m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: serializedVersion: 9 m_Resolution: 2 @@ -113,82 +113,17 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &656984880 +--- !u!1 &1023767625 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 656984882} - - component: {fileID: 656984881} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &656984881 -Light: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 656984880} - m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &656984882 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 656984880} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &759116632 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 759116636} - - component: {fileID: 759116635} - - component: {fileID: 759116634} - - component: {fileID: 759116633} + - component: {fileID: 1023767629} + - component: {fileID: 1023767628} + - component: {fileID: 1023767627} + - component: {fileID: 1023767626} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -196,26 +131,26 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &759116633 +--- !u!81 &1023767626 AudioListener: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 759116632} + m_GameObject: {fileID: 1023767625} m_Enabled: 1 ---- !u!124 &759116634 +--- !u!124 &1023767627 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 759116632} + m_GameObject: {fileID: 1023767625} m_Enabled: 1 ---- !u!20 &759116635 +--- !u!20 &1023767628 Camera: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 759116632} + m_GameObject: {fileID: 1023767625} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -229,7 +164,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 0 + orthographic: 1 orthographic size: 5 m_Depth: -1 m_CullingMask: @@ -246,16 +181,56 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &759116636 +--- !u!4 &1023767629 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 759116632} + m_GameObject: {fileID: 1023767625} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1705253461 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1705253462} + - component: {fileID: 1705253463} + m_Layer: 0 + m_Name: TimelineExample + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1705253462 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1705253461} + 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: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1705253463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1705253461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff2e958c542ab4c528a0621af083be02, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/Scene.unity.meta similarity index 74% rename from Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/Scene.unity.meta index 795e34d69..0e4566cff 100644 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/Scene.unity.meta +++ b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/Scene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc6f431809338454a827f7aee11e5806 +guid: f0cd349674cec484399639739f4e77c7 DefaultImporter: externalObjects: {} userData: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/TimelineExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/TimelineExample.cs new file mode 100644 index 000000000..1232b1353 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/TimelineExample.cs @@ -0,0 +1,55 @@ +/**************************************************************************** + * Copyright (c) 2021.3 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. + ****************************************************************************/ + +using UnityEngine; + +namespace QFramework.Example +{ + public class TimelineExample : MonoBehaviour + { + void Start() + { + var timelineNode = new Timeline(); + + // 第一秒输出 HelloWorld + timelineNode.Append(1.0f, EventAction.Allocate(() => Debug.Log("HelloWorld"))); + + // 第二秒输出 延时了 2 秒 + timelineNode.Append(2.0f, EventAction.Allocate(() => Debug.Log("延时了 2 秒"))); + + // 第三秒发送 一个事件 + timelineNode.Append(3.0f, KeyEventAction.Allocate("someEventA", timelineNode)); + + // 第四秒发送 一个事件 + timelineNode.Append(4.0f, KeyEventAction.Allocate("someEventB", timelineNode)); + + // 监听 timeline 的 key 事件 + timelineNode.OnKeyEventsReceivedCallback = keyEvent => Debug.Log(keyEvent); + + // 执行 timeline + this.ExecuteNode(timelineNode); + } + } +} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/TimelineExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/TimelineExample.cs.meta new file mode 100644 index 000000000..f0f9daa3b --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/7.Timeline/TimelineExample.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ff2e958c542ab4c528a0621af083be02 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/PackageVersion.json deleted file mode 100644 index 03c17bbd5..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.1.2","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFramework/Examples/FrameworkExamples/1.CoreExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.1.2","content":"ActionKit 添加 FSM Example","author":"liangxie","date":"2020 年 08 月 23 日 11:06","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/PackageVersion.json.meta deleted file mode 100644 index 021892922..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/PackageVersion.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a03bf51b023d64ac683bb546f4e8415c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/SingletonExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/SingletonExample/PackageVersion.json deleted file mode 100755 index 276d4edde..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/SingletonExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.1.1","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFrameworkExample/1.CoreExample/SingletonExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.1.1","content":" 初次提交","author":"liangxie","date":"2020 年 01 月 16 日 17:02","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/SingletonExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/SingletonExample/PackageVersion.json.meta deleted file mode 100755 index a6c416d5a..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/SingletonExample/PackageVersion.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1e831853edf2c412796619d2531a3f89 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/ResKitExampleMain.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/ResKitExampleMain.cs deleted file mode 100755 index e57f1b4a4..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/ResKitExampleMain.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using QFramework; -using UnityEngine; -using UnityEngine.SceneManagement; - -public class ResKitExampleMain : MonoBehaviour { - void Awake() - { - ResMgr.Init(); - } - // Use this for initialization - void Start () - { - var resLoader = ResLoader.Allocate(); - - resLoader.Add2Load("BattleScene"); - - resLoader.LoadAsync(() => - { - UnityEngine.SceneManagement.SceneManager.LoadScene("BattleScene"); - }); - - - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/PackageVersion.json deleted file mode 100755 index b5adfad84..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.9.0","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFramework/Examples/FrameworkExamples/2.ResKitExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.9.0","content":"修改路径","author":"liangxie","date":"2020 年 08 月 09 日 17:26","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/PackageVersion.json.meta deleted file mode 100755 index 1d4fd510a..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/PackageVersion.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ef993de8df32840d1a7854e8b178b262 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset.meta similarity index 57% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/PackageVersion.json.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset.meta index cf7e30983..94510f455 100644 --- a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/PackageVersion.json.meta +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: e8cd0a41c7e034613af9f63878c2c440 -TextScriptImporter: +guid: 115507f357dfa44979d361a768171090 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs new file mode 100644 index 000000000..d351f8741 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs @@ -0,0 +1,59 @@ +/**************************************************************************** + * Copyright (c) 2021.3 liangxie + * + * http://liangxiegame.com + * 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. + ****************************************************************************/ + +using UnityEngine; +using UnityEngine.UI; + +namespace QFramework.Example +{ + public class ResLoaderRelateUnloadAssetExample : MonoBehaviour + { + // Use this for initialization + void Start() + { + var image = transform.Find("Image").GetComponent(); + + ResKit.Init(); + + var resLoader = ResLoader.Allocate(); + + var texture2D = resLoader.LoadSync("TextureExample1"); + + // create Sprite 扩展 + var sprite = texture2D.CreateSprite(); + + image.sprite = sprite; + + // 添加关联的 Sprite + resLoader.AddObjectForDestroyWhenRecycle2Cache(sprite); + + this.Delay(5.0f, () => + { + resLoader.Recycle2Cache(); + resLoader = null; + }); + } + } +} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta new file mode 100644 index 000000000..e043474a2 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5581dc2fcce9a410e9f501aeeedca7b3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity similarity index 58% rename from Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity index 1e6330279..ede5ee772 100644 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/Scene.unity +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity @@ -24,9 +24,9 @@ RenderSettings: m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 + m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 11 - m_GIWorkflowMode: 0 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -51,8 +51,8 @@ LightmapSettings: m_AlbedoBoost: 1 m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: serializedVersion: 9 m_Resolution: 2 @@ -113,356 +113,320 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &243835856 +--- !u!1 &481506284 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 243835860} - - component: {fileID: 243835859} - - component: {fileID: 243835858} - - component: {fileID: 243835857} + - component: {fileID: 481506287} + - component: {fileID: 481506286} + - component: {fileID: 481506285} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: EventSystem + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &243835857 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 243835856} - m_Enabled: 1 ---- !u!124 &243835858 -Behaviour: +--- !u!114 &481506285 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 243835856} + m_GameObject: {fileID: 481506284} m_Enabled: 1 ---- !u!20 &243835859 -Camera: + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &481506286 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 243835856} + m_GameObject: {fileID: 481506284} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &243835860 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &481506287 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 243835856} + m_GameObject: {fileID: 481506284} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &303995292 +--- !u!1 &1331323563 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 303995294} - - component: {fileID: 303995293} - m_Layer: 0 - m_Name: PlayMakerGUI + - component: {fileID: 1331323568} + - component: {fileID: 1331323567} + - component: {fileID: 1331323566} + - component: {fileID: 1331323565} + - component: {fileID: 1331323564} + m_Layer: 5 + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &303995293 +--- !u!114 &1331323564 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 303995292} + m_GameObject: {fileID: 1331323563} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -73581967, guid: e743331561ef77147ae48cda9bcb8209, type: 3} + m_Script: {fileID: 11500000, guid: 5581dc2fcce9a410e9f501aeeedca7b3, type: 3} m_Name: m_EditorClassIdentifier: - previewOnGUI: 1 - enableGUILayout: 1 - drawStateLabels: 1 - enableStateLabelsInBuilds: 0 - GUITextureStateLabels: 0 - GUITextStateLabels: 0 - filterLabelsWithDistance: 0 - maxLabelDistance: 10 - controlMouseCursor: 1 - labelScale: 1 ---- !u!4 &303995294 -Transform: +--- !u!114 &1331323565 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 303995292} - 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: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1076464552 -GameObject: + m_GameObject: {fileID: 1331323563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1331323566 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1076464554} - - component: {fileID: 1076464553} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1076464553 -Light: + m_GameObject: {fileID: 1331323563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1331323567 +Canvas: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1076464552} + m_GameObject: {fileID: 1331323563} m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} + serializedVersion: 3 m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1076464554 -Transform: + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1331323568 +RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1076464552} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_GameObject: {fileID: 1331323563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1870791280} m_Father: {fileID: 0} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1453322216 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1603455279 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1453322217} - - component: {fileID: 1453322218} + - component: {fileID: 1603455283} + - component: {fileID: 1603455282} + - component: {fileID: 1603455281} + - component: {fileID: 1603455280} m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged + m_Name: Main Camera + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1453322217 -Transform: +--- !u!81 &1603455280 +AudioListener: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1453322216} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.2110374, y: 0.8073624, z: -0.08303052} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1453322218 -MonoBehaviour: + m_GameObject: {fileID: 1603455279} + m_Enabled: 1 +--- !u!124 &1603455281 +Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1453322216} + m_GameObject: {fileID: 1603455279} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ff9e800a114023b5da59508054c576, type: 3} - m_Name: - m_EditorClassIdentifier: - Actions: [] ---- !u!1 &1642340102 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1642340104} - - component: {fileID: 1642340103} - m_Layer: 0 - m_Name: _FungusState - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1642340103 -MonoBehaviour: - m_ObjectHideFlags: 1 +--- !u!20 &1603455282 +Camera: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1642340102} + m_GameObject: {fileID: 1603455279} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} - m_Name: - m_EditorClassIdentifier: - selectedFlowchart: {fileID: 0} ---- !u!4 &1642340104 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1603455283 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1642340102} + m_GameObject: {fileID: 1603455279} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2128168559 +--- !u!1 &1870791279 GameObject: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 2128168561} - - component: {fileID: 2128168560} - m_Layer: 0 - m_Name: UndoProRecords + - component: {fileID: 1870791280} + - component: {fileID: 1870791282} + - component: {fileID: 1870791281} + m_Layer: 5 + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2128168560 +--- !u!224 &1870791280 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870791279} + 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: 1331323568} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1870791281 MonoBehaviour: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2128168559} + m_GameObject: {fileID: 1870791279} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d436248cf211f4e1cb0a2524700bda0a, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - undoProRecords: [] - undoState: - redoRecords: [] - undoRecords: - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Inspector - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Selection Change - - Inspector - - Selection Change - - Selection Change - - Selection Change ---- !u!4 &2128168561 -Transform: - m_ObjectHideFlags: 3 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1870791282 +CanvasRenderer: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2128168559} - 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: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1870791279} diff --git a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/New Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity.meta similarity index 74% rename from Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/New Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity.meta index fa9a87854..37ec9549f 100644 --- a/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/ActionKitExample/Event/New Scene.unity.meta +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5316113e3fb21429a914c41d5263e32c +guid: 7042ffc77368f4765b2e4fe182416aa8 DefaultImporter: externalObjects: {} userData: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png new file mode 100644 index 000000000..103a78b81 Binary files /dev/null and b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png differ diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png.meta new file mode 100644 index 000000000..7e4553f28 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: dd3fd6f9f6cfd4d1b976378a56135a2d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: textureexample1_png + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Art.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Art.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Art/BattleScene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Art/BattleScene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Art/BattleScene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Art/BattleScene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Main.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Main.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Main.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/Main.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs new file mode 100755 index 000000000..d4e96dc57 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using QFramework; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace QFramework.Example +{ + public class ResKitExampleMain : MonoBehaviour + { + void Awake() + { + ResMgr.Init(); + } + + // Use this for initialization + void Start() + { + var resLoader = ResLoader.Allocate(); + + resLoader.Add2Load("BattleScene"); + + resLoader.LoadAsync(() => { SceneManager.LoadScene("BattleScene"); }); + } + + // Update is called once per frame + void Update() + { + + } + } +} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/ResKitExampleMain.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ExampleExample/ResKitExampleMain.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/ManagerOfManagersExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/ManagerOfManagersExample/PackageVersion.json deleted file mode 100755 index f96d1b5bd..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/ManagerOfManagersExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.0.2","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFrameworkExample/UIKitExample/ManagerOfManagersExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.0.2","content":"MsgCenter 的 ForwardMsg 改成 partial 类型的","author":"liangxie","date":"2020 年 02 月 05 日 21:05","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/ManagerOfManagersExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/ManagerOfManagersExample/PackageVersion.json.meta deleted file mode 100755 index cc53249f9..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/ManagerOfManagersExample/PackageVersion.json.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c66be74bdf9cca442a2ae742415daf9f -timeCreated: 1580809352 -licenseType: Free -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/PackageVersion.json deleted file mode 100755 index fd1c38655..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.9.3","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFramework/Examples/FrameworkExamples/3.UIKitExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.9.3","content":"修改路径","author":"liangxie","date":"2020 年 08 月 09 日 17:25","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/PackageVersion.json.meta deleted file mode 100755 index c3c027790..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/PackageVersion.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: de5c869c65441424fb2138cc60309ce7 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/QEventSystemExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/QEventSystemExample/PackageVersion.json deleted file mode 100755 index 8e5836b61..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/QEventSystemExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.0.1","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFrameworkExample/UIKitExample/QEventSystemExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.0.1","content":"第一次提交 完成基本的示例","author":"liangxie","date":"2020 年 02 月 04 日 14:13","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/QEventSystemExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/QEventSystemExample/PackageVersion.json.meta deleted file mode 100755 index 8cdf1d87a..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/3.UIKitExample/QEventSystemExample/PackageVersion.json.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1d8ff9c1e1b2f9443a226e04d257f510 -timeCreated: 1580796809 -licenseType: Free -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/PackageVersion.json deleted file mode 100755 index f004a4cea..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/PackageVersion.json +++ /dev/null @@ -1 +0,0 @@ -{"Id":"","Version":"v0.2.0","Type":4,"AccessRight":0,"DownloadUrl":"","InstallPath":"Assets/QFramework/Examples/FrameworkExamples/4.AudioKitExample/","DocUrl":"http://lianxiegame.com","Readme":{"version":"v0.2.0","content":"修改下 AudioKit 的路径","author":"liangxie","date":"2020 年 08 月 09 日 17:29","PackageId":""}} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/PackageVersion.json.meta b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/PackageVersion.json.meta deleted file mode 100755 index eb42ca36a..000000000 --- a/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/PackageVersion.json.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 329332fc13b6d3448b420f8bc4cacce7 -timeCreated: 1580891650 -licenseType: Free -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/PackageVersion.json index 9a425be6b..7b47ce8bd 100644 --- a/Unity2017/Assets/QFramework/Framework/PackageVersion.json +++ b/Unity2017/Assets/QFramework/Framework/PackageVersion.json @@ -1,6 +1,6 @@ { "Id": "", - "Version": "v0.11.54", + "Version": "v0.11.57", "Type": 0, "AccessRight": 0, "DownloadUrl": "", @@ -17,10 +17,10 @@ ], "DocUrl": "http://lianxiegame.com", "Readme": { - "version": "v0.11.54", - "content": "PanelInfo 的 Recycle2Cache 调用", + "version": "v0.11.57", + "content": "KeyEventAction 找回", "author": "liangxie", - "date": "2021 年 03 月 01 日 22:36", + "date": "2021 年 03 月 03 日 23:01", "PackageId": "" } } \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll b/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll index 5c058ee6d..2877e53da 100644 Binary files a/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll and b/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll differ diff --git a/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb b/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb index 7afc3ce1d..135715e3d 100644 Binary files a/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb and b/Unity2017/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb differ diff --git a/Unity2017/Framework_v0.11.57.unitypackage b/Unity2017/Framework_v0.11.57.unitypackage new file mode 100644 index 000000000..6714ec627 Binary files /dev/null and b/Unity2017/Framework_v0.11.57.unitypackage differ diff --git a/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll b/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll index 5c058ee6d..2877e53da 100644 Binary files a/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll and b/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.dll differ diff --git a/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb b/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb index 7afc3ce1d..135715e3d 100644 Binary files a/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb and b/Unity2020/Assets/QFramework/Framework/Plugins/QFramework.Unity.Runtime.pdb differ