diff --git a/Game 1/.vs/Game 1/v15/sqlite3/storage.ide b/Game 1/.vs/Game 1/v15/sqlite3/storage.ide index b531d16..f219d04 100644 Binary files a/Game 1/.vs/Game 1/v15/sqlite3/storage.ide and b/Game 1/.vs/Game 1/v15/sqlite3/storage.ide differ diff --git a/Game 1/Assets/Levels/Level 0.unity b/Game 1/Assets/Levels/Level 0.unity index 65a03ee..11fab76 100644 --- a/Game 1/Assets/Levels/Level 0.unity +++ b/Game 1/Assets/Levels/Level 0.unity @@ -3133,6 +3133,68 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &66223800 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 66223803} + - component: {fileID: 66223802} + - component: {fileID: 66223801} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &66223801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66223800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &66223802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66223800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &66223803 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 66223800} + 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: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &69178012 GameObject: m_ObjectHideFlags: 0 @@ -6926,7 +6988,7 @@ Transform: - {fileID: 1291212572} - {fileID: 2052133222} m_Father: {fileID: 899175371} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.00001} --- !u!1 &158463470 GameObject: @@ -8350,6 +8412,7 @@ GameObject: m_Component: - component: {fileID: 195543023} - component: {fileID: 195543024} + - component: {fileID: 195543025} m_Layer: 0 m_Name: DoorUnlocked m_TagString: Finish Line @@ -8412,6 +8475,31 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!61 &195543025 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 195543022} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.0976562, y: 1.8125} + newSize: {x: 1.0976562, y: 1.8125} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.0976562, y: 1.8125} + m_EdgeRadius: 0 --- !u!1 &196517228 GameObject: m_ObjectHideFlags: 0 @@ -15331,7 +15419,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &342009954 GameObject: @@ -19402,7 +19490,7 @@ GameObject: - component: {fileID: 440329285} - component: {fileID: 440329284} - component: {fileID: 440329288} - m_Layer: 0 + m_Layer: 8 m_Name: blocky m_TagString: Untagged m_Icon: {fileID: 0} @@ -19425,9 +19513,9 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 5 m_Material: {fileID: 0} - m_Interpolate: 0 + m_Interpolate: 1 m_SleepingMode: 1 - m_CollisionDetection: 0 + m_CollisionDetection: 1 m_Constraints: 4 --- !u!114 &440329285 MonoBehaviour: @@ -19441,8 +19529,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: jumpPower: 15 - rocketPrefab: {fileID: 0} - winText: {fileID: 0} + rocketPrefab: {fileID: 1704205186022040, guid: 34e7aebb9fac79643b1a3450a3891e90, + type: 2} + winText: {fileID: 476302442} --- !u!212 &440329286 SpriteRenderer: m_ObjectHideFlags: 0 @@ -19494,10 +19583,9 @@ Transform: 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: - - {fileID: 1521050879} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &440329288 BoxCollider2D: @@ -21350,6 +21438,80 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &476302440 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 476302441} + - component: {fileID: 476302443} + - component: {fileID: 476302442} + m_Layer: 5 + m_Name: Win Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &476302441 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 476302440} + 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: 1636734163} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &476302442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 476302440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &476302443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 476302440} --- !u!1 &476514443 GameObject: m_ObjectHideFlags: 0 @@ -27751,7 +27913,7 @@ Transform: - {fileID: 1824126077} - {fileID: 260356898} m_Father: {fileID: 899175371} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.00001} --- !u!1 &626211272 GameObject: @@ -29040,7 +29202,7 @@ Transform: m_Children: - {fileID: 195543023} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &647051905 GameObject: @@ -40005,10 +40167,10 @@ Transform: m_LocalPosition: {x: -0.0016975, y: -3.0104, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 907522873} - {fileID: 157586401} - {fileID: 625277891} - {fileID: 1533612867} - - {fileID: 907522873} - {fileID: 1683702043} - {fileID: 1972056299} - {fileID: 1955682398} @@ -40680,7 +40842,7 @@ Transform: - {fileID: 1214427844} - {fileID: 498566647} m_Father: {fileID: 899175371} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.00001} --- !u!1 &908982227 GameObject: @@ -66590,10 +66752,11 @@ GameObject: m_Component: - component: {fileID: 1521050879} - component: {fileID: 1521050878} + - component: {fileID: 1521050880} - component: {fileID: 1521050877} - component: {fileID: 1521050876} - component: {fileID: 1521050875} - m_Layer: 0 + m_Layer: 8 m_Name: Main Camera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -66667,9 +66830,21 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 440329287} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1521050880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1521050874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82066df26cc71bd46bc0762b0aba7372, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 440329283} --- !u!1 &1523573220 GameObject: m_ObjectHideFlags: 0 @@ -66993,7 +67168,7 @@ Transform: - {fileID: 46907642} - {fileID: 1812232760} m_Father: {fileID: 899175371} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.00001} --- !u!1 &1535829576 GameObject: @@ -70806,6 +70981,100 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &1636734159 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1636734163} + - component: {fileID: 1636734162} + - component: {fileID: 1636734161} + - component: {fileID: 1636734160} + m_Layer: 5 + m_Name: Canvas + m_TagString: Finish Line + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1636734160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1636734159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1636734161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1636734159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1636734162 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1636734159} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1636734163 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1636734159} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 476302441} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1637295257 GameObject: m_ObjectHideFlags: 0 @@ -75417,7 +75686,7 @@ Transform: - {fileID: 505171870} - {fileID: 2015894998} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1759768852 GameObject: @@ -85737,7 +86006,7 @@ Transform: - {fileID: 210675412} - {fileID: 535171847} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1988362806 GameObject: diff --git a/Game 1/Assets/Scripts/CameraController.cs b/Game 1/Assets/Scripts/CameraController.cs index 233a372..1caae44 100644 --- a/Game 1/Assets/Scripts/CameraController.cs +++ b/Game 1/Assets/Scripts/CameraController.cs @@ -23,8 +23,13 @@ public class CameraController : MonoBehaviour { void LateUpdate () { newPosition = player.transform.position + offset; - if(newPosition.x >= minX && newPosition.x <= maxX && newPosition.y >= minY && newPosition.y <= maxY) - transform.position = newPosition; + transform.position = new Vector3 + ( + Mathf.Clamp (newPosition.x, minX, maxX), + //transform.position.x, + Mathf.Clamp (newPosition.y, minY, maxY), + transform.position.z + ); } -} +} \ No newline at end of file