Skip to content

Commit cb8dd39

Browse files
committed
v1.0.60 release
1 parent 02e5e8c commit cb8dd39

47 files changed

Lines changed: 1810 additions & 75 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

QFramework.Toolkits.unitypackage

6.91 KB
Binary file not shown.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Id": "",
3-
"Version": "v1.0.54",
3+
"Version": "v1.0.60",
44
"Type": 0,
55
"AccessRight": 0,
66
"DownloadUrl": "",
@@ -11,10 +11,10 @@
1111
],
1212
"DocUrl": "https://liangxiegame.com",
1313
"Readme": {
14-
"version": "v1.0.54",
15-
"content": "EventKit:新增一堆事件触发器",
14+
"version": "v1.0.60",
15+
"content": "修复 UniRx&Tween Action 的报错问题",
1616
"author": "liangxie",
17-
"date": "2023 年 052418:07",
17+
"date": "2023 年 061712:59",
1818
"PackageId": ""
1919
}
2020
}

QFramework.Unity2018+/Assets/QFramework/Framework/Scripts/QFramework.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ public BindableProperty(T defaultValue = default)
732732
{
733733
mValue = defaultValue;
734734
}
735-
735+
736736
protected T mValue;
737737

738738
public T Value

QFramework.Unity2018+/Assets/QFramework/Toolkits/ResKit/Example/9.LoadPrefabByMonoType.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
using System;
2+
using System.Collections;
3+
using System.Collections.Generic;
4+
using UnityEngine;
5+
6+
namespace QFramework.Example
7+
{
8+
9+
public class LoadPrefabByMonoType : MonoBehaviour
10+
{
11+
private ResLoader mResLoader;
12+
private void Awake()
13+
{
14+
ResKit.Init();
15+
mResLoader = ResLoader.Allocate();
16+
}
17+
18+
private void Start()
19+
{
20+
mResLoader.LoadSync<SquareA>("SquareA")
21+
.InstantiateWithParent(transform)
22+
.LocalIdentity();
23+
24+
mResLoader.Add2Load<SquareA>("SquareA",(b, res) =>
25+
{
26+
if (b)
27+
{
28+
(res.Asset as GameObject).GetComponent<SquareA>()
29+
.InstantiateWithParent(transform)
30+
.LocalRotation(Quaternion.Euler(new Vector3(0, 0, 45)))
31+
.GetComponent<SpriteRenderer>()
32+
.color = Color.blue;
33+
}
34+
});
35+
36+
mResLoader.LoadAsync();
37+
}
38+
39+
private void OnDestroy()
40+
{
41+
mResLoader.Recycle2Cache();
42+
mResLoader = null;
43+
}
44+
}
45+
46+
47+
}

