Skip to content

Commit 2b4b54d

Browse files
12joan12joan
authored
Rescale level 1 (#127)
* Use SortingGroup for Pixie sprites * Use Character layer for bullets * Sort bullets on top of walk boundary * Don't let grenades rest on vertical faces * Rescale level 1 * Rescale access terminal * Rescale doors * Update positions in level * Add presence board to level background * Add remaining vertical faces
1 parent 1255324 commit 2b4b54d

36 files changed

+3112
-1861
lines changed

‎Assets/Resources/Bullets/Generic Grenade.prefab‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,54 @@ MonoBehaviour:
153153
m_BlockingMask:
154154
serializedVersion: 2
155155
m_Bits: 4294967295
156+
--- !u!1 &6825878281874802974
157+
GameObject:
158+
m_ObjectHideFlags: 0
159+
m_CorrespondingSourceObject: {fileID: 0}
160+
m_PrefabInstance: {fileID: 0}
161+
m_PrefabAsset: {fileID: 0}
162+
serializedVersion: 6
163+
m_Component:
164+
- component: {fileID: 5692111671776397543}
165+
- component: {fileID: 7289461456034618388}
166+
m_Layer: 0
167+
m_Name: Fall From Vertical Face
168+
m_TagString: Untagged
169+
m_Icon: {fileID: 0}
170+
m_NavMeshLayer: 0
171+
m_StaticEditorFlags: 0
172+
m_IsActive: 1
173+
--- !u!4 &5692111671776397543
174+
Transform:
175+
m_ObjectHideFlags: 0
176+
m_CorrespondingSourceObject: {fileID: 0}
177+
m_PrefabInstance: {fileID: 0}
178+
m_PrefabAsset: {fileID: 0}
179+
m_GameObject: {fileID: 6825878281874802974}
180+
serializedVersion: 2
181+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
182+
m_LocalPosition: {x: 0, y: 0, z: 0}
183+
m_LocalScale: {x: 4, y: 4, z: 4}
184+
m_ConstrainProportionsScale: 0
185+
m_Children: []
186+
m_Father: {fileID: 3154565098136751856}
187+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
188+
--- !u!114 &7289461456034618388
189+
MonoBehaviour:
190+
m_ObjectHideFlags: 0
191+
m_CorrespondingSourceObject: {fileID: 0}
192+
m_PrefabInstance: {fileID: 0}
193+
m_PrefabAsset: {fileID: 0}
194+
m_GameObject: {fileID: 6825878281874802974}
195+
m_Enabled: 1
196+
m_EditorHideFlags: 0
197+
m_Script: {fileID: 11500000, guid: 4c9bd004740ac4b618536fbf095bd18e, type: 3}
198+
m_Name:
199+
m_EditorClassIdentifier:
200+
BulletLayer: {fileID: 3125628876245582877}
201+
Rigidbody: {fileID: 3132916451169411846}
202+
GrenadeWaitingBeforeThrow: {fileID: 6190657918269877258}
203+
Gravity: 60
156204
--- !u!1001 &2019188914341765480
157205
PrefabInstance:
158206
m_ObjectHideFlags: 0
@@ -387,6 +435,10 @@ PrefabInstance:
387435
- {fileID: 8876649700796538210, guid: d851732923cc64201b6cdb6c0c5701cd, type: 3}
388436
m_RemovedGameObjects: []
389437
m_AddedGameObjects:
438+
- targetCorrespondingSourceObject: {fileID: 8930779186304927626, guid: d851732923cc64201b6cdb6c0c5701cd,
439+
type: 3}
440+
insertIndex: -1
441+
addedObject: {fileID: 5692111671776397543}
390442
- targetCorrespondingSourceObject: {fileID: 8930779186304927626, guid: d851732923cc64201b6cdb6c0c5701cd,
391443
type: 3}
392444
insertIndex: -1
@@ -431,6 +483,18 @@ TrailRenderer:
431483
type: 3}
432484
m_PrefabInstance: {fileID: 5780304582548719994}
433485
m_PrefabAsset: {fileID: 0}
486+
--- !u!114 &3125628876245582877 stripped
487+
MonoBehaviour:
488+
m_CorrespondingSourceObject: {fileID: 8887768667164724583, guid: d851732923cc64201b6cdb6c0c5701cd,
489+
type: 3}
490+
m_PrefabInstance: {fileID: 5780304582548719994}
491+
m_PrefabAsset: {fileID: 0}
492+
m_GameObject: {fileID: 0}
493+
m_Enabled: 1
494+
m_EditorHideFlags: 0
495+
m_Script: {fileID: 11500000, guid: ba11cef232bad45e89db8be3b191bde5, type: 3}
496+
m_Name:
497+
m_EditorClassIdentifier:
434498
--- !u!50 &3132916451169411846 stripped
435499
Rigidbody2D:
436500
m_CorrespondingSourceObject: {fileID: 8884931971228052092, guid: d851732923cc64201b6cdb6c0c5701cd,
@@ -579,3 +643,4 @@ MonoBehaviour:
579643
type: 3}
580644
ExplosionSound: {fileID: 2976656870268503580, guid: d1de24f008aa1453489e4ba94cebbe30,
581645
type: 3}
646+
Debris: {fileID: 0}

‎Assets/Resources/Bullets/GenericBullet.prefab‎

Lines changed: 93 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,90 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &744171848925003343
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: 7401179488315242871}
12+
- component: {fileID: 8887768667164724583}
13+
- component: {fileID: 7496961935948527964}
14+
m_Layer: 7
15+
m_Name: Bullet Layer
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &7401179488315242871
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: 744171848925003343}
28+
serializedVersion: 2
29+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
30+
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_ConstrainProportionsScale: 0
33+
m_Children: []
34+
m_Father: {fileID: 8930779186304927626}
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!114 &8887768667164724583
37+
MonoBehaviour:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 744171848925003343}
43+
m_Enabled: 1
44+
m_EditorHideFlags: 0
45+
m_Script: {fileID: 11500000, guid: ba11cef232bad45e89db8be3b191bde5, type: 3}
46+
m_Name:
47+
m_EditorClassIdentifier:
48+
DefaultLayer: Character
49+
TouchingWalkBoundaryLayer: Top layer
50+
SpriteRenderer: {fileID: 8722506420512878562}
51+
TrailRenderer: {fileID: 8838713438586547750}
52+
TouchingWalkBoundaries: 0
53+
--- !u!58 &7496961935948527964
54+
CircleCollider2D:
55+
m_ObjectHideFlags: 0
56+
m_CorrespondingSourceObject: {fileID: 0}
57+
m_PrefabInstance: {fileID: 0}
58+
m_PrefabAsset: {fileID: 0}
59+
m_GameObject: {fileID: 744171848925003343}
60+
m_Enabled: 1
61+
m_Density: 1
62+
m_Material: {fileID: 0}
63+
m_IncludeLayers:
64+
serializedVersion: 2
65+
m_Bits: 4294967295
66+
m_ExcludeLayers:
67+
serializedVersion: 2
68+
m_Bits: 0
69+
m_LayerOverridePriority: 0
70+
m_ForceSendLayers:
71+
serializedVersion: 2
72+
m_Bits: 4294967295
73+
m_ForceReceiveLayers:
74+
serializedVersion: 2
75+
m_Bits: 4294967295
76+
m_ContactCaptureLayers:
77+
serializedVersion: 2
78+
m_Bits: 4294967295
79+
m_CallbackLayers:
80+
serializedVersion: 2
81+
m_Bits: 4294967295
82+
m_IsTrigger: 1
83+
m_UsedByEffector: 0
84+
m_UsedByComposite: 0
85+
m_Offset: {x: 0, y: 0}
86+
serializedVersion: 2
87+
m_Radius: 0.5
388
--- !u!1 &8934373914239993322
489
GameObject:
590
m_ObjectHideFlags: 0
@@ -36,7 +121,8 @@ Transform:
36121
m_LocalPosition: {x: 0, y: 0, z: 0}
37122
m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
38123
m_ConstrainProportionsScale: 0
39-
m_Children: []
124+
m_Children:
125+
- {fileID: 7401179488315242871}
40126
m_Father: {fileID: 0}
41127
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
42128
--- !u!212 &8722506420512878562
@@ -77,9 +163,9 @@ SpriteRenderer:
77163
m_AutoUVMaxDistance: 0.5
78164
m_AutoUVMaxAngle: 89
79165
m_LightmapParameters: {fileID: 0}
80-
m_SortingLayerID: 1633601125
81-
m_SortingLayer: 3
82-
m_SortingOrder: 7
166+
m_SortingLayerID: 1415191237
167+
m_SortingLayer: 4
168+
m_SortingOrder: 0
83169
m_Sprite: {fileID: 21300000, guid: 1969fb4e6a8f0481bb82f2ce3e1bcdb0, type: 3}
84170
m_Color: {r: 1, g: 1, b: 1, a: 1}
85171
m_FlipX: 0
@@ -256,9 +342,9 @@ TrailRenderer:
256342
m_AutoUVMaxDistance: 0.5
257343
m_AutoUVMaxAngle: 89
258344
m_LightmapParameters: {fileID: 0}
259-
m_SortingLayerID: 1633601125
260-
m_SortingLayer: 3
261-
m_SortingOrder: 4
345+
m_SortingLayerID: 1415191237
346+
m_SortingLayer: 4
347+
m_SortingOrder: 0
262348
m_Time: 0.1
263349
m_PreviewTimeScale: 1
264350
m_Parameters:

‎Assets/Unity/Animations/Pixie/Crouch.anim‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ AnimationClip:
3030
m_PreInfinity: 2
3131
m_PostInfinity: 2
3232
m_RotationOrder: 4
33-
path: Sprite Group/Body/Head Group
33+
path: Sprite Group/Pivot/Body/Head Group
3434
- curve:
3535
serializedVersion: 2
3636
m_Curve:
@@ -46,7 +46,7 @@ AnimationClip:
4646
m_PreInfinity: 2
4747
m_PostInfinity: 2
4848
m_RotationOrder: 4
49-
path: Sprite Group/Body/Torso Group
49+
path: Sprite Group/Pivot/Body/Torso Group
5050
m_ScaleCurves: []
5151
m_FloatCurves: []
5252
m_PPtrCurves: []
@@ -114,7 +114,7 @@ AnimationClip:
114114
m_PostInfinity: 2
115115
m_RotationOrder: 4
116116
attribute: m_LocalPosition.x
117-
path: Sprite Group/Body/Head Group
117+
path: Sprite Group/Pivot/Body/Head Group
118118
classID: 4
119119
script: {fileID: 0}
120120
flags: 0
@@ -135,7 +135,7 @@ AnimationClip:
135135
m_PostInfinity: 2
136136
m_RotationOrder: 4
137137
attribute: m_LocalPosition.y
138-
path: Sprite Group/Body/Head Group
138+
path: Sprite Group/Pivot/Body/Head Group
139139
classID: 4
140140
script: {fileID: 0}
141141
flags: 0
@@ -156,7 +156,7 @@ AnimationClip:
156156
m_PostInfinity: 2
157157
m_RotationOrder: 4
158158
attribute: m_LocalPosition.z
159-
path: Sprite Group/Body/Head Group
159+
path: Sprite Group/Pivot/Body/Head Group
160160
classID: 4
161161
script: {fileID: 0}
162162
flags: 0
@@ -177,7 +177,7 @@ AnimationClip:
177177
m_PostInfinity: 2
178178
m_RotationOrder: 4
179179
attribute: m_LocalPosition.x
180-
path: Sprite Group/Body/Torso Group
180+
path: Sprite Group/Pivot/Body/Torso Group
181181
classID: 4
182182
script: {fileID: 0}
183183
flags: 0
@@ -198,7 +198,7 @@ AnimationClip:
198198
m_PostInfinity: 2
199199
m_RotationOrder: 4
200200
attribute: m_LocalPosition.y
201-
path: Sprite Group/Body/Torso Group
201+
path: Sprite Group/Pivot/Body/Torso Group
202202
classID: 4
203203
script: {fileID: 0}
204204
flags: 0
@@ -219,7 +219,7 @@ AnimationClip:
219219
m_PostInfinity: 2
220220
m_RotationOrder: 4
221221
attribute: m_LocalPosition.z
222-
path: Sprite Group/Body/Torso Group
222+
path: Sprite Group/Pivot/Body/Torso Group
223223
classID: 4
224224
script: {fileID: 0}
225225
flags: 0

‎Assets/Unity/Animations/Pixie/Face Left.anim‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ AnimationClip:
4343
m_PostInfinity: 2
4444
m_RotationOrder: 4
4545
attribute: m_FlipX
46-
path: Sprite Group/Body/Legs Group/Left Leg
46+
path: Sprite Group/Pivot/Body/Legs Group/Left Leg
4747
classID: 212
4848
script: {fileID: 0}
4949
flags: 0
@@ -73,7 +73,7 @@ AnimationClip:
7373
m_PostInfinity: 2
7474
m_RotationOrder: 4
7575
attribute: m_FlipX
76-
path: Sprite Group/Body/Legs Group/Right Leg
76+
path: Sprite Group/Pivot/Body/Legs Group/Right Leg
7777
classID: 212
7878
script: {fileID: 0}
7979
flags: 0
@@ -103,7 +103,7 @@ AnimationClip:
103103
m_PostInfinity: 2
104104
m_RotationOrder: 4
105105
attribute: m_FlipX
106-
path: Sprite Group/Body/Head Group/Head
106+
path: Sprite Group/Pivot/Body/Head Group/Head
107107
classID: 212
108108
script: {fileID: 0}
109109
flags: 0
@@ -133,7 +133,7 @@ AnimationClip:
133133
m_PostInfinity: 2
134134
m_RotationOrder: 4
135135
attribute: m_FlipX
136-
path: Sprite Group/Body/Torso Group/Torso
136+
path: Sprite Group/Pivot/Body/Torso Group/Torso
137137
classID: 212
138138
script: {fileID: 0}
139139
flags: 0
@@ -163,7 +163,7 @@ AnimationClip:
163163
m_PostInfinity: 2
164164
m_RotationOrder: 4
165165
attribute: m_FlipX
166-
path: Sprite Group/Body/Torso Group/Fist
166+
path: Sprite Group/Pivot/Body/Torso Group/Fist
167167
classID: 212
168168
script: {fileID: 0}
169169
flags: 0
@@ -193,7 +193,7 @@ AnimationClip:
193193
m_PostInfinity: 2
194194
m_RotationOrder: 4
195195
attribute: m_FlipX
196-
path: Sprite Group/Body/Torso Group/Equipped Weapon
196+
path: Sprite Group/Pivot/Body/Torso Group/Equipped Weapon
197197
classID: 212
198198
script: {fileID: 0}
199199
flags: 0
@@ -307,7 +307,7 @@ AnimationClip:
307307
m_PostInfinity: 2
308308
m_RotationOrder: 4
309309
attribute: m_FlipX
310-
path: Sprite Group/Body/Legs Group/Left Leg
310+
path: Sprite Group/Pivot/Body/Legs Group/Left Leg
311311
classID: 212
312312
script: {fileID: 0}
313313
flags: 0
@@ -337,7 +337,7 @@ AnimationClip:
337337
m_PostInfinity: 2
338338
m_RotationOrder: 4
339339
attribute: m_FlipX
340-
path: Sprite Group/Body/Legs Group/Right Leg
340+
path: Sprite Group/Pivot/Body/Legs Group/Right Leg
341341
classID: 212
342342
script: {fileID: 0}
343343
flags: 0
@@ -367,7 +367,7 @@ AnimationClip:
367367
m_PostInfinity: 2
368368
m_RotationOrder: 4
369369
attribute: m_FlipX
370-
path: Sprite Group/Body/Head Group/Head
370+
path: Sprite Group/Pivot/Body/Head Group/Head
371371
classID: 212
372372
script: {fileID: 0}
373373
flags: 0
@@ -397,7 +397,7 @@ AnimationClip:
397397
m_PostInfinity: 2
398398
m_RotationOrder: 4
399399
attribute: m_FlipX
400-
path: Sprite Group/Body/Torso Group/Torso
400+
path: Sprite Group/Pivot/Body/Torso Group/Torso
401401
classID: 212
402402
script: {fileID: 0}
403403
flags: 0
@@ -427,7 +427,7 @@ AnimationClip:
427427
m_PostInfinity: 2
428428
m_RotationOrder: 4
429429
attribute: m_FlipX
430-
path: Sprite Group/Body/Torso Group/Fist
430+
path: Sprite Group/Pivot/Body/Torso Group/Fist
431431
classID: 212
432432
script: {fileID: 0}
433433
flags: 0
@@ -457,7 +457,7 @@ AnimationClip:
457457
m_PostInfinity: 2
458458
m_RotationOrder: 4
459459
attribute: m_FlipX
460-
path: Sprite Group/Body/Torso Group/Equipped Weapon
460+
path: Sprite Group/Pivot/Body/Torso Group/Equipped Weapon
461461
classID: 212
462462
script: {fileID: 0}
463463
flags: 0

0 commit comments

Comments
 (0)