Merge branch 'master' of https://github.com/playmaker1210/findthesource

2023-04-19 09:45:41 +02:00
parent bef09b83dd e21cd9f100
commit 786d238f05
12 changed files with 1390 additions and 507 deletions
--- a/Assets/Scenes/Jatek.unity
+++ b/Assets/Scenes/Jatek.unity
--- a/Assets/Scripts/AspectRatioHandler.cs
+++ b/Assets/Scripts/AspectRatioHandler.cs
@@ -1,28 +1,41 @@
 using System.Collections;
 using System.Collections.Generic;
 using System;
+using System.IO; //ideiglenes amig a mac camera bug nincs javitva aztan torolheto
+using System.Text; //ideiglenes
 using UnityEngine;

 public class AspectRatioHandler : MonoBehaviour
 {
    public Camera mainCamera;
+    private StreamWriter writer;
+

    private void Awake() {
+        writer = new StreamWriter(Application.persistentDataPath + "/aspectratio.txt", false, Encoding.Default);
+
        double aspectRatio = (double)Screen.width / (double)Screen.height;
        aspectRatio = Math.Round(aspectRatio, 2);
+        writer.Write("felbontas: width: " + Screen.width + " height: " + Screen.height + " aspectratio: " + aspectRatio+ "unity aspect: " + mainCamera.aspect);
+        writer.Close();
        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
+            if(Application.platform == RuntimePlatform.OSXPlayer)
+                mainCamera.orthographicSize = 13f; //mac aspect ratio fix???
+            else
+                mainCamera.orthographicSize = 10.4f; //16:9, 21:9
        }else if(aspectRatio == 1.6){
-            mainCamera.orthographicSize = 11.43f; //16:10
+            if(Application.platform == RuntimePlatform.OSXPlayer)
+                mainCamera.orthographicSize = 13f; //mac aspect ratio fix???
+            else
+                mainCamera.orthographicSize = 11.43f; //16:9, 21:9 //16:10 11.43f
        }else if(aspectRatio == 1.33){
            mainCamera.orthographicSize = 13.72f; //4:3
        }else if(aspectRatio == 1.25){
            mainCamera.orthographicSize = 14.68f;
-        }
-        
+        }        
    }
 }
--- a/Assets/Scripts/Dice.cs
+++ b/Assets/Scripts/Dice.cs
@@ -7,16 +7,19 @@ public class Dice : MonoBehaviour {
    public Sprite[] diceSides = new Sprite[6];
    public SpriteRenderer hely1;
    public SpriteRenderer hely2;
-    public SpriteRenderer animacio1;
-    public SpriteRenderer animacio2;
+    [SerializeField] private int spriteSize = 60;
+    private Vector2 diceSpriteSize;
+    
    public Button dice1btnBtn; 
    public Button dice2btnBtn; 
+
    private Upgrade upgrade;
    private Akciopont ap;
    private Energia energiasav;
    private Targyak targyak;
    private Ugynok ugynok;
    private movement movement;
+
    public int[] diceResult = { 0, 0 };
    public List<int> ujertek = new List<int>();
    public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye
@@ -47,6 +50,8 @@ public class Dice : MonoBehaviour {
        targyak = FindObjectOfType<Targyak>();
        ugynok = FindObjectOfType<Ugynok>();
        movement = FindObjectOfType<movement>();
+
+        diceSpriteSize = new Vector2(spriteSize, spriteSize);
    }

    public void ertekValasztas(GameObject gomb) {
@@ -152,15 +157,15 @@ public class Dice : MonoBehaviour {
        } while (diceResult[0] == diceResult[1]);

        //dice porgo animacio
-        StartCoroutine(AnimateTheDice(hely1, diceResult[0]));
-        StartCoroutine(AnimateTheDice(hely2, diceResult[1]));
+        callAnimateDice(hely1, diceResult[0]);
+        callAnimateDice(hely2, diceResult[1]);

        //lassa a jatekos mit dobott
        hely1.sprite = diceSides[diceResult[0]-1];
-        hely1.size = new Vector2(38, 38);
+        hely1.size = diceSpriteSize;

        hely2.sprite = diceSides[diceResult[1]-1];
-        hely2.size = new Vector2(38, 38);
+        hely2.size = diceSpriteSize;

        if(ugynokDobas){
            ugynokDobasErtek = true;
@@ -247,10 +252,10 @@ public class Dice : MonoBehaviour {
        }

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

        hely2.sprite = diceSides[diceResult[1]-1];
-        hely2.size = new Vector2(38, 38);
+        hely2.size = diceSpriteSize;
        dobott++;

        //ha vegzett mindennel kapcsolja vissza az ertekvalasztast
@@ -279,7 +284,7 @@ public class Dice : MonoBehaviour {
        this.adrenalinMegerosites = adrenalinMegerosites; 
    }

-
+    public void callAnimateDice(SpriteRenderer rend, int diceErtek) => StartCoroutine(AnimateTheDice(rend, diceErtek));
    private IEnumerator AnimateTheDice(SpriteRenderer rend, int diceErtek)
    {
        int randomDiceSide;
@@ -295,12 +300,12 @@ public class Dice : MonoBehaviour {
            randomDiceSide = Random.Range(0, 5);

            rend.sprite = diceSides[Random.Range(0, 5)];
-            rend.size = new Vector2(38, 38);
+            rend.size = diceSpriteSize;

            yield return new WaitForSeconds(0.05f);
        }

        rend.sprite = diceSides[diceErtek - 1];
-        rend.size = new Vector2(38, 38);
+        rend.size = diceSpriteSize;
    }
 }
--- a/Assets/Scripts/Kezdohelyszin.cs
+++ b/Assets/Scripts/Kezdohelyszin.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using TMPro;
+
+public class Kezdohelyszin : MonoBehaviour
+{
+    public SpriteRenderer dice1;    
+    public SpriteRenderer dice2;
+    public TMP_Text eredmenyText;
+    public Button nextButton;
+
+    private int random;
+
+    private Dice dice;
+
+    private void Awake() {
+        dice = FindObjectOfType<Dice>();
+        nextButton.interactable = false;
+    }
+
+    public void KezdoHelyszinSorsolas(int x, int y, string helynev){
+        StartCoroutine(waitForDiceAnimation(helynev));
+
+        dice.callAnimateDice(dice1, x);
+        dice.callAnimateDice(dice2, y);
+    }
+
+    private IEnumerator waitForDiceAnimation(string helynev){
+        yield return new WaitForSeconds(5f);
+
+        eredmenyText.text = "A kezdőhelyszíned: " + helynev;
+        nextButton.interactable = true;
+    }
+
+    public void Debugl(){
+        Debug.Log("clicked");
+    }
+
+}
--- a/Assets/Scripts/Kezdohelyszin.cs.meta
+++ b/Assets/Scripts/Kezdohelyszin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2a9617c93d2bf0a4dbfd8f3c5c2aadda
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Ugynok.cs
+++ b/Assets/Scripts/Ugynok.cs
@@ -29,7 +29,7 @@ public class Ugynok : MonoBehaviour
    public bool droidagyuAktivalva = false;
    public bool canKill = false;
    public bool canShoot = false; //harchoz bool
-    private string[] previus_ugynok_csapatok;
+    [SerializeField] private string[] previus_ugynok_csapatok;
    private int elozo_x;
    private int elozo_y ;
    public void setCanKillTrue(){ canKill = true; }
@@ -288,7 +288,12 @@ public class Ugynok : MonoBehaviour
    }


-    public void ugynokOles(TMP_Text ugynokText){       
+    public void ugynokOles(TMP_Text ugynokText){     
+        if(!canKill){
+            Debug.Log("Nem nyomtal a harc gombra!!");
+            return;
+        }  
+
        //string tmp = ugynokText.gameObject.name;
        string s = ugynokText.gameObject.name;
        //Debug.Log("gomb name: " + s);
@@ -333,6 +338,7 @@ public class Ugynok : MonoBehaviour
            }

            akciok.Loves(ugynokcsapatletszama / upgrade.harc[upgrade.getHarcIndex()]);
+            canKill = false;
            Debug.Log("tolteny szama:" + ugynokcsapatletszama / upgrade.harc[upgrade.getHarcIndex()]);
        }

@@ -352,8 +358,12 @@ public class Ugynok : MonoBehaviour
        if(elozo_x != movement.jelenlegi_x || elozo_y != movement.jelenlegi_y){
            foreach(var item in previus_ugynok_csapatok){
                if(!item.Equals("")){
+                    Debug.Log("|"+item+"|");
                    //ha nem ures a text vagyis volt atirva szamra nezze meg hogy X-e
-                    if(!item.Equals("x") ||!item.Equals("X")){
+                    //if(!item.Equals("x") || !item.Equals("X"))
+                    if(item.Equals("1") || item.Equals("2") || item.Equals("3") || item.Equals("4") || item.Equals("5") || item.Equals("6"))
+                    {
+                        Debug.Log("belep ugynok item: |"+item+"|");
                        //vonjon le egy eletet
                        elet.Eletvesztes();
                        break;
--- a/Assets/Scripts/fps.cs
+++ b/Assets/Scripts/fps.cs
@@ -6,7 +6,7 @@ using System.Threading;

 public class fps : MonoBehaviour
 {
-    public TMP_Text fpsText;
+    public TMP_Text fpsText; //ideiglenesen megvaltoztatva az uzenet boxra!!
    [SerializeField] private float _hudRefreshRate = 1f;
    private float _timer;

--- a/Assets/Scripts/jatekmanager.cs
+++ b/Assets/Scripts/jatekmanager.cs
@@ -88,9 +88,21 @@ public class jatekmanager : MonoBehaviour

    public TMP_Text nev;

+    public GameObject mainCanvas;
+    public GameObject helyszinCanvas;
+    public GameObject helyszinSorsolasCanvas;
+    public GameObject palyaSprite;
+    public GameObject playerSprite;
+
    private void Awake()
    {
        Instance = this;   
+
+        mainCanvas.SetActive(false); //helyszin sorsolas animacio miatt
+        helyszinCanvas.SetActive(false);
+        helyszinSorsolasCanvas.SetActive(true);
+        palyaSprite.SetActive(false);
+        playerSprite.SetActive(false);
    }

    private void Start()
@@ -569,7 +581,7 @@ public class jatekmanager : MonoBehaviour
        Debug.Log("Játékos nyerésének vizsgálata.");
        Debug.Log("A forrás oszlopa:" + source.oszlop);
        Debug.Log("A forrás sora:" + source.sor[0]);
-        Debug.Log("");
+        //Debug.Log("");
        Debug.Log("A te jelenlegi oszlopod:" + movement.jelenlegi_y);
        Debug.Log("A te jelenlegi sorod:" + movement.jelenlegi_x);
        if (source.isNyitva == true && source.oszlop == movement.jelenlegi_x && source.sor[0] == movement.jelenlegi_y) //+ ugynokcsapat oles a helyszinen
--- a/Assets/Scripts/movement.cs
+++ b/Assets/Scripts/movement.cs
@@ -76,6 +76,7 @@ public class movement : MonoBehaviour
    private Targyak targyak;
    private jatekmanager jatekmanager;
    private Dice dice;
+    private Kezdohelyszin kezdohelyszin;

    private int oneonecount = 0;
    private int twoonecount = 0;
@@ -114,9 +115,10 @@ public class movement : MonoBehaviour
        targyak = FindObjectOfType<Targyak>();
        jatekmanager = FindObjectOfType<jatekmanager>();
        dice = FindObjectOfType<Dice>();
+        kezdohelyszin = FindObjectOfType<Kezdohelyszin>();
    }

-    void Start()
+    private void Start()
    {
        eromulepes1.SetActive(false);
        eromulepes2.SetActive(false);
@@ -168,7 +170,9 @@ public class movement : MonoBehaviour
            eromulepes1.SetActive(true);
            eromulepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 1;
-            jelenlegi_y = 1;         
+            jelenlegi_y = 1;   
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Erőmű");
+
        }
        else if (random == 2)
        {
@@ -177,6 +181,7 @@ public class movement : MonoBehaviour
            feketepiaclepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 2;
            jelenlegi_y = 1;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Fekete piac");
        }
        else if (random == 3)
        {
@@ -185,6 +190,7 @@ public class movement : MonoBehaviour
            metrolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 3;
            jelenlegi_y = 1;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Metró");
        }
        else if (random == 4)
        {
@@ -193,6 +199,7 @@ public class movement : MonoBehaviour
            szervereklepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 1;
            jelenlegi_y = 2;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Szerverek");
        }
        else if (random == 5)
        {
@@ -201,6 +208,7 @@ public class movement : MonoBehaviour
            kingcasinolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 2;
            jelenlegi_y = 2;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "King Kaszinó");
        }
        else if (random == 6)
        {
@@ -209,6 +217,7 @@ public class movement : MonoBehaviour
            feltoltolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 3;
            jelenlegi_y = 2;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Feltöltő");
        }
        else if (random == 7)
        {
@@ -217,6 +226,7 @@ public class movement : MonoBehaviour
            kutatolaborlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 1;
            jelenlegi_y = 3;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Kutatólabor");
        }
        else if (random == 8)
        {
@@ -225,6 +235,7 @@ public class movement : MonoBehaviour
            kriptoklublepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 2;
            jelenlegi_y = 3;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Kripto club");
        }
        else if (random == 9)
        {
@@ -233,6 +244,7 @@ public class movement : MonoBehaviour
            cyberplazalepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 3;
            jelenlegi_y = 3;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Cyber pláza");
        }
        else if (random == 10)
        {
@@ -241,6 +253,7 @@ public class movement : MonoBehaviour
            hadiuzemlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 1;
            jelenlegi_y = 4;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Hadiüzem");
        }
        else if (random == 11)
        {
@@ -249,6 +262,7 @@ public class movement : MonoBehaviour
            konyvtarlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 2;
            jelenlegi_y = 4;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Könyvtár");
        }
        else if (random == 12)
        {
@@ -257,6 +271,7 @@ public class movement : MonoBehaviour
            korhazlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
            jelenlegi_x = 3;
            jelenlegi_y = 4;
+            kezdohelyszin.KezdoHelyszinSorsolas(jelenlegi_x, jelenlegi_y, "Kórház");
        }

        //ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -41,3 +41,6 @@ TagManager:
  - name: Default
    uniqueID: 0
    locked: 0
+  - name: Kezdohelyszin
+    uniqueID: 2685889865
+    locked: 0
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -15,20 +15,15 @@ MonoBehaviour:
  m_PixelRect:
    serializedVersion: 2
    x: 0
-    y: 65
-    width: 1366
-    height: 680
+    y: 43
+    width: 1920
+    height: 997
  m_ShowMode: 4
-<<<<<<< Updated upstream
-  m_Title: Console
+  m_Title: Hierarchy
  m_RootView: {fileID: 3}
-=======
-  m_Title: Inspector
-  m_RootView: {fileID: 2}
->>>>>>> Stashed changes
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
+  m_Maximized: 1
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -37,7 +32,6 @@ MonoBehaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
-<<<<<<< Updated upstream
  m_EditorHideFlags: 0
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: InspectorWindow
@@ -45,12 +39,12 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1011
+    x: 1421
    y: 0
-    width: 355
-    height: 630
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 499
+    height: 947
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 18}
  m_Panes:
  - {fileID: 18}
@@ -64,29 +58,27 @@ MonoBehaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
-=======
->>>>>>> Stashed changes
  m_EditorHideFlags: 1
  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Children:
-  - {fileID: 3}
-  - {fileID: 5}
  - {fileID: 4}
+  - {fileID: 6}
+  - {fileID: 5}
  m_Position:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1366
-    height: 680
+    width: 1920
+    height: 997
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
  m_TopViewHeight: 30
  m_UseBottomView: 1
  m_BottomViewHeight: 20
--- !u!114 &3
+--- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -103,12 +95,12 @@ 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}
  m_LastLoadedLayoutName: 
--- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -124,36 +116,11 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 660
-    width: 1366
+    y: 977
+    width: 1920
    height: 20
  m_MinSize: {x: 0, y: 0}
  m_MaxSize: {x: 0, y: 0}
--- !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: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 6}
-  - {fileID: 11}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 30
-    width: 1366
-    height: 630
-  m_MinSize: {x: 300, y: 200}
-  m_MaxSize: {x: 24288, y: 16192}
-  vertical: 0
-  controlID: 18
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -168,24 +135,17 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Children:
  - {fileID: 7}
-  - {fileID: 10}
+  - {fileID: 2}
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 0
-    width: 1074
-    height: 630
-<<<<<<< Updated upstream
+    y: 30
+    width: 1920
+    height: 947
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 20
-=======
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 16192, y: 16192}
-  vertical: 1
-  controlID: 19
->>>>>>> Stashed changes
+  controlID: 40
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -200,27 +160,43 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Children:
  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 11}
  m_Position:
    serializedVersion: 2
    x: 0
    y: 0
-<<<<<<< Updated upstream
-    width: 1011
-    height: 630
+    width: 1421
+    height: 947
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 16192, y: 16192}
  vertical: 1
-  controlID: 21
-=======
-    width: 1074
-    height: 391
+  controlID: 41
+--- !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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 10}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1421
+    height: 570
  m_MinSize: {x: 200, y: 100}
  m_MaxSize: {x: 16192, y: 8096}
  vertical: 0
-  controlID: 20
->>>>>>> Stashed changes
--- !u!114 &8
+  controlID: 42
+--- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -237,46 +213,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-<<<<<<< Updated upstream
-    width: 1011
-    height: 379
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 8096}
-  vertical: 0
-  controlID: 22
-=======
-    width: 309.5
-    height: 391
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
-  m_Panes:
-  - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 0
->>>>>>> Stashed changes
--- !u!114 &9
-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: 309.5
-    y: 0
-<<<<<<< Updated upstream
-    width: 175
-    height: 379
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 255
+    height: 570
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 14}
  m_Panes:
  - {fileID: 14}
@@ -297,31 +237,19 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 175
+    x: 255
    y: 0
-    width: 836
-    height: 379
-=======
-    width: 764.5
-    height: 391
->>>>>>> Stashed changes
+    width: 1166
+    height: 570
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 15}
  m_Panes:
-<<<<<<< Updated upstream
  - {fileID: 15}
  - {fileID: 13}
  m_Selected: 0
  m_LastSelected: 1
 --- !u!114 &11
-=======
-  - {fileID: 12}
-  - {fileID: 14}
-  m_Selected: 1
-  m_LastSelected: 0
--- !u!114 &10
->>>>>>> Stashed changes
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -337,17 +265,11 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-<<<<<<< Updated upstream
-    y: 379
-    width: 1011
-    height: 251
-=======
-    y: 391
-    width: 1074
-    height: 239
->>>>>>> Stashed changes
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    y: 570
+    width: 1421
+    height: 377
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 17}
  m_Panes:
  - {fileID: 16}
@@ -355,32 +277,6 @@ MonoBehaviour:
  - {fileID: 12}
  m_Selected: 1
  m_LastSelected: 0
--- !u!114 &11
-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: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 1074
-    y: 0
-    width: 292
-    height: 630
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
-  m_Panes:
-  - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 0
 --- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -566,7 +462,6 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 1
-<<<<<<< Updated upstream
  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
@@ -578,10 +473,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 175
-    y: 86
-    width: 834
-    height: 358
+    x: 255
+    y: 73
+    width: 1164
+    height: 549
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -592,7 +487,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 599, y: 337}
+  m_TargetSize: {x: 939, y: 528}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@@ -607,10 +502,10 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -299.5
-    m_HBaseRangeMax: 299.5
-    m_VBaseRangeMin: -168.5
-    m_VBaseRangeMax: 168.5
+    m_HBaseRangeMin: -469.5
+    m_HBaseRangeMax: 469.5
+    m_VBaseRangeMin: -264
+    m_VBaseRangeMax: 264
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@@ -628,23 +523,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 834
-      height: 337
+      width: 1164
+      height: 528
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 417, y: 168.5}
+    m_Translation: {x: 582, y: 264}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -417
-      y: -168.5
-      width: 834
-      height: 337
+      x: -582
+      y: -264
+      width: 1164
+      height: 528
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 834, y: 358}
+  m_LastWindowPixelSize: {x: 1164, y: 549}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@@ -671,9 +566,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 86
-    width: 174
-    height: 358
+    y: 73
+    width: 254
+    height: 549
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -681,23 +576,23 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 006e0000
-      m_LastClickedID: 28160
-      m_ExpandedIDs: 1afbffff1e71000020790000
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 5272fdff3ab0feff6e35ffff7491ffff28fbfffff4ffffffda710000
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: dice2
+        m_OriginalName: dice2
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: 0
+        m_UserData: -93248
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
        m_IsRenamingFilename: 0
        m_ClientGUIView: {fileID: 9}
      m_SearchString: 