QFramework.Unity2018+/Assets/QFramework/Toolkits/ResKit/Example/9.LoadPrefabByMonoType/LoadPrefabByMonoType.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 239 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,239 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!29 &1
4+
OcclusionCullingSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_OcclusionBakeSettings:
8+
smallestOccluder: 5
9+
smallestHole: 0.25
10+
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
13+
--- !u!104 &2
14+
RenderSettings:
15+
m_ObjectHideFlags: 0
16+
serializedVersion: 9
17+
m_Fog: 0
18+
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
19+
m_FogMode: 3
20+
m_FogDensity: 0.01
21+
m_LinearFogStart: 0
22+
m_LinearFogEnd: 300
23+
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
24+
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
25+
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
26+
m_AmbientIntensity: 1
27+
m_AmbientMode: 3
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
29+
m_SkyboxMaterial: {fileID: 0}
30+
m_HaloStrength: 0.5
31+
m_FlareStrength: 1
32+
m_FlareFadeSpeed: 3
33+
m_HaloTexture: {fileID: 0}
34+
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
35+
m_DefaultReflectionMode: 0
36+
m_DefaultReflectionResolution: 128
37+
m_ReflectionBounces: 1
38+
m_ReflectionIntensity: 1
39+
m_CustomReflection: {fileID: 0}
40+
m_Sun: {fileID: 0}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
42+
m_UseRadianceAmbientProbe: 0
43+
--- !u!157 &3
44+
LightmapSettings:
45+
m_ObjectHideFlags: 0
46+
serializedVersion: 11
47+
m_GIWorkflowMode: 1
48+
m_GISettings:
49+
serializedVersion: 2
50+
m_BounceScale: 1
51+
m_IndirectOutputScale: 1
52+
m_AlbedoBoost: 1
53+
m_EnvironmentLightingMode: 0
54+
m_EnableBakedLightmaps: 0
55+
m_EnableRealtimeLightmaps: 0
56+
m_LightmapEditorSettings:
57+
serializedVersion: 10
58+
m_Resolution: 2
59+
m_BakeResolution: 40
60+
m_AtlasSize: 1024
61+
m_AO: 0
62+
m_AOMaxDistance: 1
63+
m_CompAOExponent: 1
64+
m_CompAOExponentDirect: 0
65+
m_Padding: 2
66+
m_LightmapParameters: {fileID: 0}
67+
m_LightmapsBakeMode: 1
68+
m_TextureCompression: 1
69+
m_FinalGather: 0
70+
m_FinalGatherFiltering: 1
71+
m_FinalGatherRayCount: 256
72+
m_ReflectionCompression: 2
73+
m_MixedBakeMode: 2
74+
m_BakeBackend: 1
75+
m_PVRSampling: 1
76+
m_PVRDirectSampleCount: 32
77+
m_PVRSampleCount: 500
78+
m_PVRBounces: 2
79+
m_PVRFilterTypeDirect: 0
80+
m_PVRFilterTypeIndirect: 0
81+
m_PVRFilterTypeAO: 0
82+
m_PVRFilteringMode: 1
83+
m_PVRCulling: 1
84+
m_PVRFilteringGaussRadiusDirect: 1
85+
m_PVRFilteringGaussRadiusIndirect: 5
86+
m_PVRFilteringGaussRadiusAO: 2
87+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
88+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
89+
m_PVRFilteringAtrousPositionSigmaAO: 1
90+
m_ShowResolutionOverlay: 1
91+
m_LightingDataAsset: {fileID: 0}
92+
m_UseShadowmask: 1
93+
--- !u!196 &4
94+
NavMeshSettings:
95+
serializedVersion: 2
96+
m_ObjectHideFlags: 0
97+
m_BuildSettings:
98+
serializedVersion: 2
99+
agentTypeID: 0
100+
agentRadius: 0.5
101+
agentHeight: 2
102+
agentSlope: 45
103+
agentClimb: 0.4
104+
ledgeDropHeight: 0
105+
maxJumpAcrossDistance: 0
106+
minRegionArea: 2
107+
manualCellSize: 0
108+
cellSize: 0.16666667
109+
manualTileSize: 0
110+
tileSize: 256
111+
accuratePlacement: 0
112+
debug:
113+
m_Flags: 0
114+
m_NavMeshData: {fileID: 0}
115+
--- !u!1 &368067480
116+
GameObject:
117+
m_ObjectHideFlags: 0
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
serializedVersion: 6
122+
m_Component:
123+
- component: {fileID: 368067483}
124+
- component: {fileID: 368067482}
125+
- component: {fileID: 368067481}
126+
m_Layer: 0
127+
m_Name: Main Camera
128+
m_TagString: MainCamera
129+
m_Icon: {fileID: 0}
130+
m_NavMeshLayer: 0
131+
m_StaticEditorFlags: 0
132+
m_IsActive: 1
133+
--- !u!81 &368067481
134+
AudioListener:
135+
m_ObjectHideFlags: 0
136+
m_CorrespondingSourceObject: {fileID: 0}
137+
m_PrefabInstance: {fileID: 0}
138+
m_PrefabAsset: {fileID: 0}
139+
m_GameObject: {fileID: 368067480}
140+
m_Enabled: 1
141+
--- !u!20 &368067482
142+
Camera:
143+
m_ObjectHideFlags: 0
144+
m_CorrespondingSourceObject: {fileID: 0}
145+
m_PrefabInstance: {fileID: 0}
146+
m_PrefabAsset: {fileID: 0}
147+
m_GameObject: {fileID: 368067480}
148+
m_Enabled: 1
149+
serializedVersion: 2
150+
m_ClearFlags: 1
151+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
152+
m_projectionMatrixMode: 1
153+
m_SensorSize: {x: 36, y: 24}
154+
m_LensShift: {x: 0, y: 0}
155+
m_GateFitMode: 2
156+
m_FocalLength: 50
157+
m_NormalizedViewPortRect:
158+
serializedVersion: 2
159+
x: 0
160+
y: 0
161+
width: 1
162+
height: 1
163+
near clip plane: 0.3
164+
far clip plane: 1000
165+
field of view: 60
166+
orthographic: 1
167+
orthographic size: 5
168+
m_Depth: -1
169+
m_CullingMask:
170+
serializedVersion: 2
171+
m_Bits: 4294967295
172+
m_RenderingPath: -1
173+
m_TargetTexture: {fileID: 0}
174+
m_TargetDisplay: 0
175+
m_TargetEye: 3
176+
m_HDR: 1
177+
m_AllowMSAA: 1
178+
m_AllowDynamicResolution: 0
179+
m_ForceIntoRT: 0
180+
m_OcclusionCulling: 1
181+
m_StereoConvergence: 10
182+
m_StereoSeparation: 0.022
183+
--- !u!4 &368067483
184+
Transform:
185+
m_ObjectHideFlags: 0
186+
m_CorrespondingSourceObject: {fileID: 0}
187+
m_PrefabInstance: {fileID: 0}
188+
m_PrefabAsset: {fileID: 0}
189+
m_GameObject: {fileID: 368067480}
190+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
191+
m_LocalPosition: {x: 0, y: 0, z: -10}
192+
m_LocalScale: {x: 1, y: 1, z: 1}
193+
m_Children: []
194+
m_Father: {fileID: 0}
195+
m_RootOrder: 0
196+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
197+
--- !u!1 &684807406
198+
GameObject:
199+
m_ObjectHideFlags: 0
200+
m_CorrespondingSourceObject: {fileID: 0}
201+
m_PrefabInstance: {fileID: 0}
202+
m_PrefabAsset: {fileID: 0}
203+
serializedVersion: 6
204+
m_Component:
205+
- component: {fileID: 684807407}
206+
- component: {fileID: 684807408}
207+
m_Layer: 0
208+
m_Name: LoadPrefabByMonoType
209+
m_TagString: Untagged
210+
m_Icon: {fileID: 0}
211+
m_NavMeshLayer: 0
212+
m_StaticEditorFlags: 0
213+
m_IsActive: 1
214+
--- !u!4 &684807407
215+
Transform:
216+
m_ObjectHideFlags: 0
217+
m_CorrespondingSourceObject: {fileID: 0}
218+
m_PrefabInstance: {fileID: 0}
219+
m_PrefabAsset: {fileID: 0}
220+
m_GameObject: {fileID: 684807406}
221+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
222+
m_LocalPosition: {x: 0, y: 0, z: 0}
223+
m_LocalScale: {x: 1, y: 1, z: 1}
224+
m_Children: []
225+
m_Father: {fileID: 0}
226+
m_RootOrder: 1
227+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
228+
--- !u!114 &684807408
229+
MonoBehaviour:
230+
m_ObjectHideFlags: 0
231+
m_CorrespondingSourceObject: {fileID: 0}
232+
m_PrefabInstance: {fileID: 0}
233+
m_PrefabAsset: {fileID: 0}
234+
m_GameObject: {fileID: 684807406}
235+
m_Enabled: 1
236+
m_EditorHideFlags: 0
237+
m_Script: {fileID: 11500000, guid: bc17798a45e824247bfed52cd4318101, type: 3}
238+
m_Name:
239+
m_EditorClassIdentifier:

QFramework.Unity2018+/Assets/QFramework/Toolkits/ResKit/Example/9.LoadPrefabByMonoType/Scene.unity.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
78 Bytes
Loading

0 commit comments

Comments
 (0)