diff --git a/Assets/Scripts/TurnManager.cs b/Assets/Scripts/TurnManager.cs index 72a1cea..8229c1a 100644 --- a/Assets/Scripts/TurnManager.cs +++ b/Assets/Scripts/TurnManager.cs @@ -36,9 +36,17 @@ public class TurnManager : MonoBehaviour dice.ujradobasszamlalo = upgrade.ujradobas[upgrade.getUjradobasIndex()] + 1; Debug.Log("ujradobasszamlalo: " + dice.ujradobasszamlalo); jatekmanager.vanertelme = true; - jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.KorKezdet); //a jatekmanager atvalt a korkezdet eventre + jatekmanager.JatekosVesztett(); + jatekmanager.JatekosNyert(); + if (jatekmanager.jatekosnyert == false && jatekmanager.jatekosvesztett == false) + { + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.KorKezdet); //a jatekmanager atvalt a korkezdet eventre - Debug.Log("kovetkezo kor " + turnCounter); + Debug.Log("kovetkezo kor " + turnCounter); + } + + + } /* diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 5f674e7..b3e3295 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -96,6 +96,9 @@ public class jatekmanager : MonoBehaviour case GameState.Ugynok: ugynokDeaktivalas(false); break; + case GameState.Vesztette: + HandleVesztette(); + break; default: throw new ArgumentOutOfRangeException(nameof(newState), newState, null); } @@ -108,9 +111,8 @@ public class jatekmanager : MonoBehaviour KorKezdet, Akcio, Fejlesztes, - Ugynok - //Nyert - //Vesztett + Ugynok, + Vesztette } private async void HandleKorkezdet() @@ -193,6 +195,12 @@ public class jatekmanager : MonoBehaviour //rolldice.SetActive(false); } + private async void HandleVesztette() + { + JatekosNyert(); + JatekosVesztett(); + } + private async void ugynokDeaktivalas(bool bekapcsolas) { energiafejlesztés.SetActive(bekapcsolas); @@ -324,7 +332,7 @@ public class jatekmanager : MonoBehaviour //JatekosNyert(); //JatekosVesztett(); - } + } */ public void JatekosNyert() { @@ -422,7 +430,7 @@ public class jatekmanager : MonoBehaviour } } - + public void JatekosVesztett() { //ha kinyilik a forras de mar voltal ott ketszer @@ -691,6 +699,5 @@ public class jatekmanager : MonoBehaviour if(jatekosvesztett){ SceneManager.LoadScene("JatekosVesztett"); } - } -*/ + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8db3995..8f18df2 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,13 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a + value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d flags: 0 RecentlyUsedSceneGuid-1: value: 07040753500359095b580a2641275e41444f19297c2d2363752d4a35b1b46339 flags: 0 RecentlyUsedSceneGuid-2: - value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d + value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a flags: 0 RecentlyUsedSceneGuid-3: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 861cd92..110a6d4 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1470 height: 806 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 15 + controlID: 32 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1092.5 + width: 927.5 height: 756 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 16 + controlID: 33 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1092.5 + width: 927.5 height: 511.5 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17 + controlID: 34 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 157.5 + width: 155.5 height: 511.5 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -206,23 +206,23 @@ 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: 157.5 + x: 155.5 y: 0 - width: 935 + width: 772 height: 511.5 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,7 +240,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 511.5 - width: 1092.5 + width: 927.5 height: 244.5 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -264,12 +264,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1092.5 + x: 927.5 y: 0 - width: 377.5 + width: 542.5 height: 756 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 17} @@ -292,14 +292,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 201 - y: 86 - width: 815 - height: 453 + x: 155.5 + y: 95 + width: 770 + height: 490.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 768, y: 432} + m_TargetSize: {x: 770, y: 433} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -169 - m_HBaseRangeMax: 169 - m_VBaseRangeMin: -95 - m_VBaseRangeMax: 95 + m_HBaseRangeMin: -192.5 + m_HBaseRangeMax: 192.5 + m_VBaseRangeMin: -108.25 + m_VBaseRangeMax: 108.25 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -337,7 +337,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 860 - height: 380 + width: 770 + height: 469.5 m_Scale: {x: 2, y: 2} - m_Translation: {x: 430, y: 190} + m_Translation: {x: 385, y: 234.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -215 - y: -95 - width: 430 - height: 190 + x: -192.5 + y: -117.375 + width: 385 + height: 234.75 m_MinimalGUI: 1 m_defaultScale: 2 - m_LastWindowPixelSize: {x: 1720, y: 802} + m_LastWindowPixelSize: {x: 1540, y: 981} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -384,13 +384,13 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 y: 95 - width: 156.5 + width: 154.5 height: 490.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -399,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 021c0000 + m_SelectedIDs: b6900000 m_LastClickedID: 0 - m_ExpandedIDs: 20fbffff + m_ExpandedIDs: 00e4ffff72e4ffffa4e6ffff16e7ffff1cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -441,13 +441,13 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 157.5 + x: 191 y: 95 - width: 933 + width: 945.5 height: 490.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -458,8 +458,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -98, y: -26} + snapOffset: {x: -101, y: -26} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -705,9 +705,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -8.265478, y: -1.4837648, z: -0.07635053} + m_Target: {x: -8.2901, y: -1.7109449, z: -0.08674711} speed: 2 - m_Value: {x: -8.265478, y: -1.4837648, z: -0.07635053} + m_Value: {x: -8.2901, y: -1.7109449, z: -0.08674711} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 14.660233 + m_Target: 15.69989 speed: 2 - m_Value: 14.660233 + m_Value: 15.69989 m_Ortho: m_Target: 1 speed: 2 @@ -801,13 +801,13 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 y: 606.5 - width: 1091.5 + width: 926.5 height: 223.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -826,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 66 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: 66 m_LastProjectPath: /Users/bance/Documents/GitHub/findthesource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 267a0000 - m_LastClickedID: 31270 - m_ExpandedIDs: 00000000047a000000ca9a3bffffff7f + scrollPos: {x: 0, y: 55.000153} + m_SelectedIDs: 247a0000 + m_LastClickedID: 31268 + m_ExpandedIDs: 00000000047a0000227a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -941,14 +941,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1018 - y: 86 - width: 347 - height: 602 + x: 927.5 + y: 95 + width: 541.5 + height: 735 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -987,7 +987,7 @@ MonoBehaviour: m_CachedPref: -160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 29606 + m_LastInspectedObjectInstanceID: 37046 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0