@@ -716,8 +611,6 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 1
-=======
->>>>>>> Stashed changes
  m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
@@ -729,17 +622,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-<<<<<<< Updated upstream
-    x: 175
-    y: 86
-    width: 834
-    height: 358
-=======
-    x: 318.5
-    y: 95
-    width: 781
-    height: 370
->>>>>>> Stashed changes
+    x: 255
+    y: 73
+    width: 1164
+    height: 549
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -989,22 +875,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:
-<<<<<<< Updated upstream
-    m_Target: {x: -0.6508466, y: 2.6651125, z: 0.050433118}
+    m_Target: {x: -7.5399766, y: -0.58874947, z: 61.085133}
    speed: 2
-    m_Value: {x: -0.6508466, y: 2.6651125, z: 0.050433118}
-=======
-    m_Target: {x: -5.063279, y: -0.4617358, z: 0.179349}
-    speed: 2
-    m_Value: {x: -5.063279, y: -0.4617358, z: 0.179349}
->>>>>>> Stashed changes
+    m_Value: {x: -7.5399766, y: -0.58874947, z: 61.085133}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -1055,15 +935,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-<<<<<<< Updated upstream
-    m_Target: 9.950926
+    m_Target: 9.850329
    speed: 2
-    m_Value: 9.950926
-=======
-    m_Target: 12.532305
-    speed: 2
-    m_Value: 12.532305
->>>>>>> Stashed changes
+    m_Value: 9.850329
  m_Ortho:
    m_Target: 1
    speed: 2
@@ -1088,160 +962,7 @@ MonoBehaviour:
  m_SceneVisActive: 1
  m_LastLockedObject: {fileID: 0}
  m_ViewIsLockedToObject: 0
-<<<<<<< Updated upstream
 --- !u!114 &16
-=======
--- !u!114 &13
-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: 308.5
-    height: 370
-  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: 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: 8}
-      m_SearchString: 
-    m_ExpandedScenes: []
-    m_CurrenRootInstanceID: 0
-    m_LockTracker:
-      m_IsLocked: 0
-    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &14
-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: 309.5
-    y: 95
-    width: 762.5
-    height: 370
-  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: 1920, y: 1080}
-  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: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -480
-    m_HBaseRangeMax: 480
-    m_VBaseRangeMin: -270
-    m_VBaseRangeMax: 270
-    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: 762.5
-      height: 349
-    m_Scale: {x: 0.64629626, y: 0.6462963}
-    m_Translation: {x: 381.24997, y: 174.5}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -589.8997
-      y: -270
-      width: 1179.7994
-      height: 540
-    m_MinimalGUI: 1
-  m_defaultScale: 0.6462963
-  m_LastWindowPixelSize: {x: 1525, y: 740}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
--- !u!114 &15
->>>>>>> Stashed changes
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -1262,15 +983,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-<<<<<<< Updated upstream
-    y: 465
-    width: 1010
-    height: 230
-=======
-    y: 606
-    width: 1155
-    height: 309
->>>>>>> Stashed changes
+    y: 643
+    width: 1420
+    height: 356
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -1288,29 +1003,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Scripts
+    - Assets
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets/Scripts
+  - Assets
  m_LastFoldersGridSize: -1
-  m_LastProjectPath: /Users/bance/Documents/GitHub/findthesource
+  m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-<<<<<<< Updated upstream
-    scrollPos: {x: 0, y: 39}
-    m_SelectedIDs: 607b0000
-    m_LastClickedID: 31584
-    m_ExpandedIDs: 000000003c7b00005c7b0000687b000000ca9a3b
-=======
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 3a7a0000
-    m_LastClickedID: 31290
-    m_ExpandedIDs: 00000000207a0000
->>>>>>> Stashed changes
+    m_SelectedIDs: 3c7b0000
+    m_LastClickedID: 31548
+    m_ExpandedIDs: 000000003c7b00003e7b0000407b0000607b0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -1338,11 +1046,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-<<<<<<< Updated upstream
-    m_ExpandedIDs: 000000003c7b0000
-=======
-    m_ExpandedIDs: 00000000207a0000
->>>>>>> Stashed changes
+    m_ExpandedIDs: 000000003c7b00003e7b0000407b0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -1367,13 +1071,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-<<<<<<< Updated upstream
-    m_SelectedInstanceIDs: aa6f0000
-    m_LastClickedInstanceID: 28586
-=======
-    m_SelectedInstanceIDs: aa6c0000
-    m_LastClickedInstanceID: 27818
->>>>>>> Stashed changes
+    m_SelectedInstanceIDs: 8c790000
+    m_LastClickedInstanceID: 31116
    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: c6230000687a00003a79000058790000
    m_RenameOverlay:
@@ -1391,11 +1090,7 @@ MonoBehaviour:
      m_IsRenaming: 0
      m_OriginalEventType: 11
      m_IsRenamingFilename: 1
-<<<<<<< Updated upstream
-      m_ClientGUIView: {fileID: 0}
-=======
-      m_ClientGUIView: {fileID: 10}
->>>>>>> Stashed changes
+      m_ClientGUIView: {fileID: 11}
    m_CreateAssetUtility:
      m_EndAction: {fileID: 0}
      m_InstanceID: 0
@@ -1403,11 +1098,7 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
    m_NewAssetIndexInList: -1
-<<<<<<< Updated upstream
-    m_ScrollPosition: {x: 0, y: 89}
-=======
    m_ScrollPosition: {x: 0, y: 0}
->>>>>>> Stashed changes
    m_GridSize: 64
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 142
@@ -1432,15 +1123,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-<<<<<<< Updated upstream
-    y: 465
-    width: 1010
-    height: 230
-=======
-    y: 486
-    width: 1073
-    height: 218
->>>>>>> Stashed changes
+    y: 643
+    width: 1420
+    height: 356
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -1461,20 +1146,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
-<<<<<<< Updated upstream
-    x: 1011
-    y: 86
-    width: 354
-=======
-    x: 1074
-    y: 95
-    width: 291
->>>>>>> Stashed changes
-    height: 609
+    x: 1421
+    y: 73
+    width: 498
+    height: 926
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -1486,11 +1165,7 @@ MonoBehaviour:
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
-<<<<<<< Updated upstream
-  m_LastVerticalScrollValue: 324
-=======
  m_LastVerticalScrollValue: 0
->>>>>>> Stashed changes
  m_GlobalObjectId: 
  m_InspectorMode: 0
  m_LockTracker: