diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 3fc0a36..b81193b 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -10706,7 +10706,7 @@ Camera: far clip plane: 10 field of view: 60 orthographic: 1 - orthographic size: 11 + orthographic size: 10.409236 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -10730,7 +10730,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4, y: 0, z: -10} + m_LocalPosition: {x: -3.19, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -20542,8 +20542,8 @@ 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: 509.34, y: -276.02} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 507.67, y: -262.1} + m_SizeDelta: {x: 200, y: 29.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &947787407 MonoBehaviour: @@ -20600,7 +20600,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -30101,8 +30101,8 @@ 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: 509.34, y: -216.4} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 509.34, y: -225.35007} + m_SizeDelta: {x: 200, y: 32.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1379644800 MonoBehaviour: @@ -30159,7 +30159,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 diff --git a/Assets/Scripts/Akciok.cs b/Assets/Scripts/Akciok.cs index 9ab2a0d..35445e3 100644 --- a/Assets/Scripts/Akciok.cs +++ b/Assets/Scripts/Akciok.cs @@ -60,7 +60,7 @@ public class Akciok : MonoBehaviour } } - public void Betarazas(int betarazas) + public void Betarazas(int betarazas, bool vonjonleapt = true) { if (tolteny_index < 24 && ap.akciopont != 0) { @@ -80,8 +80,10 @@ public class Akciok : MonoBehaviour betarazott_tolteny += betarazas; //tolteny_index++; - ap.akciopont--; - + + if(vonjonleapt) + ap.UpdateAkciopont(-1); + Debug.Log("Tolteny betarazva"); Debug.Log("Betarazott toltenyek szama: " + betarazott_tolteny); } @@ -157,7 +159,7 @@ public class Akciok : MonoBehaviour } } - ap.akciopont--; + ap.UpdateAkciopont(-1); NyomozasOszlopCheck(); @@ -192,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"; } @@ -300,7 +302,8 @@ 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 { diff --git a/Assets/Scripts/CameraMovement.cs b/Assets/Scripts/CameraMovement.cs index 4977184..109d7bc 100644 --- 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; diff --git a/Assets/Scripts/Targyak.cs b/Assets/Scripts/Targyak.cs index 09a96eb..539d88b 100644 --- a/Assets/Scripts/Targyak.cs +++ b/Assets/Scripts/Targyak.cs @@ -139,7 +139,6 @@ public class Targyak : MonoBehaviour 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 @@ -175,11 +174,11 @@ public class Targyak : MonoBehaviour public void HackerCsatlakozo() { //kesz //+2 tolteny - akciok.Betarazas(2); + akciok.Betarazas(2, false); //+1 elet elet.Eletplusz(); //+1 akcio - akciopont.UpdateAkciopont(2); + akciopont.UpdateAkciopont(1); hackercsatlakozo = 0; //targy elvesztese @@ -190,7 +189,6 @@ public class Targyak : MonoBehaviour } 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 diff --git a/Assets/Scripts/TurnManager.cs b/Assets/Scripts/TurnManager.cs index f4e4f3e..68d80b3 100644 --- a/Assets/Scripts/TurnManager.cs +++ b/Assets/Scripts/TurnManager.cs @@ -11,7 +11,7 @@ public class TurnManager : MonoBehaviour public int turnCounter = 1; - void Awake() + private void Awake() { dice = FindObjectOfType(); akciopont = FindObjectOfType(); diff --git a/Assets/Scripts/Upgrade.cs b/Assets/Scripts/Upgrade.cs index b3a6d87..3b62618 100644 --- 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,11 +26,6 @@ public class Upgrade : MonoBehaviour public int getUjradobasIndex() { return ujradobas_index; } public int getHackIndex() { return hack_index; } - private void Awake() - { - akciopont = FindObjectOfType(); - } - public void upgradeEnergia() { if (canUpgrade) { if (energia_index < 4) { diff --git a/Assets/Scripts/helyszinaktivalas.cs b/Assets/Scripts/helyszinaktivalas.cs index b024f57..15ca617 100644 --- a/Assets/Scripts/helyszinaktivalas.cs +++ b/Assets/Scripts/helyszinaktivalas.cs @@ -45,7 +45,8 @@ public class helyszinaktivalas : MonoBehaviour { upgrade.canUpgrade = true; if(!targyak.matavtaviranyitoAktivalva){ - akciopont.akciopont++; + //akciopont.akciopont++; + akciopont.UpdateAkciopont(1); energia.csokkenEnergia(2); } } diff --git a/Assets/Scripts/movement.cs b/Assets/Scripts/movement.cs index fb3bcd4..aca8fbd 100644 --- a/Assets/Scripts/movement.cs +++ b/Assets/Scripts/movement.cs @@ -848,7 +848,8 @@ public class movement : MonoBehaviour } else { - ap.akciopont = ap.akciopont - tavolsag; + //ap.akciopont = ap.akciopont - tavolsag; + ap.UpdateAkciopont(-tavolsag); } @@ -912,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"); @@ -975,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"); @@ -1042,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); @@ -1106,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"); @@ -1175,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"); @@ -1240,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"); @@ -1309,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"); @@ -1375,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"); @@ -1440,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"); @@ -1505,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"); @@ -1570,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"); diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index b8f09e6..4fca617 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 672 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Scene 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: 1366 - height: 672 + 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: 1366 + 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: 652 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 622 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 16 + controlID: 17 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 973 - height: 622 + width: 1442 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 17 + controlID: 18 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 973 - height: 522 + width: 1442 + height: 665 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 18 + controlID: 19 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 100 - height: 522 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 233 + height: 665 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 100 + x: 233 y: 0 - width: 873 - height: 522 + width: 1209 + height: 665 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 522 - width: 973 - height: 100 + y: 665 + width: 1442 + height: 282 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -264,10 +264,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 973 + x: 1442 y: 0 - width: 393 - height: 622 + width: 478 + height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 100 - y: 86 - width: 871 - height: 501 + x: 233 + y: 73 + width: 1207 + height: 644 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 871, y: 480} + m_TargetSize: {x: 1207, y: 623} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -435.5 - m_HBaseRangeMax: 435.5 - m_VBaseRangeMin: -240 - m_VBaseRangeMax: 240 + m_HBaseRangeMin: -603.5 + m_HBaseRangeMax: 603.5 + m_VBaseRangeMin: -311.5 + m_VBaseRangeMax: 311.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -337,7 +337,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 871 - height: 480 + width: 1207 + height: 623 m_Scale: {x: 1, y: 1} - m_Translation: {x: 435.5, y: 240} + m_Translation: {x: 603.5, y: 311.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -435.5 - y: -240 - width: 871 - height: 480 + x: -603.5 + y: -311.5 + width: 1207 + height: 623 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 871, y: 501} + m_LastWindowPixelSize: {x: 1207, y: 644} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 99 - height: 501 + y: 73 + width: 232 + height: 644 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 1cfbffff + m_ExpandedIDs: 1cfbffff7c700000c0770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 100 - y: 86 - width: 871 - height: 501 + x: 233 + y: 73 + width: 1207 + height: 644 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -698,16 +698,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -3.330598, y: -1.2239943, z: -2.1386344} + m_Target: {x: -4.063988, y: -1.0165341, z: -0.13052095} speed: 2 - m_Value: {x: -3.0094843, y: -1.1265955, z: -2.1337879} + m_Value: {x: -3.9455783, y: -0.9438178, z: -0.12748456} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.254967 + m_Target: 7.0511937 speed: 2 - m_Value: 10.770303 + m_Value: 6.747554 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 608 - width: 972 - height: 79 + y: 738 + width: 1441 + height: 261 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -834,14 +834,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: 66 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 149} - m_SelectedIDs: a67d0000 - m_LastClickedID: 32166 - m_ExpandedIDs: 000000009e790000a27d0000b07d000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: d2790000 + m_LastClickedID: 31186 + m_ExpandedIDs: 00000000b2790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009e790000 + m_ExpandedIDs: 00000000b2790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -921,7 +921,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 34} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 66 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -945,10 +945,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 973 - y: 86 - width: 392 - height: 601 + x: 1442 + y: 73 + width: 477 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 973 - y: 86 - width: 392 - height: 601 + x: 1442 + y: 73 + width: 477 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -988,7 +988,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 378 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: