Skip to content

Commit 1e314dd

Browse files
Merge pull request #11 from unity-game-framework/issue-5-fix-runtimeinitializeonloadmethod-with-domain-reloading
Change UI and GL events execution
2 parents d601cd6 + 7f67d18 commit 1e314dd

Some content is hidden

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

42 files changed

+344
-326
lines changed

Assets/Scenes/Empty.unity

Lines changed: 177 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,179 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126+
--- !u!1 &68777780
127+
GameObject:
128+
m_ObjectHideFlags: 0
129+
m_CorrespondingSourceObject: {fileID: 0}
130+
m_PrefabInstance: {fileID: 0}
131+
m_PrefabAsset: {fileID: 0}
132+
serializedVersion: 6
133+
m_Component:
134+
- component: {fileID: 68777783}
135+
- component: {fileID: 68777782}
136+
m_Layer: 0
137+
m_Name: Camera_1
138+
m_TagString: Untagged
139+
m_Icon: {fileID: 0}
140+
m_NavMeshLayer: 0
141+
m_StaticEditorFlags: 0
142+
m_IsActive: 1
143+
--- !u!20 &68777782
144+
Camera:
145+
m_ObjectHideFlags: 0
146+
m_CorrespondingSourceObject: {fileID: 0}
147+
m_PrefabInstance: {fileID: 0}
148+
m_PrefabAsset: {fileID: 0}
149+
m_GameObject: {fileID: 68777780}
150+
m_Enabled: 1
151+
serializedVersion: 2
152+
m_ClearFlags: 1
153+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
154+
m_projectionMatrixMode: 1
155+
m_GateFitMode: 2
156+
m_FOVAxisMode: 0
157+
m_SensorSize: {x: 36, y: 24}
158+
m_LensShift: {x: 0, y: 0}
159+
m_FocalLength: 50
160+
m_NormalizedViewPortRect:
161+
serializedVersion: 2
162+
x: 0
163+
y: 0
164+
width: 0.25
165+
height: 0.25
166+
near clip plane: 0.3
167+
far clip plane: 1000
168+
field of view: 60
169+
orthographic: 0
170+
orthographic size: 5
171+
m_Depth: 1
172+
m_CullingMask:
173+
serializedVersion: 2
174+
m_Bits: 4294967295
175+
m_RenderingPath: -1
176+
m_TargetTexture: {fileID: 0}
177+
m_TargetDisplay: 0
178+
m_TargetEye: 3
179+
m_HDR: 1
180+
m_AllowMSAA: 1
181+
m_AllowDynamicResolution: 0
182+
m_ForceIntoRT: 0
183+
m_OcclusionCulling: 1
184+
m_StereoConvergence: 10
185+
m_StereoSeparation: 0.022
186+
--- !u!4 &68777783
187+
Transform:
188+
m_ObjectHideFlags: 0
189+
m_CorrespondingSourceObject: {fileID: 0}
190+
m_PrefabInstance: {fileID: 0}
191+
m_PrefabAsset: {fileID: 0}
192+
m_GameObject: {fileID: 68777780}
193+
m_LocalRotation: {x: -0.149608, y: 0.8423521, z: -0.29731724, w: -0.4238666}
194+
m_LocalPosition: {x: 4.746426, y: 4.7661033, z: 3.5221124}
195+
m_LocalScale: {x: 1, y: 1, z: 1}
196+
m_Children: []
197+
m_Father: {fileID: 0}
198+
m_RootOrder: 1
199+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
200+
--- !u!1 &729525157
201+
GameObject:
202+
m_ObjectHideFlags: 0
203+
m_CorrespondingSourceObject: {fileID: 0}
204+
m_PrefabInstance: {fileID: 0}
205+
m_PrefabAsset: {fileID: 0}
206+
serializedVersion: 6
207+
m_Component:
208+
- component: {fileID: 729525158}
209+
- component: {fileID: 729525159}
210+
m_Layer: 0
211+
m_Name: DebugGL
212+
m_TagString: Untagged
213+
m_Icon: {fileID: 0}
214+
m_NavMeshLayer: 0
215+
m_StaticEditorFlags: 0
216+
m_IsActive: 1
217+
--- !u!4 &729525158
218+
Transform:
219+
m_ObjectHideFlags: 0
220+
m_CorrespondingSourceObject: {fileID: 0}
221+
m_PrefabInstance: {fileID: 0}
222+
m_PrefabAsset: {fileID: 0}
223+
m_GameObject: {fileID: 729525157}
224+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
225+
m_LocalPosition: {x: 0, y: 0, z: 0}
226+
m_LocalScale: {x: 1, y: 1, z: 1}
227+
m_Children: []
228+
m_Father: {fileID: 0}
229+
m_RootOrder: 2
230+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
231+
--- !u!114 &729525159
232+
MonoBehaviour:
233+
m_ObjectHideFlags: 0
234+
m_CorrespondingSourceObject: {fileID: 0}
235+
m_PrefabInstance: {fileID: 0}
236+
m_PrefabAsset: {fileID: 0}
237+
m_GameObject: {fileID: 729525157}
238+
m_Enabled: 1
239+
m_EditorHideFlags: 0
240+
m_Script: {fileID: 11500000, guid: f703d31518bf42139c3e84790d308364, type: 3}
241+
m_Name:
242+
m_EditorClassIdentifier:
243+
m_enable: 1
244+
m_defaultMaterial: {fileID: 0}
245+
m_shapes: []
246+
--- !u!1 &770230239
247+
GameObject:
248+
m_ObjectHideFlags: 0
249+
m_CorrespondingSourceObject: {fileID: 0}
250+
m_PrefabInstance: {fileID: 0}
251+
m_PrefabAsset: {fileID: 0}
252+
serializedVersion: 6
253+
m_Component:
254+
- component: {fileID: 770230240}
255+
- component: {fileID: 770230241}
256+
m_Layer: 0
257+
m_Name: DebugUI
258+
m_TagString: Untagged
259+
m_Icon: {fileID: 0}
260+
m_NavMeshLayer: 0
261+
m_StaticEditorFlags: 0
262+
m_IsActive: 1
263+
--- !u!4 &770230240
264+
Transform:
265+
m_ObjectHideFlags: 0
266+
m_CorrespondingSourceObject: {fileID: 0}
267+
m_PrefabInstance: {fileID: 0}
268+
m_PrefabAsset: {fileID: 0}
269+
m_GameObject: {fileID: 770230239}
270+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
271+
m_LocalPosition: {x: 0, y: 0, z: 0}
272+
m_LocalScale: {x: 1, y: 1, z: 1}
273+
m_Children: []
274+
m_Father: {fileID: 0}
275+
m_RootOrder: 3
276+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
277+
--- !u!114 &770230241
278+
MonoBehaviour:
279+
m_ObjectHideFlags: 0
280+
m_CorrespondingSourceObject: {fileID: 0}
281+
m_PrefabInstance: {fileID: 0}
282+
m_PrefabAsset: {fileID: 0}
283+
m_GameObject: {fileID: 770230239}
284+
m_Enabled: 1
285+
m_EditorHideFlags: 0
286+
m_Script: {fileID: 11500000, guid: cc789d3dfe8e4c90ae18d29e6a687166, type: 3}
287+
m_Name:
288+
m_EditorClassIdentifier:
289+
m_enable: 1
290+
m_scale: 2
291+
m_skin: {fileID: 11400000, guid: 4346a5dd01e15a745b7d3df2ba5ab6d3, type: 2}
292+
m_drawers:
293+
- m_guid: f856bfcfa6327534fbdcfb32e09bad6f
294+
m_asset: {fileID: 11400000, guid: f856bfcfa6327534fbdcfb32e09bad6f, type: 2}
295+
- m_guid: e22946bc75712b245899bc6dfb0c8498
296+
m_asset: {fileID: 11400000, guid: e22946bc75712b245899bc6dfb0c8498, type: 2}
297+
- m_guid: 2c3a2510c22cba645ac071cc0c57d937
298+
m_asset: {fileID: 11400000, guid: 2c3a2510c22cba645ac071cc0c57d937, type: 2}
126299
--- !u!1 &1188849071
127300
GameObject:
128301
m_ObjectHideFlags: 0
@@ -203,7 +376,7 @@ Transform:
203376
m_LocalScale: {x: 1, y: 1, z: 1}
204377
m_Children: []
205378
m_Father: {fileID: 0}
206-
m_RootOrder: 4
379+
m_RootOrder: 7
207380
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
208381
--- !u!1 &1507539452
209382
GameObject:
@@ -320,7 +493,7 @@ Transform:
320493
m_LocalScale: {x: 1, y: 1, z: 1}
321494
m_Children: []
322495
m_Father: {fileID: 0}
323-
m_RootOrder: 1
496+
m_RootOrder: 4
324497
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
325498
--- !u!1 &1572831520
326499
GameObject:
@@ -402,7 +575,7 @@ Transform:
402575
m_LocalScale: {x: 1, y: 1, z: 1}
403576
m_Children: []
404577
m_Father: {fileID: 0}
405-
m_RootOrder: 3
578+
m_RootOrder: 6
406579
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
407580
--- !u!1 &1823135811
408581
GameObject:
@@ -433,7 +606,7 @@ Transform:
433606
m_LocalScale: {x: 1, y: 1, z: 1}
434607
m_Children: []
435608
m_Father: {fileID: 0}
436-
m_RootOrder: 2
609+
m_RootOrder: 5
437610
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
438611
--- !u!114 &1823135813
439612
MonoBehaviour:

