From 47332803caf43e5ff0c381440c0bc104e81f2b19 Mon Sep 17 00:00:00 2001 From: liangxie Date: Tue, 6 Apr 2021 12:16:00 +0800 Subject: [PATCH] =?UTF-8?q?v0.11.92=20=E6=95=B4=E7=90=86=20ResKit=20?= =?UTF-8?q?=E7=9A=84=E7=A4=BA=E4=BE=8B=20&=20=E5=A2=9E=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=89=A9=E5=B1=95=20Res=20=E7=9A=84=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Unity2017/Assembly-CSharp.csproj | 33 +-- .../IOCExample.meta | 0 .../IOCExample/IOCFrameworkExample.cs | 0 .../IOCExample/IOCFrameworkExample.cs.meta | 0 .../IOCExample/IOCFrameworkExample.unity | 0 .../IOCExample/IOCFrameworkExample.unity.meta | 0 .../IOCExample/InjectExample.cs | 0 .../IOCExample/InjectExample.cs.meta | 0 .../IOCExample/InjectExample.unity | 0 .../IOCExample/InjectExample.unity.meta | 0 .../IOCExample/MainContainer.cs | 0 .../IOCExample/MainContainer.cs.meta | 0 .../IOCExample/NetworkExampleService.cs | 0 .../IOCExample/NetworkExampleService.cs.meta | 0 .../Pool.meta | 0 .../Pool/CallPool.cs | 0 .../Pool/CallPool.cs.meta | 0 .../Pool/Scene.unity | 0 .../Pool/Scene.unity.meta | 0 .../RefCounter.meta | 0 .../RefCounter/RefCounterExample.cs | 0 .../RefCounter/RefCounterExample.cs.meta | 0 .../RefCounter/Scene.unity | 0 .../RefCounter/Scene.unity.meta | 0 .../TableExample.meta | 0 .../TableExample/Scene.unity | 0 .../TableExample/Scene.unity.meta | 0 .../TypeEventSystemExample.meta | 0 .../TypeEventSystemExample/Scene.unity | 0 .../TypeEventSystemExample/Scene.unity.meta | 0 .../TypeEventSystemExample.cs | 0 .../TypeEventSystemExample.cs.meta | 0 .../0.BasicUsage.meta} | 4 +- .../{ => 0.BasicUsage}/AssetObj.prefab | 0 .../{ => 0.BasicUsage}/AssetObj.prefab.meta | 0 .../{ => 0.BasicUsage}/ResKitExample.cs | 0 .../{ => 0.BasicUsage}/ResKitExample.cs.meta | 0 .../{ => 0.BasicUsage}/Scene.unity | 0 .../{ => 0.BasicUsage}/Scene.unity.meta | 0 .../2.ResKitExample/10.CustomResExample.meta | 8 + .../10.CustomResExample/CustomResExample.cs | 72 ++++++ .../CustomResExample.cs.meta | 11 + .../10.CustomResExample/Scene.unity | 236 ++++++++++++++++++ .../10.CustomResExample/Scene.unity.meta | 7 + ...le.meta => 2.LoadResourcesResExample.meta} | 0 .../LoadResourcesResExample.cs | 0 .../LoadResourcesResExample.cs.meta | 0 .../Resources.meta | 0 .../Resources/TestTexture.png | Bin .../Resources/TestTexture.png.meta | 0 .../Scene.unity | 0 .../Scene.unity.meta | 0 ...neExample.meta => 3.LoadSceneExample.meta} | 0 .../Art.meta | 0 .../Art/SceneRes.unity | 0 .../Art/SceneRes.unity.meta | 0 .../LoadSceneExample.cs | 0 .../LoadSceneExample.cs.meta | 0 .../LoadSceneExample.unity | 0 .../LoadSceneExample.unity.meta | 0 ...meta => 4.ResLoaderRelateUnloadAsset.meta} | 0 .../ResLoaderRelateUnloadAssetExample.cs | 0 .../ResLoaderRelateUnloadAssetExample.cs.meta | 0 .../Scene.unity | 0 .../Scene.unity.meta | 0 .../TextureExample1.png | Bin .../TextureExample1.png.meta | 0 ...las.meta => 5.LoadSpriteAtlasExample.meta} | 0 .../Square.png | Bin .../Square.png.meta | 0 .../TestSpriteAtlas.cs | 0 .../TestSpriteAtlas.cs.meta | 0 .../TestSpriteAtlas.unity | 0 .../TestSpriteAtlas.unity.meta | 0 .../Triangle.png | Bin .../Triangle.png.meta | 0 .../spriteatlas.spriteatlas | 0 .../spriteatlas.spriteatlas.meta | 0 ...neExample.meta => 7.LoadSceneExample.meta} | 0 .../Art.meta | 0 .../Art/BattleScene.unity | 0 .../Art/BattleScene.unity.meta | 0 .../Main.unity | 0 .../Main.unity.meta | 0 .../ResKitExampleMain.cs | 0 .../ResKitExampleMain.cs.meta | 0 ...ageExample.meta => 8.NetImageExample.meta} | 0 .../ImageLoaderExample.cs | 0 .../ImageLoaderExample.cs.meta | 0 .../NetImageExample.cs | 0 .../NetImageExample.cs.meta | 0 .../Scene.unity | 0 .../Scene.unity.meta | 0 .../2.ResKitExample/9.ResourcesExample.meta | 8 + .../{ => 9.ResourcesExample}/Resources.meta | 0 .../Resources/GameObject.prefab | 0 .../Resources/GameObject.prefab.meta | 0 .../Audio.meta | 0 .../Audio/AudioTest.cs | 0 .../Audio/AudioTest.cs.meta | 0 .../Audio/New Scene.unity | 0 .../Audio/New Scene.unity.meta | 0 .../QFramework/Framework/PackageVersion.json | 8 +- 103 files changed, 364 insertions(+), 23 deletions(-) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/IOCFrameworkExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/IOCFrameworkExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/IOCFrameworkExample.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/IOCFrameworkExample.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/InjectExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/InjectExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/InjectExample.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/InjectExample.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/MainContainer.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/MainContainer.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/NetworkExampleService.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/IOCExample/NetworkExampleService.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/Pool.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/Pool/CallPool.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/Pool/CallPool.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/Pool/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/Pool/Scene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/RefCounter.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/RefCounter/RefCounterExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/RefCounter/RefCounterExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/RefCounter/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 1.CoreExample}/RefCounter/Scene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TableExample.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TableExample/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TableExample/Scene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TypeEventSystemExample.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TypeEventSystemExample/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TypeEventSystemExample/Scene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TypeEventSystemExample/TypeEventSystemExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample => 1.CoreExample}/TypeEventSystemExample/TypeEventSystemExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{0.PackageKitExample.meta => 2.ResKitExample/0.BasicUsage.meta} (62%) mode change 100755 => 100644 rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 0.BasicUsage}/AssetObj.prefab (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 0.BasicUsage}/AssetObj.prefab.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 0.BasicUsage}/ResKitExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 0.BasicUsage}/ResKitExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 0.BasicUsage}/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 0.BasicUsage}/Scene.unity.meta (100%) create mode 100644 Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample.meta create mode 100644 Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs create mode 100644 Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs.meta create mode 100644 Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity create mode 100644 Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity.meta rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample.meta => 2.LoadResourcesResExample.meta} (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/LoadResourcesResExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/LoadResourcesResExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/Resources.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/Resources/TestTexture.png (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/Resources/TestTexture.png.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadResourcesResExample => 2.LoadResourcesResExample}/Scene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample.meta => 3.LoadSceneExample.meta} (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/Art.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/Art/SceneRes.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/Art/SceneRes.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/LoadSceneExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/LoadSceneExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/LoadSceneExample.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{LoadSceneExample => 3.LoadSceneExample}/LoadSceneExample.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset.meta => 4.ResLoaderRelateUnloadAsset.meta} (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset => 4.ResLoaderRelateUnloadAsset}/ResLoaderRelateUnloadAssetExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset => 4.ResLoaderRelateUnloadAsset}/ResLoaderRelateUnloadAssetExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset => 4.ResLoaderRelateUnloadAsset}/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset => 4.ResLoaderRelateUnloadAsset}/Scene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset => 4.ResLoaderRelateUnloadAsset}/TextureExample1.png (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ResLoaderRelateUnloadAsset => 4.ResLoaderRelateUnloadAsset}/TextureExample1.png.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas.meta => 5.LoadSpriteAtlasExample.meta} (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/Square.png (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/Square.png.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/TestSpriteAtlas.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/TestSpriteAtlas.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/TestSpriteAtlas.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/TestSpriteAtlas.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/Triangle.png (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/Triangle.png.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/spriteatlas.spriteatlas (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SpriteAtlas => 5.LoadSpriteAtlasExample}/spriteatlas.spriteatlas.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample.meta => 7.LoadSceneExample.meta} (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/Art.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/Art/BattleScene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/Art/BattleScene.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/Main.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/Main.unity.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/ResKitExampleMain.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{SceneExample => 7.LoadSceneExample}/ResKitExampleMain.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{NetImageExample.meta => 8.NetImageExample.meta} (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 8.NetImageExample}/ImageLoaderExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 8.NetImageExample}/ImageLoaderExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{NetImageExample => 8.NetImageExample}/NetImageExample.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{NetImageExample => 8.NetImageExample}/NetImageExample.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{NetImageExample => 8.NetImageExample}/Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{NetImageExample => 8.NetImageExample}/Scene.unity.meta (100%) create mode 100644 Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample.meta rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 9.ResourcesExample}/Resources.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 9.ResourcesExample}/Resources/GameObject.prefab (100%) rename Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/{ => 9.ResourcesExample}/Resources/GameObject.prefab.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 4.AudioKitExample}/Audio.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 4.AudioKitExample}/Audio/AudioTest.cs (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 4.AudioKitExample}/Audio/AudioTest.cs.meta (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 4.AudioKitExample}/Audio/New Scene.unity (100%) rename Unity2017/Assets/QFramework/Framework/Examples/{2.ResKitExample => 4.AudioKitExample}/Audio/New Scene.unity.meta (100%) diff --git a/Unity2017/Assembly-CSharp.csproj b/Unity2017/Assembly-CSharp.csproj index a2fc5ce70..a819c9461 100644 --- a/Unity2017/Assembly-CSharp.csproj +++ b/Unity2017/Assembly-CSharp.csproj @@ -173,11 +173,6 @@ - - - - - @@ -204,24 +199,29 @@ + + + + + + + + - - - - - - - - - + + + + + + + + - - @@ -246,6 +246,7 @@ + diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/IOCFrameworkExample.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/IOCFrameworkExample.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/InjectExample.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/InjectExample.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/MainContainer.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/MainContainer.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/MainContainer.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/MainContainer.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/MainContainer.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/MainContainer.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/MainContainer.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/MainContainer.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/NetworkExampleService.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/NetworkExampleService.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/NetworkExampleService.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/NetworkExampleService.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/NetworkExampleService.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/NetworkExampleService.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/IOCExample/NetworkExampleService.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/IOCExample/NetworkExampleService.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/CallPool.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/CallPool.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/CallPool.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/CallPool.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/CallPool.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/CallPool.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/CallPool.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/CallPool.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Pool/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/Pool/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/RefCounterExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/RefCounterExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/RefCounterExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/RefCounterExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/RefCounterExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/RefCounterExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/RefCounterExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/RefCounterExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/RefCounter/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/RefCounter/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TableExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TableExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TableExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TableExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TableExample/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TableExample/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TableExample/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TableExample/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TableExample/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TableExample/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TableExample/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TableExample/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/TypeEventSystemExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/TypeEventSystemExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/TypeEventSystemExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/TypeEventSystemExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/TypeEventSystemExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/TypeEventSystemExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample/TypeEventSystemExample/TypeEventSystemExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/1.CoreExample/TypeEventSystemExample/TypeEventSystemExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage.meta old mode 100755 new mode 100644 similarity index 62% rename from Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage.meta index abf59cafa..45c7b7c5a --- a/Unity2017/Assets/QFramework/Framework/Examples/0.PackageKitExample.meta +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: a6a8cd917af4fc845bb66fd400951fc8 +guid: 65a702e0d70f8420184c487c4ceffbb4 folderAsset: yes -timeCreated: 1580809805 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/AssetObj.prefab b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/AssetObj.prefab similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/AssetObj.prefab rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/AssetObj.prefab diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/AssetObj.prefab.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/AssetObj.prefab.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/AssetObj.prefab.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/AssetObj.prefab.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResKitExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/ResKitExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResKitExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/ResKitExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResKitExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/ResKitExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResKitExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/ResKitExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/0.BasicUsage/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample.meta new file mode 100644 index 000000000..251ccd9e3 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 12ac79e6bb9404dd49bb3d7c51ef3669 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs new file mode 100644 index 000000000..213211488 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs @@ -0,0 +1,72 @@ +using UnityEngine; + +namespace QFramework +{ + public class CustomResExample : MonoBehaviour + { + // 自定义的 Res + public class MyRes : Res + { + public MyRes(string name) + { + mAssetName = name; + } + + // 同步加载（自己实现） + public override bool LoadSync() + { + // Asset = 加载的结果给 Asset 赋值 + State = ResState.Ready; + return true; + } + + // 异步加载(自己实现) + public override void LoadAsync() + { + // Asset = 加载的结果给 Asset 赋值 + State = ResState.Ready; + } + + + // 释放资源（自己实现) + protected override void OnReleaseRes() + { + // 卸载操作 + // Asset = null + State = ResState.Waiting; + } + } + + // 自定义的 Res 创建器（包含识别功能） + public class MyResCreator : IResCreator + { + public bool Match(ResSearchKeys resSearchKeys) + { + return resSearchKeys.AssetName.StartsWith("myres://"); + } + + public IRes Create(ResSearchKeys resSearchKeys) + { + return new MyRes(resSearchKeys.AssetName); + } + } + + // Use this for initialization + void Start() + { + // 添加创建器 + ResFactory.AddResCreator(); + + var resLoader = ResLoader.Allocate(); + + var resSearchKeys = ResSearchKeys.Allocate("myres://hello_world"); + + var myRes = resLoader.LoadResSync(resSearchKeys); + + resSearchKeys.Recycle2Cache(); + + Debug.Log(myRes.AssetName); + Debug.Log(myRes.State); + } + } +} \ No newline at end of file diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs.meta new file mode 100644 index 000000000..519294a5a --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/CustomResExample.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 64e0d257180e6409fa88b7fec5a3ffd0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity new file mode 100644 index 000000000..d69bb0900 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity @@ -0,0 +1,236 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 8 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + 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: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 9 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &654024862 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 654024863} + - component: {fileID: 654024864} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &654024863 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 654024862} + 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 &654024864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 654024862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64e0d257180e6409fa88b7fec5a3ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1018295849 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1018295853} + - component: {fileID: 1018295852} + - component: {fileID: 1018295851} + - component: {fileID: 1018295850} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1018295850 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1018295849} + m_Enabled: 1 +--- !u!124 &1018295851 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1018295849} + m_Enabled: 1 +--- !u!20 &1018295852 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1018295849} + 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: 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 &1018295853 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1018295849} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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} diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity.meta new file mode 100644 index 000000000..1c9f3f5fc --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/10.CustomResExample/Scene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 132ff17a898564f09a4d4599a9925aa5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/LoadResourcesResExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/LoadResourcesResExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/LoadResourcesResExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/LoadResourcesResExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/LoadResourcesResExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/LoadResourcesResExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/LoadResourcesResExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/LoadResourcesResExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Resources.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Resources.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Resources.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Resources.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Resources/TestTexture.png b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Resources/TestTexture.png similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Resources/TestTexture.png rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Resources/TestTexture.png diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Resources/TestTexture.png.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Resources/TestTexture.png.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Resources/TestTexture.png.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Resources/TestTexture.png.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadResourcesResExample/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/2.LoadResourcesResExample/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/Art.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/Art.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/Art.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/Art.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/Art/SceneRes.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/Art/SceneRes.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/Art/SceneRes.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/Art/SceneRes.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/Art/SceneRes.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/Art/SceneRes.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/Art/SceneRes.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/Art/SceneRes.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/LoadSceneExample/LoadSceneExample.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/3.LoadSceneExample/LoadSceneExample.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/ResLoaderRelateUnloadAssetExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/TextureExample1.png similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/TextureExample1.png diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/TextureExample1.png.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ResLoaderRelateUnloadAsset/TextureExample1.png.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/4.ResLoaderRelateUnloadAsset/TextureExample1.png.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Square.png b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Square.png similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Square.png rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Square.png diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Square.png.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Square.png.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Square.png.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Square.png.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/TestSpriteAtlas.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/TestSpriteAtlas.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Triangle.png b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Triangle.png similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Triangle.png rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Triangle.png diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Triangle.png.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Triangle.png.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/Triangle.png.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/Triangle.png.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/spriteatlas.spriteatlas b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/spriteatlas.spriteatlas similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/spriteatlas.spriteatlas rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/spriteatlas.spriteatlas diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/spriteatlas.spriteatlas.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/spriteatlas.spriteatlas.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SpriteAtlas/spriteatlas.spriteatlas.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/5.LoadSpriteAtlasExample/spriteatlas.spriteatlas.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Art.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Art.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Art/BattleScene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Art/BattleScene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Art/BattleScene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Art/BattleScene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Art/BattleScene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Main.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Main.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Main.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/Main.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/Main.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/ResKitExampleMain.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/ResKitExampleMain.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/ResKitExampleMain.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/SceneExample/ResKitExampleMain.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/7.LoadSceneExample/ResKitExampleMain.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ImageLoaderExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/ImageLoaderExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ImageLoaderExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/ImageLoaderExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ImageLoaderExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/ImageLoaderExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/ImageLoaderExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/ImageLoaderExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/NetImageExample.cs b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/NetImageExample.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/NetImageExample.cs rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/NetImageExample.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/NetImageExample.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/NetImageExample.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/NetImageExample.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/NetImageExample.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/NetImageExample/Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/8.NetImageExample/Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample.meta new file mode 100644 index 000000000..16e13b1a7 --- /dev/null +++ b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1384186d53e6f463c81119807147dd58 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Resources.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample/Resources.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Resources.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample/Resources.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Resources/GameObject.prefab b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample/Resources/GameObject.prefab similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Resources/GameObject.prefab rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample/Resources/GameObject.prefab diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Resources/GameObject.prefab.meta b/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample/Resources/GameObject.prefab.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Resources/GameObject.prefab.meta rename to Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/9.ResourcesExample/Resources/GameObject.prefab.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio.meta b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio.meta rename to Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/AudioTest.cs b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/AudioTest.cs similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/AudioTest.cs rename to Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/AudioTest.cs diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/AudioTest.cs.meta b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/AudioTest.cs.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/AudioTest.cs.meta rename to Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/AudioTest.cs.meta diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/New Scene.unity b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/New Scene.unity similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/New Scene.unity rename to Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/New Scene.unity diff --git a/Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/New Scene.unity.meta b/Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/New Scene.unity.meta similarity index 100% rename from Unity2017/Assets/QFramework/Framework/Examples/2.ResKitExample/Audio/New Scene.unity.meta rename to Unity2017/Assets/QFramework/Framework/Examples/4.AudioKitExample/Audio/New Scene.unity.meta diff --git a/Unity2017/Assets/QFramework/Framework/PackageVersion.json b/Unity2017/Assets/QFramework/Framework/PackageVersion.json index 00901cba0..6248a92fd 100644 --- a/Unity2017/Assets/QFramework/Framework/PackageVersion.json +++ b/Unity2017/Assets/QFramework/Framework/PackageVersion.json @@ -1,6 +1,6 @@ { "Id": "", - "Version": "v0.11.90", + "Version": "v0.11.92", "Type": 0, "AccessRight": 0, "DownloadUrl": "", @@ -17,10 +17,10 @@ ], "DocUrl": "http://lianxiegame.com", "Readme": { - "version": "v0.11.90", - "content": "1. InputField 增加回车提交功能(OnEnterSubmit)\n2. GetOrAddComponent 支持 Component 对象", + "version": "v0.11.92", + "content": "整理 ResKit 的示例 & 增加自定义扩展 Res 的示例", "author": "liangxie", - "date": "2021 年 04 月 05 日 09:09", + "date": "2021 年 04 月 06 日 12:15", "PackageId": "" } } \ No newline at end of file