ugynok state

2023-03-09 15:06:41 +01:00
parent 63fae0aa8d
commit 897e635a93
4 changed files with 135 additions and 130 deletions
--- a/Assets/Scripts/Targyak.cs
+++ b/Assets/Scripts/Targyak.cs
@@ -206,7 +206,9 @@ public class Targyak : MonoBehaviour
        //ugynok.canKill = true; //barhol meg tud olni ha kattint
        
        //deaktivalas
-        jatekmanager.ugynokDeaktivalas(false);
+        //jatekmanager.ugynokDeaktivalas(false);
+        jatekmanager.UpdateGameState(jatekmanager.GameState.Ugynok); //ugynok state (minden kikapcsolva);
+        
        ugynok.droidagyuAktivalva = true;

        Debug.Log("kattints egy ugynok csapatra!");
--- a/Assets/Scripts/Ugynok.cs
+++ b/Assets/Scripts/Ugynok.cs
@@ -332,7 +332,8 @@ public class Ugynok : MonoBehaviour
        ugynokText.text = "X"; //ugynok csapat megolve

        //minden vissza kapcsolasa 
-        jatekmanager.ugynokDeaktivalas(true);
+        //jatekmanager.ugynokDeaktivalas(true);
+        jatekmanager.UpdateGameState(jatekmanager.GameState.Akcio); //miutan vegzett menjen az akcio state-re
        droidagyuAktivalva = false;
    }

--- a/Assets/Scripts/jatekmanager.cs
+++ b/Assets/Scripts/jatekmanager.cs
@@ -62,50 +62,8 @@ public class jatekmanager : MonoBehaviour

    public Button helyszinaktivalasBtn;

-    public 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);
-    }
-
-
-    void Awake()
+    private void Awake()
    {
        Instance = this;
    }
@@ -124,7 +82,6 @@ public class jatekmanager : MonoBehaviour
        source = FindObjectOfType<Source>();

        UpdateGameState(GameState.KorKezdet);
-       
    }

    public void UpdateGameState(GameState newState)
@@ -142,6 +99,9 @@ public class jatekmanager : MonoBehaviour
            case GameState.Fejlesztes:
                HandleFejlesztes();
                break;
+            case GameState.Ugynok:
+                ugynokDeaktivalas(false);
+                break;
            default:
                throw new ArgumentOutOfRangeException(nameof(newState), newState, null);
        }
@@ -153,7 +113,8 @@ public class jatekmanager : MonoBehaviour
    {
        KorKezdet,
        Akcio,
-        Fejlesztes
+        Fejlesztes,
+        Ugynok
        //Nyert
        //Vesztett
    }
@@ -205,12 +166,54 @@ public class jatekmanager : MonoBehaviour
        ujradobasfejlesztés.SetActive(false);
        hackfejlesztés.SetActive(false);

-        
        kovetkezokor.SetActive(true);

        rolldice.SetActive(false);
    }

+    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);
+    }
+

    /*

@@ -669,4 +672,3 @@ public class jatekmanager : MonoBehaviour
    }
 */
 }
-    
--- 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: 673
+    y: 43
+    width: 1920
+    height: 997
  m_ShowMode: 4
-  m_Title: Project
+  m_Title: Hierarchy
  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: 673
+    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: 653
-    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: 623
+    width: 1920
+    height: 947
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 86
+  controlID: 45
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1015
-    height: 623
+    width: 1427
+    height: 947
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 87
+  controlID: 123
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -164,12 +164,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1015
-    height: 422
+    width: 1427
+    height: 641
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 22
+  controlID: 124
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -187,10 +187,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 153
-    height: 422
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 215
+    height: 641
+  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: 153
+    x: 215
    y: 0
-    width: 862
-    height: 422
+    width: 1212
+    height: 641
  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: 422
-    width: 1015
-    height: 201
+    y: 641
+    width: 1427
+    height: 306
  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: 1015
+    x: 1427
    y: 0
-    width: 351
-    height: 623
+    width: 493
+    height: 947
  m_MinSize: {x: 101, y: 121}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 16}
@@ -296,10 +296,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 154
-    y: 86
-    width: 859
-    height: 401
+    x: 215
+    y: 73
+    width: 1210
+    height: 620
  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: 676, y: 380}
+  m_TargetSize: {x: 1210, y: 599}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@@ -325,10 +325,10 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -338
-    m_HBaseRangeMax: 338
-    m_VBaseRangeMin: -190
-    m_VBaseRangeMax: 190
+    m_HBaseRangeMin: -605
+    m_HBaseRangeMax: 605
+    m_VBaseRangeMin: -299.5
+    m_VBaseRangeMax: 299.5
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@@ -346,23 +346,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 859
-      height: 380
+      width: 1210
+      height: 599
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 429.5, y: 190}
+    m_Translation: {x: 605, y: 299.5}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -429.5
-      y: -190
-      width: 859
-      height: 380
+      x: -605
+      y: -299.5
+      width: 1210
+      height: 599
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 859, y: 401}
+  m_LastWindowPixelSize: {x: 1210, y: 620}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@@ -389,9 +389,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 86
-    width: 152
-    height: 401
+    y: 73
+    width: 214
+    height: 620
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -399,9 +399,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: cc240000
+      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 28fbffff
+      m_ExpandedIDs: 1efbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -445,10 +445,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 153
-    y: 86
-    width: 860
-    height: 401
+    x: 215
+    y: 73
+    width: 1210
+    height: 620
  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: -2.1241224, y: -0.120902985, z: -2.0966113}
+    m_Target: {x: -4.9125323, y: -0.30520058, z: 0.077698514}
    speed: 2
-    m_Value: {x: -2.1241224, y: -0.120902985, z: -2.0966113}
+    m_Value: {x: -4.9125323, y: -0.30520058, z: 0.077698514}
  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.152161
+    m_Target: 11.858034
    speed: 2
-    m_Value: 11.152161
+    m_Value: 11.858034
  m_Ortho:
    m_Target: 1
    speed: 2
@@ -806,9 +806,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 508
-    width: 1014
-    height: 180
+    y: 714
+    width: 1426
+    height: 285
  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: 1}
-    m_SelectedIDs: 0a7a0000
-    m_LastClickedID: 31242
-    m_ExpandedIDs: 00000000ea79000000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 047a0000
+    m_LastClickedID: 31236
+    m_ExpandedIDs: 00000000f8790000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -869,7 +869,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000ea790000
+    m_ExpandedIDs: 00000000f8790000
    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: 78}
+    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: 1015
-    y: 86
-    width: 350
-    height: 602
+    x: 1427
+    y: 73
+    width: 492
+    height: 926
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -973,10 +973,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1015
-    y: 86
-    width: 350
-    height: 602
+    x: 1427
+    y: 73
+    width: 492
+    height: 926
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -987,7 +987,7 @@ MonoBehaviour:
    m_CachedPref: -160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: 27702
+  m_LastInspectedObjectInstanceID: -1
  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0