Skip to content

Commit 9848018

Browse files
Add Knife collider
1 parent 886778e commit 9848018

File tree

16 files changed

+390
-105
lines changed

16 files changed

+390
-105
lines changed
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 7d02ee1190fbb4449a60931ed977bd6a, type: 3}
13-
m_Name: Level 1
12+
m_Script: {fileID: 11500000, guid: 40a5796d1baa77246ba5de086b53fbdf, type: 3}
13+
m_Name: Stage 1
1414
m_EditorClassIdentifier:
15-
lifes: 7
15+
shoots: 2
1616
boss: 0
17-
initialSpeed: 1
17+
initialSpeed: 32
1818
angleObjects:
1919
- angle: 119
2020
objectType: 0
21-
- angle: 0
22-
objectType: 0
23-
- angle: 0
24-
objectType: 0
25-
- angle: 0
26-
objectType: 0

Assets/Levels/Stage 2.asset

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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: 40a5796d1baa77246ba5de086b53fbdf, type: 3}
13+
m_Name: Stage 2
14+
m_EditorClassIdentifier:
15+
shoots: 7
16+
boss: 0
17+
initialSpeed: 128
18+
angleObjects:
19+
- angle: 119
20+
objectType: 0

Assets/Levels/Stage 2.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.

Assets/Prefabs/Apple.prefab

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ GameObject:
1111
- component: {fileID: 4873163033378388583}
1212
- component: {fileID: 4873163033378388582}
1313
- component: {fileID: 4873163033378388569}
14-
- component: {fileID: 4873163033378388568}
14+
- component: {fileID: 463781191535349612}
15+
- component: {fileID: 6124453430235594041}
1516
m_Layer: 0
1617
m_Name: Apple
1718
m_TagString: Untagged
@@ -80,16 +81,50 @@ MeshRenderer:
8081
m_SortingLayerID: 0
8182
m_SortingLayer: 0
8283
m_SortingOrder: 0
83-
--- !u!65 &4873163033378388568
84-
BoxCollider:
84+
--- !u!61 &463781191535349612
85+
BoxCollider2D:
8586
m_ObjectHideFlags: 0
8687
m_CorrespondingSourceObject: {fileID: 0}
8788
m_PrefabInstance: {fileID: 0}
8889
m_PrefabAsset: {fileID: 0}
8990
m_GameObject: {fileID: 4873163033378388571}
90-
m_Material: {fileID: 0}
91-
m_IsTrigger: 0
9291
m_Enabled: 1
92+
m_Density: 1
93+
m_Material: {fileID: 0}
94+
m_IsTrigger: 1
95+
m_UsedByEffector: 0
96+
m_UsedByComposite: 0
97+
m_Offset: {x: 0, y: 0}
98+
m_SpriteTilingProperty:
99+
border: {x: 0, y: 0, z: 0, w: 0}
100+
pivot: {x: 0, y: 0}
101+
oldSize: {x: 0, y: 0}
102+
newSize: {x: 0, y: 0}
103+
adaptiveTilingThreshold: 0
104+
drawMode: 0
105+
adaptiveTiling: 0
106+
m_AutoTiling: 0
93107
serializedVersion: 2
94-
m_Size: {x: 1, y: 1, z: 1}
95-
m_Center: {x: 0, y: 0, z: 0}
108+
m_Size: {x: 1, y: 1}
109+
m_EdgeRadius: 0
110+
--- !u!50 &6124453430235594041
111+
Rigidbody2D:
112+
serializedVersion: 4
113+
m_ObjectHideFlags: 0
114+
m_CorrespondingSourceObject: {fileID: 0}
115+
m_PrefabInstance: {fileID: 0}
116+
m_PrefabAsset: {fileID: 0}
117+
m_GameObject: {fileID: 4873163033378388571}
118+
m_BodyType: 1
119+
m_Simulated: 1
120+
m_UseFullKinematicContacts: 0
121+
m_UseAutoMass: 0
122+
m_Mass: 1
123+
m_LinearDrag: 0
124+
m_AngularDrag: 0.05
125+
m_GravityScale: 1
126+
m_Material: {fileID: 0}
127+
m_Interpolate: 0
128+
m_SleepingMode: 1
129+
m_CollisionDetection: 0
130+
m_Constraints: 0

