Skip to content

Commit 1d9b14a

Browse files
authored
Merge pull request #17 from detjonmataj/merge-helper
Merge all the beta features added to merge helper from dev-dm, dev-dk, dev-kk Singly Linked List from dev-dm (@detjonmataj ) Functions 1. Generate Random 2. Clear List 3. Insert First 4. Insert Last 5. Delete First 6. Delete Last 7. Search Value 8. Delete Value 9. Delete at Position 10. Insert at Position Doubly Linked List from dev-dk (@ComputerGeek5, @es20-cen ) Functions 1. Generate Random 2. Clear List 3. Insert First 4. Insert Last 5. Delete First 6. Delete Last 7. Search Value Circular Linked List from dev-kk(@KevinKollcaku ) Functions 1. Generate Random 2. Clear List 3. Insert First 4. Insert Last 5. Delete First 6. Delete Last 7. Search Value 8. Delete Value 9. Delete at Position 10. Insert at Position 11. Rotate
2 parents d934889 + 8c61d08 commit 1d9b14a

17 files changed

+14054
-3052
lines changed

Assets/Images/StraightLineimg.png

20.4 KB
Loading

Assets/Images/StraightLineimg.png.meta

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

Assets/Prefab/StraightLine.prefab

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &2503446259277267114
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: 4357068936692501535}
12+
- component: {fileID: 5686259984414951522}
13+
- component: {fileID: 1866086436879308325}
14+
m_Layer: 0
15+
m_Name: StraightLine
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &4357068936692501535
22+
Transform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 2503446259277267114}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: -0.8, y: -1.14, z: 3.45}
30+
m_LocalScale: {x: 0.2, y: 0.3, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!212 &5686259984414951522
36+
SpriteRenderer:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 2503446259277267114}
42+
m_Enabled: 1
43+
m_CastShadows: 0
44+
m_ReceiveShadows: 0
45+
m_DynamicOccludee: 1
46+
m_MotionVectors: 1
47+
m_LightProbeUsage: 1
48+
m_ReflectionProbeUsage: 1
49+
m_RayTracingMode: 0
50+
m_RayTraceProcedural: 0
51+
m_RenderingLayerMask: 1
52+
m_RendererPriority: 0
53+
m_Materials:
54+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
55+
m_StaticBatchInfo:
56+
firstSubMesh: 0
57+
subMeshCount: 0
58+
m_StaticBatchRoot: {fileID: 0}
59+
m_ProbeAnchor: {fileID: 0}
60+
m_LightProbeVolumeOverride: {fileID: 0}
61+
m_ScaleInLightmap: 1
62+
m_ReceiveGI: 1
63+
m_PreserveUVs: 0
64+
m_IgnoreNormalsForChartDetection: 0
65+
m_ImportantGI: 0
66+
m_StitchLightmapSeams: 1
67+
m_SelectedEditorRenderState: 0
68+
m_MinimumChartSize: 4
69+
m_AutoUVMaxDistance: 0.5
70+
m_AutoUVMaxAngle: 89
71+
m_LightmapParameters: {fileID: 0}
72+
m_SortingLayerID: 0
73+
m_SortingLayer: 0
74+
m_SortingOrder: 0
75+
m_Sprite: {fileID: 21300000, guid: 8bc1c52cb0dc6a749a09eb8973a663db, type: 3}
76+
m_Color: {r: 1, g: 1, b: 1, a: 1}
77+
m_FlipX: 0
78+
m_FlipY: 0
79+
m_DrawMode: 0
80+
m_Size: {x: 21, y: 15.001465}
81+
m_AdaptiveModeThreshold: 0.5
82+
m_SpriteTileMode: 0
83+
m_WasSpriteAssigned: 1
84+
m_MaskInteraction: 0
85+
m_SpriteSortPoint: 0
86+
--- !u!65 &1866086436879308325
87+
BoxCollider:
88+
m_ObjectHideFlags: 0
89+
m_CorrespondingSourceObject: {fileID: 0}
90+
m_PrefabInstance: {fileID: 0}
91+
m_PrefabAsset: {fileID: 0}
92+
m_GameObject: {fileID: 2503446259277267114}
93+
m_Material: {fileID: 0}
94+
m_IsTrigger: 0
95+
m_Enabled: 1
96+
serializedVersion: 2
97+
m_Size: {x: 3.4, y: 15.001465, z: 0.2}
98+
m_Center: {x: 0, y: 0, z: 0}

Assets/Prefab/StraightLine.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/Prefab/TextCube.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ RectTransform:
123123
m_GameObject: {fileID: 7784379458614453904}
124124
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
125125
m_LocalPosition: {x: 0, y: 0, z: -1}
126-
m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 0.001}
126+
m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 2.85}
127127
m_Children: []
128128
m_Father: {fileID: 6179790032124166069}
129129
m_RootOrder: 0

Assets/Prefab/arrow.prefab

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &5885207926123501819
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: 2091403715643954697}
12+
- component: {fileID: 8275017304345127556}
13+
m_Layer: 0
14+
m_Name: arrow
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &2091403715643954697
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: 5885207926123501819}
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!212 &8275017304345127556
35+
SpriteRenderer:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
m_GameObject: {fileID: 5885207926123501819}
41+
m_Enabled: 1
42+
m_CastShadows: 0
43+
m_ReceiveShadows: 0
44+
m_DynamicOccludee: 1
45+
m_MotionVectors: 1
46+
m_LightProbeUsage: 1
47+
m_ReflectionProbeUsage: 1
48+
m_RayTracingMode: 0
49+
m_RayTraceProcedural: 0
50+
m_RenderingLayerMask: 1
51+
m_RendererPriority: 0
52+
m_Materials:
53+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
54+
m_StaticBatchInfo:
55+
firstSubMesh: 0
56+
subMeshCount: 0
57+
m_StaticBatchRoot: {fileID: 0}
58+
m_ProbeAnchor: {fileID: 0}
59+
m_LightProbeVolumeOverride: {fileID: 0}
60+
m_ScaleInLightmap: 1
61+
m_ReceiveGI: 1
62+
m_PreserveUVs: 0
63+
m_IgnoreNormalsForChartDetection: 0
64+
m_ImportantGI: 0
65+
m_StitchLightmapSeams: 1
66+
m_SelectedEditorRenderState: 0
67+
m_MinimumChartSize: 4
68+
m_AutoUVMaxDistance: 0.5
69+
m_AutoUVMaxAngle: 89
70+
m_LightmapParameters: {fileID: 0}
71+
m_SortingLayerID: 0
72+
m_SortingLayer: 0
73+
m_SortingOrder: 0
74+
m_Sprite: {fileID: 21300000, guid: 1e2482df46705ac4ebaf155071ca756a, type: 3}
75+
m_Color: {r: 1, g: 1, b: 1, a: 1}
76+
m_FlipX: 0
77+
m_FlipY: 0
78+
m_DrawMode: 0
79+
m_Size: {x: 2.25, y: 2.25}
80+
m_AdaptiveModeThreshold: 0.5
81+
m_SpriteTileMode: 0
82+
m_WasSpriteAssigned: 1
83+
m_MaskInteraction: 0
84+
m_SpriteSortPoint: 0

Assets/Prefab/arrow.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/Prefab/currentLabel.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Transform:
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 81824558397936866}
2727
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28-
m_LocalPosition: {x: 0, y: 0, z: 0}
28+
m_LocalPosition: {x: 0, y: 0.6, z: 0}
2929
m_LocalScale: {x: 1, y: 1, z: 1}
3030
m_Children: []
3131
m_Father: {fileID: 0}

0 commit comments

Comments
 (0)