Skip to content

Commit 83aa11a

Browse files
ATHellboyATHellboy
committed
- Interface functionality added
- Abstract class functionality added - Derived custom class functionality added - Some code refactoring and bug fixing
1 parent 01151ea commit 83aa11a

File tree

88 files changed

+967
-141
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

+967
-141
lines changed

‎Assets/Example/Prefabs.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/Prefabs/BlockManager.prefab

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &699644917522739232
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: 699644917522739234}
12+
- component: {fileID: 699644917522739233}
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 &699644917522739234
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: 699644917522739232}
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 &699644917522739233
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: 699644917522739232}
41+
m_Enabled: 1
42+
m_EditorHideFlags: 0
43+
m_Script: {fileID: 11500000, guid: 0b13df133f6543a4885a40e882e32370, type: 3}
44+
m_Name:
45+
m_EditorClassIdentifier:
46+
_debug: 0
47+
_blockSettings: {fileID: 11400000, guid: ae25058a40c727e428cbf20f79f0123b, type: 2}
48+
targetBlock:
49+
value: {fileID: 11400000, guid: beb8f83df77db0945bbad5f24d8327d3, type: 2}
50+
targetBlockByGrouping:
51+
value: {fileID: 0}
52+
derivedClassTargetBlock:
53+
value: {fileID: 11400000, guid: 8083fb116ccbcb049ba804205f1d82a5, type: 2}
54+
derivedAbstractClassTargetBlock:
55+
value: {fileID: 11400000, guid: 206a0e01685e06645970a96112a1eb9e, type: 2}
56+
interfaceTargetBlock:
57+
value: {fileID: 11400000, guid: 0062a4372fa0c3d4fa8ceb75c36518d5, type: 2}

‎Assets/Example/Prefabs/BlockManager.prefab.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/Scene/Example.unity

+70-46
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,51 +211,6 @@ Transform:
211211
m_Father: {fileID: 0}
212212
m_RootOrder: 1
213213
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
214-
--- !u!1 &822862908
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: 822862910}
223-
- component: {fileID: 822862909}
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 &822862909
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: 822862908}
238-
m_Enabled: 1
239-
m_EditorHideFlags: 0
240-
m_Script: {fileID: 11500000, guid: 0b13df133f6543a4885a40e882e32370, type: 3}
241-
m_Name:
242-
m_EditorClassIdentifier:
243-
firstTargetBlock: {fileID: 11400000, guid: d629ef1fbd435274d929e2946cb0e75f, type: 2}
244-
secondTargetBlock: {fileID: 11400000, guid: 03da76798a0f9434ca42e4648ab9a4cf, type: 2}
245-
--- !u!4 &822862910
246-
Transform:
247-
m_ObjectHideFlags: 0
248-
m_CorrespondingSourceObject: {fileID: 0}
249-
m_PrefabInstance: {fileID: 0}
250-
m_PrefabAsset: {fileID: 0}
251-
m_GameObject: {fileID: 822862908}
252-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
253-
m_LocalPosition: {x: 0, y: 0, z: 0}
254-
m_LocalScale: {x: 1, y: 1, z: 1}
255-
m_Children: []
256-
m_Father: {fileID: 0}
257-
m_RootOrder: 2
258-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
259214
--- !u!1 &963194225
260215
GameObject:
261216
m_ObjectHideFlags: 0
@@ -339,3 +294,72 @@ Transform:
339294
m_Father: {fileID: 0}
340295
m_RootOrder: 0
341296
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
297+
--- !u!1001 &699644916456341780
298+
PrefabInstance:
299+
m_ObjectHideFlags: 0
300+
serializedVersion: 2
301+
m_Modification:
302+
m_TransformParent: {fileID: 0}
303+
m_Modifications:
304+
- target: {fileID: 699644917522739232, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
305+
type: 3}
306+
propertyPath: m_Name
307+
value: BlockManager
308+
objectReference: {fileID: 0}
309+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
310+
type: 3}
311+
propertyPath: m_LocalPosition.x
312+
value: 0
313+
objectReference: {fileID: 0}
314+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
315+
type: 3}
316+
propertyPath: m_LocalPosition.y
317+
value: 0
318+
objectReference: {fileID: 0}
319+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
320+
type: 3}
321+
propertyPath: m_LocalPosition.z
322+
value: 0
323+
objectReference: {fileID: 0}
324+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
325+
type: 3}
326+
propertyPath: m_LocalRotation.x
327+
value: 0
328+
objectReference: {fileID: 0}
329+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
330+
type: 3}
331+
propertyPath: m_LocalRotation.y
332+
value: 0
333+
objectReference: {fileID: 0}
334+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
335+
type: 3}
336+
propertyPath: m_LocalRotation.z
337+
value: 0
338+
objectReference: {fileID: 0}
339+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
340+
type: 3}
341+
propertyPath: m_LocalRotation.w
342+
value: 1
343+
objectReference: {fileID: 0}
344+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
345+
type: 3}
346+
propertyPath: m_RootOrder
347+
value: 2
348+
objectReference: {fileID: 0}
349+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
350+
type: 3}
351+
propertyPath: m_LocalEulerAnglesHint.x
352+
value: 0
353+
objectReference: {fileID: 0}
354+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
355+
type: 3}
356+
propertyPath: m_LocalEulerAnglesHint.y
357+
value: 0
358+
objectReference: {fileID: 0}
359+
- target: {fileID: 699644917522739234, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0,
360+
type: 3}
361+
propertyPath: m_LocalEulerAnglesHint.z
362+
value: 0
363+
objectReference: {fileID: 0}
364+
m_RemovedComponents: []
365+
m_SourcePrefab: {fileID: 100100000, guid: e451fb8b9c6f9c04b8b5f8d78d088aa0, type: 3}

‎Assets/Example/ScriptableObjects/BlockManagerSettings.asset

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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: e76a637aeef825444afda0107bf92531, type: 3}
13+
m_Name: BlockManagerSettings
14+
m_EditorClassIdentifier:
15+
targetBlock:
16+
value: {fileID: 11400000, guid: 8083fb116ccbcb049ba804205f1d82a5, type: 2}
17+
targetBlockByGrouping:
18+
value: {fileID: 11400000, guid: f1e95e5dbdd8efb4b9e23d547cd2737a, type: 2}
19+
derivedClassTargetBlock:
20+
value: {fileID: 0}
21+
derivedAbstractClassTargetBlock:
22+
value: {fileID: 11400000, guid: 9c519212ccc59264fb30d7ca7afcec14, type: 2}
23+
interfaceTargetBlock:
24+
value: {fileID: 11400000, guid: 6d54653f42ecbf94e97e7cfe0df274ab, type: 2}

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

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Dirt.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/BlockManagerSettings.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/Dirt/Dirt1.asset

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: e76a637aeef825444afda0107bf92531, type: 3}
13-
m_Name: BlockManagerSettings
12+
m_Script: {fileID: 11500000, guid: a0a4448a1a3a77c41b6e02608101e83e, type: 3}
13+
m_Name: Dirt1
1414
m_EditorClassIdentifier:
15-
firstTargetBlock: {fileID: 11400000, guid: 61ccf68aa0c1aaf49863e42dbf5daccb, type: 2}
16-
secondTargetBlock: {fileID: 11400000, guid: b7db1a267a54352409462236e19036f3, type: 2}

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

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+14
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: Dirt2
14+
m_EditorClassIdentifier:

‎Assets/Example/ScriptableObjects/Blocks/Dirt/Dirt2.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+14
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: Dirt3
14+
m_EditorClassIdentifier:

‎Assets/Example/ScriptableObjects/Blocks/Dirt/Dirt3.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+14
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: Dirt4
14+
m_EditorClassIdentifier:

‎Assets/Example/ScriptableObjects/Blocks/Dirt/Dirt4.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/General.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Dirt.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Dirt.asset

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Dirt.asset.meta renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Dirt.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Grass.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Grass.asset

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Grass.asset.meta renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Grass.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Sand.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Sand.asset

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Sand.asset.meta renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Sand.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Snow.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Snow.asset

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Snow.asset.meta renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Snow.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Stone.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Stone.asset

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Stone.asset.meta renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Stone.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Swamp.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Swamp.asset

File renamed without changes.

‎Assets/Example/ScriptableObjects/Blocks/Swamp.asset.meta renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Swamp.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Example/ScriptableObjects/Blocks/Water.asset renamed to ‎Assets/Example/ScriptableObjects/Blocks/General/Water.asset

File renamed without changes.

0 commit comments

Comments
 (0)