Assets/Prefabs/Knife.prefab

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ GameObject:
1111
- component: {fileID: 7305310117627508165}
1212
- component: {fileID: 7305310117627508164}
1313
- component: {fileID: 7305310117627508219}
14-
- component: {fileID: 7305310117627508218}
15-
- component: {fileID: -3529474764473007745}
14+
- component: {fileID: 3722182541494549366}
15+
- component: {fileID: 4344828171510076192}
16+
- component: {fileID: -5444808443540897917}
1617
m_Layer: 0
1718
m_Name: Knife
18-
m_TagString: Untagged
19+
m_TagString: Knife
1920
m_Icon: {fileID: 0}
2021
m_NavMeshLayer: 0
2122
m_StaticEditorFlags: 0
@@ -81,20 +82,54 @@ MeshRenderer:
8182
m_SortingLayerID: 0
8283
m_SortingLayer: 0
8384
m_SortingOrder: 0
84-
--- !u!65 &7305310117627508218
85-
BoxCollider:
85+
--- !u!61 &3722182541494549366
86+
BoxCollider2D:
8687
m_ObjectHideFlags: 0
8788
m_CorrespondingSourceObject: {fileID: 0}
8889
m_PrefabInstance: {fileID: 0}
8990
m_PrefabAsset: {fileID: 0}
9091
m_GameObject: {fileID: 7305310117627508217}
91-
m_Material: {fileID: 0}
92-
m_IsTrigger: 0
9392
m_Enabled: 1
93+
m_Density: 1
94+
m_Material: {fileID: 0}
95+
m_IsTrigger: 1
96+
m_UsedByEffector: 0
97+
m_UsedByComposite: 0
98+
m_Offset: {x: 0, y: 0}
99+
m_SpriteTilingProperty:
100+
border: {x: 0, y: 0, z: 0, w: 0}
101+
pivot: {x: 0, y: 0}
102+
oldSize: {x: 0, y: 0}
103+
newSize: {x: 0, y: 0}
104+
adaptiveTilingThreshold: 0
105+
drawMode: 0
106+
adaptiveTiling: 0
107+
m_AutoTiling: 0
94108
serializedVersion: 2
95-
m_Size: {x: 1, y: 1, z: 1}
96-
m_Center: {x: 0, y: 0, z: 0}
97-
--- !u!114 &-3529474764473007745
109+
m_Size: {x: 1, y: 1}
110+
m_EdgeRadius: 0
111+
--- !u!50 &4344828171510076192
112+
Rigidbody2D:
113+
serializedVersion: 4
114+
m_ObjectHideFlags: 0
115+
m_CorrespondingSourceObject: {fileID: 0}
116+
m_PrefabInstance: {fileID: 0}
117+
m_PrefabAsset: {fileID: 0}
118+
m_GameObject: {fileID: 7305310117627508217}
119+
m_BodyType: 1
120+
m_Simulated: 1
121+
m_UseFullKinematicContacts: 0
122+
m_UseAutoMass: 0
123+
m_Mass: 1
124+
m_LinearDrag: 0
125+
m_AngularDrag: 0.05
126+
m_GravityScale: 1
127+
m_Material: {fileID: 0}
128+
m_Interpolate: 0
129+
m_SleepingMode: 1
130+
m_CollisionDetection: 0
131+
m_Constraints: 0
132+
--- !u!114 &-5444808443540897917
98133
MonoBehaviour:
99134
m_ObjectHideFlags: 0
100135
m_CorrespondingSourceObject: {fileID: 0}
@@ -103,7 +138,7 @@ MonoBehaviour:
103138
m_GameObject: {fileID: 7305310117627508217}
104139
m_Enabled: 1
105140
m_EditorHideFlags: 0
106-
m_Script: {fileID: 11500000, guid: 32f8dfc0bc6ac474db13ed5624964444, type: 3}
141+
m_Script: {fileID: 11500000, guid: 4ff2cb9f1bf80674e9db982cb6054236, type: 3}
107142
m_Name:
108143
m_EditorClassIdentifier:
109-
speed: 1
144+
isPlayer: 0

0 commit comments

Comments
 (0)