Skip to content

Commit a139cc8

Browse files
Add Knife colliders
1 parent 9848018 commit a139cc8

File tree

12 files changed

+250
-142
lines changed

12 files changed

+250
-142
lines changed

Assets/Levels/Stage 1.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ MonoBehaviour:
1717
initialSpeed: 32
1818
angleObjects:
1919
- angle: 119
20-
objectType: 0
20+
objectType: 1

Assets/Levels/Stage 2.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ MonoBehaviour:
1717
initialSpeed: 128
1818
angleObjects:
1919
- angle: 119
20-
objectType: 0
20+
objectType: 1

Assets/Prefabs/Apple.prefab

Lines changed: 61 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,55 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &4873163033378388571
3+
--- !u!1 &3668666866657707775
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 4873163033378388583}
12-
- component: {fileID: 4873163033378388582}
13-
- component: {fileID: 4873163033378388569}
14-
- component: {fileID: 463781191535349612}
15-
- component: {fileID: 6124453430235594041}
11+
- component: {fileID: 4855441562687327847}
12+
- component: {fileID: 4394182972471781503}
1613
m_Layer: 0
17-
m_Name: Apple
14+
m_Name: Render
1815
m_TagString: Untagged
1916
m_Icon: {fileID: 0}
2017
m_NavMeshLayer: 0
2118
m_StaticEditorFlags: 0
2219
m_IsActive: 1
23-
--- !u!4 &4873163033378388583
20+
--- !u!4 &4855441562687327847
2421
Transform:
2522
m_ObjectHideFlags: 0
2623
m_CorrespondingSourceObject: {fileID: 0}
2724
m_PrefabInstance: {fileID: 0}
2825
m_PrefabAsset: {fileID: 0}
29-
m_GameObject: {fileID: 4873163033378388571}
26+
m_GameObject: {fileID: 3668666866657707775}
3027
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3128
m_LocalPosition: {x: 0, y: 0, z: 0}
32-
m_LocalScale: {x: 0.25, y: 0.25, z: 1}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
3330
m_Children: []
34-
m_Father: {fileID: 0}
31+
m_Father: {fileID: 4873163033378388583}
3532
m_RootOrder: 0
3633
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37-
--- !u!33 &4873163033378388582
38-
MeshFilter:
39-
m_ObjectHideFlags: 0
40-
m_CorrespondingSourceObject: {fileID: 0}
41-
m_PrefabInstance: {fileID: 0}
42-
m_PrefabAsset: {fileID: 0}
43-
m_GameObject: {fileID: 4873163033378388571}
44-
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
45-
--- !u!23 &4873163033378388569
46-
MeshRenderer:
34+
--- !u!212 &4394182972471781503
35+
SpriteRenderer:
4736
m_ObjectHideFlags: 0
4837
m_CorrespondingSourceObject: {fileID: 0}
4938
m_PrefabInstance: {fileID: 0}
5039
m_PrefabAsset: {fileID: 0}
51-
m_GameObject: {fileID: 4873163033378388571}
40+
m_GameObject: {fileID: 3668666866657707775}
5241
m_Enabled: 1
53-
m_CastShadows: 1
54-
m_ReceiveShadows: 1
42+
m_CastShadows: 0
43+
m_ReceiveShadows: 0
5544
m_DynamicOccludee: 1
5645
m_MotionVectors: 1
5746
m_LightProbeUsage: 1
5847
m_ReflectionProbeUsage: 1
59-
m_RayTracingMode: 2
48+
m_RayTracingMode: 0
6049
m_RenderingLayerMask: 1
6150
m_RendererPriority: 0
6251
m_Materials:
63-
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
52+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
6453
m_StaticBatchInfo:
6554
firstSubMesh: 0
6655
subMeshCount: 0
@@ -73,14 +62,58 @@ MeshRenderer:
7362
m_IgnoreNormalsForChartDetection: 0
7463
m_ImportantGI: 0
7564
m_StitchLightmapSeams: 1
76-
m_SelectedEditorRenderState: 3
65+
m_SelectedEditorRenderState: 0
7766
m_MinimumChartSize: 4
7867
m_AutoUVMaxDistance: 0.5
7968
m_AutoUVMaxAngle: 89
8069
m_LightmapParameters: {fileID: 0}
8170
m_SortingLayerID: 0
8271
m_SortingLayer: 0
8372
m_SortingOrder: 0
73+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
74+
m_Color: {r: 1, g: 1, b: 1, a: 1}
75+
m_FlipX: 0
76+
m_FlipY: 0
77+
m_DrawMode: 2
78+
m_Size: {x: 0.25, y: 0.25}
79+
m_AdaptiveModeThreshold: 0.5
80+
m_SpriteTileMode: 0
81+
m_WasSpriteAssigned: 1
82+
m_MaskInteraction: 0
83+
m_SpriteSortPoint: 0
84+
--- !u!1 &4873163033378388571
85+
GameObject:
86+
m_ObjectHideFlags: 0
87+
m_CorrespondingSourceObject: {fileID: 0}
88+
m_PrefabInstance: {fileID: 0}
89+
m_PrefabAsset: {fileID: 0}
90+
serializedVersion: 6
91+
m_Component:
92+
- component: {fileID: 4873163033378388583}
93+
- component: {fileID: 463781191535349612}
94+
- component: {fileID: 6124453430235594041}
95+
m_Layer: 0
96+
m_Name: Apple
97+
m_TagString: Untagged
98+
m_Icon: {fileID: 0}
99+
m_NavMeshLayer: 0
100+
m_StaticEditorFlags: 0
101+
m_IsActive: 1
102+
--- !u!4 &4873163033378388583
103+
Transform:
104+
m_ObjectHideFlags: 0
105+
m_CorrespondingSourceObject: {fileID: 0}
106+
m_PrefabInstance: {fileID: 0}
107+
m_PrefabAsset: {fileID: 0}
108+
m_GameObject: {fileID: 4873163033378388571}
109+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
110+
m_LocalPosition: {x: 0, y: 0, z: 0}
111+
m_LocalScale: {x: 1, y: 1, z: 1}
112+
m_Children:
113+
- {fileID: 4855441562687327847}
114+
m_Father: {fileID: 0}
115+
m_RootOrder: 0
116+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
84117
--- !u!61 &463781191535349612
85118
BoxCollider2D:
86119
m_ObjectHideFlags: 0
@@ -105,7 +138,7 @@ BoxCollider2D:
105138
adaptiveTiling: 0
106139
m_AutoTiling: 0
107140
serializedVersion: 2
108-
m_Size: {x: 1, y: 1}
141+
m_Size: {x: 0.25, y: 0.25}
109142
m_EdgeRadius: 0
110143
--- !u!50 &6124453430235594041
111144
Rigidbody2D:

Assets/Prefabs/Knife.prefab

Lines changed: 63 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,55 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &7305310117627508217
3+
--- !u!1 &2622157780918595413
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 7305310117627508165}
12-
- component: {fileID: 7305310117627508164}
13-
- component: {fileID: 7305310117627508219}
14-
- component: {fileID: 3722182541494549366}
15-
- component: {fileID: 4344828171510076192}
16-
- component: {fileID: -5444808443540897917}
11+
- component: {fileID: 1880692307386267771}
12+
- component: {fileID: 5475321395613312673}
1713
m_Layer: 0
18-
m_Name: Knife
19-
m_TagString: Knife
14+
m_Name: New Sprite
15+
m_TagString: Untagged
2016
m_Icon: {fileID: 0}
2117
m_NavMeshLayer: 0
2218
m_StaticEditorFlags: 0
2319
m_IsActive: 1
24-
--- !u!4 &7305310117627508165
20+
--- !u!4 &1880692307386267771
2521
Transform:
2622
m_ObjectHideFlags: 0
2723
m_CorrespondingSourceObject: {fileID: 0}
2824
m_PrefabInstance: {fileID: 0}
2925
m_PrefabAsset: {fileID: 0}
30-
m_GameObject: {fileID: 7305310117627508217}
26+
m_GameObject: {fileID: 2622157780918595413}
3127
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3228
m_LocalPosition: {x: 0, y: 0, z: 0}
33-
m_LocalScale: {x: 0.125, y: 0.5, z: 1}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
3430
m_Children: []
35-
m_Father: {fileID: 0}
31+
m_Father: {fileID: 7305310117627508165}
3632
m_RootOrder: 0
3733
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38-
--- !u!33 &7305310117627508164
39-
MeshFilter:
34+
--- !u!212 &5475321395613312673
35+
SpriteRenderer:
4036
m_ObjectHideFlags: 0
4137
m_CorrespondingSourceObject: {fileID: 0}
4238
m_PrefabInstance: {fileID: 0}
4339
m_PrefabAsset: {fileID: 0}
44-
m_GameObject: {fileID: 7305310117627508217}
45-
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
46-
--- !u!23 &7305310117627508219
47-
MeshRenderer:
48-
m_ObjectHideFlags: 0
49-
m_CorrespondingSourceObject: {fileID: 0}
50-
m_PrefabInstance: {fileID: 0}
51-
m_PrefabAsset: {fileID: 0}
52-
m_GameObject: {fileID: 7305310117627508217}
40+
m_GameObject: {fileID: 2622157780918595413}
5341
m_Enabled: 1
54-
m_CastShadows: 1
55-
m_ReceiveShadows: 1
42+
m_CastShadows: 0
43+
m_ReceiveShadows: 0
5644
m_DynamicOccludee: 1
5745
m_MotionVectors: 1
5846
m_LightProbeUsage: 1
5947
m_ReflectionProbeUsage: 1
60-
m_RayTracingMode: 2
48+
m_RayTracingMode: 0
6149
m_RenderingLayerMask: 1
6250
m_RendererPriority: 0
6351
m_Materials:
64-
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
52+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
6553
m_StaticBatchInfo:
6654
firstSubMesh: 0
6755
subMeshCount: 0
@@ -74,14 +62,59 @@ MeshRenderer:
7462
m_IgnoreNormalsForChartDetection: 0
7563
m_ImportantGI: 0
7664
m_StitchLightmapSeams: 1
77-
m_SelectedEditorRenderState: 3
65+
m_SelectedEditorRenderState: 0
7866
m_MinimumChartSize: 4
7967
m_AutoUVMaxDistance: 0.5
8068
m_AutoUVMaxAngle: 89
8169
m_LightmapParameters: {fileID: 0}
8270
m_SortingLayerID: 0
8371
m_SortingLayer: 0
8472
m_SortingOrder: 0
73+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
74+
m_Color: {r: 1, g: 1, b: 1, a: 1}
75+
m_FlipX: 0
76+
m_FlipY: 0
77+
m_DrawMode: 2
78+
m_Size: {x: 0.125, y: 0.5}
79+
m_AdaptiveModeThreshold: 0.5
80+
m_SpriteTileMode: 0
81+
m_WasSpriteAssigned: 1
82+
m_MaskInteraction: 0
83+
m_SpriteSortPoint: 0
84+
--- !u!1 &7305310117627508217
85+
GameObject:
86+
m_ObjectHideFlags: 0
87+
m_CorrespondingSourceObject: {fileID: 0}
88+
m_PrefabInstance: {fileID: 0}
89+
m_PrefabAsset: {fileID: 0}
90+
serializedVersion: 6
91+
m_Component:
92+
- component: {fileID: 7305310117627508165}
93+
- component: {fileID: 3722182541494549366}
94+
- component: {fileID: 4344828171510076192}
95+
- component: {fileID: -5444808443540897917}
96+
m_Layer: 10
97+
m_Name: Knife
98+
m_TagString: Knife
99+
m_Icon: {fileID: 0}
100+
m_NavMeshLayer: 0
101+
m_StaticEditorFlags: 0
102+
m_IsActive: 1
103+
--- !u!4 &7305310117627508165
104+
Transform:
105+
m_ObjectHideFlags: 0
106+
m_CorrespondingSourceObject: {fileID: 0}
107+
m_PrefabInstance: {fileID: 0}
108+
m_PrefabAsset: {fileID: 0}
109+
m_GameObject: {fileID: 7305310117627508217}
110+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
111+
m_LocalPosition: {x: 0, y: 0, z: 0}
112+
m_LocalScale: {x: 1, y: 1, z: 1}
113+
m_Children:
114+
- {fileID: 1880692307386267771}
115+
m_Father: {fileID: 0}
116+
m_RootOrder: 0
117+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
85118
--- !u!61 &3722182541494549366
86119
BoxCollider2D:
87120
m_ObjectHideFlags: 0
@@ -106,7 +139,7 @@ BoxCollider2D:
106139
adaptiveTiling: 0
107140
m_AutoTiling: 0
108141
serializedVersion: 2
109-
m_Size: {x: 1, y: 1}
142+
m_Size: {x: 0.125, y: 0.5}
110143
m_EdgeRadius: 0
111144
--- !u!50 &4344828171510076192
112145
Rigidbody2D:

0 commit comments

Comments
 (0)