v0.0.12.18

Assets/QFramework/Example/LibsExample/CatlibExample/CatlibExample.cs

@@ -0,0 +1,52 @@
+using System.Collections;
+using CatLib;
+using UnityEngine;
+using Application = CatLib.Application;
+using IServiceProvider = CatLib.IServiceProvider;
+
+namespace QFramework.Example
+{
+	public class CatlibExample : MonoBehaviour
+	{
+		// Use this for initialization
+		IEnumerator Start()
+		{
+
+			var application = new Application();
+			application.Bootstrap();
+			application.Register(new FileSystemProvider());
+			application.Init();
+
+			yield return new WaitForEndOfFrame();
+
+			App.Make<IFileSystem>().HelloWorld();
+
+		}
+
+
+		public interface IFileSystem
+		{
+			void HelloWorld();
+		}
+
+		public class FileSystem : IFileSystem
+		{
+			public void HelloWorld()
+			{
+				"HelloWorld".LogInfo();
+			}
+		}
+
+		public class FileSystemProvider : IServiceProvider
+		{
+			public void Init()
+			{
+			}
+
+			public void Register()
+			{
+				App.Singleton<IFileSystem, FileSystem>();
+			}
+		}
+	}
+}

Assets/QFramework/Example/LibsExample/CatlibExample/CatlibExample.unity

@@ -0,0 +1,208 @@
+%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 &132906102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 132906106}
+  - component: {fileID: 132906105}
+  - component: {fileID: 132906104}
+  - component: {fileID: 132906103}
+  - component: {fileID: 132906107}
+  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 &132906103
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 132906102}
+  m_Enabled: 1
+--- !u!124 &132906104
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 132906102}
+  m_Enabled: 1
+--- !u!20 &132906105
+Camera:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 132906102}
+  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 &132906106
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 132906102}
+  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}
+--- !u!114 &132906107
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 132906102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae15caf1e303ff54a8421c19e63fe11c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/QFramework/Example/LibsExample/NetworkExample/UIConnect.cs

@@ -67,7 +67,6 @@ protected override void OnHide()
 
 		protected override void OnClose()
 		{
-			base.OnClose();
 		}
 
 		void ShowLog(string content)

Assets/QFramework/Example/LibsExample/NetworkExample/UIMsg.cs

@@ -79,7 +79,6 @@ protected override void OnHide()
 
 		protected override void OnClose()
 		{
-			base.OnClose();
 		}
 
 		void ShowLog(string content)

Assets/QFramework/Example/LibsExample/UniRxExample/UITestUniRx.cs

@@ -74,7 +74,6 @@ protected override void OnHide()
 
 		protected override void OnClose()
 		{
-			base.OnClose();
 		}
 
 		void ShowLog(string content)

Assets/QFramework/Example/PackageVersion.json

@@ -1,16 +1,16 @@
 {
-  "Version": "v0.0.37",
+  "Version": "v0.0.39",
   "Type": 0,
   "AccessRight": 0,
   "DownloadUrl": null,
   "InstallPath": "Assets/QFramework/Example/",
   "Readme": {
-    "version": "v0.0.37",
-    "content": "update component 2 designer",
-    "author": "LIANGXIE",
-    "date": "2019-01-06"
+    "version": "v0.0.39",
+    "content": "add catlib example",
+    "author": "liangxie",
+    "date": "2019 年 01 月 21 日 10:32"
   },
   "Name": "Example",
-  "VersionNumber": 37,
-  "FileName": "Example_v0.0.37.unitypackage"
+  "VersionNumber": 39,
+  "FileName": "Example_v0.0.39.unitypackage"
 }

Assets/QFramework/Example/ResKitExample/ResKit/LoadAssetBundleResExample/AssetBundleResExample.cs

@@ -21,9 +21,9 @@ void Start()
 		{
 			RawImage rawImage = transform.Find("RawImage").GetComponent<RawImage>();
 
-//			rawImage.texture = mResLoader.LoadSync<Texture2D>("TestImage");
+			rawImage.texture = mResLoader.LoadSync<Texture2D>("TestImage");
 
-			rawImage.texture = mResLoader.LoadSync<Texture2D>("testimage_png","TestImage");
+//			rawImage.texture = mResLoader.LoadSync<Texture2D>("testimage_png","TestImage");
 		}
 
 		private void OnDestroy()

Assets/QFramework/Example/UIKitExample/UIExample/Scripts/UI/UIGamePanel.cs

@@ -33,6 +33,7 @@ public class UIGamePanelData : UIPanelData
 
 	public partial class UIGamePanel : UIPanel
 	{
+
 		protected override void InitUI(IUIData uiData = null)
 		{
 			mData = uiData as UIGamePanelData;
@@ -52,5 +53,10 @@ protected override void RegisterUIEvent()
 				CloseSelf();
 			});
 		}
+
+		protected override void OnClose()
+		{
+
+		}
 	}
 }

Assets/QFramework/Example/UIKitExample/UIExample/Scripts/UI/UIMenuPanel.cs

@@ -69,5 +69,10 @@ protected override void RegisterUIEvent()
 					prefabName: "Resources/UISettingPanel");
 			});
 		}
+
+		protected override void OnClose()
+		{
+
+		}
 	}
 }