diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 462c58c..f784990 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -4438,7 +4438,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3} m_Name: m_EditorClassIdentifier: - foundsource: 0 + szoveg: {fileID: 0} --- !u!114 &197904234 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8294,9 +8294,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 197904236} - m_TargetAssemblyTypeName: Targyak, Assembly-CSharp - m_MethodName: RandomTargy + - m_Target: {fileID: 197904230} + m_TargetAssemblyTypeName: Elet, Assembly-CSharp + m_MethodName: Eletvesztes m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scripts/Elet.cs b/Assets/Scripts/Elet.cs index 49ebd51..00154c0 100644 --- a/Assets/Scripts/Elet.cs +++ b/Assets/Scripts/Elet.cs @@ -21,6 +21,12 @@ public class Elet : MonoBehaviour } } + private void Update() { + if(elet == 0){ + jatekmanager.Instance.jatekosvesztett = true; + } + } + public void Eletplusz() { if (elet > 4) return; if (elet_megszerezve > 4) return; @@ -39,7 +45,7 @@ public class Elet : MonoBehaviour public void Eletvesztes() { if (elet_vesztve > 4) { - jatekmanager.jatekosvesztett = true; + //jatekmanager.jatekosvesztett = true; return; } if (elet_megszerezve > elet +1) return; diff --git a/Assets/Scripts/Energia.cs b/Assets/Scripts/Energia.cs index d767db7..f3f6f16 100644 --- a/Assets/Scripts/Energia.cs +++ b/Assets/Scripts/Energia.cs @@ -9,6 +9,8 @@ public class Energia : MonoBehaviour private int energiasav_index = 0; public bool granatAktivalva = false; + private jatekmanager jatekmanager; + public int getEnergiasavIndex() { return energiasav_index; } public void setEnegiasavIndex(int ertek) { energiasav_index = ertek; } @@ -18,7 +20,7 @@ public class Energia : MonoBehaviour return; //targy cucc aktivalva egesz korbe nem csokken az energia } - if (energiasav_index > 30) return; + if (energiasav_index > 29) jatekmanager.Instance.jatekosvesztett = true; //ha nincs tobb energia vesztes for (int i = 0; i < number; i++) { //if (number + enegiasav_index > energiasav_text.Length) break; diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 3ec42c8..724d3a3 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -201,6 +201,15 @@ public class jatekmanager : MonoBehaviour JatekosVesztett(); } + private void Update() { + if(jatekosvesztett){ + SceneManager.LoadScene("JatekosVesztett"); + } + if(jatekosnyert){ + SceneManager.LoadScene("JatekosNyert"); + } + } + private async void ugynokDeaktivalas(bool bekapcsolas) { energiafejlesztés.SetActive(bekapcsolas); diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index a2bdecb..3ca867b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,16 +15,43 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 673 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Hierarchy - m_RootView: {fileID: 2} + m_Title: Game + m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 +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: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1306 + y: 0 + width: 614 + height: 947 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +64,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - {fileID: 4} + - {fileID: 6} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 673 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -69,12 +96,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,36 +117,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 653 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 -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: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1366 - height: 623 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 185 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -134,17 +136,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 10} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 1043 - height: 623 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 186 + y: 30 + width: 1920 + height: 947 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 19 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -159,18 +161,43 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 8} - - {fileID: 9} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1043 - height: 369 + width: 1306 + height: 947 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 20 +--- !u!114 &8 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1306 + height: 561 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 187 ---- !u!114 &8 + controlID: 21 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -187,16 +214,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 258 - height: 369 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 242 + height: 561 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -206,24 +233,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 258 + x: 242 y: 0 - width: 785 - height: 369 + width: 1064 + height: 561 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &10 + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -239,41 +266,14 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 369 - width: 1043 - height: 254 + y: 561 + width: 1306 + height: 386 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &11 -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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1043 - y: 0 - width: 323 - height: 623 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 258 - y: 86 - width: 783 - height: 348 + x: 242 + y: 73 + width: 1062 + height: 540 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: 783, y: 327} + m_TargetSize: {x: 1062, y: 519} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -391.5 - m_HBaseRangeMax: 391.5 - m_VBaseRangeMin: -163.5 - m_VBaseRangeMax: 163.5 + m_HBaseRangeMin: -531 + m_HBaseRangeMax: 531 + m_VBaseRangeMin: -259.5 + m_VBaseRangeMax: 259.5 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: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 783 - height: 327 + width: 1062 + height: 519 m_Scale: {x: 1, y: 1} - m_Translation: {x: 391.5, y: 163.5} + m_Translation: {x: 531, y: 259.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -391.5 - y: -163.5 - width: 783 - height: 327 + x: -531 + y: -259.5 + width: 1062 + height: 519 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 783, y: 348} + m_LastWindowPixelSize: {x: 1062, y: 540} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 257 - height: 348 + y: 73 + width: 241 + height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: d0ecffff4eedffff26efffff30effffff8f0ffff16f1ffff9efaffff + m_ExpandedIDs: 14fbffffba6d000094700000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 278 - y: 95 - width: 842.5 - height: 430 + x: 242 + y: 73 + width: 1062 + height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -698,16 +698,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -8.945042, y: -2.5416188, z: 0.0057649035} + m_Target: {x: -4.3600006, y: 0, z: -10} speed: 2 - m_Value: {x: -8.945042, y: -2.5416188, z: 0.0057649035} + m_Value: {x: -4.3600006, y: 0, z: -10} 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: 7.5217633 + m_Target: 12.124355 speed: 2 - m_Value: 7.5217633 + m_Value: 12.124355 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 455 - width: 1042 - height: 233 + y: 634 + width: 1305 + height: 365 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -826,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scenes m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c6690000 - m_LastClickedID: 27078 - m_ExpandedIDs: 00000000c669000000ca9a3b + m_SelectedIDs: 1a7a0000 + m_LastClickedID: 31258 + m_ExpandedIDs: 00000000067a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c669000000ca9a3b + m_ExpandedIDs: 00000000067a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -945,10 +945,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 546 - width: 1121.5 - height: 289 + x: 1306 + y: 73 + width: 613 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1043 - y: 86 - width: 322 - height: 602 + x: 1306 + y: 73 + width: 613 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -988,7 +988,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 74 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: