Skip to content

Commit 8e2e41c

Browse files
ATHellboyATHellboy
committed
- Interface functionality added
- Abstract class functionality added - Derived custom class functionality added - Some code refactoring and bug fixing
1 parent 3e15f63 commit 8e2e41c

File tree

88 files changed

+1008
-169
lines changed

Some content is hidden

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

88 files changed

+1008
-169
lines changed

‎Assets/Example/BlockManagerSettings.asset‎

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

‎Assets/Example/Prefabs.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.

‎Assets/Example/Prefabs/BlockManager.prefab‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &5749572176560424828
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 5749572176560424830}
12+
- component: {fileID: 5749572176560424829}
13+
m_Layer: 0
14+
m_Name: BlockManager
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &5749572176560424830
21+
Transform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 5749572176560424828}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: 0, y: 0, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children: []
31+
m_Father: {fileID: 0}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!114 &5749572176560424829
35+
MonoBehaviour:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
m_GameObject: {fileID: 5749572176560424828}
41+
m_Enabled: 1
42+
m_EditorHideFlags: 0
43+
m_Script: {fileID: 11500000, guid: ad5e36d07f2c1074f8b3ca06e7b9bd3e, type: 3}
44+
m_Name:
45+
m_EditorClassIdentifier:
46+
_debug: 0
47+
_blockManagerSettings: {fileID: 11400000, guid: d15dbe612f0db894c81bca7bf9fb063b,
48+
type: 2}
49+
targetBlocks:
50+
values:
51+
- {fileID: 11400000, guid: 06ef197a50150d74bbd59e14971d0d64, type: 2}
52+
- {fileID: 11400000, guid: 7813bad2eca620e4b8ba9ef02c6a51c1, type: 2}
53+
- {fileID: 11400000, guid: e722f56469abf8040abe00b5c7b415a2, type: 2}
54+
targetBlocksByGrouping:
55+
values:
56+
- {fileID: 11400000, guid: 06ef197a50150d74bbd59e14971d0d64, type: 2}
57+
derivedClassTargetBlock:
58+
values:
59+
- {fileID: 11400000, guid: 845bb09fb7a27914aab1ed8e41fa0bc4, type: 2}
60+
- {fileID: 11400000, guid: 0c04c34a666b5ef45b4de17d56b37f7f, type: 2}
61+
derivedAbstractClassTargetBlock:
62+
values:
63+
- {fileID: 11400000, guid: 206a0e01685e06645970a96112a1eb9e, type: 2}
64+
- {fileID: 11400000, guid: 1ae40a6432952284ca40fee094865c94, type: 2}
65+
interfaceTargetBlock:
66+
values:
67+
- {fileID: 11400000, guid: 1a2d527461d5fcc45b670b13a4c6edf1, type: 2}
68+
- {fileID: 11400000, guid: cb9a5c190c16c074bb08579d9b9c1084, type: 2}
69+
- {fileID: 11400000, guid: f08e908af041baa49b12fc391937dc75, type: 2}
70+
- {fileID: 11400000, guid: 497631a3e68e18343a6ceb125aed4f7a, type: 2}
71+
- {fileID: 11400000, guid: 0062a4372fa0c3d4fa8ceb75c36518d5, type: 2}
72+
- {fileID: 11400000, guid: 40ec20c9b0451bf4899aeb7d3192c53c, type: 2}

‎Assets/Example/Prefabs/BlockManager.prefab.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.

‎Assets/Example/Scenes/Example.unity‎

Lines changed: 70 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ LightmapSettings:
9494
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
9595
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9696
m_PVRFilteringAtrousPositionSigmaAO: 1
97-
m_ShowResolutionOverlay: 1
9897
m_ExportTrainingData: 0
98+
m_TrainingDataDestination: TrainingData
9999
m_LightingDataAsset: {fileID: 0}
100100
m_UseShadowmask: 1
101101
--- !u!196 &4
@@ -211,64 +211,6 @@ Transform:
211211
m_Father: {fileID: 0}
212212
m_RootOrder: 1
213213
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
214-
--- !u!1 &852145776
215-
GameObject:
216-
m_ObjectHideFlags: 0
217-
m_CorrespondingSourceObject: {fileID: 0}
218-
m_PrefabInstance: {fileID: 0}
219-
m_PrefabAsset: {fileID: 0}
220-
serializedVersion: 6
221-
m_Component:
222-
- component: {fileID: 852145778}
223-
- component: {fileID: 852145777}
224-
m_Layer: 0
225-
m_Name: BlockManager
226-
m_TagString: Untagged
227-
m_Icon: {fileID: 0}
228-
m_NavMeshLayer: 0
229-
m_StaticEditorFlags: 0
230-
m_IsActive: 1
231-
--- !u!114 &852145777
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: 852145776}
238-
m_Enabled: 1
239-
m_EditorHideFlags: 0
240-
m_Script: {fileID: 11500000, guid: ad5e36d07f2c1074f8b3ca06e7b9bd3e, type: 3}
241-
m_Name:
242-
m_EditorClassIdentifier:
243-
firstTargetBlocks:
244-
values:
245-
- {fileID: 11400000, guid: 06ef197a50150d74bbd59e14971d0d64, type: 2}
246-
- {fileID: 11400000, guid: b2ad02b3fe2a980418912ccc895ec331, type: 2}
247-
- {fileID: 11400000, guid: 85a6b7c369d930a4b9e0f4f4a91ee957, type: 2}
248-
- {fileID: 11400000, guid: 7813bad2eca620e4b8ba9ef02c6a51c1, type: 2}
249-
secondTargetBlocks:
250-
values:
251-
- {fileID: 11400000, guid: 06ef197a50150d74bbd59e14971d0d64, type: 2}
252-
- {fileID: 11400000, guid: b2ad02b3fe2a980418912ccc895ec331, type: 2}
253-
- {fileID: 11400000, guid: 71e7cba0d9c18cb4cbd3514fd9edf794, type: 2}
254-
- {fileID: 11400000, guid: 85a6b7c369d930a4b9e0f4f4a91ee957, type: 2}
255-
- {fileID: 11400000, guid: 7813bad2eca620e4b8ba9ef02c6a51c1, type: 2}
256-
- {fileID: 11400000, guid: e722f56469abf8040abe00b5c7b415a2, type: 2}
257-
- {fileID: 11400000, guid: eba01a4723edb6e4fb8f2e1569b40d81, type: 2}
258-
--- !u!4 &852145778
259-
Transform:
260-
m_ObjectHideFlags: 0
261-
m_CorrespondingSourceObject: {fileID: 0}
262-
m_PrefabInstance: {fileID: 0}
263-
m_PrefabAsset: {fileID: 0}
264-
m_GameObject: {fileID: 852145776}
265-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
266-
m_LocalPosition: {x: 0, y: 0, z: 0}
267-
m_LocalScale: {x: 1, y: 1, z: 1}
268-
m_Children: []
269-
m_Father: {fileID: 0}
270-
m_RootOrder: 2
271-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
272214
--- !u!1 &963194225
273215
GameObject:
274216
m_ObjectHideFlags: 0
@@ -352,3 +294,72 @@ Transform:
352294
m_Father: {fileID: 0}
353295
m_RootOrder: 0
354296
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
297+
--- !u!1001 &5749572176798822668
298+
PrefabInstance:
299+
m_ObjectHideFlags: 0
300+
serializedVersion: 2
301+
m_Modification:
302+
m_TransformParent: {fileID: 0}
303+
m_Modifications:
304+
- target: {fileID: 5749572176560424828, guid: 8b61ad661b9b569469c8e5c63f5b3100,
305+
type: 3}
306+
propertyPath: m_Name
307+
value: BlockManager
308+
objectReference: {fileID: 0}
309+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
310+
type: 3}
311+
propertyPath: m_LocalPosition.x
312+
value: 0
313+
objectReference: {fileID: 0}
314+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
315+
type: 3}
316+
propertyPath: m_LocalPosition.y
317+
value: 0
318+
objectReference: {fileID: 0}
319+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
320+
type: 3}
321+
propertyPath: m_LocalPosition.z
322+
value: 0
323+
objectReference: {fileID: 0}
324+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
325+
type: 3}
326+
propertyPath: m_LocalRotation.x
327+
value: 0
328+
objectReference: {fileID: 0}
329+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
330+
type: 3}
331+
propertyPath: m_LocalRotation.y
332+
value: 0
333+
objectReference: {fileID: 0}
334+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
335+
type: 3}
336+
propertyPath: m_LocalRotation.z
337+
value: 0
338+
objectReference: {fileID: 0}
339+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
340+
type: 3}
341+
propertyPath: m_LocalRotation.w
342+
value: 1
343+
objectReference: {fileID: 0}
344+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
345+
type: 3}
346+
propertyPath: m_RootOrder
347+
value: 2
348+
objectReference: {fileID: 0}
349+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
350+
type: 3}
351+
propertyPath: m_LocalEulerAnglesHint.x
352+
value: 0
353+
objectReference: {fileID: 0}
354+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
355+
type: 3}
356+
propertyPath: m_LocalEulerAnglesHint.y
357+
value: 0
358+
objectReference: {fileID: 0}
359+
- target: {fileID: 5749572176560424830, guid: 8b61ad661b9b569469c8e5c63f5b3100,
360+
type: 3}
361+
propertyPath: m_LocalEulerAnglesHint.z
362+
value: 0
363+
objectReference: {fileID: 0}
364+
m_RemovedComponents: []
365+
m_SourcePrefab: {fileID: 100100000, guid: 8b61ad661b9b569469c8e5c63f5b3100, type: 3}

‎Assets/Example/ScriptableObjects/BlockManagerSettings.asset‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 51edcd5a81e4a05408d77f4332faf02a, type: 3}
13+
m_Name: BlockManagerSettings
14+
m_EditorClassIdentifier:
15+
targetBlocks:
16+
values:
17+
- {fileID: 11400000, guid: b2ad02b3fe2a980418912ccc895ec331, type: 2}
18+
- {fileID: 11400000, guid: 71e7cba0d9c18cb4cbd3514fd9edf794, type: 2}
19+
- {fileID: 11400000, guid: 7813bad2eca620e4b8ba9ef02c6a51c1, type: 2}
20+
- {fileID: 11400000, guid: e722f56469abf8040abe00b5c7b415a2, type: 2}
21+
- {fileID: 11400000, guid: eba01a4723edb6e4fb8f2e1569b40d81, type: 2}
22+
- {fileID: 11400000, guid: c2077eb71dcaf63429b38a89513e4084, type: 2}
23+
- {fileID: 11400000, guid: 0c04c34a666b5ef45b4de17d56b37f7f, type: 2}
24+
targetBlocksByGrouping:
25+
values:
26+
- {fileID: 11400000, guid: b2ad02b3fe2a980418912ccc895ec331, type: 2}
27+
derivedClassTargetBlock:
28+
values:
29+
- {fileID: 11400000, guid: 845bb09fb7a27914aab1ed8e41fa0bc4, type: 2}
30+
- {fileID: 11400000, guid: 0c04c34a666b5ef45b4de17d56b37f7f, type: 2}
31+
derivedAbstractClassTargetBlock:
32+
values:
33+
- {fileID: 11400000, guid: 206a0e01685e06645970a96112a1eb9e, type: 2}
34+
- {fileID: 11400000, guid: 48d64063107d2bd4d83cf0d7975beda9, type: 2}
35+
- {fileID: 11400000, guid: 64d18f463ab236e44b677bb5ca09404b, type: 2}
36+
- {fileID: 11400000, guid: 1ae40a6432952284ca40fee094865c94, type: 2}
37+
- {fileID: 11400000, guid: 5b6a863cb5e4ac3409e4c4b9d2cc226d, type: 2}
38+
interfaceTargetBlock:
39+
values: []

Assets/Example/BlockManagerSettings.asset.meta renamed to Assets/Example/ScriptableObjects/BlockManagerSettings.asset.meta

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Dirt.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.

‎Assets/Example/ScriptableObjects/Blocks/Dirt/Dirt1.asset‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: a0a4448a1a3a77c41b6e02608101e83e, type: 3}
13+
m_Name: Dirt1
14+
m_EditorClassIdentifier:

‎Assets/Example/ScriptableObjects/Blocks/Dirt/Dirt1.asset.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.

0 commit comments

Comments
 (0)