Merge branch 'master' into FinalSubmission
This commit is contained in:
Sam
commit
76fe0be86d
@ -674,6 +674,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: b0115312556794123a3cafad4b83d0a7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
forward: 1
|
||||
playerInput: {fileID: 1407172087}
|
||||
launcher: {fileID: 6559806128767475056}
|
||||
hasTambourine: 1
|
||||
@ -684,7 +685,7 @@ MonoBehaviour:
|
||||
waterGravity: 0.5
|
||||
velocityCut: 1.5
|
||||
cymbalBounceForce: 10
|
||||
cymbalHitboxRange: 3
|
||||
cymbalHitboxRange: 2.5
|
||||
cymbalAudio: {fileID: 264629194984044240}
|
||||
grapplingGun: {fileID: 3465910379319867675}
|
||||
grapplingRope: {fileID: 7648135587659148198}
|
||||
@ -1009,7 +1010,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
grappleRope: {fileID: 7648135587659148198}
|
||||
m_camera: {fileID: 0}
|
||||
gunHolder: {fileID: 5885597207104481986}
|
||||
gunPivot: {fileID: 5885597207531562994}
|
||||
firePoint: {fileID: 5885597208857297552}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1383583972917023564
|
||||
--- !u!1 &846954788906673686
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -8,13 +8,13 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1383583972917023563}
|
||||
- component: {fileID: 7137590925806210046}
|
||||
- component: {fileID: 4280484977328239622}
|
||||
- component: {fileID: 3514624092989024146}
|
||||
- component: {fileID: -618517480110831953}
|
||||
- component: {fileID: 8586493026733961254}
|
||||
- component: {fileID: 4464024349174775543}
|
||||
- component: {fileID: 4169947924414531487}
|
||||
- component: {fileID: 767994494619494189}
|
||||
- component: {fileID: 2737831488321223751}
|
||||
- component: {fileID: 5459201274984818219}
|
||||
- component: {fileID: 8615781453448118873}
|
||||
- component: {fileID: 3870016400149749308}
|
||||
- component: {fileID: 5743551219668214514}
|
||||
m_Layer: 0
|
||||
m_Name: tambourine
|
||||
m_TagString: tambourine
|
||||
@ -22,44 +22,44 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1383583972917023563
|
||||
--- !u!4 &4169947924414531487
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.98, y: -0.67, z: 0}
|
||||
m_LocalScale: {x: 0.04, y: 0.04, z: 0.04}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8074438095219817362}
|
||||
- {fileID: 9029893400482145899}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &7137590925806210046
|
||||
--- !u!114 &767994494619494189
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4797d7ba2c50b4594bb88bfffee1f8d0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
pinned: 0
|
||||
tambourineHitSound: {fileID: -618517480110831953}
|
||||
--- !u!50 &4280484977328239622
|
||||
tambourineHitSound: {fileID: 8615781453448118873}
|
||||
--- !u!50 &2737831488321223751
|
||||
Rigidbody2D:
|
||||
serializedVersion: 4
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_BodyType: 0
|
||||
m_Simulated: 1
|
||||
m_UseFullKinematicContacts: 0
|
||||
@ -79,13 +79,13 @@ Rigidbody2D:
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 1
|
||||
m_Constraints: 4
|
||||
--- !u!58 &3514624092989024146
|
||||
--- !u!58 &5459201274984818219
|
||||
CircleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
@ -114,13 +114,13 @@ CircleCollider2D:
|
||||
m_Offset: {x: 0, y: 0}
|
||||
serializedVersion: 2
|
||||
m_Radius: 5.6
|
||||
--- !u!82 &-618517480110831953
|
||||
--- !u!82 &8615781453448118873
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
@ -210,13 +210,13 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!61 &8586493026733961254
|
||||
--- !u!61 &3870016400149749308
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
@ -242,7 +242,7 @@ BoxCollider2D:
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 60, y: 60}
|
||||
m_Offset: {x: 58.32233, y: 58.315758}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
@ -253,15 +253,15 @@ BoxCollider2D:
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 125, y: 125}
|
||||
m_Size: {x: 128.35533, y: 128.36848}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!60 &4464024349174775543
|
||||
--- !u!60 &5743551219668214514
|
||||
PolygonCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1383583972917023564}
|
||||
m_GameObject: {fileID: 846954788906673686}
|
||||
m_Enabled: 0
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
@ -305,7 +305,7 @@ PolygonCollider2D:
|
||||
- {x: 12, y: 94}
|
||||
- {x: 121, y: 94}
|
||||
m_UseDelaunayMesh: 1
|
||||
--- !u!1 &7218975625062829832
|
||||
--- !u!1 &7197847412137544156
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -313,9 +313,9 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8074438095219817362}
|
||||
- component: {fileID: 5289674117813526079}
|
||||
- component: {fileID: 1153042263548898733}
|
||||
- component: {fileID: 9029893400482145899}
|
||||
- component: {fileID: 7145655876668355451}
|
||||
- component: {fileID: 4313813593087747928}
|
||||
m_Layer: 0
|
||||
m_Name: tambourineSprite
|
||||
m_TagString: Untagged
|
||||
@ -323,28 +323,28 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8074438095219817362
|
||||
--- !u!4 &9029893400482145899
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7218975625062829832}
|
||||
m_GameObject: {fileID: 7197847412137544156}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1383583972917023563}
|
||||
m_Father: {fileID: 4169947924414531487}
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &5289674117813526079
|
||||
--- !u!212 &7145655876668355451
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7218975625062829832}
|
||||
m_GameObject: {fileID: 7197847412137544156}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
@ -390,14 +390,14 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!95 &1153042263548898733
|
||||
--- !u!95 &4313813593087747928
|
||||
Animator:
|
||||
serializedVersion: 5
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7218975625062829832}
|
||||
m_GameObject: {fileID: 7197847412137544156}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: c55b775f272db4472814cb6f30ac169e, type: 2}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -184,7 +184,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 34
|
||||
value: 33
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -399,11 +399,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -26
|
||||
value: -23.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 35.8
|
||||
value: 31.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
@ -538,7 +538,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 22
|
||||
m_RootOrder: 21
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &272640804
|
||||
GameObject:
|
||||
@ -631,7 +631,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 18
|
||||
m_RootOrder: 17
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &277557301
|
||||
PrefabInstance:
|
||||
@ -825,7 +825,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 19
|
||||
m_RootOrder: 18
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &353472570
|
||||
GameObject:
|
||||
@ -971,7 +971,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 24
|
||||
m_RootOrder: 23
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &377548165
|
||||
GameObject:
|
||||
@ -1055,7 +1055,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 30
|
||||
m_RootOrder: 29
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &380422480
|
||||
GameObject:
|
||||
@ -1148,7 +1148,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 20
|
||||
m_RootOrder: 19
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &404810523
|
||||
PrefabInstance:
|
||||
@ -1354,7 +1354,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 23
|
||||
m_RootOrder: 22
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &440397388
|
||||
BoxCollider2D:
|
||||
@ -1432,7 +1432,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 17
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &599868449
|
||||
BoxCollider2D:
|
||||
@ -1589,7 +1589,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 16
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &625004206
|
||||
GameObject:
|
||||
@ -1717,7 +1717,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 40
|
||||
m_RootOrder: 39
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &708704664
|
||||
GameObject:
|
||||
@ -1861,6 +1861,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1809671261}
|
||||
- {fileID: 168704917}
|
||||
- {fileID: 1755104000}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -2008,7 +2009,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 31
|
||||
m_RootOrder: 30
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &881612903
|
||||
PrefabInstance:
|
||||
@ -2276,7 +2277,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 37
|
||||
m_RootOrder: 36
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -4528,7 +4529,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 26
|
||||
value: 25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -6084,7 +6085,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 29
|
||||
m_RootOrder: 28
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.086}
|
||||
--- !u!1001 &1300684579
|
||||
PrefabInstance:
|
||||
@ -6269,7 +6270,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 38
|
||||
m_RootOrder: 37
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -23.922}
|
||||
--- !u!1 &1464762821
|
||||
GameObject:
|
||||
@ -6417,71 +6418,6 @@ BoxCollider2D:
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1001 &1510697823
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 367295637452716247, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: GrappleBox (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1025473297745678352, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_Radius
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 6.0668344
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 45.00944
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
--- !u!1 &1581570628
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6558,7 +6494,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 28
|
||||
m_RootOrder: 27
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1612458169
|
||||
PrefabInstance:
|
||||
@ -6635,7 +6571,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 14
|
||||
value: 13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -6826,7 +6762,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 25
|
||||
m_RootOrder: 24
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1689909171
|
||||
GameObject:
|
||||
@ -6997,7 +6933,7 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 39
|
||||
m_RootOrder: 38
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -7018,7 +6954,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 33
|
||||
value: 32
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -7069,6 +7005,76 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
--- !u!1001 &1755103999
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 784959645}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3694183975375614525, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: DeathZone (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 64.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 49.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -1.6646442
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
--- !u!4 &1755104000 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6506293507589830987, guid: d89768fad21a147d59156c6b9503b913, type: 3}
|
||||
m_PrefabInstance: {fileID: 1755103999}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1757844132
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7091,7 +7097,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 27
|
||||
value: 26
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8452658923215583967, guid: 94c7d43583a3b46c58e7d4e253eae896, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -19756,7 +19762,7 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 36
|
||||
value: 35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -19902,7 +19908,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 15
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1932598057
|
||||
GameObject:
|
||||
@ -19995,7 +20001,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 21
|
||||
m_RootOrder: 20
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1997830446
|
||||
PrefabInstance:
|
||||
@ -20015,7 +20021,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 35
|
||||
value: 34
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -20076,7 +20082,7 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 32
|
||||
value: 31
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3126075626113644576, guid: bdd07b902ef53a2d4a03cd503bb6e9ae, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
||||
@ -20,7 +20,7 @@ public class ProjectileBehavior : MonoBehaviour
|
||||
|
||||
public void OnCollisionEnter2D(Collision2D col)
|
||||
{
|
||||
if (col.gameObject.tag == "wall")
|
||||
if (col.gameObject.tag == "wall" || col.gameObject.tag == "Player")
|
||||
{
|
||||
Explode();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user