Assets/Scripts/Dice.cs

@@ -32,6 +32,7 @@ public class Dice : MonoBehaviour {
     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 Awake() {
         upgrade = FindObjectOfType<Upgrade>();
@@ -104,7 +105,11 @@ public class Dice : MonoBehaviour {
         hely2.sprite = diceSides[diceResult[1]-1];
         hely2.size = new Vector2(38, 38);
 
-        dobottEgyszer = true;
+        ujradobasszamlalo--;
+        Debug.Log("ujradobasszamlalo: " + ujradobasszamlalo);
+        if(ujradobasszamlalo == 0){
+            dobottEgyszer = true;
+        }       
 
         //ha megvan a targy
         if(targyak.adrenalinloket > 0) {

Assets/Scripts/TurnManager.cs

@@ -19,6 +19,9 @@ public class TurnManager : MonoBehaviour
         energia = FindObjectOfType<Energia>();
         upgrade = FindObjectOfType<Upgrade>();
         jatekmanager = FindObjectOfType<jatekmanager>();
+
+        dice.ujradobasszamlalo = upgrade.ujradobas[upgrade.getUjradobasIndex()] + 1;
+        Debug.Log("ujradobasszamlalo: " + dice.ujradobasszamlalo);
     }
 
     public void nextTurn() {
@@ -30,6 +33,8 @@ public class TurnManager : MonoBehaviour
         turnCounter++;
         dice.hely1.sprite = null;
         dice.hely2.sprite = null;
+        dice.ujradobasszamlalo = upgrade.ujradobas[upgrade.getUjradobasIndex()] + 1;
+        Debug.Log("ujradobasszamlalo: " + dice.ujradobasszamlalo);
         jatekmanager.vanertelme = true;
         jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.KorKezdet); //a jatekmanager atvalt a korkezdet eventre
 

Assets/Scripts/Upgrade.cs

@@ -31,10 +31,10 @@ public class Upgrade : MonoBehaviour
             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++;
         }
     }
@@ -44,10 +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++;
         }
     }
@@ -57,10 +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++;
         }
     }
@@ -70,10 +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++;
         }
     }
@@ -83,10 +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++;
         }
     }

Assets/Scripts/jatekmanager.cs

@@ -166,7 +166,7 @@ public class jatekmanager : MonoBehaviour
         ujradobasfejlesztés.SetActive(true);
         hackfejlesztés.SetActive(true);
         kovetkezokor.SetActive(false);
-        rolldice.SetActive(false);
+        //rolldice.SetActive(false);
         helyszinaktivalasBtn.gameObject.SetActive(false);
 
         betarazas.SetActive(false);
@@ -190,7 +190,7 @@ public class jatekmanager : MonoBehaviour
 
         kovetkezokor.SetActive(true);
 
-        rolldice.SetActive(false);
+        //rolldice.SetActive(false);
     }
 
     private async void ugynokDeaktivalas(bool bekapcsolas)

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: 0.6
+  bundleVersion: 0.8
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -774,7 +774,7 @@ PlayerSettings:
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
-  selectedPlatform: 2
+  selectedPlatform: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 1

UserSettings/Layouts/default-2021.dwlt

@@ -259,7 +259,7 @@ 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:
@@ -270,12 +270,12 @@ MonoBehaviour:
     height: 756
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  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 +296,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 153
+    x: 201
     y: 86
-    width: 860
-    height: 401
+    width: 815
+    height: 453
   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: 768, y: 432}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -945,9 +945,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1015
+    x: 1018
     y: 86
-    width: 350
+    width: 347
     height: 602
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -987,7 +987,7 @@ MonoBehaviour:
     m_CachedPref: -160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -1
+  m_LastInspectedObjectInstanceID: 29606
   m_LastVerticalScrollValue: 0
   m_GlobalObjectId: 
   m_InspectorMode: 0