diff --git a/Assets/Animations/Tambourine/Pin.anim b/Assets/Animations/Tambourine/Pin.anim index 1ca5950..c5a5a56 100644 --- a/Assets/Animations/Tambourine/Pin.anim +++ b/Assets/Animations/Tambourine/Pin.anim @@ -21,7 +21,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.04, y: 0.04, z: 0.04} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -30,7 +30,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0.06, y: 0.06, z: 0.06} + value: {x: 1.5, y: 1.5, z: 1.5} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -39,7 +39,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0.02, y: 0.02, z: 0.02} + value: {x: 0.5, y: 0.5, z: 0.5} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -48,7 +48,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0.04, y: 0.04, z: 0.04} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -105,7 +105,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.04 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -114,7 +114,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.06 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -123,7 +123,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.02 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -132,7 +132,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0.04 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -153,7 +153,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.04 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -162,7 +162,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.06 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -171,7 +171,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.02 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -180,7 +180,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0.04 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -201,7 +201,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.04 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -210,7 +210,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.06 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -219,7 +219,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.02 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -228,7 +228,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0.04 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/PlayerControls.inputactions b/Assets/PlayerControls.inputactions index d7a3017..18426b3 100644 --- a/Assets/PlayerControls.inputactions +++ b/Assets/PlayerControls.inputactions @@ -303,6 +303,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "6654038f-11be-4872-a40a-2e4e1ddb4398", + "path": "/rightTrigger", + "interactions": "", + "processors": "", + "groups": "", + "action": "Grapple", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "f3aa2992-7914-440a-b109-bf84cfa770a3", diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index a01c178..4662ee7 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1246,7 +1246,7 @@ MonoBehaviour: m_EditorClassIdentifier: grapplingGun: {fileID: 3465910379319867675} m_lineRenderer: {fileID: 5885597207789090694} - precision: 40 + precision: 20 ropeAnimationCurve: serializedVersion: 2 m_Curve: @@ -1341,7 +1341,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - ropeProgressionSpeed: 10 + ropeProgressionSpeed: 30 isGrappling: 1 sirJacques: {fileID: 7242173371790695690} --- !u!82 &5502596181530623924 diff --git a/Assets/Prefabs/tambourine.prefab b/Assets/Prefabs/tambourine.prefab index 6353c18..fccb2a9 100644 --- a/Assets/Prefabs/tambourine.prefab +++ b/Assets/Prefabs/tambourine.prefab @@ -9,13 +9,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1383583972917023563} - - component: {fileID: 1383583972917023562} - - component: {fileID: 1383583972917023565} - component: {fileID: 7137590925806210046} - component: {fileID: 4280484977328239622} - component: {fileID: 3514624092989024146} - component: {fileID: -618517480110831953} - component: {fileID: 8586493026733961254} + - component: {fileID: 4464024349174775543} m_Layer: 0 m_Name: tambourine m_TagString: tambourine @@ -34,83 +33,11 @@ Transform: 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: [] + m_Children: + - {fileID: 8074438095219817362} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1383583972917023562 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1383583972917023564} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: b5f64a07787ea48ad8d00b3ec2d138e4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.2, y: 10.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!95 &1383583972917023565 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1383583972917023564} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c55b775f272db4472814cb6f30ac169e, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!114 &7137590925806210046 MonoBehaviour: m_ObjectHideFlags: 0 @@ -315,7 +242,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 25, y: 25} + m_Offset: {x: 60, y: 60} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -328,3 +255,159 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 125, y: 125} m_EdgeRadius: 0 +--- !u!60 &4464024349174775543 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1383583972917023564} + m_Enabled: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -5, y: -2} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.2, y: 10.16} + newSize: {x: 10.2, y: 10.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 121, y: -35} + - {x: 87, y: -35} + - {x: 0, y: 0} + - {x: 12, y: 94} + - {x: 121, y: 94} + m_UseDelaunayMesh: 1 +--- !u!1 &7218975625062829832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8074438095219817362} + - component: {fileID: 5289674117813526079} + - component: {fileID: 1153042263548898733} + m_Layer: 0 + m_Name: tambourineSprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8074438095219817362 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7218975625062829832} + 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_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5289674117813526079 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7218975625062829832} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: 21300000, guid: b5f64a07787ea48ad8d00b3ec2d138e4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.2, y: 10.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &1153042263548898733 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7218975625062829832} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c55b775f272db4472814cb6f30ac169e, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/SFX/cave_transition_music.ogg b/Assets/SFX/cave_transition_music.ogg new file mode 100644 index 0000000..e213d77 Binary files /dev/null and b/Assets/SFX/cave_transition_music.ogg differ diff --git a/Assets/SFX/cave_transition_music.ogg.meta b/Assets/SFX/cave_transition_music.ogg.meta new file mode 100644 index 0000000..8825981 --- /dev/null +++ b/Assets/SFX/cave_transition_music.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 183c10c135b624f7ea121037664d8580 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Brasslands.unity b/Assets/Scenes/Brasslands.unity index cc8956d..887a236 100644 --- a/Assets/Scenes/Brasslands.unity +++ b/Assets/Scenes/Brasslands.unity @@ -14537,6 +14537,46 @@ PrefabInstance: propertyPath: m_Name value: water2 objectReference: {fileID: 0} + - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_LocalScale.x + value: 0.98429507 + objectReference: {fileID: 0} + - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_LocalScale.y + value: 0.95135957 + objectReference: {fileID: 0} + - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_LocalPosition.x + value: 0.00007 + objectReference: {fileID: 0} + - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0114 + objectReference: {fileID: 0} + - target: {fileID: 7472744527897648634, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.b + value: 0.5932776 + objectReference: {fileID: 0} + - target: {fileID: 7472744527897648634, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7472744527897648634, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.r + value: 0.22075468 + objectReference: {fileID: 0} + - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.b + value: 0.5769551 + objectReference: {fileID: 0} + - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.g + value: 0.745283 + objectReference: {fileID: 0} + - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.r + value: 0.16452472 + objectReference: {fileID: 0} - target: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} propertyPath: m_RootOrder value: 14 @@ -26924,11 +26964,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} propertyPath: m_LocalScale.x - value: 0.98346794 + value: 0.9749355 + objectReference: {fileID: 0} + - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_LocalScale.y + value: 0.9773292 objectReference: {fileID: 0} - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} propertyPath: m_LocalPosition.x - value: -0.001447 + value: -0.002759 + objectReference: {fileID: 0} + - target: {fileID: 1505955197487938437, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0015 + objectReference: {fileID: 0} + - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.b + value: 0.45489684 + objectReference: {fileID: 0} + - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.g + value: 0.9433962 + objectReference: {fileID: 0} + - target: {fileID: 8004311008239541573, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Color.r + value: 0.32395867 objectReference: {fileID: 0} - target: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity index 4afb277..a63c66e 100644 --- a/Assets/Scenes/GrappleScene.unity +++ b/Assets/Scenes/GrappleScene.unity @@ -255,6 +255,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} m_PrefabInstance: {fileID: 97690371} m_PrefabAsset: {fileID: 0} +--- !u!1001 &190490668 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalPosition.x + value: 6.067114 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalPosition.y + value: -9.93632 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6806933941183193853, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_Name + value: SpawnPoint (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} --- !u!1 &193907867 GameObject: m_ObjectHideFlags: 0 @@ -4084,7 +4145,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 16 + value: 18 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.x @@ -4176,7 +4237,7 @@ Transform: - {fileID: 1831209646} - {fileID: 1350631289} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1325296801 PrefabInstance: @@ -4266,7 +4327,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 18 + value: 20 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.x @@ -4582,7 +4643,7 @@ Transform: - {fileID: 1479717957} - {fileID: 1818375522} m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1383539493 PrefabInstance: @@ -4903,7 +4964,7 @@ Transform: - {fileID: 684906576} - {fileID: 1325296802} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1442389786 PrefabInstance: @@ -4919,11 +4980,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.x - value: 37.30627 + value: 48.52 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.y - value: 18.02 + value: 11.06 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.z @@ -6291,6 +6352,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 47, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 49, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 6 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 66, y: 10, z: 0} second: serializedVersion: 2 @@ -6424,9 +6505,9 @@ Tilemap: - first: {x: 36, y: 17, z: 0} second: serializedVersion: 2 - m_TileIndex: 14 - m_TileSpriteIndex: 11 - m_TileMatrixIndex: 0 + m_TileIndex: 9 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 25 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 @@ -6434,9 +6515,9 @@ Tilemap: - first: {x: 38, y: 17, z: 0} second: serializedVersion: 2 - m_TileIndex: 14 - m_TileSpriteIndex: 11 - m_TileMatrixIndex: 6 + m_TileIndex: 12 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 27 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 @@ -6501,6 +6582,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 36, y: 20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 13 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: 20, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 14 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 38, y: 20, z: 0} second: serializedVersion: 2 @@ -6541,6 +6642,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 34, y: 29, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 35, y: 29, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 6 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 11, y: 30, z: 0} second: serializedVersion: 2 @@ -6821,6 +6942,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 32, y: 48, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 33, y: 48, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 6 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 49, y: 48, z: 0} second: serializedVersion: 2 @@ -7309,19 +7450,19 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 7834f7b1366284e9b889a252e33f6df0, type: 2} - - m_RefCount: 11 + - m_RefCount: 13 m_Data: {fileID: 11400000, guid: 5ad1bac2ca22b410fb4f12781c35e0d5, type: 2} - - m_RefCount: 10 + - m_RefCount: 11 m_Data: {fileID: 11400000, guid: 4941b5c865c424caab7d9f221bd82c33, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 54c5b834288f24a89b7e35e0ef9f7c93, type: 2} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: bebf24da26253497bae1042b6392b396, type: 2} - - m_RefCount: 12 + - m_RefCount: 13 m_Data: {fileID: 11400000, guid: fd05a048e46df42f0841aedc5c26e033, type: 2} - m_RefCount: 7 m_Data: {fileID: 11400000, guid: 56c0705e362d74fefa0d3e4efbbcca70, type: 2} - - m_RefCount: 18 + - m_RefCount: 22 m_Data: {fileID: 11400000, guid: f395a2524c46040d2bd365b8c63d6ddd, type: 2} - m_RefCount: 7 m_Data: {fileID: 11400000, guid: 3d4b06bf9cd254a5e864cc57c6080384, type: 2} @@ -7342,11 +7483,11 @@ Tilemap: m_Data: {fileID: 554307562, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 46 m_Data: {fileID: -1419052898, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 11 + - m_RefCount: 13 m_Data: {fileID: 418300172, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 10 + - m_RefCount: 11 m_Data: {fileID: -240375783, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 12 + - m_RefCount: 13 m_Data: {fileID: 284850178, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 2 m_Data: {fileID: -1680641961, guid: 2097266264e574d71a38da279b45c7c0, type: 3} @@ -7354,7 +7495,7 @@ Tilemap: m_Data: {fileID: -610258227, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 7 m_Data: {fileID: 1096025109, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 18 + - m_RefCount: 22 m_Data: {fileID: 2054305501, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 7 m_Data: {fileID: 1436478779, guid: 2097266264e574d71a38da279b45c7c0, type: 3} @@ -7371,7 +7512,7 @@ Tilemap: - m_RefCount: 10 m_Data: {fileID: -1183118302, guid: 2097266264e574d71a38da279b45c7c0, type: 3} m_TileMatrixArray: - - m_RefCount: 131 + - m_RefCount: 133 m_Data: e00: 1 e01: 0 @@ -7479,7 +7620,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 11 + - m_RefCount: 13 m_Data: e00: -1 e01: 0 @@ -7605,7 +7746,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 2 + - m_RefCount: 3 m_Data: e00: 2 e01: -0.00000017484555 @@ -7623,7 +7764,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 1 + - m_RefCount: 2 m_Data: e00: 1.8911506 e01: 0.65080667 @@ -7821,7 +7962,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 1 + - m_RefCount: 2 m_Data: e00: 4 e01: 0 @@ -7857,8 +7998,26 @@ Tilemap: e31: 0 e32: 0 e33: 1 + - m_RefCount: 1 + m_Data: + e00: -1 + e01: 0 + e02: -0.00000008742278 + e03: 0.51 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.00000008742278 + e21: 0 + e22: -1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_TileColorArray: - - m_RefCount: 216 + - m_RefCount: 224 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -8431,7 +8590,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 17 + value: 19 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.x @@ -33034,8 +33193,8 @@ Tilemap: - first: {x: -37, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -33044,8 +33203,8 @@ Tilemap: - first: {x: -36, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -33054,8 +33213,8 @@ Tilemap: - first: {x: -35, y: -12, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -33694,8 +33853,8 @@ Tilemap: - first: {x: -37, y: -11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -33704,8 +33863,8 @@ Tilemap: - first: {x: -36, y: -11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -33714,8 +33873,8 @@ Tilemap: - first: {x: -35, y: -11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48104,8 +48263,8 @@ Tilemap: - first: {x: 48, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48624,8 +48783,8 @@ Tilemap: - first: {x: 18, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48634,8 +48793,8 @@ Tilemap: - first: {x: 19, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48644,8 +48803,8 @@ Tilemap: - first: {x: 20, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48654,8 +48813,8 @@ Tilemap: - first: {x: 21, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48664,8 +48823,8 @@ Tilemap: - first: {x: 22, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48674,8 +48833,8 @@ Tilemap: - first: {x: 23, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -48714,8 +48873,8 @@ Tilemap: - first: {x: 48, y: 10, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -49224,8 +49383,8 @@ Tilemap: - first: {x: 18, y: 11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -49234,8 +49393,8 @@ Tilemap: - first: {x: 19, y: 11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -49244,8 +49403,8 @@ Tilemap: - first: {x: 20, y: 11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -49254,8 +49413,8 @@ Tilemap: - first: {x: 21, y: 11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -49264,8 +49423,8 @@ Tilemap: - first: {x: 22, y: 11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -49274,8 +49433,8 @@ Tilemap: - first: {x: 23, y: 11, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -62134,8 +62293,8 @@ Tilemap: - first: {x: -20, y: 26, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -62154,8 +62313,8 @@ Tilemap: - first: {x: -18, y: 26, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -62164,8 +62323,8 @@ Tilemap: - first: {x: -17, y: 26, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -62174,8 +62333,8 @@ Tilemap: - first: {x: -16, y: 26, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -63044,8 +63203,8 @@ Tilemap: - first: {x: -20, y: 27, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -63064,8 +63223,8 @@ Tilemap: - first: {x: -18, y: 27, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -63074,8 +63233,8 @@ Tilemap: - first: {x: -17, y: 27, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -63084,8 +63243,8 @@ Tilemap: - first: {x: -16, y: 27, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74124,8 +74283,8 @@ Tilemap: - first: {x: 28, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74154,8 +74313,8 @@ Tilemap: - first: {x: 31, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74164,8 +74323,8 @@ Tilemap: - first: {x: 32, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74174,8 +74333,8 @@ Tilemap: - first: {x: 33, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74184,8 +74343,8 @@ Tilemap: - first: {x: 34, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74234,8 +74393,8 @@ Tilemap: - first: {x: 39, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -74244,8 +74403,8 @@ Tilemap: - first: {x: 40, y: 39, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75234,8 +75393,8 @@ Tilemap: - first: {x: 28, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75264,8 +75423,8 @@ Tilemap: - first: {x: 31, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75274,8 +75433,8 @@ Tilemap: - first: {x: 32, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75284,8 +75443,8 @@ Tilemap: - first: {x: 33, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75294,8 +75453,8 @@ Tilemap: - first: {x: 34, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75344,8 +75503,8 @@ Tilemap: - first: {x: 39, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -75354,8 +75513,8 @@ Tilemap: - first: {x: 40, y: 40, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -81574,8 +81733,8 @@ Tilemap: - first: {x: 16, y: 47, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -81624,8 +81783,8 @@ Tilemap: - first: {x: 21, y: 47, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -81664,8 +81823,8 @@ Tilemap: - first: {x: 25, y: 47, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -81674,8 +81833,8 @@ Tilemap: - first: {x: 26, y: 47, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -82484,8 +82643,8 @@ Tilemap: - first: {x: 16, y: 48, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -82534,8 +82693,8 @@ Tilemap: - first: {x: 21, y: 48, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -82574,8 +82733,8 @@ Tilemap: - first: {x: 25, y: 48, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -82584,8 +82743,8 @@ Tilemap: - first: {x: 26, y: 48, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97464,8 +97623,8 @@ Tilemap: - first: {x: -4, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97474,8 +97633,8 @@ Tilemap: - first: {x: -3, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97644,8 +97803,8 @@ Tilemap: - first: {x: 14, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97694,8 +97853,8 @@ Tilemap: - first: {x: 19, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97734,8 +97893,8 @@ Tilemap: - first: {x: 23, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97744,8 +97903,8 @@ Tilemap: - first: {x: 24, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97754,8 +97913,8 @@ Tilemap: - first: {x: 25, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97764,8 +97923,8 @@ Tilemap: - first: {x: 26, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97964,8 +98123,8 @@ Tilemap: - first: {x: 46, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -97974,8 +98133,8 @@ Tilemap: - first: {x: 47, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98004,8 +98163,8 @@ Tilemap: - first: {x: 50, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98014,8 +98173,8 @@ Tilemap: - first: {x: 51, y: 64, z: 0} second: serializedVersion: 2 - m_TileIndex: 40 - m_TileSpriteIndex: 29 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98474,8 +98633,8 @@ Tilemap: - first: {x: -4, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98484,8 +98643,8 @@ Tilemap: - first: {x: -3, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98654,8 +98813,8 @@ Tilemap: - first: {x: 14, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98704,8 +98863,8 @@ Tilemap: - first: {x: 19, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98744,8 +98903,8 @@ Tilemap: - first: {x: 23, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98754,8 +98913,8 @@ Tilemap: - first: {x: 24, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98764,8 +98923,8 @@ Tilemap: - first: {x: 25, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98774,8 +98933,8 @@ Tilemap: - first: {x: 26, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98974,8 +99133,8 @@ Tilemap: - first: {x: 46, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -98984,8 +99143,8 @@ Tilemap: - first: {x: 47, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -99014,8 +99173,8 @@ Tilemap: - first: {x: 50, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -99024,8 +99183,8 @@ Tilemap: - first: {x: 51, y: 65, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 10 + m_TileIndex: 9 + m_TileSpriteIndex: 9 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -112805,7 +112964,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 16 m_Data: {fileID: 11400000, guid: ab4e95294930b475f9b238352cc20e55, type: 2} - - m_RefCount: 381 + - m_RefCount: 418 m_Data: {fileID: 11400000, guid: 613380c5913ee4d90b8e3dfef129417a, type: 2} - m_RefCount: 15 m_Data: {fileID: 11400000, guid: 11cfe0b7c898b4fb39e26bf3211799bc, type: 2} @@ -112821,7 +112980,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 9ee40f0adf1cd4a1294f1badb0db90c1, type: 2} - m_RefCount: 25 m_Data: {fileID: 11400000, guid: d3309547bd7154e2ab3957fc802ddee9, type: 2} - - m_RefCount: 173 + - m_RefCount: 210 m_Data: {fileID: 11400000, guid: 753aa7819b117485cbe8e3525f0815f1, type: 2} - m_RefCount: 43 m_Data: {fileID: 11400000, guid: ec86462e6c269475ab8be052bd9c88d8, type: 2} @@ -112881,10 +113040,10 @@ Tilemap: m_Data: {fileID: 11400000, guid: c2e8aba0233104f90a09adaf74211138, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: fd05a048e46df42f0841aedc5c26e033, type: 2} - - m_RefCount: 37 - m_Data: {fileID: 11400000, guid: 9380b8b6c990146f7b532b9d8bb76a20, type: 2} - - m_RefCount: 37 - m_Data: {fileID: 11400000, guid: d2b6851ea76b2465bb0f07a1b9641803, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 4941b5c865c424caab7d9f221bd82c33, type: 2} - m_RefCount: 1 @@ -112892,7 +113051,7 @@ Tilemap: m_TileSpriteArray: - m_RefCount: 16 m_Data: {fileID: -866399296, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 381 + - m_RefCount: 418 m_Data: {fileID: -1873221857, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 15 m_Data: {fileID: -660347865, guid: 2097266264e574d71a38da279b45c7c0, type: 3} @@ -112908,10 +113067,10 @@ Tilemap: m_Data: {fileID: 1328316489, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 25 m_Data: {fileID: 596793319, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 173 + - m_RefCount: 210 m_Data: {fileID: 784849295, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 37 - m_Data: {fileID: -1180649061, guid: 2097266264e574d71a38da279b45c7c0, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 211 m_Data: {fileID: 431461063, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 21 @@ -112948,8 +113107,8 @@ Tilemap: m_Data: {fileID: -748917288, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 43 m_Data: {fileID: 422422043, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 37 - m_Data: {fileID: 738992274, guid: 2097266264e574d71a38da279b45c7c0, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 8 m_Data: {fileID: 82606424, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 8 @@ -115900,6 +116059,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 493245979038171992, guid: c33beb037603b4e12a75275ec13369ef, type: 3} m_PrefabInstance: {fileID: 1866363914} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1916714849 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalPosition.x + value: 33.02 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalPosition.y + value: 49.09 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6806933941183193853, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} + propertyPath: m_Name + value: SpawnPoint (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} --- !u!1001 &2001788622 PrefabInstance: m_ObjectHideFlags: 0 @@ -116403,7 +116623,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 20 + value: 22 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalPosition.x @@ -116472,7 +116692,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} propertyPath: m_RootOrder - value: 23 + value: 25 objectReference: {fileID: 0} - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/TransitionToTambourine.unity b/Assets/Scenes/TransitionToTambourine.unity index 6489d86..f36fd27 100644 --- a/Assets/Scenes/TransitionToTambourine.unity +++ b/Assets/Scenes/TransitionToTambourine.unity @@ -1170,7 +1170,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: e7278b4bebe79784b9977672a9fc8e8a, type: 3} + m_audioClip: {fileID: 8300000, guid: 183c10c135b624f7ea121037664d8580, type: 3} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index c13c40d..efb98a8 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -8,7 +8,7 @@ public class PlayerBehavior : MonoBehaviour [Header("Physics:")] private float _hInput; private Rigidbody2D _rb; - private int forward = 1; + [HideInInspector] public int forward = 1; public PlayerInput playerInput; [Header("Tambourine:")] @@ -382,9 +382,16 @@ public class PlayerBehavior : MonoBehaviour // destroy all tambourines GameObject[] currentTambourines = GameObject.FindGameObjectsWithTag("tambourine"); - foreach (GameObject tambourine in currentTambourines) { - tambourine.GetComponent().DestroySelf(); - // Destroy(tambourine); + print("tambs found: " + currentTambourines.Length); + if (currentTambourines != null) { + foreach (GameObject tambourine in currentTambourines) { + if (tambourine != null) { + tambourine.GetComponent().DestroySelf(); + print("tamb destroyed"); + } else { + print("null tamb"); + } + } } StateController.Instance.RespawnPlayer(); diff --git a/Assets/Scripts/TambourineBehavior.cs b/Assets/Scripts/TambourineBehavior.cs index bcb58c3..ac96d06 100644 --- a/Assets/Scripts/TambourineBehavior.cs +++ b/Assets/Scripts/TambourineBehavior.cs @@ -24,20 +24,18 @@ public class TambourineBehavior : MonoBehaviour { void Awake() { this.gameObject.GetComponent().enabled = true; rb = this.gameObject.GetComponent(); - animator = this.gameObject.GetComponent(); + animator = this.gameObject.transform.GetChild(0).gameObject.GetComponent(); player = GameObject.FindGameObjectWithTag("Player"); } void Start() { // rb.AddForce(new Vector2(horizSpeed, vertSpeed), ForceMode2D.Impulse); + this.gameObject.transform.localScale = new Vector2(transform.localScale.x * player.GetComponent().forward, transform.localScale.y); StartCoroutine(CheckToDestroy()); } void Update() { - // if (Input.GetKeyUp(KeyCode.K)) { - // Destroy(this.gameObject); - // } if (player == null) { DestroySelf(); } else { @@ -46,9 +44,9 @@ public class TambourineBehavior : MonoBehaviour { // this.gameObject.transform.position = col.transform.position; timeLerped += Time.deltaTime; this.gameObject.transform.position = Vector2.Lerp(this.gameObject.transform.position, collidedObject.transform.position, timeLerped/timeToLerp); - if (this.gameObject.transform.position.x == collidedObject.transform.position.x && this.gameObject.transform.position.y == collidedObject.transform.position.y && !pinned) { - animator.SetBool("pinned", true); + if (this.gameObject.transform.position.x == collidedObject.transform.position.x && this.gameObject.transform.position.y == collidedObject.transform.position.y && !animator.GetBool("pinned")) { pinned = true; + animator.SetBool("pinned", true); tambourineHitSound.Play(); } else { // print("pinned, but not same position: " + this.gameObject.transform.position + " / " + collidedObject.transform.position);