From bef09b83dd322813aeaf426bd385e844699185e5 Mon Sep 17 00:00:00 2001 From: bance <90307762+bance23@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:12:36 +0200 Subject: [PATCH 1/2] pull aha --- Assets/Scenes/Jatek.unity | 23 +- Assets/Scripts/jatekmanager.cs | 248 ++++++-- .../LiberationSans SDF - Fallback.asset | 45 +- .../Layouts/CurrentMaximizeLayout.dwlt | 596 +++++++++--------- UserSettings/Layouts/default-2021.dwlt | 395 +++++++++++- 5 files changed, 918 insertions(+), 389 deletions(-) diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 7c391d9..3f12e62 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -5183,11 +5183,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6423cb96f98604ea1be2455ae7cff97d, type: 3} m_Name: m_EditorClassIdentifier: - "energiafejleszt\xE9s": {fileID: 652887773} - "akciofejleszt\xE9s": {fileID: 767162772} - "harcfejleszt\xE9s": {fileID: 917471241} - "ujradobasfejleszt\xE9s": {fileID: 723782981} - "hackfejleszt\xE9s": {fileID: 1785481345} + energiafejlesztes: {fileID: 652887773} + akciofejlesztes: {fileID: 767162772} + harcfejlesztes: {fileID: 917471241} + ujradobasfejlesztes: {fileID: 723782981} + hackfejlesztes: {fileID: 1785481345} kovetkezokor: {fileID: 1177305936} betarazas: {fileID: 235549630} nyomozas: {fileID: 83085749} @@ -9093,6 +9093,7 @@ GameObject: - component: {fileID: 401176109} - component: {fileID: 401176108} - component: {fileID: 401176107} + - component: {fileID: 401176110} m_Layer: 5 m_Name: TestGomb m_TagString: Untagged @@ -9215,6 +9216,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 401176105} m_CullTransparentMesh: 1 +--- !u!225 &401176110 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 401176105} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &410263759 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 47b8dc3..7976108 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -12,17 +12,38 @@ public class jatekmanager : MonoBehaviour public static jatekmanager Instance; //game objectek implementálása - public GameObject energiafejlesztés; - public GameObject akciofejlesztés; - public GameObject harcfejlesztés; - public GameObject ujradobasfejlesztés; - public GameObject hackfejlesztés; + 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 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 @@ -84,6 +105,19 @@ public class jatekmanager : MonoBehaviour turnManager = FindObjectOfType(); source = FindObjectOfType(); vegpontozas = FindObjectOfType(); + + + energiafejlesztesgomb = energiafejlesztes.GetComponent