From ad11946a20a485ddb5ba2c1f5710438230675f8a Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Wed, 19 Apr 2023 10:27:49 +0200 Subject: [PATCH] update --- Assets/Scenes/Jatek.unity | 15 +- Assets/Scripts/jatekmanager.cs | 6 + ProjectSettings/ProjectSettings.asset | 3 +- .../Layouts/CurrentMaximizeLayout.dwlt | 381 +++++++--- UserSettings/Layouts/default-2021.dwlt | 684 +++++++++--------- 5 files changed, 638 insertions(+), 451 deletions(-) diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 90702f3..74c9978 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -1720,7 +1720,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 2 + m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!1 &86648682 GameObject: @@ -4942,7 +4942,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0547daa776d6894eb26f972bda2e52d, type: 3} m_Name: m_EditorClassIdentifier: - fpsText: {fileID: 1479459479} + fpsText: {fileID: 947787407} _hudRefreshRate: 1 --- !u!114 &197904229 MonoBehaviour: @@ -5124,6 +5124,7 @@ MonoBehaviour: droidagyuAktivalva: 0 canKill: 0 canShoot: 0 + previus_ugynok_csapatok: [] --- !u!114 &197904236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5194,6 +5195,8 @@ MonoBehaviour: hackeles: {fileID: 191744299} rolldice: {fileID: 1393612611} test: {fileID: 401176105} + harc: {fileID: 2108944971} + uzenetBox: {fileID: 1479459479} oneone: - {fileID: 1326456196} - {fileID: 144640423} @@ -36581,7 +36584,7 @@ GameObject: - component: {fileID: 1479459480} - component: {fileID: 1479459479} m_Layer: 5 - m_Name: fpsText + m_Name: uzenetText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -52444,7 +52447,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2063388576 RectTransform: m_ObjectHideFlags: 0 @@ -52463,8 +52466,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 208.85, y: -185.71} - m_SizeDelta: {x: 160.96, y: 29.98} + m_AnchoredPosition: {x: 208.85, y: -159.52} + m_SizeDelta: {x: 160.96, y: 25.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2063388577 MonoBehaviour: diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 0fa80cd..2cff590 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -23,6 +23,8 @@ public class jatekmanager : MonoBehaviour public GameObject hackeles; public GameObject rolldice; public GameObject test; + public GameObject harc; + public TMP_Text uzenetBox; //script-ek implementalasa @@ -289,6 +291,7 @@ public class jatekmanager : MonoBehaviour nyomozas.SetActive(false); hackeles.SetActive(false); helyszinaktivalasBtn.gameObject.SetActive(false); + harc.SetActive(false); //test.SetActive(false); rolldice.SetActive(false); } @@ -304,6 +307,7 @@ public class jatekmanager : MonoBehaviour kovetkezokor.SetActive(false); //rolldice.SetActive(false); helyszinaktivalasBtn.gameObject.SetActive(false); + harc.SetActive(false); betarazas.SetActive(false); nyomozas.SetActive(false); @@ -323,6 +327,7 @@ public class jatekmanager : MonoBehaviour harcfejlesztés.SetActive(false); ujradobasfejlesztés.SetActive(false); hackfejlesztés.SetActive(false); + harc.SetActive(true); kovetkezokor.SetActive(true); @@ -401,6 +406,7 @@ public class jatekmanager : MonoBehaviour movement.threetwo_Collider.gameObject.SetActive(bekapcsolas); movement.threethree_Collider.gameObject.SetActive(bekapcsolas); movement.threefour_Collider.gameObject.SetActive(bekapcsolas); + harc.SetActive(bekapcsolas); targyak.hackerFelhasznalva.GetComponent