Assets/Settings.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/Settings/Resources.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/Settings/Resources/UGF.DebugTools.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/Settings/Resources/UGF.DebugTools/DebugGLSettings.asset

Lines changed: 0 additions & 17 deletions
This file was deleted.

Assets/Settings/Resources/UGF.DebugTools/DebugGLSettings.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/Settings/Resources/UGF.DebugTools/DebugUISettings.asset

Lines changed: 0 additions & 24 deletions
This file was deleted.

Assets/Settings/Resources/UGF.DebugTools/DebugUISettings.asset.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/DebugGLSettingsAssetEditor.cs renamed to Packages/UGF.DebugTools/Editor/DebugGLComponentEditor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
namespace UGF.DebugTools.Editor
77
{
8-
[CustomEditor(typeof(DebugGLSettingsAsset), true)]
9-
internal class DebugGLSettingsAssetEditor : UnityEditor.Editor
8+
[CustomEditor(typeof(DebugGLComponent), true)]
9+
internal class DebugGLComponentEditor : UnityEditor.Editor
1010
{
1111
private SerializedProperty m_propertyEnable;
1212
private SerializedProperty m_propertyDefaultMaterial;

Packages/UGF.DebugTools/Editor/DebugGLComponentEditor.cs.meta

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

Packages/UGF.DebugTools/Editor/DebugGLSettingsAssetEditor.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/DebugGLSettingsProvider.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/DebugGLSettingsProvider.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/DebugUISettingsAssetEditor.cs renamed to Packages/UGF.DebugTools/Editor/DebugUIComponentEditor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
namespace UGF.DebugTools.Editor
77
{
8-
[CustomEditor(typeof(DebugUISettingsAsset), true)]
9-
internal class DebugUISettingsAssetEditor : UnityEditor.Editor
8+
[CustomEditor(typeof(DebugUIComponent), true)]
9+
internal class DebugUIComponentEditor : UnityEditor.Editor
1010
{
1111
private SerializedProperty m_propertyEnable;
1212
private SerializedProperty m_propertyScale;

Packages/UGF.DebugTools/Editor/DebugUIComponentEditor.cs.meta

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

Packages/UGF.DebugTools/Editor/DebugUISettingsAssetEditor.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/DebugUISettingsProvider.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/DebugUISettingsProvider.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Packages/UGF.DebugTools/Editor/UGF.DebugTools.Editor.asmdef

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
"rootNamespace": "UGF.DebugTools.Editor",
44
"references": [
55
"GUID:37dddc4e4de3de84f81310a1d1cd5e2c",
6-
"GUID:ff62901452104d14cae29322ac133c05",
7-
"GUID:4806a292f99efd44aba38aea20847e17",
86
"GUID:abdd615e45137c74ca2ce9c636c78c15"
97
],
108
"includePlatforms": [

0 commit comments

Comments
 (0)