diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 90344fa..e26af59 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -213,7 +213,7 @@ namespace Assets.Scripts.Player public void gameFinished() { - if (worldGenerator.gameWon()) + if (worldGenerator.gameWon() && player.getStat("Level").getAmount() >= difficulty * 10 + 10) { finishedGame = true; uihandler.showMessage("SUCCESS;" + TextHandler.getText("gameWon")); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 24ee082..8a467a5 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,12 +12,15 @@ EditorUserSettings: value: 0503045757070c095e0b087612765b40474f4979757d24647c71496ae7b8313e flags: 0 RecentlyUsedSceneGuid-2: - value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d - flags: 0 - RecentlyUsedSceneGuid-3: value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a flags: 0 + RecentlyUsedSceneGuid-3: + value: 5354065550010c035a0d0f7b15715a474515417b7d7f23607d2a456ae7b4656a + flags: 0 RecentlyUsedSceneGuid-4: + value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d + flags: 0 + RecentlyUsedSceneGuid-5: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 28c70d5..71dfdda 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 3840 - y: 32 - width: 1920 - height: 1048 - m_ShowMode: 0 - m_Title: Game - m_RootView: {fileID: 4} - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,63 +19,12 @@ MonoBehaviour: width: 1920 height: 988 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 5} + m_Title: Game + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1048 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1048 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 76 - draggingID: 0 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -112,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -127,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -170,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -183,7 +108,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 @@ -193,9 +118,9 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 124 + controlID: 40 draggingID: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -208,8 +133,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 15} + - {fileID: 7} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -219,9 +144,9 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 125 + controlID: 41 draggingID: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -234,20 +159,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 8} - {fileID: 11} - - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1604 + width: 1644 height: 938 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 126 + controlID: 42 draggingID: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -260,20 +185,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 13} + - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1604 - height: 662 + width: 1644 + height: 703 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 72 + controlID: 43 draggingID: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,16 +215,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 320 - height: 662 + width: 286 + height: 703 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 17} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -309,27 +234,28 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 320 + x: 286 y: 0 - width: 1284 - height: 662 - m_MinSize: {x: 202, y: 221} + width: 1358 + height: 703 + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 19} m_Panes: + - {fileID: 13} + - {fileID: 15} - {fileID: 16} + - {fileID: 17} - {fileID: 18} - {fileID: 19} - - {fileID: 20} - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 4 ---- !u!114 &14 + m_Selected: 5 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -345,18 +271,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 662 - width: 1604 - height: 276 + y: 703 + width: 1644 + height: 235 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 23} - - {fileID: 24} + - {fileID: 20} + - {fileID: 21} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -371,18 +297,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1604 + x: 1644 y: 0 - width: 316 + width: 276 height: 938 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 25} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 25} + - {fileID: 22} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -402,10 +328,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2240 + x: 2206 y: 122 - width: 1282 - height: 641 + width: 1356 + height: 682 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -710,7 +636,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 10 + index: 9 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -764,9 +690,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 852.216, y: 606.83356, z: -543.93787} + m_Target: {x: 1292.0848, y: 416.75504, z: -322.90186} speed: 2 - m_Value: {x: 852.216, y: 606.83356, z: -543.93787} + m_Value: {x: 1292.0848, y: 416.75504, z: -322.90186} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -812,13 +738,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.035842143, y: 0.0069304137, z: -0.002457157, w: 0.99851084} + m_Target: {x: 0.042149037, y: -0.17012805, z: 0.0051005473, w: 0.98367304} speed: 2 - m_Value: {x: 0.035871524, y: 0.0069360947, z: -0.0024591712, w: 0.9993293} + m_Value: {x: 0.042188335, y: -0.16936463, z: 0.0050660386, w: 0.984637} m_Size: - m_Target: 83.68339 + m_Target: 569.94525 speed: 2 - m_Value: 83.68339 + m_Value: 569.94525 m_Ortho: m_Target: 0 speed: 2 @@ -843,7 +769,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -863,10 +789,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 122 - width: 319 - height: 641 + x: 0 + y: 19 + width: 285 + height: 682 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -880,9 +806,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: fa070000 + m_SelectedIDs: 4e610000 m_LastClickedID: 0 - m_ExpandedIDs: 4a9efeff5caafeffc0cffefffeab000058ac000008ad000088ad000002b10000e62a0100442b0100542f0100dc3101008e3201004e370100843a0100de3a01008e3b01000e3c0100 + m_ExpandedIDs: 72f8ffff0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -898,7 +824,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 12} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -906,7 +832,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1464,7 +1390,7 @@ MonoBehaviour: m_Text: Input (Input Actions) m_Image: {fileID: 0} m_Tooltip: ---- !u!114 &19 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1520,7 +1446,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &20 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1590,7 +1516,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &21 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1613,7 +1539,7 @@ MonoBehaviour: x: 2240 y: 122 width: 1282 - height: 641 + height: 642 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1624,7 +1550,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &22 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1644,10 +1570,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3840 - y: 32 - width: 1920 - height: 1027 + x: 2206 + y: 122 + width: 1356 + height: 682 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1690,8 +1616,8 @@ MonoBehaviour: m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 + m_HSlider: 1 + m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -1702,29 +1628,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1920 - height: 1006 - m_Scale: {x: 0.9314815, y: 0.9314815} - m_Translation: {x: 960, y: 503} + width: 1356 + height: 661 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 678, y: 339.4267} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1030.6163 - y: -540 - width: 2061.2327 - height: 1080 + x: -678 + y: -339.4267 + width: 1356 + height: 661 m_MinimalGUI: 1 - m_defaultScale: 0.9314815 - m_LastWindowPixelSize: {x: 1920, y: 1027} + m_defaultScale: 0.61203706 + m_LastWindowPixelSize: {x: 1356, y: 682} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &23 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1745,9 +1671,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 784 - width: 1603 - height: 255 + y: 825 + width: 1643 + height: 214 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1783,10 +1709,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 72} - m_SelectedIDs: fa070000 - m_LastClickedID: 2042 - m_ExpandedIDs: 00000000ea0600003e0700001e0800008e080000b608000000ca9a3b + scrollPos: {x: 0, y: 114} + m_SelectedIDs: 42610000 + m_LastClickedID: 24898 + m_ExpandedIDs: 000000007c6000007e60000080600000826000008460000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1802,7 +1728,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1814,7 +1740,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ea0600003e0700001e0800008e080000b6080000 + m_ExpandedIDs: 000000007c6000007e600000806000008260000084600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1870,7 +1796,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &24 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1891,9 +1817,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 784 - width: 1601 - height: 255 + y: 825 + width: 1644 + height: 214 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1904,7 +1830,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &25 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1924,9 +1850,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3524 + x: 3564 y: 122 - width: 315 + width: 275 height: 917 m_SerializedDataModeController: m_DataMode: 0 @@ -1945,7 +1871,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 108 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: