diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 471e353..6294f1c 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -5124,6 +5124,7 @@ MonoBehaviour: droidagyuAktivalva: 0 canKill: 0 canShoot: 0 + previus_ugynok_csapatok: [] --- !u!114 &197904236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5183,11 +5184,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6423cb96f98604ea1be2455ae7cff97d, type: 3} m_Name: m_EditorClassIdentifier: - energiafejlesztes: {fileID: 652887773} - akciofejlesztes: {fileID: 767162772} - harcfejlesztes: {fileID: 917471241} - ujradobasfejlesztes: {fileID: 723782981} - hackfejlesztes: {fileID: 1785481345} + "energiafejleszt\xE9s": {fileID: 652887773} + "akciofejleszt\xE9s": {fileID: 767162772} + "harcfejleszt\xE9s": {fileID: 917471241} + "ujradobasfejleszt\xE9s": {fileID: 723782981} + "hackfejleszt\xE9s": {fileID: 1785481345} kovetkezokor: {fileID: 1177305936} betarazas: {fileID: 235549630} nyomozas: {fileID: 83085749} diff --git a/Assets/Scripts/AspectRatioHandler.cs b/Assets/Scripts/AspectRatioHandler.cs index 7db00a8..a0d53d6 100644 --- a/Assets/Scripts/AspectRatioHandler.cs +++ b/Assets/Scripts/AspectRatioHandler.cs @@ -24,12 +24,12 @@ public class AspectRatioHandler : MonoBehaviour if(aspectRatio == 1.78 || aspectRatio == 2.33){ if(Application.platform == RuntimePlatform.OSXPlayer) - mainCamera.orthographicSize = 13f; //mac aspect ratio fix??? + mainCamera.orthographicSize = 11.5f; //mac aspect ratio fix??? else mainCamera.orthographicSize = 10.4f; //16:9, 21:9 }else if(aspectRatio == 1.6){ if(Application.platform == RuntimePlatform.OSXPlayer) - mainCamera.orthographicSize = 13f; //mac aspect ratio fix??? + mainCamera.orthographicSize = 11.5f; //mac aspect ratio fix??? else mainCamera.orthographicSize = 11.43f; //16:9, 21:9 //16:10 11.43f }else if(aspectRatio == 1.33){ diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index a8bc6c1..5c131bf 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -12,38 +12,17 @@ public class jatekmanager : MonoBehaviour public static jatekmanager Instance; //game objectek implementálása - public GameObject energiafejlesztes; - private Button energiafejlesztesgomb; - - public GameObject akciofejlesztes; - private Button akciofejlesztesgomb; - - public GameObject harcfejlesztes; - private Button harcfejlesztesgomb; - - public GameObject ujradobasfejlesztes; - private Button ujradobasfejlesztesgomb; - - public GameObject hackfejlesztes; - private Button hackfejlesztesgomb; - + public GameObject energiafejlesztés; + public GameObject akciofejlesztés; + public GameObject harcfejlesztés; + public GameObject ujradobasfejlesztés; + public GameObject hackfejlesztés; public GameObject kovetkezokor; - private Button kovetkezokorgomb; - public GameObject betarazas; - private Button betarazasgomb; - public GameObject nyomozas; - private Button nyomozasgomb; - public GameObject hackeles; - private Button hackelesgomb; - public GameObject rolldice; - private Button rolldicegomb; - public GameObject test; - private Button testgomb; //script-ek implementalasa @@ -96,7 +75,7 @@ public class jatekmanager : MonoBehaviour private void Awake() { - Instance = this; + Instance = this; mainCanvas.SetActive(false); //helyszin sorsolas animacio miatt helyszinCanvas.SetActive(false); @@ -117,29 +96,16 @@ public class jatekmanager : MonoBehaviour turnManager = FindObjectOfType(); source = FindObjectOfType(); vegpontozas = FindObjectOfType(); - - - energiafejlesztesgomb = energiafejlesztes.GetComponent