Skip to content

Commit c2042d5

Browse files
CheesenessCheeseness
authored
Merge pull request #114 from jctwood/master
Stop collision between paddle and table
2 parents db2886c + 32f4e4a commit c2042d5

File tree

9 files changed

+98
-94
lines changed

9 files changed

+98
-94
lines changed

‎Assets/entities/paddle/paddle-kednar/paddle_kednar1.prefab‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GameObject:
2020
m_Component:
2121
- component: {fileID: 4333402344084556}
2222
- component: {fileID: 137565355972161342}
23-
m_Layer: 0
23+
m_Layer: 8
2424
m_Name: Plane
2525
m_TagString: Untagged
2626
m_Icon: {fileID: 0}
@@ -46,7 +46,7 @@ GameObject:
4646
- component: {fileID: 65184877789162762}
4747
- component: {fileID: 64160184544417980}
4848
- component: {fileID: 114077496278766262}
49-
m_Layer: 0
49+
m_Layer: 8
5050
m_Name: paddle_kednar1
5151
m_TagString: Paddle
5252
m_Icon: {fileID: 0}
@@ -61,7 +61,7 @@ GameObject:
6161
serializedVersion: 5
6262
m_Component:
6363
- component: {fileID: 4241101952248444}
64-
m_Layer: 0
64+
m_Layer: 8
6565
m_Name: side.L_end
6666
m_TagString: Untagged
6767
m_Icon: {fileID: 0}
@@ -76,7 +76,7 @@ GameObject:
7676
serializedVersion: 5
7777
m_Component:
7878
- component: {fileID: 4245309826442408}
79-
m_Layer: 0
79+
m_Layer: 8
8080
m_Name: side.R
8181
m_TagString: Untagged
8282
m_Icon: {fileID: 0}
@@ -91,7 +91,7 @@ GameObject:
9191
serializedVersion: 5
9292
m_Component:
9393
- component: {fileID: 4165662995570476}
94-
m_Layer: 0
94+
m_Layer: 8
9595
m_Name: side.L
9696
m_TagString: Untagged
9797
m_Icon: {fileID: 0}
@@ -106,7 +106,7 @@ GameObject:
106106
serializedVersion: 5
107107
m_Component:
108108
- component: {fileID: 4372888626353902}
109-
m_Layer: 0
109+
m_Layer: 8
110110
m_Name: Armature
111111
m_TagString: Untagged
112112
m_Icon: {fileID: 0}
@@ -121,7 +121,7 @@ GameObject:
121121
serializedVersion: 5
122122
m_Component:
123123
- component: {fileID: 4014996629165306}
124-
m_Layer: 0
124+
m_Layer: 8
125125
m_Name: slingshot
126126
m_TagString: Untagged
127127
m_Icon: {fileID: 0}
@@ -136,7 +136,7 @@ GameObject:
136136
serializedVersion: 5
137137
m_Component:
138138
- component: {fileID: 4104049851060384}
139-
m_Layer: 0
139+
m_Layer: 8
140140
m_Name: side.R_end
141141
m_TagString: Untagged
142142
m_Icon: {fileID: 0}
@@ -151,7 +151,7 @@ GameObject:
151151
serializedVersion: 5
152152
m_Component:
153153
- component: {fileID: 4689425857533304}
154-
m_Layer: 0
154+
m_Layer: 8
155155
m_Name: slingshot_end
156156
m_TagString: Untagged
157157
m_Icon: {fileID: 0}

‎Assets/entities/paddle/paddle-kednar2/paddle_k2_p1.prefab‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ GameObject:
1919
serializedVersion: 5
2020
m_Component:
2121
- component: {fileID: 4241117769281486}
22-
m_Layer: 0
22+
m_Layer: 8
2323
m_Name: hand.R_end
2424
m_TagString: Untagged
2525
m_Icon: {fileID: 0}
@@ -34,7 +34,7 @@ GameObject:
3434
serializedVersion: 5
3535
m_Component:
3636
- component: {fileID: 4176265711467016}
37-
m_Layer: 0
37+
m_Layer: 8
3838
m_Name: forearm.L.001
3939
m_TagString: Untagged
4040
m_Icon: {fileID: 0}
@@ -49,7 +49,7 @@ GameObject:
4949
serializedVersion: 5
5050
m_Component:
5151
- component: {fileID: 4201873093931040}
52-
m_Layer: 0
52+
m_Layer: 8
5353
m_Name: hand.L
5454
m_TagString: Untagged
5555
m_Icon: {fileID: 0}
@@ -64,7 +64,7 @@ GameObject:
6464
serializedVersion: 5
6565
m_Component:
6666
- component: {fileID: 4395670242579758}
67-
m_Layer: 0
67+
m_Layer: 8
6868
m_Name: arm.L.001
6969
m_TagString: Untagged
7070
m_Icon: {fileID: 0}
@@ -79,7 +79,7 @@ GameObject:
7979
serializedVersion: 5
8080
m_Component:
8181
- component: {fileID: 4980421058845368}
82-
m_Layer: 0
82+
m_Layer: 8
8383
m_Name: arm.R
8484
m_TagString: Untagged
8585
m_Icon: {fileID: 0}
@@ -94,7 +94,7 @@ GameObject:
9494
serializedVersion: 5
9595
m_Component:
9696
- component: {fileID: 4919252079265480}
97-
m_Layer: 0
97+
m_Layer: 8
9898
m_Name: hand.R
9999
m_TagString: Untagged
100100
m_Icon: {fileID: 0}
@@ -109,7 +109,7 @@ GameObject:
109109
serializedVersion: 5
110110
m_Component:
111111
- component: {fileID: 4605257003028250}
112-
m_Layer: 0
112+
m_Layer: 8
113113
m_Name: paddle
114114
m_TagString: Untagged
115115
m_Icon: {fileID: 0}
@@ -124,7 +124,7 @@ GameObject:
124124
serializedVersion: 5
125125
m_Component:
126126
- component: {fileID: 4529914187890306}
127-
m_Layer: 0
127+
m_Layer: 8
128128
m_Name: forearm.R.001_end
129129
m_TagString: Untagged
130130
m_Icon: {fileID: 0}
@@ -139,7 +139,7 @@ GameObject:
139139
serializedVersion: 5
140140
m_Component:
141141
- component: {fileID: 4492037937365644}
142-
m_Layer: 0
142+
m_Layer: 8
143143
m_Name: arm.R.001
144144
m_TagString: Untagged
145145
m_Icon: {fileID: 0}
@@ -165,7 +165,7 @@ GameObject:
165165
- component: {fileID: 65366183662971692}
166166
- component: {fileID: 64408747623793184}
167167
- component: {fileID: 114577559176711594}
168-
m_Layer: 0
168+
m_Layer: 8
169169
m_Name: paddle_k2_p1
170170
m_TagString: Paddle
171171
m_Icon: {fileID: 0}
@@ -180,7 +180,7 @@ GameObject:
180180
serializedVersion: 5
181181
m_Component:
182182
- component: {fileID: 4576431676629230}
183-
m_Layer: 0
183+
m_Layer: 8
184184
m_Name: hand.L_end
185185
m_TagString: Untagged
186186
m_Icon: {fileID: 0}
@@ -195,7 +195,7 @@ GameObject:
195195
serializedVersion: 5
196196
m_Component:
197197
- component: {fileID: 4094864330366550}
198-
m_Layer: 0
198+
m_Layer: 8
199199
m_Name: main
200200
m_TagString: Untagged
201201
m_Icon: {fileID: 0}
@@ -210,7 +210,7 @@ GameObject:
210210
serializedVersion: 5
211211
m_Component:
212212
- component: {fileID: 4842013611058288}
213-
m_Layer: 0
213+
m_Layer: 8
214214
m_Name: forearm.R.001
215215
m_TagString: Untagged
216216
m_Icon: {fileID: 0}
@@ -225,7 +225,7 @@ GameObject:
225225
serializedVersion: 5
226226
m_Component:
227227
- component: {fileID: 4832558632311100}
228-
m_Layer: 0
228+
m_Layer: 8
229229
m_Name: forearm.L.001_end
230230
m_TagString: Untagged
231231
m_Icon: {fileID: 0}
@@ -240,7 +240,7 @@ GameObject:
240240
serializedVersion: 5
241241
m_Component:
242242
- component: {fileID: 4546860172190450}
243-
m_Layer: 0
243+
m_Layer: 8
244244
m_Name: paddle_k2_rig
245245
m_TagString: Untagged
246246
m_Icon: {fileID: 0}
@@ -255,7 +255,7 @@ GameObject:
255255
serializedVersion: 5
256256
m_Component:
257257
- component: {fileID: 4969673278933476}
258-
m_Layer: 0
258+
m_Layer: 8
259259
m_Name: forearm.L
260260
m_TagString: Untagged
261261
m_Icon: {fileID: 0}
@@ -270,7 +270,7 @@ GameObject:
270270
serializedVersion: 5
271271
m_Component:
272272
- component: {fileID: 4844542979181186}
273-
m_Layer: 0
273+
m_Layer: 8
274274
m_Name: forearm.R
275275
m_TagString: Untagged
276276
m_Icon: {fileID: 0}
@@ -287,7 +287,7 @@ GameObject:
287287
- component: {fileID: 4343188087811214}
288288
- component: {fileID: 33300974289969836}
289289
- component: {fileID: 23886679836742166}
290-
m_Layer: 0
290+
m_Layer: 8
291291
m_Name: k2_panel_1
292292
m_TagString: Untagged
293293
m_Icon: {fileID: 0}
@@ -302,7 +302,7 @@ GameObject:
302302
serializedVersion: 5
303303
m_Component:
304304
- component: {fileID: 4972211796517308}
305-
m_Layer: 0
305+
m_Layer: 8
306306
m_Name: arm.L
307307
m_TagString: Untagged
308308
m_Icon: {fileID: 0}
@@ -318,7 +318,7 @@ GameObject:
318318
m_Component:
319319
- component: {fileID: 4673375719718462}
320320
- component: {fileID: 137448341318004968}
321-
m_Layer: 0
321+
m_Layer: 8
322322
m_Name: k2_body_1
323323
m_TagString: Untagged
324324
m_Icon: {fileID: 0}

0 commit comments

Comments
 (0)