targy aktivalas bug

Assets/Scenes/Jatek.unity

@@ -4544,6 +4544,7 @@ MonoBehaviour:
   droidgepagyu: 0
   matavtaviranyito: 0
   fustgranat: 0
+  vanUgynok: 0
   lathatatlanOltozetAktivalva: 0
   matavtaviranyitoAktivalva: 0
   confirmNewValue: {fileID: 815764584}
@@ -8311,9 +8312,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 197904230}
+      - m_Target: {fileID: 197904236}
-        m_TargetAssemblyTypeName: Elet, Assembly-CSharp
+        m_TargetAssemblyTypeName: Targyak, Assembly-CSharp
-        m_MethodName: Eletplusz
+        m_MethodName: RandomTargy
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

Assets/Scripts/Targyak.cs

@@ -26,6 +26,9 @@ public class Targyak : MonoBehaviour
     public int droidgepagyu = 0;
     public int matavtaviranyito = 0;
     public int fustgranat = 0;
+
+    [SerializeField] private bool vanUgynok = false;
+
     public bool lathatatlanOltozetAktivalva = false;
     public bool matavtaviranyitoAktivalva = false;
     private int randomszam;
@@ -61,6 +64,15 @@ public class Targyak : MonoBehaviour
         jatekmanager = FindObjectOfType<jatekmanager>();
     }
 
+    private void Start() {
+        adrenalinFelhasznalva.gameObject.SetActive(false);
+        hackerFelhasznalva.gameObject.SetActive(false);
+        lathatatlanFelhasznalva.gameObject.SetActive(false);
+        droidFelhasznalva.gameObject.SetActive(false);
+        matavFelhasznalva.gameObject.SetActive(false);
+        alomhozoFelhasznalva.gameObject.SetActive(false);
+    }
+
     public void RandomTargy()
     {
         if(elerheto_targyak.Count == 0) return;
@@ -71,26 +83,32 @@ public class Targyak : MonoBehaviour
         if(elerheto_targyak[randomszam].Equals("Adrenalinloket")){
             adrenalinMegszerezve.text = "X";
             adrenalinloket++;
+            adrenalinFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy AdrenalinLoketet!");
         }else if(elerheto_targyak[randomszam].Equals("Hacker csatlakozo")){
             hackerMegszerezve.text = "X";
             hackercsatlakozo++;
+            hackerFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Hacker Csatlakozot!");
         }else if(elerheto_targyak[randomszam].Equals("Lathatatlan oltozet")){
             lathatatlanMegszerezve.text = "X";
             lathatatlanoltozet++;
+            lathatatlanFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Lathatatlan oltozetet!");
         }else if(elerheto_targyak[randomszam].Equals("Droid agyu")){
             droidMegszerezve.text = "X";
             droidgepagyu++;
+            droidFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Droid-X2 Gepagyut!");
         }else if(elerheto_targyak[randomszam].Equals("Matav taviranyito")){
             matavMegszerezve.text = "X";
             matavtaviranyito++;
+            matavFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Matav Taviranyitot!");
         }else if(elerheto_targyak[randomszam].Equals("Alomhozo fustgranat")){
             alomhozoMegszerezve.text = "X";
             fustgranat++;
+            alomhozoFelhasznalva.gameObject.SetActive(true);
             Debug.Log("Kaptal egy Alomhozo Fustgranatot!");
         }
 
@@ -203,10 +221,55 @@ public class Targyak : MonoBehaviour
 
     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
         
         //deaktivalas
         //jatekmanager.ugynokDeaktivalas(false);
+
+        vanUgynok = false;
+
+        //nezze meg hogy van ugynokcsapat valahol kulonben ne aktivalja
+        foreach(var item in ugynok.oneone){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.onetwo){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.onethree){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.onefour){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.twoone){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.twotwo){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.twothree){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.twofour){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.threeone){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.threetwo){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.threethree){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+        foreach(var item in ugynok.threefour){
+            if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6")) vanUgynok = true;
+        }
+
+        if(!vanUgynok){
+            Debug.Log("nincs sehol ugynok csapat");
+            return; //ha nincs sehol ugynok ne fussok le
+        } 
+
         jatekmanager.UpdateGameState(jatekmanager.GameState.Ugynok); //ugynok state (minden kikapcsolva);
         
         ugynok.droidagyuAktivalva = true;

Packages/manifest.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.collab-proxy": "1.17.7",
     "com.unity.feature.2d": "1.0.0",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.render-pipelines.universal": "12.1.8",
     "com.unity.test-framework": "1.1.33",

Packages/packages-lock.json

@@ -125,7 +125,7 @@
       }
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectSettings.asset

@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.9.1
+  bundleVersion: 0.9.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

UserSettings/Layouts/default-2021.dwlt

@@ -15,11 +15,11 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 43
+    y: 28
-    width: 1920
+    width: 1366
-    height: 997
+    height: 680
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Game
   m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -39,12 +39,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1414
+    x: 898
     y: 0
-    width: 506
+    width: 468
-    height: 947
+    height: 630
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -70,8 +70,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920
+    width: 1366
-    height: 997
+    height: 680
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -95,7 +95,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920
+    width: 1366
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -116,8 +116,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 977
+    y: 660
-    width: 1920
+    width: 1366
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -140,12 +140,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920
+    width: 1366
-    height: 947
+    height: 630
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 94
+  controlID: 19
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -165,12 +165,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1414
+    width: 898
-    height: 947
+    height: 630
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 82
+  controlID: 63
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -190,12 +190,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1414
+    width: 898
-    height: 617
+    height: 391
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 83
+  controlID: 64
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -213,10 +213,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 205
+    width: 259
-    height: 617
+    height: 391
-  m_MinSize: {x: 201, y: 221}
+  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -237,12 +237,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 205
+    x: 259
     y: 0
-    width: 1209
+    width: 639
-    height: 617
+    height: 391
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -265,9 +265,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 617
+    y: 391
-    width: 1414
+    width: 898
-    height: 330
+    height: 239
   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: 205
+    x: 259
-    y: 73
+    y: 86
-    width: 1207
+    width: 637
-    height: 596
+    height: 370
   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: 1207, y: 575}
+  m_TargetSize: {x: 637, y: 349}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -325,10 +325,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -603.5
+    m_HBaseRangeMin: -318.5
-    m_HBaseRangeMax: 603.5
+    m_HBaseRangeMax: 318.5
-    m_VBaseRangeMin: -287.5
+    m_VBaseRangeMin: -174.5
-    m_VBaseRangeMax: 287.5
+    m_VBaseRangeMax: 174.5
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -346,23 +346,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1207
+      width: 637
-      height: 575
+      height: 349
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 603.5, y: 287.5}
+    m_Translation: {x: 318.5, y: 174.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -603.5
+      x: -318.5
-      y: -287.5
+      y: -174.5
-      width: 1207
+      width: 637
-      height: 575
+      height: 349
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1207, y: 596}
+  m_LastWindowPixelSize: {x: 637, y: 370}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -389,19 +389,19 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
+    y: 86
-    width: 204
+    width: 258
-    height: 596
+    height: 370
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
+      scrollPos: {x: 0, y: 419}
-      m_SelectedIDs: 
+      m_SelectedIDs: f26e0000
-      m_LastClickedID: 0
+      m_LastClickedID: 28402
-      m_ExpandedIDs: 6a9afeff0c9bfeffe69cfefff09cfeffe49efeffee9efeffbca2feff5ea3feff38a5feff42a5feff36a7feff40a7feff3eabfeffe0abfeffbaadfeffc4adfeff8caffeff96affeffccb2feffd6b2feff56b6fefff8b6feff10b7feff1ab7feffe2b8feffecb8feff7cbafeff1ebbfeff00bdfeff0abdfefffebefeff08bffeff9ec2feff40c3feff1ac5feff24c5feff18c7feff22c7feff3ccbfeffdecbfeffc0cdfeffcacdfeffbecffeffc8cffeff6ad3feff0cd4feff1cd4feff26d4feffeed5fefff8d5feff0cd7feffd2d8feff74d9feff84d9feff8ed9feff56dbfeff60dbfeff18ddfeffbaddfeffcaddfeffd4ddfeff9cdffeffa6dffeff8ae2feff36e6feff82e9feff24eafefffeebfeff08ecfeffd0edfeffeeedfeff563fffff6e46ffff1647ffffe048ffffdc4bffff804effff2c4fffffc258ffff7c59ffff785cffff6465ffffe26bffffd46cffff206effff28fbfffffa6b00009c700000567300003075000010780000b88a0100a28c0100c48c0100389b010062aa010054ab010056af0100c8b20100ce6e02008e6f0200
+      m_ExpandedIDs: 28fbffff246c0000626e0000966f000096700000e8730000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -445,10 +445,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 205
+    x: 259
-    y: 73
+    y: 86
-    width: 1207
+    width: 637
-    height: 596
+    height: 370
   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: 1
+  m_SceneIsLit: 0
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 721.455, y: 264.75873, z: -3.1850817}
+    m_Target: {x: -1.8306633, y: -3.2436488, z: 0.12008308}
     speed: 2
-    m_Value: {x: 721.455, y: 264.75873, z: -3.1850817}
+    m_Value: {x: -1.8306633, y: -3.2436488, z: 0.12008308}
   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: 421.58566
+    m_Target: 9.074684
     speed: 2
-    m_Value: 421.58566
+    m_Value: 9.074684
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -806,9 +806,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 690
+    y: 496
-    width: 1413
+    width: 819
-    height: 309
+    height: 199
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -826,22 +826,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scenes
+    - Assets/Scripts
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Scenes
+  - Assets/Scripts
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource
+  m_LastProjectPath: /home/tom/Documents/dev/find the source
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 547a0000
+    m_SelectedIDs: 387a0000
-    m_LastClickedID: 31316
+    m_LastClickedID: 31288
-    m_ExpandedIDs: 00000000187a0000567a0000
+    m_ExpandedIDs: 00000000147a000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -869,7 +869,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000187a0000
+    m_ExpandedIDs: 00000000147a0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -894,8 +894,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
+    m_SelectedInstanceIDs: 9e6c0000
-    m_LastClickedInstanceID: 0
+    m_LastClickedInstanceID: 27806
     m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
@@ -921,7 +921,7 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
+    m_ScrollPosition: {x: 0, y: 60}
     m_GridSize: 64
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 207
@@ -946,9 +946,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 690
+    y: 477
-    width: 1413
+    width: 897
-    height: 309
+    height: 218
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -973,10 +973,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1414
+    x: 898
-    y: 73
+    y: 86
-    width: 505
+    width: 467
-    height: 926
+    height: 609
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -988,7 +988,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 702
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: