aha

jo
aha
2023-03-29 09:26:36 +02:00 · 2023-03-29 09:24:31 +02:00 · 2023-03-25 15:26:10 +01:00 · 2023-03-24 14:25:10 +01:00 · 2023-03-24 10:10:22 +01:00 · 2023-03-24 10:10:06 +01:00
37 changed files with 6163 additions and 1673 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/Assets/.DS_Store
+++ b/Assets/.DS_Store
--- a/Assets/Scenes/Jatek.unity
+++ b/Assets/Scenes/Jatek.unity
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -417,82 +417,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 45143193}
  m_CullTransparentMesh: 1
--- !u!1 &57176555
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 57176556}
-  - component: {fileID: 57176558}
-  - component: {fileID: 57176557}
-  m_Layer: 5
-  m_Name: Checkmark
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
--- !u!224 &57176556
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 57176555}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 850122247}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &57176557
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 57176555}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &57176558
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 57176555}
-  m_CullTransparentMesh: 1
 --- !u!1 &97446639
 GameObject:
  m_ObjectHideFlags: 0
@@ -892,7 +816,7 @@ RectTransform:
  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: 404, y: -65}
+  m_AnchoredPosition: {x: 404, y: -180}
  m_SizeDelta: {x: 85.471, y: 76.781}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &267579259
@@ -1046,7 +970,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &345853270
 RectTransform:
  m_ObjectHideFlags: 0
@@ -1061,7 +985,6 @@ RectTransform:
  m_Children:
  - {fileID: 415922101}
  - {fileID: 267579258}
-  - {fileID: 1834896933}
  m_Father: {fileID: 500113176}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1146,7 +1069,7 @@ RectTransform:
  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: 400, y: 90}
+  m_AnchoredPosition: {x: 400, y: 70}
  m_SizeDelta: {x: 433.849, y: 95.04}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &415922102
@@ -1582,7 +1505,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &500113176
 RectTransform:
  m_ObjectHideFlags: 0
@@ -1673,18 +1596,6 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!114 &500113178
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -2452,83 +2363,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 788560222}
  m_CullTransparentMesh: 1
--- !u!1 &850122246
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 850122247}
-  - component: {fileID: 850122249}
-  - component: {fileID: 850122248}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
--- !u!224 &850122247
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 850122246}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 57176556}
-  m_Father: {fileID: 1834896933}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &850122248
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 850122246}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &850122249
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 850122246}
-  m_CullTransparentMesh: 1
 --- !u!1 &882912777
 GameObject:
  m_ObjectHideFlags: 0
@@ -2824,22 +2658,10 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 1704647066}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 1274410647}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
+      - m_Target: {fileID: 1386328425}
+        m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp
+        m_MethodName: OptionMenu
+        m_Mode: 1
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -2962,141 +2784,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1023402264}
  m_CullTransparentMesh: 1
--- !u!1 &1077206447
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1077206448}
-  - component: {fileID: 1077206450}
-  - component: {fileID: 1077206449}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
--- !u!224 &1077206448
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1077206447}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1834896933}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -946, y: 10}
-  m_SizeDelta: {x: 258.70892, y: 60.25596}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1077206449
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1077206447}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: Vsync
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 1
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
-    topRight: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
-    bottomLeft: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
-    bottomRight: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
-  m_fontColorGradientPreset: {fileID: 11400000, guid: 3993022102250764cb128dc715602c65, type: 2}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 65
-  m_fontSizeBase: 48
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  m_fontSizeMin: 30
-  m_fontSizeMax: 65
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1077206450
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1077206447}
-  m_CullTransparentMesh: 1
 --- !u!1 &1092561535
 GameObject:
  m_ObjectHideFlags: 0
@@ -4027,8 +3714,8 @@ GameObject:
  - component: {fileID: 1386328417}
  - component: {fileID: 1386328422}
  - component: {fileID: 1386328425}
-  - component: {fileID: 1386328424}
  - component: {fileID: 1386328423}
+  - component: {fileID: 1386328426}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -4149,18 +3836,6 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  resolutionDropdown: {fileID: 415922102}
  mixer: {fileID: 24100000, guid: 833dc20f7f9e5b244a756827a43d874d, type: 2}
--- !u!114 &1386328424
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1386328416}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30554c5b5d693404cab81430d7e894ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &1386328425
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -4173,6 +3848,21 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: b9102add15fe89844a6f103c51332836, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  MainMenuObj: {fileID: 1704647066}
+  OptionsMenu: {fileID: 1274410647}
+  VideoButton: {fileID: 500113175}
+--- !u!114 &1386328426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1386328416}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0fa93b33fed1ce42a3e77548b03decc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1421471717
 GameObject:
  m_ObjectHideFlags: 0
@@ -4954,7 +4644,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 2147483647
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1804663945
 RectTransform:
  m_ObjectHideFlags: 0
@@ -5105,105 +4795,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1831593193}
  m_CullTransparentMesh: 1
--- !u!1 &1834896932
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1834896933}
-  - component: {fileID: 1834896934}
-  m_Layer: 5
-  m_Name: VsyncToggle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
--- !u!224 &1834896933
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1834896932}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1077206448}
-  - {fileID: 850122247}
-  m_Father: {fileID: 345853270}
-  m_RootOrder: 2
-  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: 404, y: -202}
-  m_SizeDelta: {x: 85.471, y: 76.781}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1834896934
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1834896932}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 850122248}
-  toggleTransition: 1
-  graphic: {fileID: 57176557}
-  m_Group: {fileID: 0}
-  onValueChanged:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1386328423}
-        m_TargetAssemblyTypeName: OptionMenu, Assembly-CSharp
-        m_MethodName: setVsync
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-  m_IsOn: 1
 --- !u!1 &1847040547
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Akciok.cs
+++ b/Assets/Scripts/Akciok.cs
@@ -30,9 +30,6 @@ public class Akciok : MonoBehaviour

    };

-
-    //
-
    //Hack
    public TMP_Text elso_sor_text;
    public TMP_Text[] masodik_sor;
@@ -48,13 +45,14 @@ public class Akciok : MonoBehaviour
    private bool omega = false;
    //

-    private void Start()
-    {
+    private void Awake(){
        ap = FindObjectOfType<Akciopont>();
        movement = FindObjectOfType<movement>();
        upgrade = FindObjectOfType<Upgrade>();
-        source = FindObjectOfType<Source>();
+        source = FindObjectOfType<Source>();        
+    }

+    private void Start(){
        //kezdesnel karikazza be az elso harom adott toltenyt
        for (int i = 0; i < tolteny_index; i++)
        {
@@ -82,8 +80,10 @@ public class Akciok : MonoBehaviour

            betarazott_tolteny += betarazas;
            //tolteny_index++;
-            ap.akciopont--;
+            

+            ap.UpdateAkciopont(-1);
+        
            Debug.Log("Tolteny betarazva");
            Debug.Log("Betarazott toltenyek szama: " + betarazott_tolteny);
        }
@@ -159,7 +159,7 @@ public class Akciok : MonoBehaviour
            }
        }

-        ap.akciopont--;
+        ap.UpdateAkciopont(-1);

        NyomozasOszlopCheck();

@@ -194,7 +194,7 @@ public class Akciok : MonoBehaviour

        if (nyomozas_counter == 4)
        {
-            ap.akciopont += 2;
+            ap.UpdateAkciopont(2);
            Debug.Log("Ap novelve");
            nyomozas_oszlop[oszlop].text = "X";
        }
@@ -302,12 +302,12 @@ public class Akciok : MonoBehaviour
                    hackelt_sorok[movement.jelenlegi_y - 1] = movement.jelenlegi_y;
                }
            }
-            ap.akciopont -= upgrade.hack[upgrade.getHackIndex()]; //ap koltseg levonasa
+            //ap.akciopont -= upgrade.hack[upgrade.getHackIndex()]; //ap koltseg levonasa
+            ap.UpdateAkciopont(-upgrade.hack[upgrade.getHackIndex()]); //ap koltseg levonasa
        }
        else
        {
            Debug.Log("itt mar hackeltel");
        }
-
    }
-}
+}
--- a/Assets/Scripts/AspectRatioHandler.cs
+++ b/Assets/Scripts/AspectRatioHandler.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+
+public class AspectRatioHandler : MonoBehaviour
+{
+    public Camera mainCamera;
+
+    private void Awake() {
+        double aspectRatio = (double)Screen.width / (double)Screen.height;
+        aspectRatio = Math.Round(aspectRatio, 2);
+        Debug.Log("aspectratio: " + aspectRatio);
+
+        //5:4 1,25, 4:3 1,33, 16:9 1,77, 16:10 1,6, 21:9 2,33
+
+        if(aspectRatio == 1.78 || aspectRatio == 2.33){
+            mainCamera.orthographicSize = 10.4f; //16:9, 21:9
+        }else if(aspectRatio == 1.6){
+            mainCamera.orthographicSize = 11.43f; //16:10
+        }else if(aspectRatio == 1.33){
+            mainCamera.orthographicSize = 13.72f; //4:3
+        }else if(aspectRatio == 1.25){
+            mainCamera.orthographicSize = 14.68f;
+        }
+        
+    }
+}
--- a/Assets/Scripts/AspectRatioHandler.cs.meta
+++ b/Assets/Scripts/AspectRatioHandler.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 32cd04417f58e9744b4743a6cc333196
+guid: f1646c9ba4620a0e7861327e11e40849
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/Scripts/CameraMovement.cs
+++ b/Assets/Scripts/CameraMovement.cs
@@ -7,7 +7,6 @@ public class CameraMovement : MonoBehaviour
    public Camera mainCamera;
    public Vector3 offset;

-
    public void moveCameraToTarget(Transform target) {
        Debug.Log("Moved to " + target.name);
        mainCamera.transform.position = target.position + offset;
--- a/Assets/Scripts/Dice.cs
+++ b/Assets/Scripts/Dice.cs
@@ -1,32 +1,27 @@
 using System.Collections;
-using TMPro;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
-using static jatekmanager;

 public class Dice : MonoBehaviour {
    public Sprite[] diceSides = new Sprite[6];
    public SpriteRenderer hely1;
    public SpriteRenderer hely2;
-
+    public Button dice1btnBtn; 
+    public Button dice2btnBtn; 
    private Upgrade upgrade;
    private Akciopont ap;
    private Energia energiasav;
    private Targyak targyak;
-
    public int[] diceResult = { 0, 0 };
-    public int[] ujertek;
+    public List<int> ujertek = new List<int>();
    public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye
-    private bool locked = false; //ne lehessen ujra kivalasztani a masikat ha mar tortent egy valasztas
-    
+    private bool locked = false; //ne lehessen ujra kivalasztani a masikat ha mar tortent egy valasztas  
    public bool adrenalinMegerosites = false;
    public GameObject adrenalinHasznalat;
    public Button confirm;
-    public Button cancel;
-
-    public GameObject rolldice;
-
-
+    public Button cancel;  
+    public bool mehet = false;
    public BoxCollider2D[] colliders;

    //getters setters
@@ -35,27 +30,27 @@ public class Dice : MonoBehaviour {
    public void setValasztottErtek(int ujErtek) { valasztottErtek = ujErtek; }
    public bool getLocked() { return locked; }
    public void setLocked(bool locked) { this.locked = locked; }
-
    public int dobott = 0;
+    public bool dobottEgyszer = false; //tudjon ujra dobni vagy nem
+    public int ujradobasszamlalo;

-    private void Start() {
+    private void Awake() {
        upgrade = FindObjectOfType<Upgrade>();
        ap = FindObjectOfType<Akciopont>();
        energiasav = FindObjectOfType<Energia>();
        targyak = FindObjectOfType<Targyak>();
    }

-
    public void ertekValasztas(GameObject gomb) {
        if (diceResult[0] != 0 && diceResult[1] != 0 && !locked) { //megnezzuk hogy lett e mar dobva es nem valasztott meg a jatekos
            if (gomb.name == "dice1btn") {
                valasztottErtek = diceResult[0];
                if (diceResult[0] < diceResult[1]) {
                    upgrade.canUpgrade = true; //kisebb szam valasztasa eseten fejlesztes egyszer
-                    jatekmanager.Instance.UpdateGameState(GameState.Fejlesztes); //a jatekmanager atvalt a fejlesztes eventre
+                    jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
                } else {
                    energiasav.csokkenEnergia(1); //nagyobb szam valasztasa eseten -1 energia
-                    jatekmanager.Instance.UpdateGameState(GameState.Akcio); //a jatekmanager atvalt az akcio eventre
+                    jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
                }

                locked = true;
@@ -63,10 +58,10 @@ public class Dice : MonoBehaviour {
                valasztottErtek = diceResult[1];
                if (diceResult[1] < diceResult[0]) {
                    upgrade.canUpgrade = true;
-                    jatekmanager.Instance.UpdateGameState(GameState.Fejlesztes); //a jatekmanager atvalt a fejlesztes eventre
+                    jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
                } else {
                    energiasav.csokkenEnergia(1);
-                    jatekmanager.Instance.UpdateGameState(GameState.Akcio); //a jatekmanager atvalt az akcio eventre
+                    jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio);
                }

                locked = true;
@@ -85,18 +80,24 @@ public class Dice : MonoBehaviour {
        Debug.Log(finalSide);

        return finalSide;
-
-
    }

    public void CallRenderDice() => StartCoroutine(renderDice());

    public IEnumerator renderDice() {
+        //ha zarolva van akkor ne tudjon ujra dobni / csak egyszer dobhasson (amig nincs feloldva a kovetkezo dobashoz)
+        if(dobottEgyszer) yield break;
+
+        //dice gombok kikapcsolasa hogy amig nem vegez ne tudjon erteket valasztani
+        dice1btnBtn.enabled = false;
+        dice2btnBtn.enabled = false;
+
        do {
            diceResult[0] = RollDice();
            diceResult[1] = RollDice();
        } while (diceResult[0] == diceResult[1]);

+
        //lassa a jatekos mit dobott
        hely1.sprite = diceSides[diceResult[0]-1];
        hely1.size = new Vector2(38, 38);
@@ -104,23 +105,14 @@ public class Dice : MonoBehaviour {
        hely2.sprite = diceSides[diceResult[1]-1];
        hely2.size = new Vector2(38, 38);

-        dobott++;
-        Debug.Log("Ennyit dobtál: " + dobott);
-        Debug.Log("Ennyi dobásod van még: " + ((upgrade.getUjradobasIndex() + 1) - dobott));
+        ujradobasszamlalo--;
+        Debug.Log("ujradobasszamlalo: " + ujradobasszamlalo);
+        if(ujradobasszamlalo == 0){
+            dobottEgyszer = true;
+        }       

-        //jatemanager reszere
-        if (dobott < upgrade.getUjradobasIndex() + 1)
-        {
-            Debug.Log(dobott);
-        }
-        else
-        {
-            rolldice.SetActive(false);
-            Debug.Log("Nincs több dobásod a körben");
-        }
-
-
-        if (targyak.adrenalinloket > 0) {
+        //ha megvan a targy
+        if(targyak.adrenalinloket > 0) {
            //helyszin collider kikapcsolas a gomb miatt
            HelyszinKiBekapcs(true);
            //text aktivalasa kerdesre hogy akarja e hasznalni a targyat
@@ -134,23 +126,67 @@ public class Dice : MonoBehaviour {
                adrenalinMegerosites = true;
            }else{
                adrenalinMegerosites = false;
+                HelyszinKiBekapcs(false); //nem hasznalja fel ezert visszakapcsoljuk
            }

            adrenalinHasznalat.gameObject.SetActive(false);

            if (adrenalinMegerosites) {
-                Debug.Log("belep");
                targyak.CallAdrenalinLoket();
-                diceResult[0] = ujertek[0];
-                diceResult[1] = ujertek[1];
+                yield return new WaitUntil(() => ujertek.Count > 0);
+                if(mehet){
+                    Debug.Log("belep mehet");
+                    Debug.Log("List: 0: " + ujertek[0] + " 1: " + ujertek[1]);
+                    //EGYENLO ERTEKEK VIZSGALATA
+                    //ha tul nagy vagy tul kicsi erteket ad meg az elso kockanak valtsa at az erteket
+                    if(targyak.ujertek1 > 6 && diceResult[1] != 6 && targyak.ujertek2 != 6){ //ha tul nagy szamot adott meg legyen 6 az ertek
+                        targyak.ujertek1 = 6;
+                    }else if(targyak.ujertek1 > 6 && (diceResult[1] == 6 || targyak.ujertek2 == 6)){ //ha a masik ertek 6 akkor legyen az ertek 5
+                        targyak.ujertek1 = 5;
+                    }else if(targyak.ujertek1 < 1 && diceResult[1] != 1 && targyak.ujertek2 != 1){
+                        targyak.ujertek1 = 1;
+                    }else if(targyak.ujertek1 < 1 && (diceResult[1] == 1 || targyak.ujertek2 == 1)){
+                        targyak.ujertek1 = 2;
+                    }else if(targyak.ujertek1 == targyak.ujertek2 || targyak.ujertek1 == diceResult[1]){ //ha egyenlo a ket uj ertek vagy az elso egyenlo a mar meglevo masodik kockaval
+                        if(targyak.ujertek1 == 1){
+                            targyak.ujertek1++;
+                        }else if(targyak.ujertek1 == 6){
+                            targyak.ujertek1--;
+                        }else{
+                            targyak.ujertek1--;
+                        }
+                    }
+
+                    //
+
+                    //ha tul nagy vagy tul kicsi erteket ad meg az masodik kockanak valtsa at az erteket
+                    if(targyak.ujertek2 > 6 && diceResult[0] != 6 && targyak.ujertek1 != 6){ //ha tul nagy szamot adott meg legyen 6 az ertek
+                        targyak.ujertek2 = 6;
+                    }else if(targyak.ujertek2 > 6 && (diceResult[0] == 6 || targyak.ujertek1 == 6)){ //ha a masik ertek 6 akkor legyen az ertek 5
+                        targyak.ujertek2 = 5;
+                    }else if(targyak.ujertek2 < 1 && diceResult[0] != 1 && targyak.ujertek1 != 1){
+                        targyak.ujertek2 = 1;
+                    }else if(targyak.ujertek2 < 1 && (diceResult[0] == 1 || targyak.ujertek1 == 1)){
+                        targyak.ujertek2 = 2;
+                    }/*else if(targyak.ujertek1 == targyak.ujertek2 || targyak.ujertek2 == diceResult[0]){ //ha egyenlo a ket uj ertek vagy a masodik egyenlo a mar meglevo elso kockaval
+                        if(targyak.ujertek2 == 1){
+                            targyak.ujertek2++;
+                        }else if(targyak.ujertek2 == 6){
+                            targyak.ujertek2--;
+                        }else{
+                            targyak.ujertek2--;
+                        }
+                    }   */            
+
+                    diceResult[0] = targyak.ujertek1;
+                    diceResult[1] = targyak.ujertek2;
+                    dobottEgyszer = true;
+                }        
            }
            //deaktivalas
-            Debug.Log("belep2");
            adrenalinMegerosites = false;
-            HelyszinKiBekapcs(false);
        }

-
        hely1.sprite = diceSides[diceResult[0]-1];
        hely1.size = new Vector2(38, 38);

@@ -158,6 +194,9 @@ public class Dice : MonoBehaviour {
        hely2.size = new Vector2(38, 38);
        dobott++;

+        //ha vegzett mindennel kapcsolja vissza az ertekvalasztast
+        dice1btnBtn.enabled = true;
+        dice2btnBtn.enabled = true;
    }

    public void HelyszinKiBekapcs(bool kikapcsolas){
@@ -168,20 +207,6 @@ public class Dice : MonoBehaviour {
            foreach(var item in colliders)
                item.gameObject.SetActive(true);            
    }
-    
-    public IEnumerator waitbutton(){
-        Debug.Log("belep wait");
-        var waitForButton = new WaitForUIButtons(confirm, cancel);
-            yield return waitForButton.Reset();
-
-            if(waitForButton.PressedButton == confirm){
-                adrenalinMegerosites = true;
-            }else{
-                adrenalinMegerosites = false;
-            }
-
-        adrenalinHasznalat.gameObject.SetActive(false);
-    }

    public void setAdrenalinMegerosites(bool adrenalinMegerosites) {
        this.adrenalinMegerosites = adrenalinMegerosites; 
--- a/Assets/Scripts/Elet.cs
+++ b/Assets/Scripts/Elet.cs
@@ -11,10 +11,11 @@ public class Elet : MonoBehaviour
    private int elet_megszerezve = 2;
    private jatekmanager jatekmanager;

-    private void Start() {
+    private void Awake() {
        jatekmanager = FindObjectOfType<jatekmanager>();
+    }

-
+    private void Start() {
        for (int i = 0; i < elet_megszerezve; i++) {
            elet_text[i].text = "O";
        }
--- a/Assets/Scripts/Source.cs
+++ b/Assets/Scripts/Source.cs
@@ -10,12 +10,16 @@ public class Source : MonoBehaviour

    private movement movement;
    public GameObject sourceSprite;
+    private Ugynok ugynok;

    private bool oneTime = false;

-    private void Start() {
+    private void Awake() {
        movement = FindObjectOfType<movement>();
+        ugynok = FindObjectOfType<Ugynok>();
+    }

+    private void Start() {
        sor = new List<int>();
        for (int i = 1; i < 5; i++) {
            sor.Add(i);
@@ -26,6 +30,10 @@ public class Source : MonoBehaviour
        if(isNyitva && oszlop != -1 && sor.Count == 1) {
            sourceRender(oszlop, sor[0]);
            if (!oneTime) {
+                for (int i = 0; i < 3; i++)
+                {
+                    ugynok.UgynokSorsolas(oszlop, sor[0]);
+                }
                printSourceLocation();
                oneTime = true;
            }
--- a/Assets/Scripts/Targyak.cs
+++ b/Assets/Scripts/Targyak.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -13,14 +14,11 @@ public class Targyak : MonoBehaviour
    private Energia energia;
    private Ugynok ugynok;
    private Dice dice;
-
+    private jatekmanager jatekmanager;
    public TMP_InputField kocka1ertek;
    public TMP_InputField kocka2ertek;
    public int ujertek1;
    public int ujertek2;
-    public Button confirmNewValue;
-    public Button cancelNewValue;
-
    public int targy_szamlalo = 0;
    public int adrenalinloket = 0;
    public int hackercsatlakozo = 0;
@@ -31,8 +29,28 @@ public class Targyak : MonoBehaviour
    public bool lathatatlanOltozetAktivalva = false;
    public bool matavtaviranyitoAktivalva = false;
    private int randomszam;
+    public Button confirmNewValue;
+    public Button cancelNewValue;

-    private void Start() {
+    //targy megszerezve ui
+    public TMP_Text adrenalinMegszerezve;
+    public TMP_Text hackerMegszerezve;
+    public TMP_Text lathatatlanMegszerezve;
+    public TMP_Text droidMegszerezve;
+    public TMP_Text matavMegszerezve;
+    public TMP_Text alomhozoMegszerezve;
+
+    //targy felhasznalva ui
+    public TMP_Text adrenalinFelhasznalva;
+    public TMP_Text hackerFelhasznalva;
+    public TMP_Text lathatatlanFelhasznalva;
+    public TMP_Text droidFelhasznalva;
+    public TMP_Text matavFelhasznalva;
+    public TMP_Text alomhozoFelhasznalva;
+
+    public List<string> elerheto_targyak = new List<string>{"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"};
+
+    private void Awake() {
        akciok = FindObjectOfType<Akciok>(); 
        elet = FindObjectOfType<Elet>();
        akciopont = FindObjectOfType<Akciopont>();
@@ -40,59 +58,76 @@ public class Targyak : MonoBehaviour
        energia = FindObjectOfType<Energia>();
        ugynok = FindObjectOfType<Ugynok>();
        dice = FindObjectOfType<Dice>();
+        jatekmanager = FindObjectOfType<jatekmanager>();
    }

    public void RandomTargy()
    {
-        string[] elerheto_targyak = {"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"} ;
-        
-        do{
-            randomszam = UnityEngine.Random.Range(0, elerheto_targyak.Length);
-        }while(!elerheto_targyak[randomszam].Equals(""));
+        if(elerheto_targyak.Count == 0) return;

+            randomszam = UnityEngine.Random.Range(0, elerheto_targyak.Count);

-        elerheto_targyak[randomszam] = "";
-
-        if (randomszam == 0)
-        {
+        //megszerezve ui es beaddolas
+        if(elerheto_targyak[randomszam].Equals("Adrenalinloket")){
+            adrenalinMegszerezve.text = "X";
            adrenalinloket++;
            Debug.Log("Kaptal egy AdrenalinLoketet!");
-        }
-        else if (randomszam == 1)
-        {
+        }else if(elerheto_targyak[randomszam].Equals("Hacker csatlakozo")){
+            hackerMegszerezve.text = "X";
            hackercsatlakozo++;
            Debug.Log("Kaptal egy Hacker Csatlakozot!");
-        }
-        else if (randomszam == 2)
-        {
+        }else if(elerheto_targyak[randomszam].Equals("Lathatatlan oltozet")){
+            lathatatlanMegszerezve.text = "X";
            lathatatlanoltozet++;
            Debug.Log("Kaptal egy Lathatatlan oltozetet!");
-        }
-        else if (randomszam == 3)
-        {
+        }else if(elerheto_targyak[randomszam].Equals("Droid agyu")){
+            droidMegszerezve.text = "X";
            droidgepagyu++;
            Debug.Log("Kaptal egy Droid-X2 Gepagyut!");
-        }
-        else if (randomszam == 4)
-        {
+        }else if(elerheto_targyak[randomszam].Equals("Matav taviranyito")){
+            matavMegszerezve.text = "X";
            matavtaviranyito++;
            Debug.Log("Kaptal egy Matav Taviranyitot!");
-        }
-        else if (randomszam == 5)
-        {
+        }else if(elerheto_targyak[randomszam].Equals("Alomhozo fustgranat")){
+            alomhozoMegszerezve.text = "X";
            fustgranat++;
            Debug.Log("Kaptal egy Alomhozo Fustgranatot!");
        }
+
+        elerheto_targyak.RemoveAt(randomszam); //szedje ki a listabol
    }

    public void addAdrenalin() {
        adrenalinloket = 1;
    }

+    private void Update() {     
+        //betu kitorlese 
+        if(!kocka1ertek.text.Equals("")){ //megnezzuk hogy van e mar valami a szovegben
+            for(int i = 0; i < kocka1ertek.text.Length; i++) //vegig megyunk a szovegen
+            {              
+                if(!Char.IsDigit(kocka1ertek.text[i])){ //ha a betu nem szam torolje
+                    Debug.Log("updaate");
+                    kocka1ertek.text = kocka1ertek.text.Remove(i);
+                }
+            }
+        }
+
+        if(!kocka2ertek.text.Equals("")){ //megnezzuk hogy van e mar valami a szovegben
+            for(int i = 0; i < kocka2ertek.text.Length; i++) //vegig megyunk a szovegen
+            {
+                if(!Char.IsDigit(kocka2ertek.text[i])){ //ha a betu nem szam torolje
+                    kocka2ertek.text = kocka2ertek.text.Remove(i);
+                }
+            }
+        }
+    }
+
    public void CallAdrenalinLoket() => StartCoroutine(AdrenalinLoket());

    public IEnumerator AdrenalinLoket() {
-        Debug.Log("nefefs");
+        Debug.Log("adrenalin ienumerator");
+
        kocka1ertek.text = dice.getDices()[0].ToString(); //maradjon uresen es jelenjen meg kepen a kocka ertekek, hogy while-al varakoztatni lehessen?
        kocka2ertek.text = dice.getDices()[1].ToString();

@@ -102,20 +137,32 @@ public class Targyak : MonoBehaviour
        confirmNewValue.gameObject.SetActive(true);//aktivalja a gombot hozza
        cancelNewValue.gameObject.SetActive(true);

+        //VARNIA KELL A GOMBRA || itt folytatja
+        var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue);
+        yield return waitForButton.Reset();
+
+        //nem szam karakter levedes?
        ujertek1 = int.Parse(kocka1ertek.text);
        ujertek2 = int.Parse(kocka2ertek.text); //hogy tunik el az elozo? || egymas melle kerul a ket input vagy gomb ami deaktivalja a inputot
        
-        //VARNIA KELL A GOMBRA
-        var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue);
-        yield return waitForButton.Reset();
-        
+        Debug.Log("ujertek1: " + ujertek1 + " ujertek2: " + ujertek2);
+
        if(waitForButton.PressedButton == confirmNewValue){
            deactivateInputOk(true);
-            dice.ujertek[0] = ujertek1; //csak akkor adja at ha leokezta
-            dice.ujertek[1] = ujertek2;
+            dice.ujertek.Add(ujertek1); //csak akkor adja at ha leokezta
+            dice.ujertek.Add(ujertek2); //uj adat amit a user adott meg
+            dice.mehet = true;
+            dice.HelyszinKiBekapcs(false);
+            adrenalinFelhasznalva.text = "X";
+            yield break; //kilepeshez
        }else{
            deactivateInputOk(false);
-        }           
+            dice.HelyszinKiBekapcs(false);
+        }  
+
+        //ha nem lepett ki eddig
+        //dice.ujertek[0] = dice.getDices()[0]; 
+        //dice.ujertek[1] = dice.getDices()[1]; //regi adat, hogy ne legyen hibas       
    }

    public void deactivateInputOk(bool targyelvesztes) {
@@ -127,37 +174,70 @@ public class Targyak : MonoBehaviour
            adrenalinloket = 0; //targy elvesztese
    }

-
-
    public void HackerCsatlakozo() { //kesz
        //+2 tolteny
        akciok.Betarazas(2);
+        akciopont.akciopont++; //betarazas miatt egy pont visszaadasa
        //+1 elet
        elet.Eletplusz();
        //+1 akcio
-        akciopont.akciopont++;
-        
+        akciopont.UpdateAkciopont(1);
+
+        hackercsatlakozo = 0; //targy elvesztese 
+
+        Debug.Log("hacker felhasznalva");
+
+        //felhasznalva ui
+        hackerFelhasznalva.text = "X";     
    }

    public void LathatatlanOltozek() { //kesz
-        //movement.mozgasHelyre(2, 2); //megadni inkabb a hely nevet ahova menni akar? | input field es nev megadas
        lathatatlanOltozetAktivalva = true;
-        
+        lathatatlanoltozet = 0; //targy elvesztese 
+
+        Debug.Log("lathatatlan felhasznalva");
+
+        //felhasznalva ui
+        lathatatlanFelhasznalva.text = "X";  
    }

-    public void DroidGepagyu() { //kesz
+    public void DroidGepagyu() { 
+        //deaktivalni minden objectet kiveve a ugynok text boxokat es addig nem vissza aktivalni amig nem kattintott ra valamelyikre      
+        //ugynok.canKill = true; //barhol meg tud olni ha kattint
        
-        //ugynok cucc
-        ugynok.canKill = true; //barhol meg tud olni ha kattint
+        //deaktivalas
+        //jatekmanager.ugynokDeaktivalas(false);
+        jatekmanager.UpdateGameState(jatekmanager.GameState.Ugynok); //ugynok state (minden kikapcsolva);
+        
+        ugynok.droidagyuAktivalva = true;
+
+        Debug.Log("kattints egy ugynok csapatra!");
+
+        droidgepagyu = 0; //targy elvesztese
+
+        Debug.Log("droid felhasznalva");
+
+        //felhasznalva ui
+        droidFelhasznalva.text = "X";
    }

    public void MatavTaviranyito() {
        matavtaviranyitoAktivalva = true;
+        matavtaviranyito = 0; //targy elvesztese
+
+        Debug.Log("matav felhasznalva");
+
+        //felhasznalva ui
+        matavFelhasznalva.text = "X";
    }

    public void FustGranat() {
        energia.granatAktivalva = true;
-        
-    }
+        fustgranat = 0; //targy elvesztese   

-}
+        Debug.Log("granat felhasznalva");
+
+        //felhasznalva ui
+        alomhozoFelhasznalva.text = "X";   
+    }
+}
--- a/Assets/Scripts/TurnManager.cs
+++ b/Assets/Scripts/TurnManager.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using static jatekmanager;

 public class TurnManager : MonoBehaviour
 {
@@ -13,34 +12,48 @@ public class TurnManager : MonoBehaviour

    public int turnCounter = 1;

-    void Start()
+    private void Awake()
    {
        dice = FindObjectOfType<Dice>();
        akciopont = FindObjectOfType<Akciopont>();
        energia = FindObjectOfType<Energia>();
        upgrade = FindObjectOfType<Upgrade>();
        jatekmanager = FindObjectOfType<jatekmanager>();
+
+        dice.ujradobasszamlalo = upgrade.ujradobas[upgrade.getUjradobasIndex()] + 1;
+        Debug.Log("ujradobasszamlalo: " + dice.ujradobasszamlalo);
    }

    public void nextTurn() {
        dice.setLocked(false);
+        dice.dobottEgyszer = false;
        akciopont.resetAkciopont();
        energia.csokkenEnergia(upgrade.energia[upgrade.getEnergiaIndex()]);
        energia.granatAktivalva = false; //ha aktivalva lett a granat a korben deaktivalja
        turnCounter++;
        dice.hely1.sprite = null;
        dice.hely2.sprite = null;
+        dice.ujradobasszamlalo = upgrade.ujradobas[upgrade.getUjradobasIndex()] + 1;
+        Debug.Log("ujradobasszamlalo: " + dice.ujradobasszamlalo);
        jatekmanager.vanertelme = true;
-        Debug.Log("kovetkezo kor " + turnCounter);
-        jatekmanager.Instance.UpdateGameState(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);
+        }
+        
+
+        
+    }

        /*
          if (energiavesztese > 29)
        {
            jatekmanager.Instance.UpdateGameState(GameState.Vesztett); //a jatekmanager atvalt a vesztett eventre
        }
-         */
+         */ 

-        
-    }
 }
--- a/Assets/Scripts/Ugynok.cs
+++ b/Assets/Scripts/Ugynok.cs
@@ -1,43 +1,55 @@
 using System.Collections;
 using System.Collections.Generic;
+using System;
 using UnityEngine;
 using TMPro;

 public class Ugynok : MonoBehaviour
 {
+    private Akciok akciok;
+    private Upgrade upgrade;
+    private jatekmanager jatekmanager;
+    private movement movement;
+
    public TMP_Text[] oneone;
-    public BoxCollider2D[] oneoneCollider;
+    //public BoxCollider2D[] oneoneCollider;
    public TMP_Text[] twoone;
-    public BoxCollider2D[] twooneCollider;
+    //public BoxCollider2D[] twooneCollider;
    public TMP_Text[] threeone;
-    public BoxCollider2D[] threeoneCollider;
+    //public BoxCollider2D[] threeoneCollider;
    public TMP_Text[] onetwo;
-    public BoxCollider2D[] onetwoCollider;
+    //public BoxCollider2D[] onetwoCollider;
    public TMP_Text[] twotwo;
-    public BoxCollider2D[] twotwoCollider;
+    //public BoxCollider2D[] twotwoCollider;
    public TMP_Text[] threetwo;
-    public BoxCollider2D[] threetwoCollider;
+    //public BoxCollider2D[] threetwoCollider;
    public TMP_Text[] onethree;
-    public BoxCollider2D[] onethreeCollider;
+    //public BoxCollider2D[] onethreeCollider;
    public TMP_Text[] twothree;
-    public BoxCollider2D[] twothreeCollider;
+    //public BoxCollider2D[] twothreeCollider;
    public TMP_Text[] threethree;
-    public BoxCollider2D[] threethreeCollider;
+    //public BoxCollider2D[] threethreeCollider;
    public TMP_Text[] onefour;
-    public BoxCollider2D[] onefourCollider;
+    //public BoxCollider2D[] onefourCollider;
    public TMP_Text[] twofour;
-    public BoxCollider2D[] twofourCollider;
+    //public BoxCollider2D[] twofourCollider;
    public TMP_Text[] threefour;
-    public BoxCollider2D[] threefourCollider;
+    //public BoxCollider2D[] threefourCollider;
+
+    public bool droidagyuAktivalva = false;

    public bool canKill = false;
    public bool canShoot = false; //harchoz bool
-    public void setCanKillTrue()
-    {
-        canKill = true;
-    }
+    public void setCanKillTrue(){ canKill = true; }
    public Camera maincamera;

+    private void Awake() {
+        akciok = FindObjectOfType<Akciok>();
+        upgrade = FindObjectOfType<Upgrade>();
+        jatekmanager = FindObjectOfType<jatekmanager>();
+        movement = FindObjectOfType<movement>();
+    }
+
    private void Start()
    {
        for (int i = 0; i < oneone.Length; i++)
@@ -93,7 +105,243 @@ public class Ugynok : MonoBehaviour

    }

-    private void Update()
+    public void UgynokSorsolas(int x, int y){
+        if (x == 1 && y == 1)
+        {
+            if (oneone[0].text.Equals(""))
+            {
+                oneone[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (oneone[1].text.Equals(""))
+            {
+                oneone[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (oneone[2].text.Equals(""))
+            {
+                oneone[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 1 && y == 2)
+        {
+            if (onetwo[0].text.Equals(""))
+            {
+                onetwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (onetwo[1].text.Equals(""))
+            {
+                onetwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (onetwo[2].text.Equals(""))
+            {
+                onetwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 1 && y == 3)
+        {
+            if (onethree[0].text.Equals(""))
+            {
+                onethree[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (onethree[1].text.Equals(""))
+            {
+                onethree[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (onethree[2].text.Equals(""))
+            {
+                onethree[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 1 && y == 4)
+        {
+            if (onefour[0].text.Equals(""))
+            {
+                onefour[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (onefour[1].text.Equals(""))
+            {
+                onefour[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (onefour[2].text.Equals(""))
+            {
+                onefour[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 2 && y == 1)
+        {
+            if (twoone[0].text.Equals(""))
+            {
+                twoone[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twoone[1].text.Equals(""))
+            {
+                twoone[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twoone[2].text.Equals(""))
+            {
+                twoone[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 2 && y == 2)
+        {
+            if (twotwo[0].text.Equals(""))
+            {
+                twotwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twotwo[1].text.Equals(""))
+            {
+                twotwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twotwo[2].text.Equals(""))
+            {
+                twotwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 2 && y == 3)
+        {
+            if (twothree[0].text.Equals(""))
+            {
+                twothree[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twothree[1].text.Equals(""))
+            {
+                twothree[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twothree[2].text.Equals(""))
+            {
+                twothree[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 2 && y == 4)
+        {
+            if (twofour[0].text.Equals(""))
+            {
+                twofour[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twofour[1].text.Equals(""))
+            {
+                twofour[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (twofour[2].text.Equals(""))
+            {
+                twofour[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 3 && y == 1)
+        {
+            if (threeone[0].text.Equals(""))
+            {
+                threeone[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threeone[1].text.Equals(""))
+            {
+                threeone[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threeone[2].text.Equals(""))
+            {
+                threeone[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 3 && y == 2)
+        {
+            if (threetwo[0].text.Equals(""))
+            {
+                threetwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threetwo[1].text.Equals(""))
+            {
+                threetwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threetwo[2].text.Equals(""))
+            {
+                threetwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 3 && y == 3)
+        {
+            if (threethree[0].text.Equals(""))
+            {
+                threethree[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threethree[1].text.Equals(""))
+            {
+                threethree[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threethree[2].text.Equals(""))
+            {
+                threethree[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+        else if (x == 3 && y == 4)
+        {
+            if (threefour[0].text.Equals(""))
+            {
+                threefour[0].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threefour[1].text.Equals(""))
+            {
+                threefour[1].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+            else if (threefour[2].text.Equals(""))
+            {
+                threefour[2].text = UnityEngine.Random.Range(1, 7).ToString();
+            }
+        }
+    }
+
+
+    public void ugynokOles(TMP_Text ugynokText){       
+        //string tmp = ugynokText.gameObject.name;
+        string s = ugynokText.gameObject.name;
+        //Debug.Log("gomb name: " + s);
+        string sx = Char.ToString(s[7]);
+        string sy = Char.ToString(s[8]);
+        //char cx = sx[7];
+        //char cy = sx[8];
+        int x = int.Parse(sx);
+        int y = int.Parse(sy);
+        Debug.Log("ugynok x: " + x + " y: "+y);
+        Debug.Log("movement x: " + movement.jelenlegi_x +  " y: " + movement.jelenlegi_y);
+
+        if(x != movement.jelenlegi_x || y != movement.jelenlegi_y){
+            Debug.Log("nem egyenlo a ketto");
+        }else{
+            Debug.Log("egyenlo");
+        }
+        
+        if(ugynokText.text.Equals("")){ //ha nincs ott ugynok csapat ne csinaljon semmit
+            Debug.Log("itt nincs ugynok csapat!!");
+            return;
+        }
+
+        if(!droidagyuAktivalva){ //toltenyek levonasa
+            //nincs aktivalva a targy csak azon a helyen olhet ahol van (x, y)
+            if(x != movement.jelenlegi_x || y != movement.jelenlegi_y){
+                Debug.Log("nem vagy azon a helyen es nincs aktivalva a targy!");
+                return;
+            }
+
+            int ugynokcsapatletszama = int.Parse(ugynokText.text);
+            if(ugynokcsapatletszama > akciok.betarazott_tolteny / upgrade.harc[upgrade.getHarcIndex()]){ //ha nincs eleg tolteny
+                Debug.Log("nincs eleg tolteny");
+                return;
+            }
+            akciok.Loves(ugynokcsapatletszama / upgrade.harc[upgrade.getHarcIndex()]);
+            Debug.Log("tolteny szama:" + ugynokcsapatletszama / upgrade.harc[upgrade.getHarcIndex()]);
+        }
+
+        ugynokText.text = "X"; //ugynok csapat megolve
+
+        //minden vissza kapcsolasa 
+        //jatekmanager.ugynokDeaktivalas(true);
+        jatekmanager.UpdateGameState(jatekmanager.GameState.Akcio); //miutan vegzett menjen az akcio state-re
+        droidagyuAktivalva = false;
+    }
+
+
+
+
+
+      /*  private void Update()
    {
        if(canShoot){
            if(oneone[0].text.Equals("")){
@@ -551,188 +799,5 @@ public class Ugynok : MonoBehaviour
            }
        }
    }
-
-    public void UgynokSorsolas(int x, int y)
-    {
-        if (x == 1 && y == 1)
-        {
-            if (oneone[0].text.Equals(""))
-            {
-                oneone[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (oneone[1].text.Equals(""))
-            {
-                oneone[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (oneone[2].text.Equals(""))
-            {
-                oneone[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 1 && y == 2)
-        {
-            if (onetwo[0].text.Equals(""))
-            {
-                onetwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (onetwo[1].text.Equals(""))
-            {
-                onetwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (onetwo[2].text.Equals(""))
-            {
-                onetwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 1 && y == 3)
-        {
-            if (onethree[0].text.Equals(""))
-            {
-                onethree[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (onethree[1].text.Equals(""))
-            {
-                onethree[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (onethree[2].text.Equals(""))
-            {
-                onethree[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 1 && y == 4)
-        {
-            if (onefour[0].text.Equals(""))
-            {
-                onefour[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (onefour[1].text.Equals(""))
-            {
-                onefour[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (onefour[2].text.Equals(""))
-            {
-                onefour[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 2 && y == 1)
-        {
-            if (twoone[0].text.Equals(""))
-            {
-                twoone[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twoone[1].text.Equals(""))
-            {
-                twoone[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twoone[2].text.Equals(""))
-            {
-                twoone[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 2 && y == 2)
-        {
-            if (twotwo[0].text.Equals(""))
-            {
-                twotwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twotwo[1].text.Equals(""))
-            {
-                twotwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twotwo[2].text.Equals(""))
-            {
-                twotwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 2 && y == 3)
-        {
-            if (twothree[0].text.Equals(""))
-            {
-                twothree[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twothree[1].text.Equals(""))
-            {
-                twothree[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twothree[2].text.Equals(""))
-            {
-                twothree[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 2 && y == 4)
-        {
-            if (twofour[0].text.Equals(""))
-            {
-                twofour[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twofour[1].text.Equals(""))
-            {
-                twofour[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (twofour[2].text.Equals(""))
-            {
-                twofour[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 3 && y == 1)
-        {
-            if (threeone[0].text.Equals(""))
-            {
-                threeone[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threeone[1].text.Equals(""))
-            {
-                threeone[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threeone[2].text.Equals(""))
-            {
-                threeone[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 3 && y == 2)
-        {
-            if (threetwo[0].text.Equals(""))
-            {
-                threetwo[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threetwo[1].text.Equals(""))
-            {
-                threetwo[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threetwo[2].text.Equals(""))
-            {
-                threetwo[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 3 && y == 3)
-        {
-            if (threethree[0].text.Equals(""))
-            {
-                threethree[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threethree[1].text.Equals(""))
-            {
-                threethree[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threethree[2].text.Equals(""))
-            {
-                threethree[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-        else if (x == 3 && y == 4)
-        {
-            if (threefour[0].text.Equals(""))
-            {
-                threefour[0].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threefour[1].text.Equals(""))
-            {
-                threefour[1].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-            else if (threefour[2].text.Equals(""))
-            {
-                threefour[2].text = UnityEngine.Random.Range(1, 7).ToString();
-            }
-        }
-    }
-}
+*/
+}
--- a/Assets/Scripts/Upgrade.cs
+++ b/Assets/Scripts/Upgrade.cs
@@ -3,7 +3,6 @@ using UnityEngine;

 public class Upgrade : MonoBehaviour
 {
-    private Akciopont akciopont;
    public readonly int[] energia = { 3, 3, 2, 2, 1 };
    public readonly int[] akcio = { 0, 0, 1, 1, 2 };
    public readonly int[] harc = { 1, 1, 2, 2, 3 };
@@ -27,18 +26,15 @@ public class Upgrade : MonoBehaviour
    public int getUjradobasIndex() { return ujradobas_index; }
    public int getHackIndex() { return hack_index; }

-    private void Start()
-    {
-        akciopont = FindObjectOfType<Akciopont>();
-    }
    public void upgradeEnergia() {
        if (canUpgrade) {
            if (energia_index < 4) {
                energiatext[energia_index].text = "X";
                energia_index++;
+                canUpgrade = false;
+                jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); //a jatekmanager atvalt a korkezdet eventre
            }
            Debug.Log("energia_i: " + energia_index);
-            canUpgrade = false;
            fejlesztes_szamlalo++;
        }
    }
@@ -48,9 +44,10 @@ public class Upgrade : MonoBehaviour
            if (akcio_index < 4) {
                akciotext[akcio_index].text = "X";
                akcio_index++;
+                canUpgrade = false;
+                jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); //a jatekmanager atvalt a korkezdet eventre
            }
-            Debug.Log("akcio_i: " + akcio_index);
-            canUpgrade = false;
+            Debug.Log("akcio_i: " + akcio_index);          
            fejlesztes_szamlalo++;
        }
    }
@@ -60,9 +57,10 @@ public class Upgrade : MonoBehaviour
            if (harc_index < 4) {
                harctext[harc_index].text = "X";
                harc_index++;
+                canUpgrade = false;
+                jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); //a jatekmanager atvalt a korkezdet eventre
            }
-            Debug.Log("harc_i: " + harc_index);
-            canUpgrade = false;
+            Debug.Log("harc_i: " + harc_index);        
            fejlesztes_szamlalo++;
        }
    }
@@ -72,9 +70,10 @@ public class Upgrade : MonoBehaviour
            if (ujradobas_index < 4) {
                ujradobastext[ujradobas_index].text = "X";
                ujradobas_index++;
+                canUpgrade = false;
+                jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); //a jatekmanager atvalt a korkezdet eventre
            }
-            Debug.Log("ujradobas_i: " + ujradobas_index);
-            canUpgrade = false;
+            Debug.Log("ujradobas_i: " + ujradobas_index);    
            fejlesztes_szamlalo++;
        }
    }
@@ -84,9 +83,10 @@ public class Upgrade : MonoBehaviour
            if (hack_index < 3) {
                hacktext[hack_index].text = "X";
                hack_index++;
+                canUpgrade = false;
+                jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Akcio); //a jatekmanager atvalt a korkezdet eventre
            }
-            Debug.Log("hack_i: " + hack_index);
-            canUpgrade = false;
+            Debug.Log("hack_i: " + hack_index);           
            fejlesztes_szamlalo++;
        }
    }
--- a/Assets/Scripts/helyszinaktivalas.cs
+++ b/Assets/Scripts/helyszinaktivalas.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Unity.Mathematics;
 using UnityEditor;
 using UnityEngine;
+using TMPro;

 public class helyszinaktivalas : MonoBehaviour
 {
@@ -14,8 +15,27 @@ public class helyszinaktivalas : MonoBehaviour
    private movement movement;
    private Ugynok ugynok;
    private Energia energia;
+    private jatekmanager jatekmanager;

-    void Start()
+    private int[] helyszinAktivalasSzamlalo;
+
+    //textboxos az aktivalas szamlalohoz
+    public List<TMP_Text> oneoneText; //2
+    public TMP_Text onetwoText; //1
+    public List<TMP_Text> onethreeText; //2
+    public List<TMP_Text> onefourText; //2
+    public TMP_Text twooneText;
+    public List<TMP_Text> twotwoText;
+    public TMP_Text twothreeText;
+    public TMP_Text twofourText;
+
+    public TMP_Text threeoneText;
+    public List<TMP_Text> threetwoText;
+    public TMP_Text threethreeText;
+    public List<TMP_Text> threefourText;
+
+
+    private void Awake()
    {
        akciopont = FindObjectOfType<Akciopont>();
        movement = FindObjectOfType<movement>();
@@ -25,52 +45,81 @@ public class helyszinaktivalas : MonoBehaviour
        elet = FindObjectOfType<Elet>();
        ugynok = FindObjectOfType<Ugynok>();
        energia = FindObjectOfType<Energia>();
+
+        helyszinAktivalasSzamlalo = new int[12];
+        for (int i = 0; i < helyszinAktivalasSzamlalo.Length; i++){
+            helyszinAktivalasSzamlalo[i] = 0;
+        }
    }

    public void HelyszinAktivalas()
    {
-        //1-es mez<EFBFBD> kesz
+        //1-es mezo
        if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1)
        {
+            if(helyszinAktivalasSzamlalo[0] == 2) return; //ketszer lehet aktivalni
            //ugynokcsapat oles barhol tolteny nelkul
-            ugynok.canKill = true; //megolhetunk egy csapatot
+            targyak.DroidGepagyu();
+
            if(!targyak.matavtaviranyitoAktivalva){
                akciopont.UpdateAkciopont(-1);
                energia.csokkenEnergia(1);
            }
-
+    
+            oneoneText[helyszinAktivalasSzamlalo[0]].text = "X";
+            helyszinAktivalasSzamlalo[0]++; 
        }
-        //2-es mez<EFBFBD> -- K<>SZ
+        //2-es mezo
        if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1)
        {
+            if(helyszinAktivalasSzamlalo[1] == 1) return; //egyszer lehet aktivalni
+
            upgrade.canUpgrade = true;
+            jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
            if(!targyak.matavtaviranyitoAktivalva){
-                akciopont.akciopont++;
+                //akciopont.akciopont++;
+                akciopont.UpdateAkciopont(1);
                energia.csokkenEnergia(2);
            }
+
+            twooneText.text = "X";
+            helyszinAktivalasSzamlalo[1]++;
        }
-        //3-es mez<EFBFBD> 
+        //3-es mezo
        if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 1)
        {
-            movement.helyreTeleport(); //hogy teleportal
+            if(helyszinAktivalasSzamlalo[2] == 1) return; //egyszer lehet aktivalni
+
+            //movement.helyreTeleport(); //hogy teleportal (jo?)
+            targyak.lathatatlanOltozetAktivalva = true; //mint a targy
            if(!targyak.matavtaviranyitoAktivalva){
                energia.csokkenEnergia(1);
            }
+
+            threeoneText.text = "X";
+            helyszinAktivalasSzamlalo[2]++;
        }
-        //4-es mez<EFBFBD> kesz
+        //4-es mezo
        if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 2)
        {
-            //kapsz egy t<>rgyat
+            if(helyszinAktivalasSzamlalo[3] == 1) return; //egyszer lehet aktivalni
+
+            //kapsz egy targyat
            targyak.RandomTargy();
            targyak.targy_szamlalo++;
            if(!targyak.matavtaviranyitoAktivalva){
                akciopont.UpdateAkciopont(-1);
                energia.csokkenEnergia(1);
            }
+
+            onetwoText.text = "X";
+            helyszinAktivalasSzamlalo[3]++;
        }
-        //5-es mez<EFBFBD> kesz
+        //5-es mezo
        if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 2)
        {
+            if(helyszinAktivalasSzamlalo[4] == 2) return; //ketszer lehet aktivalni
+
            ///dobj paros +3 ap paratlan -1 energia
            int eredmeny = UnityEngine.Random.Range(1,7);
            Debug.Log("Dobas eredmeny: " + eredmeny);
@@ -82,69 +131,107 @@ public class helyszinaktivalas : MonoBehaviour
            if(!targyak.matavtaviranyitoAktivalva){
                akciopont.UpdateAkciopont(-1);
            }
+
+            twotwoText[helyszinAktivalasSzamlalo[4]].text = "X";
+            helyszinAktivalasSzamlalo[4]++;
        }
-        //6-es mez<EFBFBD> kesz
+        //6-es mezo
        if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 2)
        {
+            if(helyszinAktivalasSzamlalo[5] == 2) return; //ketszer lehet aktivalni
+
            //+1 akcio
            akciopont.UpdateAkciopont(1);
+
+            threetwoText[helyszinAktivalasSzamlalo[5]].text = "X";
+            helyszinAktivalasSzamlalo[5]++;
        }
-        //7-es mez<EFBFBD> -- K<>SZ
+        //7-es mezo
        if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 3)
        {
-            //1 fejleszt<7A>s ingyen
+            if(helyszinAktivalasSzamlalo[6] == 2) return; //ketszer lehet aktivalni
+
+            //1 fejlesztes ingyen
            upgrade.canUpgrade = true;
+            jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Fejlesztes);
            if(!targyak.matavtaviranyitoAktivalva){
                akciopont.UpdateAkciopont(-2);
            }
+
+            onethreeText[helyszinAktivalasSzamlalo[6]].text = "X";
+            helyszinAktivalasSzamlalo[6]++;
        }
-        //8-es mez<EFBFBD> kesz
+        //8-es mezo
        if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 3)
        {
-
+            if(helyszinAktivalasSzamlalo[7] == 1) return; //egyszer lehet aktivalni
+            
            //2 kocka dobas egyik +ap masik -energia
            int eredmeny1 = UnityEngine.Random.Range(1,7); //+ap
            int eredmeny2 = UnityEngine.Random.Range(1,7); //-energia
            Debug.Log("Dobas eredmeny elso: "+eredmeny1+ " masodik: " + eredmeny2);
            akciopont.UpdateAkciopont(eredmeny1);
            energia.csokkenEnergia(eredmeny2);
+
+            twothreeText.text = "X";
+            helyszinAktivalasSzamlalo[7]++;
        }
-        //9-es mez<EFBFBD> -- K<>SZ
+        //9-es mezo
        if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 3)
        {
+            if(helyszinAktivalasSzamlalo[8] == 1) return; //egyszer lehet aktivalni
+
            targyak.RandomTargy();
            targyak.targy_szamlalo++;
            if(!targyak.matavtaviranyitoAktivalva){
                akciopont.UpdateAkciopont(-2);
            }
+
+            threethreeText.text = "X";
+            helyszinAktivalasSzamlalo[8]++;
        }
-        //10-es mez<EFBFBD> -- K<>SZ ?
+        //10-es mezo
        if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 4)
        {
-            //+4 t<>lt<6C>ny
+            if(helyszinAktivalasSzamlalo[9] == 2) return; //ketszer lehet aktivalni
+
+            //+4 tolteny
            akciok.Betarazas(4); //ha nincs negy darab tolteny toltse be a maradekot vagy ne lehessen aktivalni a helyszint?
            if(!targyak.matavtaviranyitoAktivalva){
-                akciopont.UpdateAkciopont(-1);
+                akciopont.UpdateAkciopont(0); //betarazasba levon egyet (csak placeholder)
            }
+
+            onefourText[helyszinAktivalasSzamlalo[9]].text = "X";
+            helyszinAktivalasSzamlalo[9]++;
        }
-        //11-es mez<EFBFBD> kesz
+        //11-es mezo
        if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 4)
        {
-            //Dobj! Megkapod a t<>rgyat.
+            if(helyszinAktivalasSzamlalo[10] == 1) return; //egyszer lehet aktivalni
+
+            //Dobj! Megkapod a targyat.
            targyak.RandomTargy();
            targyak.targy_szamlalo++;
            if(!targyak.matavtaviranyitoAktivalva){
                energia.csokkenEnergia(1);
            }
+
+            twofourText.text = "X";
+            helyszinAktivalasSzamlalo[10]++;
        }
-        //12-es mez<EFBFBD>  -- K<>SZ
+        //12-es mezo
        if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4)
        {
+            if(helyszinAktivalasSzamlalo[11] == 2) return; //ketszer lehet aktivalni
+
            //+1 elet
            elet.Eletplusz();
            if(!targyak.matavtaviranyitoAktivalva){
                akciopont.UpdateAkciopont(-1);
            }
+
+            threefourText[helyszinAktivalasSzamlalo[11]].text = "X";
+            helyszinAktivalasSzamlalo[11]++;
        }
    }
-}
+}
--- a/Assets/Scripts/jatekmanager.cs
+++ b/Assets/Scripts/jatekmanager.cs
@@ -54,20 +54,15 @@ public class jatekmanager : MonoBehaviour
    public bool jatekosnyert = false;
    public bool jatekosvesztett = false;
    public bool vanertelme = true;
-
    public GameState State;
-
    public static event Action<GameState> OnGameStateChanged;
+    public Button helyszinaktivalasBtn;

-    [SerializeField] private Button RollDice;
-
-
-    void Awake()
+    private void Awake()
    {
        Instance = this;
    }

-
    private void Start()
    {
        elet = FindObjectOfType<Elet>();
@@ -81,7 +76,6 @@ public class jatekmanager : MonoBehaviour
        source = FindObjectOfType<Source>();

        UpdateGameState(GameState.KorKezdet);
-       
    }

    public void UpdateGameState(GameState newState)
@@ -99,6 +93,12 @@ public class jatekmanager : MonoBehaviour
            case GameState.Fejlesztes:
                HandleFejlesztes();
                break;
+            case GameState.Ugynok:
+                ugynokDeaktivalas(false);
+                break;
+            case GameState.Vesztette:
+                HandleVesztette();
+                break;
            default:
                throw new ArgumentOutOfRangeException(nameof(newState), newState, null);
        }
@@ -110,9 +110,9 @@ public class jatekmanager : MonoBehaviour
    {
        KorKezdet,
        Akcio,
-        Fejlesztes
-        //Nyert
-        //Vesztett
+        Fejlesztes,
+        Ugynok,
+        Vesztette
    }

    private async void HandleKorkezdet()
@@ -128,15 +128,35 @@ public class jatekmanager : MonoBehaviour
        betarazas.SetActive(false);
        nyomozas.SetActive(false);
        hackeles.SetActive(false);
-        test.SetActive(false);
+        helyszinaktivalasBtn.gameObject.SetActive(false);
+        //test.SetActive(false);
+
+        //ha ugynok state-el vegezne kapcsoljon vissza mindent
+        movement.oneone_Collider.gameObject.SetActive(true);
+        movement.onetwo_Collider.gameObject.SetActive(true);
+        movement.onethree_Collider.gameObject.SetActive(true);
+        movement.onefour_Collider.gameObject.SetActive(true);
+        movement.twoone_Collider.gameObject.SetActive(true);
+        movement.twotwo_Collider.gameObject.SetActive(true);
+        movement.twothree_Collider.gameObject.SetActive(true);
+        movement.twofour_Collider.gameObject.SetActive(true);
+        movement.threeone_Collider.gameObject.SetActive(true);
+        movement.threetwo_Collider.gameObject.SetActive(true);
+        movement.threethree_Collider.gameObject.SetActive(true);
+        movement.threefour_Collider.gameObject.SetActive(true);
+
+        targyak.hackerFelhasznalva.GetComponent<Button>().gameObject.SetActive(true);
+        targyak.lathatatlanFelhasznalva.GetComponent<Button>().gameObject.SetActive(true);
+        targyak.droidFelhasznalva.GetComponent<Button>().gameObject.SetActive(true);
+        targyak.matavFelhasznalva.GetComponent<Button>().gameObject.SetActive(true);
+        targyak.alomhozoFelhasznalva.GetComponent<Button>().gameObject.SetActive(true);
+
+        dice.dice1btnBtn.gameObject.SetActive(true);
+        dice.dice2btnBtn.gameObject.SetActive(true);
+

        Debug.Log(dice.dobott + " ; ennyiszer dobtál már a körben");
        Debug.Log((upgrade.getUjradobasIndex() + 1) + " ; ennyi dobásod van összesen");
-
-        
-        
-        
-
    }


@@ -147,8 +167,13 @@ public class jatekmanager : MonoBehaviour
        harcfejlesztés.SetActive(true);
        ujradobasfejlesztés.SetActive(true);
        hackfejlesztés.SetActive(true);
-        kovetkezokor.SetActive(true);
+        kovetkezokor.SetActive(false);
+        //rolldice.SetActive(false);
+        helyszinaktivalasBtn.gameObject.SetActive(false);

+        betarazas.SetActive(false);
+        nyomozas.SetActive(false);
+        hackeles.SetActive(false);
    }

    private async void HandleAkcio()
@@ -158,7 +183,65 @@ public class jatekmanager : MonoBehaviour
        betarazas.SetActive(true);
        nyomozas.SetActive(true);
        hackeles.SetActive(true);
+        helyszinaktivalasBtn.gameObject.SetActive(true);
+        energiafejlesztés.SetActive(false);
+        akciofejlesztés.SetActive(false);
+        harcfejlesztés.SetActive(false);
+        ujradobasfejlesztés.SetActive(false);
+        hackfejlesztés.SetActive(false);

+        kovetkezokor.SetActive(true);
+
+        //rolldice.SetActive(false);
+    }
+
+    private async void HandleVesztette()
+    {
+        JatekosNyert();
+        JatekosVesztett();
+    }
+
+    private async void ugynokDeaktivalas(bool bekapcsolas)
+    {
+        energiafejlesztés.SetActive(bekapcsolas);
+        akciofejlesztés.SetActive(bekapcsolas);
+        harcfejlesztés.SetActive(bekapcsolas);
+        ujradobasfejlesztés.SetActive(bekapcsolas);
+        hackfejlesztés.SetActive(bekapcsolas);
+        kovetkezokor.SetActive(bekapcsolas);
+        betarazas.SetActive(bekapcsolas);
+        nyomozas.SetActive(bekapcsolas);
+        hackeles.SetActive(bekapcsolas);
+
+        //roll dice gomb
+        rolldice.SetActive(bekapcsolas);
+        //kovetkezo kor
+        kovetkezokor.SetActive(bekapcsolas);
+        //helyszinaktivalas
+        helyszinaktivalasBtn.gameObject.SetActive(bekapcsolas);
+
+
+        movement.oneone_Collider.gameObject.SetActive(bekapcsolas);
+        movement.onetwo_Collider.gameObject.SetActive(bekapcsolas);
+        movement.onethree_Collider.gameObject.SetActive(bekapcsolas);
+        movement.onefour_Collider.gameObject.SetActive(bekapcsolas);
+        movement.twoone_Collider.gameObject.SetActive(bekapcsolas);
+        movement.twotwo_Collider.gameObject.SetActive(bekapcsolas);
+        movement.twothree_Collider.gameObject.SetActive(bekapcsolas);
+        movement.twofour_Collider.gameObject.SetActive(bekapcsolas);
+        movement.threeone_Collider.gameObject.SetActive(bekapcsolas);
+        movement.threetwo_Collider.gameObject.SetActive(bekapcsolas);
+        movement.threethree_Collider.gameObject.SetActive(bekapcsolas);
+        movement.threefour_Collider.gameObject.SetActive(bekapcsolas);
+
+        targyak.hackerFelhasznalva.GetComponent<Button>().gameObject.SetActive(bekapcsolas);
+        targyak.lathatatlanFelhasznalva.GetComponent<Button>().gameObject.SetActive(bekapcsolas);
+        targyak.droidFelhasznalva.GetComponent<Button>().gameObject.SetActive(bekapcsolas);
+        targyak.matavFelhasznalva.GetComponent<Button>().gameObject.SetActive(bekapcsolas);
+        targyak.alomhozoFelhasznalva.GetComponent<Button>().gameObject.SetActive(bekapcsolas);
+
+        dice.dice1btnBtn.gameObject.SetActive(bekapcsolas);
+        dice.dice2btnBtn.gameObject.SetActive(bekapcsolas);
    }


@@ -249,7 +332,7 @@ public class jatekmanager : MonoBehaviour
        //JatekosNyert();
        //JatekosVesztett();

-    }
+    } */

    public void JatekosNyert()
    {
@@ -347,7 +430,7 @@ public class jatekmanager : MonoBehaviour
        }

    }
-
+     
    public void JatekosVesztett()
    {
        //ha kinyilik a forras de mar voltal ott ketszer
@@ -616,7 +699,5 @@ public class jatekmanager : MonoBehaviour
        if(jatekosvesztett){
            SceneManager.LoadScene("JatekosVesztett");
        }
-    }
-*/
+    } 
 }
-    
--- a/Assets/Scripts/menu/FrameRateSetter.cs
+++ b/Assets/Scripts/menu/FrameRateSetter.cs
@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FrameRateSetter : MonoBehaviour
+{
+    private void Awake() {
+        Application.targetFrameRate = 60;
+    }
+}
--- a/Assets/Scripts/menu/FrameRateSetter.cs.meta
+++ b/Assets/Scripts/menu/FrameRateSetter.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eaba8d7c523212e4a8a40fcef8e9eb9e
+guid: b0fa93b33fed1ce42a3e77548b03decc
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/Scripts/menu/MainMenu.cs
+++ b/Assets/Scripts/menu/MainMenu.cs
@@ -5,16 +5,35 @@ using UnityEngine.SceneManagement;

 public class MainMenu : MonoBehaviour
 {
-    public void PlayGame() {
+    public GameObject MainMenuObj;
+    public GameObject OptionsMenu;
+    public GameObject VideoButton;
+
+    public void PlayGame()
+    {
        SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1);
    }

-    public void QuitGame() {
+    public void QuitGame()
+    {
        Debug.Log("Application is quitting!!");
        Application.Quit();
    }

-    public void GoToMenu(){
+    public void GoToMenu()
+    {
        SceneManager.LoadScene("MainMenu");
    }
+
+    public void OptionMenu()
+    {
+        MainMenuObj.SetActive(false); //kikapcsolni a fomenu dolgokat
+        OptionsMenu.SetActive(true); //bekapcsolni a beallitas menu dolgokat
+
+        //megvizsgalni hogy a platform szamitogep, es ha nem csak a hangerot lehessen allitani
+        if (Application.platform == RuntimePlatform.WindowsPlayer || Application.platform == RuntimePlatform.OSXPlayer || Application.platform == RuntimePlatform.LinuxPlayer || Application.platform == RuntimePlatform.WindowsEditor || Application.platform == RuntimePlatform.OSXEditor || Application.platform == RuntimePlatform.LinuxEditor)
+        {
+            VideoButton.SetActive(true);
+        }
+    }
 }
--- a/Assets/Scripts/menu/MainMenuQuit.cs
+++ b/Assets/Scripts/menu/MainMenuQuit.cs
@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class MainMenuQuit : MonoBehaviour
-{
-    public void QuitGame() {
-        Debug.Log("Application is quitting!!");
-        Application.Quit();
-    }
-}
--- a/Assets/Scripts/menu/MainMenuQuit.cs.meta
+++ b/Assets/Scripts/menu/MainMenuQuit.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 30554c5b5d693404cab81430d7e894ea
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/menu/OptionMenu.cs
+++ b/Assets/Scripts/menu/OptionMenu.cs
@@ -61,7 +61,7 @@ public class OptionMenu : MonoBehaviour
        Screen.fullScreen = isFullscreen;
    }

-    public void setVsync(bool value) {
+    /*public void setVsync(bool value) {
        int num = 0;

        if (value) num = 1;
@@ -71,5 +71,5 @@ public class OptionMenu : MonoBehaviour
        else Debug.Log("vsync off");

        QualitySettings.vSyncCount = num;
-    }
+    }*/
 }
--- a/Assets/Scripts/movement.cs
+++ b/Assets/Scripts/movement.cs
@@ -105,12 +105,14 @@ public class movement : MonoBehaviour
        {"", "", "", "" }
    };

-    void Start()
-    {
+    private void Awake() {
        ap = FindObjectOfType<Akciopont>();
        ugynok = FindObjectOfType<Ugynok>();
-        targyak = FindObjectOfType<Targyak>();
+        targyak = FindObjectOfType<Targyak>();    
+    }

+    void Start()
+    {
        eromulepes1.SetActive(false);
        eromulepes2.SetActive(false);

@@ -846,7 +848,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }

                                
@@ -910,7 +913,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    twoonecount = twoonecount + 1;
                                    Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas");
@@ -973,7 +977,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    threeonecount++;
                                    Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas");
@@ -1040,7 +1045,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    onetwocount++;
                                    Debug.Log(ap.akciopont);
@@ -1104,7 +1110,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1173,7 +1180,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1238,7 +1246,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1307,7 +1316,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1373,7 +1383,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1438,7 +1449,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1503,7 +1515,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
@@ -1568,7 +1581,8 @@ public class movement : MonoBehaviour
                                        }
                                        else
                                        {
-                                            ap.akciopont = ap.akciopont - tavolsag;
+                                            //ap.akciopont = ap.akciopont - tavolsag;
+                                            ap.UpdateAkciopont(-tavolsag);
                                        }
                                    Debug.Log(ap.akciopont);
                                    Debug.Log("ugynok sorsolas");
--- a/Assets/Scripts/nyomozas.cs
+++ b/Assets/Scripts/nyomozas.cs
@@ -1,9 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-
-public class nyomozas : MonoBehaviour
-{
-
-}
--- a/Assets/Scripts/uj.cs
+++ b/Assets/Scripts/uj.cs
@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class uj : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Assets/Scripts/vegpontozas.cs
+++ b/Assets/Scripts/vegpontozas.cs
@@ -20,7 +20,7 @@ public class vegpontozas : MonoBehaviour
    int energiapont;
    int megmaradtelet;

-    void Start()
+    void Awake()
    {
        energia = FindObjectOfType<Energia>();
        FejlesztesPont = FindObjectOfType<Upgrade>();
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2180264
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: LiberationSans SDF Material
  m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@@ -67,6 +68,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _Ambient: 0.5
    - _Bevel: 0.5
@@ -148,6 +150,7 @@ Material:
    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_BuildTextureStacks: []
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -165,15 +168,16 @@ MonoBehaviour:
  materialHashCode: 462855346
  m_Version: 1.1.0
  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75,
-    type: 3}
+  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
  m_AtlasPopulationMode: 1
  m_FaceInfo:
+    m_FaceIndex: 0
    m_FamilyName: Liberation Sans
    m_StyleName: Regular
    m_PointSize: 86
    m_Scale: 1
+    m_UnitsPerEM: 0
    m_LineHeight: 98.8916
    m_AscentLine: 77.853516
    m_CapLine: 59
@@ -313,15 +317,20 @@ Texture2D:
    Hash: 00000000000000000000000000000000
  m_ForcedFallbackFormat: 4
  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
  serializedVersion: 2
  m_Width: 0
  m_Height: 0
  m_CompleteImageSize: 0
+  m_MipsStripped: 0
  m_TextureFormat: 1
  m_MipCount: 1
  m_IsReadable: 1
+  m_IsPreProcessed: 0
+  m_IgnoreMasterTextureLimit: 0
  m_StreamingMipmaps: 0
  m_StreamingMipmapsPriority: 0
+  m_VTOnly: 0
  m_AlphaIsTransparency: 0
  m_ImageCount: 1
  m_TextureDimension: 2
@@ -335,9 +344,11 @@ Texture2D:
    m_WrapW: 0
  m_LightmapFormat: 0
  m_ColorSpace: 0
+  m_PlatformBlob: 
  image data: 0
  _typelessdata: 
  m_StreamData:
+    serializedVersion: 2
    offset: 0
    size: 0
    path: 
--- a/Assets/Urp/New
+++ b/Assets/Urp/New
@@ -42,7 +42,7 @@ MonoBehaviour:
  m_AdditionalLightsShadowResolutionTierHigh: 1024
  m_ReflectionProbeBlending: 0
  m_ReflectionProbeBoxProjection: 0
-  m_ShadowDistance: 1
+  m_ShadowDistance: 0
  m_ShadowCascadeCount: 1
  m_Cascade2Split: 0.25
  m_Cascade3Split: {x: 0.1, y: 0.3}
@@ -50,6 +50,7 @@ MonoBehaviour:
  m_CascadeBorder: 0.2
  m_ShadowDepthBias: 1
  m_ShadowNormalBias: 1
+  m_AnyShadowsSupported: 1
  m_SoftShadowsSupported: 0
  m_ConservativeEnclosingSphere: 1
  m_NumIterationsEnclosingSphere: 64
--- a/ProjectSettings/BurstAotSettings_StandaloneOSX.json
+++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json
@@ -0,0 +1,16 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "EnableArmv9SecurityFeatures": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX64": 72,
+    "OptimizeFor": 0
+  }
+}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -21,7 +21,7 @@ PlayerSettings:
  m_ShowUnitySplashLogo: 1
  m_SplashScreenOverlayOpacity: 1
  m_SplashScreenAnimation: 1
-  m_SplashScreenLogoStyle: 1
+  m_SplashScreenLogoStyle: 0
  m_SplashScreenDrawMode: 0
  m_SplashScreenBackgroundAnimationZoom: 1
  m_SplashScreenLogoAnimationZoom: 1
@@ -129,12 +129,12 @@ PlayerSettings:
  vulkanEnableLateAcquireNextImage: 0
  vulkanEnableCommandBufferRecycling: 1
  m_SupportedAspectRatios:
-    4:3: 1
-    5:4: 1
+    4:3: 0
+    5:4: 0
    16:10: 1
    16:9: 1
    Others: 1
-  bundleVersion: 1.0
+  bundleVersion: 0.8
  preloadedAssets: []
  metroInputSource: 0
  wsaTransparentSwapchain: 0
@@ -370,6 +370,66 @@ PlayerSettings:
      m_SubKind: App Store
  - m_BuildTarget: Android
    m_Icons:
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
    - m_Textures: []
      m_Width: 432
      m_Height: 432
@@ -400,66 +460,6 @@ PlayerSettings:
      m_Height: 81
      m_Kind: 2
      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 0
-      m_SubKind: 
  m_BuildTargetBatching: []
  m_BuildTargetShaderSettings: []
  m_BuildTargetGraphicsJobs:
@@ -662,6 +662,7 @@ PlayerSettings:
  switchNetworkInterfaceManagerInitializeEnabled: 1
  switchPlayerConnectionEnabled: 1
  switchUseNewStyleFilepaths: 0
+  switchUseLegacyFmodPriorities: 1
  switchUseMicroSleepForYield: 1
  switchEnableRamDiskSupport: 0
  switchMicroSleepForYieldTime: 25
@@ -761,6 +762,7 @@ PlayerSettings:
  webGLLinkerTarget: 1
  webGLThreadsSupport: 0
  webGLDecompressionFallback: 0
+  webGLPowerPreference: 2
  scriptingDefineSymbols: {}
  additionalCompilerArguments: {}
  platformArchitecture: {}
@@ -772,6 +774,7 @@ PlayerSettings:
  allowUnsafeCode: 0
  useDeterministicCompilation: 1
  enableRoslynAnalyzers: 1
+  selectedPlatform: 0
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 1
  gcIncremental: 1
@@ -849,6 +852,7 @@ PlayerSettings:
    m_VersionName: 
  apiCompatibilityLevel: 6
  activeInputHandler: 0
+  windowsGamepadBackendHint: 0
  cloudProjectId: 
  framebufferDepthMemorylessMode: 0
  qualitySettingsNames: []
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -6,114 +6,6 @@ QualitySettings:
  serializedVersion: 5
  m_CurrentQuality: 0
  m_QualitySettings:
-  - serializedVersion: 2
-    name: Low
-    pixelLightCount: 0
-    shadows: 0
-    shadowResolution: 0
-    shadowProjection: 1
-    shadowCascades: 1
-    shadowDistance: 20
-    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 0
-    skinWeights: 2
-    textureQuality: 0
-    anisotropicTextures: 0
-    antiAliasing: 0
-    softParticles: 0
-    softVegetation: 0
-    realtimeReflectionProbes: 0
-    billboardsFaceCameraPosition: 0
-    vSyncCount: 0
-    lodBias: 0.4
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 16
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 16
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2}
-    excludedTargetPlatforms: []
-  - serializedVersion: 2
-    name: Medium
-    pixelLightCount: 1
-    shadows: 1
-    shadowResolution: 0
-    shadowProjection: 1
-    shadowCascades: 1
-    shadowDistance: 20
-    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 0
-    skinWeights: 2
-    textureQuality: 0
-    anisotropicTextures: 1
-    antiAliasing: 0
-    softParticles: 0
-    softVegetation: 0
-    realtimeReflectionProbes: 0
-    billboardsFaceCameraPosition: 0
-    vSyncCount: 0
-    lodBias: 0.7
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 64
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 16
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2}
-    excludedTargetPlatforms: []
-  - serializedVersion: 2
-    name: High
-    pixelLightCount: 2
-    shadows: 2
-    shadowResolution: 1
-    shadowProjection: 1
-    shadowCascades: 2
-    shadowDistance: 40
-    shadowNearPlaneOffset: 3
-    shadowCascade2Split: 0.33333334
-    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
-    shadowmaskMode: 1
-    skinWeights: 2
-    textureQuality: 0
-    anisotropicTextures: 1
-    antiAliasing: 0
-    softParticles: 0
-    softVegetation: 1
-    realtimeReflectionProbes: 1
-    billboardsFaceCameraPosition: 1
-    vSyncCount: 0
-    lodBias: 1
-    maximumLODLevel: 0
-    streamingMipmapsActive: 0
-    streamingMipmapsAddAllCameras: 1
-    streamingMipmapsMemoryBudget: 512
-    streamingMipmapsRenderersPerFrame: 512
-    streamingMipmapsMaxLevelReduction: 2
-    streamingMipmapsMaxFileIORequests: 1024
-    particleRaycastBudget: 256
-    asyncUploadTimeSlice: 2
-    asyncUploadBufferSize: 16
-    asyncUploadPersistentBuffer: 1
-    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2}
-    excludedTargetPlatforms: []
  - serializedVersion: 2
    name: Ultra
    pixelLightCount: 4
@@ -151,18 +43,18 @@ QualitySettings:
    customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2}
    excludedTargetPlatforms: []
  m_PerPlatformDefaultQuality:
-    Android: 1
-    GameCoreScarlett: 3
-    GameCoreXboxOne: 3
-    Lumin: 3
-    Nintendo Switch: 3
-    PS4: 3
-    PS5: 3
+    Android: 0
+    GameCoreScarlett: 0
+    GameCoreXboxOne: 0
+    Lumin: 0
+    Nintendo Switch: 0
+    PS4: 0
+    PS5: 0
    Server: 0
-    Stadia: 3
-    Standalone: 3
-    WebGL: 2
-    Windows Store Apps: 3
-    XboxOne: 3
-    iPhone: 1
-    tvOS: 1
+    Stadia: 0
+    Standalone: 0
+    WebGL: 0
+    Windows Store Apps: 0
+    XboxOne: 0
+    iPhone: 0
+    tvOS: 0
--- 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
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@@ -19,13 +19,265 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 30
-    width: 1470
-    height: 771
+    width: 1366
+    height: 622
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 45
+  controlID: 166
 --- !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: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 225
+    y: 86
+    width: 831
+    height: 356
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 3840, y: 2160}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 1
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -1920
+    m_HBaseRangeMax: 1920
+    m_VBaseRangeMin: -1080
+    m_VBaseRangeMax: 1080
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 831
+      height: 335
+    m_Scale: {x: 0.1550926, y: 0.1550926}
+    m_Translation: {x: 415.5, y: 167.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -2679.0447
+      y: -1080
+      width: 5358.0894
+      height: 2160
+    m_MinimalGUI: 1
+  m_defaultScale: 0.1550926
+  m_LastWindowPixelSize: {x: 831, y: 356}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 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: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 4}
+  - {fileID: 9}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1058
+    height: 622
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 16192, y: 16192}
+  vertical: 1
+  controlID: 167
+--- !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: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 5}
+  - {fileID: 7}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1058
+    height: 377
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 8096}
+  vertical: 0
+  controlID: 168
+--- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 225
+    height: 377
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 6}
+  m_Panes:
+  - {fileID: 6}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &6
+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: 12061, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 86
+    width: 224
+    height: 356
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+  m_SceneHierarchy:
+    m_TreeViewState:
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 58faffff
+      m_RenameOverlay:
+        m_UserAcceptedRename: 0
+        m_Name: 
+        m_OriginalName: 
+        m_EditFieldRect:
+          serializedVersion: 2
+          x: 0
+          y: 0
+          width: 0
+          height: 0
+        m_UserData: 0
+        m_IsWaitingForDelay: 0
+        m_IsRenaming: 0
+        m_OriginalEventType: 11
+        m_IsRenamingFilename: 0
+        m_ClientGUIView: {fileID: 5}
+      m_SearchString: 
+    m_ExpandedScenes: []
+    m_CurrenRootInstanceID: 0
+    m_LockTracker:
+      m_IsLocked: 0
+    m_CurrentSortingName: TransformSorting
+  m_WindowGUID: 4c969a2b90040154d917609493e03593
+--- !u!114 &7
+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: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 225
+    y: 0
+    width: 833
+    height: 377
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 8}
+  - {fileID: 2}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -45,10 +297,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 238
-    y: 95
-    width: 848
-    height: 446.5
+    x: 225
+    y: 86
+    width: 831
+    height: 356
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -58,8 +310,8 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: -101, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: -101, y: -26}
      snapCorner: 3
      id: Tool Settings
      index: 0
@@ -298,16 +550,16 @@ MonoBehaviour:
  m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
  m_Gizmos: 1
  m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 1
+  m_SceneIsLit: 0
  m_SceneLighting: 1
  m_2DMode: 1
  m_isRotationLocked: 0
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: -5.112349, y: -0.030514337, z: -0.533039}
+    m_Target: {x: -4.4946966, y: 0.05774405, z: -2.1177318}
    speed: 2
-    m_Value: {x: -5.112349, y: -0.030514337, z: -0.533039}
+    m_Value: {x: -4.4946966, y: 0.05774405, z: -2.1177318}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -358,9 +610,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 10.906873
+    m_Target: 10.402437
    speed: 2
-    m_Value: 10.906873
+    m_Value: 10.402437
  m_Ortho:
    m_Target: 1
    speed: 2
@@ -385,258 +637,6 @@ MonoBehaviour:
  m_SceneVisActive: 1
  m_LastLockedObject: {fileID: 0}
  m_ViewIsLockedToObject: 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: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  - {fileID: 9}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1088
-    height: 771
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 16192, y: 16192}
-  vertical: 1
-  controlID: 46
--- !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: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 5}
-  - {fileID: 7}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1088
-    height: 467.5
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 8096}
-  vertical: 0
-  controlID: 47
--- !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: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 238
-    height: 467.5
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 6}
-  m_Panes:
-  - {fileID: 6}
-  m_Selected: 0
-  m_LastSelected: 0
--- !u!114 &6
-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: 12061, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 95
-    width: 237
-    height: 446.5
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-  m_SceneHierarchy:
-    m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 021c0000
-      m_LastClickedID: 0
-      m_ExpandedIDs: 2afbffff
-      m_RenameOverlay:
-        m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
-        m_EditFieldRect:
-          serializedVersion: 2
-          x: 0
-          y: 0
-          width: 0
-          height: 0
-        m_UserData: 0
-        m_IsWaitingForDelay: 0
-        m_IsRenaming: 0
-        m_OriginalEventType: 11
-        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 5}
-      m_SearchString: 
-    m_ExpandedScenes: []
-    m_CurrenRootInstanceID: 0
-    m_LockTracker:
-      m_IsLocked: 0
-    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &7
-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: SceneView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 238
-    y: 0
-    width: 850
-    height: 467.5
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 2}
-  - {fileID: 8}
-  m_Selected: 0
-  m_LastSelected: 1
--- !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: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 238
-    y: 95
-    width: 848
-    height: 446.5
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 848, y: 425.5}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -212
-    m_HBaseRangeMax: 212
-    m_VBaseRangeMin: -106.375
-    m_VBaseRangeMax: 106.375
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 848
-      height: 425.5
-    m_Scale: {x: 2, y: 2}
-    m_Translation: {x: 424, y: 212.75}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -212
-      y: -106.375
-      width: 424
-      height: 212.75
-    m_MinimalGUI: 1
-  m_defaultScale: 2
-  m_LastWindowPixelSize: {x: 1696, y: 893}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
 --- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -647,23 +647,23 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 467.5
-    width: 1088
-    height: 303.5
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 10}
+    y: 377
+    width: 1058
+    height: 245
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 11}
  m_Panes:
  - {fileID: 10}
  - {fileID: 11}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -685,9 +685,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 562.5
-    width: 1087
-    height: 282.5
+    y: 463
+    width: 1057
+    height: 224
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -713,14 +713,14 @@ MonoBehaviour:
  m_LastFolders:
  - Assets/Scripts
  m_LastFoldersGridSize: 66
-  m_LastProjectPath: /Users/bance/Documents/GitHub/findthesource
+  m_LastProjectPath: /home/tom/Documents/dev/find the source
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 42790000
-    m_LastClickedID: 31042
-    m_ExpandedIDs: 000000002479000000ca9a3bffffff7f
+    m_SelectedIDs: bc690000
+    m_LastClickedID: 27068
+    m_ExpandedIDs: 00000000b669000000ca9a3b
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -748,7 +748,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 0000000024790000
+    m_ExpandedIDs: 00000000b669000000ca9a3b
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -773,9 +773,9 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 021c0000
-    m_LastClickedInstanceID: 7170
-    m_HadKeyboardFocusLastEvent: 1
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 0
    m_ExpandedInstanceIDs: c623000000000000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@@ -800,7 +800,7 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
    m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
+    m_ScrollPosition: {x: 0, y: 34}
    m_GridSize: 66
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 193
@@ -825,9 +825,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 562.5
-    width: 1087
-    height: 282.5
+    y: 463
+    width: 1057
+    height: 224
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -847,10 +847,10 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1088
+    x: 1058
    y: 0
-    width: 382
-    height: 771
+    width: 308
+    height: 622
  m_MinSize: {x: 276, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 13}
@@ -874,14 +874,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1088
-    y: 95
-    width: 381
-    height: 750
+    x: 1058
+    y: 86
+    width: 307
+    height: 601
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -889,7 +889,7 @@ MonoBehaviour:
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
  m_PreviewResizer:
-    m_CachedPref: 160
+    m_CachedPref: -160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -15,11 +15,11 @@ MonoBehaviour:
  m_PixelRect:
    serializedVersion: 2
    x: 0
-    y: 65
-    width: 1470
-    height: 817
+    y: 43
+    width: 1920
+    height: 997
  m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Game
  m_RootView: {fileID: 2}
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
@@ -44,8 +44,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1470
-    height: 817
+    width: 1920
+    height: 997
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1470
+    width: 1920
    height: 30
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 797
-    width: 1470
+    y: 977
+    width: 1920
    height: 20
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
@@ -114,12 +114,16 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 30
-    width: 1470
-    height: 767
+    width: 1920
+    height: 947
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 60
+<<<<<<< HEAD
+  controlID: 32
+=======
+  controlID: 86
+>>>>>>> b7a6275f0bc9ad64e243e322939afb85c91d1264
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -139,12 +143,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1134.5
-    height: 767
+    width: 927.5
+    height: 756
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 61
+  controlID: 33
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -164,12 +168,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1134.5
-    height: 559
+    width: 927.5
+    height: 511.5
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 62
+  controlID: 34
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -187,10 +191,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 160.5
-    height: 559
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 155.5
+    height: 511.5
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 13}
  m_Panes:
  - {fileID: 13}
@@ -211,10 +215,10 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 160.5
+    x: 155.5
    y: 0
-    width: 974
-    height: 559
+    width: 772
+    height: 511.5
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 12}
@@ -239,9 +243,9 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 559
-    width: 1134.5
-    height: 208
+    y: 511.5
+    width: 927.5
+    height: 244.5
  m_MinSize: {x: 231, y: 271}
  m_MaxSize: {x: 10001, y: 10021}
  m_ActualView: {fileID: 15}
@@ -259,23 +263,23 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: ConsoleWindow
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1134.5
+    x: 927.5
    y: 0
-    width: 335.5
-    height: 767
-  m_MinSize: {x: 275, y: 50}
+    width: 542.5
+    height: 756
+  m_MinSize: {x: 100, y: 100}
  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 16}
  m_Panes:
  - {fileID: 17}
  - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -296,10 +300,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 160.5
+    x: 155.5
    y: 95
-    width: 972
-    height: 538
+    width: 770
+    height: 490.5
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -310,7 +314,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 972, y: 517}
+  m_TargetSize: {x: 770, y: 433}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@@ -319,16 +323,16 @@ MonoBehaviour:
  m_VSyncEnabled: 0
  m_Gizmos: 0
  m_Stats: 0
-  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000
  m_ZoomArea:
    m_HRangeLocked: 0
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -243
-    m_HBaseRangeMax: 243
-    m_VBaseRangeMin: -129.25
-    m_VBaseRangeMax: 129.25
+    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
@@ -346,23 +350,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 972
-      height: 517
+      width: 770
+      height: 469.5
    m_Scale: {x: 2, y: 2}
-    m_Translation: {x: 486, y: 258.5}
+    m_Translation: {x: 385, y: 234.75}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -243
-      y: -129.25
-      width: 486
-      height: 258.5
+      x: -192.5
+      y: -117.375
+      width: 385
+      height: 234.75
    m_MinimalGUI: 1
  m_defaultScale: 2
-  m_LastWindowPixelSize: {x: 1944, y: 1076}
+  m_LastWindowPixelSize: {x: 1540, y: 981}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@@ -390,8 +394,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 95
-    width: 159.5
-    height: 538
+    width: 154.5
+    height: 490.5
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -399,9 +403,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: b6900000
      m_LastClickedID: 0
-      m_ExpandedIDs: 02fbffff
+      m_ExpandedIDs: 00e4ffff72e4ffffa4e6ffff16e7ffff1cfbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -445,10 +449,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 160.5
+    x: 191
    y: 95
-    width: 972
-    height: 538
+    width: 945.5
+    height: 490.5
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -458,8 +462,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 +709,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: -8.288611, y: 4.0163245, z: -0.40011978}
+    m_Target: {x: -8.2901, y: -1.7109449, z: -0.08674711}
    speed: 2
-    m_Value: {x: -8.288611, y: 4.0163245, z: -0.40011978}
+    m_Value: {x: -8.2901, y: -1.7109449, z: -0.08674711}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -758,9 +762,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 12.713149
+    m_Target: 15.69989
    speed: 2
-    m_Value: 12.713149
+    m_Value: 15.69989
  m_Ortho:
    m_Target: 1
    speed: 2
@@ -806,9 +810,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 654
-    width: 1133.5
-    height: 187
+    y: 606.5
+    width: 926.5
+    height: 223.5
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -826,22 +830,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets
+    - Assets/Scenes
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 66
  m_LastFolders:
-  - Assets
+  - Assets/Scenes
  m_LastFoldersGridSize: 66
-  m_LastProjectPath: /Users/bance/Documents/GitHub/findthesource
+  m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 067a0000
-    m_LastClickedID: 31238
-    m_ExpandedIDs: 00000000067a000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 55.000153}
+    m_SelectedIDs: 247a0000
+    m_LastClickedID: 31268
+    m_ExpandedIDs: 00000000047a0000227a000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -869,7 +873,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000067a0000
+    m_ExpandedIDs: 00000000346f0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -896,7 +900,7 @@ MonoBehaviour:
  m_ListAreaState:
    m_SelectedInstanceIDs: 
    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: c623000000000000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@@ -945,10 +949,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1482
-    y: 73
-    width: 437
-    height: 926
+    x: 927.5
+    y: 95
+    width: 541.5
+    height: 735
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -969,14 +973,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1134.5
-    y: 95
-    width: 334.5
-    height: 746
+    x: 1453
+    y: 73
+    width: 466
+    height: 926
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -987,7 +991,7 @@ MonoBehaviour:
    m_CachedPref: -160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
+  m_LastInspectedObjectInstanceID: 37046
  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0
--- a/UserSettings/Search.index
+++ b/UserSettings/Search.index
@@ -0,0 +1,13 @@
+{
+    "name": "Assets",
+    "roots": ["Assets"],
+    "includes": [],
+    "excludes": [],
+    "options": {
+        "types": true,
+        "properties": true,
+        "extended": false,
+        "dependencies": false
+    },
+    "baseScore": 999
+}
--- a/UserSettings/Search.settings
+++ b/UserSettings/Search.settings
@@ -1 +1,66 @@
-{}
+trackSelection = true
+fetchPreview = true
+defaultFlags = 0
+keepOpen = false
+queryFolder = "Assets"
+onBoardingDoNotAskAgain = true
+showPackageIndexes = false
+showStatusBar = false
+scopes = {
+}
+providers = {
+	packages = {
+		active = true
+		priority = 90
+		defaultAction = null
+	}
+	log = {
+		active = false
+		priority = 210
+		defaultAction = null
+	}
+	store = {
+		active = true
+		priority = 100
+		defaultAction = null
+	}
+	scene = {
+		active = true
+		priority = 50
+		defaultAction = null
+	}
+	performance = {
+		active = false
+		priority = 100
+		defaultAction = null
+	}
+	find = {
+		active = true
+		priority = 25
+		defaultAction = null
+	}
+	asset = {
+		active = true
+		priority = 25
+		defaultAction = null
+	}
+	adb = {
+		active = false
+		priority = 2500
+		defaultAction = null
+	}
+}
+objectSelectors = {
+}
+recentSearches = [
+]
+searchItemFavorites = [
+]
+savedSearchesSortOrder = 0
+showSavedSearchPanel = false
+expandedQueries = [
+]
+queryBuilder = false
+ignoredProperties = "id;name;classname;imagecontentshash"
+helperWidgetCurrentArea = "all"
+disabledIndexers = ""
Author	SHA1	Message	Date
bance	311cd2a21d	aha jo	2023-03-29 09:26:36 +02:00
bance	361b1625c0	aha jo	2023-03-29 09:24:31 +02:00
Playmaker1210	b7a6275f0b	source ugynok fix	2023-03-25 15:26:10 +01:00
playmaker1210	e644f1de7c	aspect ratio handler	2023-03-24 14:25:10 +01:00
playmaker1210	76f2975f7e	Merge pull request #16 from playmaker1210/ujradobas ujradobas mukodik	2023-03-24 10:10:22 +01:00
playmaker1210	29ae6cfe06	Merge branch 'master' into ujradobas	2023-03-24 10:10:06 +01:00
playmaker1210	abc3dee946	ujradobas mukodik	2023-03-24 10:03:41 +01:00
bance	27fefad271	? ?	2023-03-24 10:02:57 +01:00
Playmaker1210	20fbe86322	60 fps mobil	2023-03-14 16:44:25 +01:00
Playmaker1210	a5c962b8bc	helyszinaktivalas kesz	2023-03-13 10:58:52 +01:00
playmaker1210	c4670305fc	helyszinaktivalas	2023-03-13 10:10:05 +01:00
Playmaker1210	897e635a93	ugynok state	2023-03-09 15:06:41 +01:00
playmaker1210	63fae0aa8d	ugynok csapat oszlop fix	2023-03-08 18:57:02 +01:00
playmaker1210	fd63ae99e6	jatekmanager mukodik	2023-03-01 10:43:27 +01:00
Playmaker1210	830022e1e6	uj jatekmanager	2023-02-27 19:31:57 +01:00
Playmaker1210	653a970aa0	valami	2023-02-22 21:06:49 +01:00
playmaker1210	d63f048f59	ugynok bug	2023-02-22 15:39:59 +01:00
Playmaker1210	37d43ace38	ugynok rework	2023-02-21 17:21:15 +01:00
Playmaker1210	aa638ee67c	update	2023-02-20 16:16:23 +01:00
playmaker1210	4ec15e928f	update	2023-02-20 15:21:58 +01:00
Playmaker1210	cf570640ac	tagyak kesz + adrenalin levedes	2023-02-19 17:24:34 +01:00
playmaker1210	b746bb4bea	update	2023-02-16 14:56:30 +01:00
Playmaker1210	6dc7a42e5e	dice bugfixes	2023-02-12 16:53:09 +01:00
Playmaker1210	a6d71246ff	update	2023-02-10 16:13:26 +01:00
Playmaker1210	4ab79e6545	adrenalin mukodik ertek levedes nelkul	2023-02-10 14:06:30 +01:00
playmaker1210	24554934f5	targy update	2023-02-10 13:33:09 +01:00
playmaker1210	169a2c12b0	targy update	2023-02-09 13:38:54 +01:00