diff --git a/Game 1/Assets/Levels/Level0.unity b/Game 1/Assets/Levels/Level0.unity index 90b36d8..68fd809 100644 --- a/Game 1/Assets/Levels/Level0.unity +++ b/Game 1/Assets/Levels/Level0.unity @@ -117,11 +117,11 @@ Prefab: m_Modifications: - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.x - value: -6.46 + value: -6.5200005 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.y - value: 5.12 + value: 5.78 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.z @@ -180,7 +180,7 @@ Transform: m_PrefabInternal: {fileID: 3481234} m_GameObject: {fileID: 1699751173} m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} - m_LocalPosition: {x: -6.46, y: 5.12, z: 0} + m_LocalPosition: {x: -6.5200005, y: 5.78, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1790009488} @@ -3267,7 +3267,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &69178012 GameObject: @@ -4087,6 +4087,7 @@ GameObject: m_Component: - component: {fileID: 95581934} - component: {fileID: 95581933} + - component: {fileID: 95581935} m_Layer: 0 m_Name: LevelController m_TagString: Untagged @@ -4117,8 +4118,88 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &95581935 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 95581932} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: ace850a1eaeffca4e9c3801b7b5800d2, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1 &98167301 GameObject: m_ObjectHideFlags: 0 @@ -8764,7 +8845,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 195543022} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.37, y: -1.28, z: 0} + m_LocalPosition: {x: 8.15, y: 21.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 644993876} @@ -16266,7 +16347,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &342009954 GameObject: @@ -24523,7 +24604,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 505171869} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -9.5, y: 10.04, z: 0} + m_LocalPosition: {x: -9.559999, y: 10.699999, z: 0} m_LocalScale: {x: 1.0000005, y: 1.0000005, z: 1} m_Children: - {fileID: 1644478051} @@ -25552,7 +25633,7 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1689622294736962, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - component: {fileID: 540718596} @@ -25569,7 +25650,7 @@ Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 4885470353582802, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 540718595} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.5096, y: -3.5017, z: 0} @@ -25583,7 +25664,7 @@ SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 212210161852618910, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 540718595} m_Enabled: 1 m_CastShadows: 0 @@ -27581,7 +27662,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 586620800} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 3, y: 6.2, z: 0} + m_LocalPosition: {x: 2.9399996, y: 6.86, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1950657657} @@ -28962,11 +29043,11 @@ Prefab: m_Modifications: - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.x - value: 8 + value: 7.9399996 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.y - value: 23 + value: 23.66 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.z @@ -29021,7 +29102,7 @@ Transform: m_PrefabInternal: {fileID: 619292391} m_GameObject: {fileID: 205512634} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8, y: 23, z: 0} + m_LocalPosition: {x: 7.9399996, y: 23.66, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1979978877} @@ -29587,75 +29668,15 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!1001 &629198292 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1756437265} - m_Modifications: - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.x - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.y - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - propertyPath: m_Name - value: Plat 1-0.5-flat - objectReference: {fileID: 0} - - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, - type: 2} - propertyPath: m_Offset.y - value: -3.25 - objectReference: {fileID: 0} - - target: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, - type: 2} - propertyPath: m_Size.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 61019197741482430, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - - {fileID: 61153641053818090, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - - {fileID: 61168176574206006, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - - {fileID: 61527302635927084, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_ParentPrefab: {fileID: 0} - m_IsPrefabParent: 0 --- !u!4 &629198293 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1176713944} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6, y: 4, z: 0} + m_LocalPosition: {x: 5.9399996, y: 4.6600003, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 636641959} @@ -30121,7 +30142,7 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1263156782750720, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - component: {fileID: 636641959} @@ -30138,7 +30159,7 @@ Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 4688478652842136, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636641958} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.49407, y: -3.4978, z: 0} @@ -30152,7 +30173,7 @@ SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 212589021318912284, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636641958} m_Enabled: 1 m_CastShadows: 0 @@ -49669,11 +49690,11 @@ Prefab: m_Modifications: - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.x - value: 3 + value: 2.9399996 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.y - value: 18 + value: 18.66 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.z @@ -49772,7 +49793,7 @@ Transform: m_PrefabInternal: {fileID: 1066716614} m_GameObject: {fileID: 1532088219} m_LocalRotation: {x: -0, y: -0, z: 0.7071067, w: 0.7071069} - m_LocalPosition: {x: 3, y: 18, z: 0} + m_LocalPosition: {x: 2.9399996, y: 18.66, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 317481777} @@ -51716,7 +51737,7 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1866320705803288, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - component: {fileID: 1106124692} @@ -51733,7 +51754,7 @@ Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 4420090309376412, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1106124691} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.51, y: -3.4978, z: 0} @@ -51747,7 +51768,7 @@ SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 212893028471955042, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1106124691} m_Enabled: 1 m_CastShadows: 0 @@ -54485,7 +54506,7 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1146037055527736, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - component: {fileID: 629198293} @@ -54502,7 +54523,7 @@ BoxCollider2D: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 61020385707696216, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1176713944} m_Enabled: 1 m_Density: 1 @@ -60459,7 +60480,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1296371898} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.85651577, y: 7.440595, z: 0} + m_LocalPosition: {x: -0.9165162, y: 8.100595, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 347549481} @@ -65249,7 +65270,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1402737627} m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} - m_LocalPosition: {x: 7.05, y: 4.39, z: 0} + m_LocalPosition: {x: 6.99, y: 5.05, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 909710695} @@ -71157,7 +71178,7 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1814295392045598, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - component: {fileID: 1539776175} @@ -71174,7 +71195,7 @@ Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 4066993358347928, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1539776174} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.4941, y: -3.4978, z: 0} @@ -71188,7 +71209,7 @@ SpriteRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 212576916222148090, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} - m_PrefabInternal: {fileID: 629198292} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1539776174} m_Enabled: 1 m_CastShadows: 0 @@ -74857,7 +74878,7 @@ RectTransform: m_Children: - {fileID: 1346051379} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -81765,6 +81786,7 @@ Transform: - {fileID: 169225487} - {fileID: 914550841} - {fileID: 628045562} + - {fileID: 1985043894} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -83972,11 +83994,11 @@ Prefab: m_Modifications: - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.x - value: -3.72 + value: -3.7800007 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.y - value: 0.63 + value: 1.2900003 objectReference: {fileID: 0} - target: {fileID: 4750771738415664, guid: 37ac9a85e6d63c14fb94f09793c36676, type: 2} propertyPath: m_LocalPosition.z @@ -84035,7 +84057,7 @@ Transform: m_PrefabInternal: {fileID: 1848171958} m_GameObject: {fileID: 952030093} m_LocalRotation: {x: -0, y: -0, z: -0.3826837, w: 0.9238795} - m_LocalPosition: {x: -3.72, y: 0.63, z: 0} + m_LocalPosition: {x: -3.7800007, y: 1.2900003, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1795439059} @@ -90522,7 +90544,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1985043893} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: @@ -90531,7 +90553,7 @@ Transform: - {fileID: 535171847} - {fileID: 1144508725} - {fileID: 1165436486} - m_Father: {fileID: 0} + m_Father: {fileID: 1792161510} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1988362806 @@ -91377,7 +91399,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2015894997} m_LocalRotation: {x: -0, y: -0, z: -0.3826837, w: 0.9238795} - m_LocalPosition: {x: 1.06, y: 20.86, z: 0} + m_LocalPosition: {x: 0.9999995, y: 21.52, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 598380718} diff --git a/Game 1/Assets/Levels/Level1.unity b/Game 1/Assets/Levels/Level1.unity index b060433..7e4ad85 100644 --- a/Game 1/Assets/Levels/Level1.unity +++ b/Game 1/Assets/Levels/Level1.unity @@ -7929,7 +7929,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &176111127 GameObject: @@ -10512,7 +10512,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &257580017 GameObject: @@ -13894,7 +13894,7 @@ Transform: - {fileID: 2036645228} - {fileID: 882627828} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &331527685 GameObject: @@ -14710,7 +14710,7 @@ Transform: m_Children: - {fileID: 1034324675} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &356052976 GameObject: @@ -38118,6 +38118,128 @@ Transform: m_Father: {fileID: 1534266028} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!1 &894147251 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 894147254} + - component: {fileID: 894147253} + - component: {fileID: 894147252} + m_Layer: 0 + m_Name: LevelController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &894147252 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 894147251} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: ace850a1eaeffca4e9c3801b7b5800d2, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 +--- !u!114 &894147253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 894147251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cd1d4ed12e73d4d89f6301bb296452, type: 3} + m_Name: + m_EditorClassIdentifier: + winText: {fileID: 1942968537} +--- !u!4 &894147254 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 894147251} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.39, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &895406274 GameObject: m_ObjectHideFlags: 0 @@ -56726,7 +56848,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1305300237 GameObject: @@ -59206,7 +59328,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1366318067 GameObject: @@ -72046,47 +72168,6 @@ Transform: m_Father: {fileID: 472991697} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} ---- !u!1 &1657325524 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1657325526} - - component: {fileID: 1657325525} - m_Layer: 0 - m_Name: LevelController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1657325525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1657325524} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61cd1d4ed12e73d4d89f6301bb296452, type: 3} - m_Name: - m_EditorClassIdentifier: - winText: {fileID: 1942968537} ---- !u!4 &1657325526 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1657325524} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1657623011 GameObject: m_ObjectHideFlags: 0 @@ -83625,7 +83706,7 @@ Transform: - {fileID: 221292271} - {fileID: 1796807963} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1940502427 GameObject: @@ -90390,7 +90471,7 @@ Transform: - {fileID: 472991697} - {fileID: 1534266028} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2072903189 GameObject: @@ -93509,7 +93590,7 @@ RectTransform: m_Children: - {fileID: 1942968536} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Game 1/Assets/Music.meta b/Game 1/Assets/Music.meta new file mode 100644 index 0000000..915ca59 --- /dev/null +++ b/Game 1/Assets/Music.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1675ca3ec6bfe444db49c99207e04083 +folderAsset: yes +timeCreated: 1504763566 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Music/AnotherOneBitesTheDustBaseLine.mp3 b/Game 1/Assets/Music/AnotherOneBitesTheDustBaseLine.mp3 new file mode 100644 index 0000000..df420b4 Binary files /dev/null and b/Game 1/Assets/Music/AnotherOneBitesTheDustBaseLine.mp3 differ diff --git a/Game 1/Assets/Music/AnotherOneBitesTheDustBaseLine.mp3.meta b/Game 1/Assets/Music/AnotherOneBitesTheDustBaseLine.mp3.meta new file mode 100644 index 0000000..308a733 --- /dev/null +++ b/Game 1/Assets/Music/AnotherOneBitesTheDustBaseLine.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ace850a1eaeffca4e9c3801b7b5800d2 +timeCreated: 1504765424 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Prefabs/Explosion.prefab b/Game 1/Assets/Prefabs/Explosion.prefab index df39554..c202583 100644 --- a/Game 1/Assets/Prefabs/Explosion.prefab +++ b/Game 1/Assets/Prefabs/Explosion.prefab @@ -23,6 +23,7 @@ GameObject: - component: {fileID: 95598204179832612} - component: {fileID: 114562294083830174} - component: {fileID: 114448192127375214} + - component: {fileID: 82220757448783750} m_Layer: 0 m_Name: Explosion m_TagString: Untagged @@ -43,6 +44,86 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &82220757448783750 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1183751695519662} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3b8d735856cce9c488663340d1e17d67, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.333 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!95 &95598204179832612 Animator: serializedVersion: 3 diff --git a/Game 1/Assets/Scripts/CameraController.cs b/Game 1/Assets/Scripts/CameraController.cs index 1caae44..c695470 100644 --- a/Game 1/Assets/Scripts/CameraController.cs +++ b/Game 1/Assets/Scripts/CameraController.cs @@ -14,8 +14,8 @@ public class CameraController : MonoBehaviour { void Start () { offset = transform.position - player.transform.position; - minX = 0.0f; - maxX = 0.0f; + minX = -2.0f; + maxX = 2.0f; minY = 0.0f; maxY = 18.0f; } diff --git a/Game 1/Assets/Sounds.meta b/Game 1/Assets/Sounds.meta new file mode 100644 index 0000000..38b7813 --- /dev/null +++ b/Game 1/Assets/Sounds.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9067f97743c9dbb4984b2b1ff7984f6a +folderAsset: yes +timeCreated: 1504763560 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Sounds/Pow.wav b/Game 1/Assets/Sounds/Pow.wav new file mode 100644 index 0000000..4c67b74 Binary files /dev/null and b/Game 1/Assets/Sounds/Pow.wav differ diff --git a/Game 1/Assets/Sounds/Pow.wav.meta b/Game 1/Assets/Sounds/Pow.wav.meta new file mode 100644 index 0000000..3a2570f --- /dev/null +++ b/Game 1/Assets/Sounds/Pow.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3b8d735856cce9c488663340d1e17d67 +timeCreated: 1504766435 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/ProjectSettings/GraphicsSettings.asset b/Game 1/ProjectSettings/GraphicsSettings.asset index 74d7b53..d74737e 100644 --- a/Game 1/ProjectSettings/GraphicsSettings.asset +++ b/Game 1/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,7 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/Game 1/ProjectSettings/ProjectSettings.asset b/Game 1/ProjectSettings/ProjectSettings.asset index b5b30e8..60f5057 100644 --- a/Game 1/ProjectSettings/ProjectSettings.asset +++ b/Game 1/ProjectSettings/ProjectSettings.asset @@ -374,6 +374,9 @@ PlayerSettings: switchUdpSendBufferSize: 9 switchUdpReceiveBufferSize: 42 switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: