diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index f784990..0c7376d 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -4053,6 +4053,7 @@ GameObject: - component: {fileID: 197904237} - component: {fileID: 197904238} - component: {fileID: 197904239} + - component: {fileID: 197904240} m_Layer: 0 m_Name: Mangager m_TagString: Untagged @@ -4690,6 +4691,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mainCamera: {fileID: 519420031} +--- !u!114 &197904240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197904216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834fb3b3751703f9bfcd35d25b4ccc4, type: 3} + m_Name: + m_EditorClassIdentifier: + connected: 0 + controllers: [] --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 @@ -8479,6 +8494,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410263759} m_CullTransparentMesh: 1 +--- !u!1 &414012301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 414012302} + - component: {fileID: 414012303} + m_Layer: 0 + m_Name: BlueDot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &414012302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414012301} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 996884040} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &414012303 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414012301} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 0, g: 0.054581404, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &416499490 GameObject: m_ObjectHideFlags: 0 @@ -23059,6 +23158,91 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 996172357} m_CullTransparentMesh: 1 +--- !u!1 &996884038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 996884040} + - component: {fileID: 996884039} + m_Layer: 0 + m_Name: ControllerPointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &996884039 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996884038} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &996884040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996884038} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -40.2, y: -2.5, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 414012302} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &998264440 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/JatekosNyert.unity b/Assets/Scenes/JatekosNyert.unity index 522e5c2..d822a03 100644 --- a/Assets/Scenes/JatekosNyert.unity +++ b/Assets/Scenes/JatekosNyert.unity @@ -271,6 +271,7 @@ GameObject: - component: {fileID: 958920304} - component: {fileID: 958920307} - component: {fileID: 958920308} + - component: {fileID: 958920309} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -392,6 +393,19 @@ MonoBehaviour: MainMenuObj: {fileID: 0} OptionsMenu: {fileID: 0} VideoButton: {fileID: 0} +--- !u!114 &958920309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958920303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3} + m_Name: + m_EditorClassIdentifier: + szoveg: {fileID: 1041644989} --- !u!1 &1041644987 GameObject: m_ObjectHideFlags: 0 @@ -450,7 +464,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: 'Pontszam: ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scenes/JatekosVesztett.unity b/Assets/Scenes/JatekosVesztett.unity index 1dbf9df..f911fa2 100644 --- a/Assets/Scenes/JatekosVesztett.unity +++ b/Assets/Scenes/JatekosVesztett.unity @@ -136,6 +136,7 @@ GameObject: - component: {fileID: 392158087} - component: {fileID: 392158091} - component: {fileID: 392158090} + - component: {fileID: 392158092} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -221,6 +222,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b9102add15fe89844a6f103c51332836, type: 3} m_Name: m_EditorClassIdentifier: + MainMenuObj: {fileID: 0} + OptionsMenu: {fileID: 0} + VideoButton: {fileID: 0} --- !u!114 &392158091 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,6 +258,19 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &392158092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392158086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38c0315629436f34d8ba48f6d00b8302, type: 3} + m_Name: + m_EditorClassIdentifier: + szoveg: {fileID: 1059568913} --- !u!1 &534187230 GameObject: m_ObjectHideFlags: 0 @@ -291,7 +308,7 @@ 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: 0, y: -72.19} + m_AnchoredPosition: {x: 7, y: -14} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &534187232 @@ -523,6 +540,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019554694} m_CullTransparentMesh: 1 +--- !u!1 &1059568911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1059568912} + - component: {fileID: 1059568914} + - component: {fileID: 1059568913} + m_Layer: 5 + m_Name: pont_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1059568912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1059568911} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1833175879} + m_RootOrder: 2 + 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: 7, y: -101} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1059568913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1059568911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Pontszam: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1059568914 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1059568911} + m_CullTransparentMesh: 1 --- !u!1 &1782492010 GameObject: m_ObjectHideFlags: 0 @@ -558,7 +710,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 7, y: 58.190002} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1782492012 @@ -752,6 +904,7 @@ RectTransform: m_Children: - {fileID: 1782492011} - {fileID: 534187231} + - {fileID: 1059568912} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/ControllerHandler.cs b/Assets/Scripts/ControllerHandler.cs new file mode 100644 index 0000000..f4236db --- /dev/null +++ b/Assets/Scripts/ControllerHandler.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ControllerHandler : MonoBehaviour +{ + [SerializeField]private bool connected = false; + public string[] controllers; + + private IEnumerator detectControllers(){ + while(true){ + controllers = Input.GetJoystickNames(); + + if(!connected && controllers.Length > 0){ + Debug.Log("Controller connected"); + for(int i = 0; i < controllers.Length; i++){ + Debug.Log(controllers[i]); + //yield break; + } + }else if(connected && controllers.Length == 0){ + Debug.Log("disconnected / not connected"); + }else if(!connected && controllers.Length == 0){ + Debug.Log("not connected"); + } + + yield return new WaitForSeconds(5f); //check every 5 seconds + } + } + + private void Awake() { + StartCoroutine(detectControllers()); + } +} diff --git a/Assets/Scripts/ControllerHandler.cs.meta b/Assets/Scripts/ControllerHandler.cs.meta new file mode 100644 index 0000000..39912dc --- /dev/null +++ b/Assets/Scripts/ControllerHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5834fb3b3751703f9bfcd35d25b4ccc4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Elet.cs b/Assets/Scripts/Elet.cs index 00154c0..ab71de1 100644 --- a/Assets/Scripts/Elet.cs +++ b/Assets/Scripts/Elet.cs @@ -24,6 +24,7 @@ public class Elet : MonoBehaviour private void Update() { if(elet == 0){ jatekmanager.Instance.jatekosvesztett = true; + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Vesztette); } } diff --git a/Assets/Scripts/Energia.cs b/Assets/Scripts/Energia.cs index f3f6f16..bca7b31 100644 --- a/Assets/Scripts/Energia.cs +++ b/Assets/Scripts/Energia.cs @@ -20,7 +20,11 @@ public class Energia : MonoBehaviour return; //targy cucc aktivalva egesz korbe nem csokken az energia } - if (energiasav_index > 29) jatekmanager.Instance.jatekosvesztett = true; //ha nincs tobb energia vesztes + if (energiasav_index > 29) { + jatekmanager.Instance.jatekosvesztett = true; + jatekmanager.Instance.UpdateGameState(jatekmanager.GameState.Vesztette); + //ha nincs tobb energia vesztes + } for (int i = 0; i < number; i++) { //if (number + enegiasav_index > energiasav_text.Length) break; diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 724d3a3..e1e0255 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -35,6 +35,7 @@ public class jatekmanager : MonoBehaviour private movement movement; private TurnManager turnManager; private Source source; + private vegpontozas vegpontozas; //ügynökcsapatok implementálása public TMP_Text[] oneone; @@ -197,17 +198,18 @@ public class jatekmanager : MonoBehaviour private async void HandleVesztette() { + //vegpontozas.pontkiiras(); JatekosNyert(); JatekosVesztett(); } private void Update() { - if(jatekosvesztett){ + /*if(jatekosvesztett){ SceneManager.LoadScene("JatekosVesztett"); } if(jatekosnyert){ SceneManager.LoadScene("JatekosNyert"); - } + }*/ } private async void ugynokDeaktivalas(bool bekapcsolas) @@ -442,6 +444,7 @@ public class jatekmanager : MonoBehaviour } if(jatekosnyert){ + vegpontozas.pontkiiras(); SceneManager.LoadScene("JatekosNyert"); } else @@ -718,6 +721,7 @@ public class jatekmanager : MonoBehaviour } if(jatekosvesztett){ + vegpontozas.pontkiiras(); SceneManager.LoadScene("JatekosVesztett"); } else diff --git a/Assets/Scripts/vegpontozas.cs b/Assets/Scripts/vegpontozas.cs index a4738ce..1331844 100644 --- a/Assets/Scripts/vegpontozas.cs +++ b/Assets/Scripts/vegpontozas.cs @@ -3,7 +3,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using TMPro; - +using System.IO; +using System.Text; +using UnityEngine.SceneManagement; public class vegpontozas : MonoBehaviour { @@ -14,9 +16,9 @@ public class vegpontozas : MonoBehaviour private Elet elet; - public GameObject szoveg; + public TMP_Text szoveg; - int osszpont = 0; + public int osszpont = 0; int tolteny; int megszerzetttargyak; int fejlesztespont; @@ -30,6 +32,10 @@ public class vegpontozas : MonoBehaviour targyak = FindObjectOfType(); akciok = FindObjectOfType(); elet = FindObjectOfType(); + + if(SceneManager.GetActiveScene().name.Equals("JatekosNyert") || SceneManager.GetActiveScene().name.Equals("JatekosVesztett")){ + szoveg.text = "Pontszam: " + pontbeolvas(); + } } public int OsszpontSzamalas() @@ -44,4 +50,21 @@ public class vegpontozas : MonoBehaviour //textMesh.text = "Összesen ennyi pontot szereztél:" + osszpont; return osszpont; } + + public void pontkiiras(){ + StreamWriter writer = new StreamWriter(Application.persistentDataPath + "/pontszam.txt", false, Encoding.Default); + + writer.Write(osszpont); + writer.Close(); + + Debug.Log("fajl kiirva"); + } + + public string pontbeolvas(){ + StreamReader reader = new StreamReader(Application.persistentDataPath + "/pontszam.txt"); + string pontszam = reader.ReadLine(); + reader.Close(); + + return pontszam; + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8f18df2..7e41fac 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d flags: 0 RecentlyUsedSceneGuid-1: - value: 07040753500359095b580a2641275e41444f19297c2d2363752d4a35b1b46339 + value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a flags: 0 RecentlyUsedSceneGuid-2: - value: 0200045e07010a5f5d5c542341765d4213164a7f797d7e347c7e1c60bab7656a + value: 07040753500359095b580a2641275e41444f19297c2d2363752d4a35b1b46339 flags: 0 RecentlyUsedSceneGuid-3: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3ca867b..09ae5ae 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 1920 - height: 997 + y: 28 + width: 1366 + height: 680 m_ShowMode: 4 - m_Title: Game + m_Title: Hierarchy m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,18 +39,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1306 + x: 742 y: 0 - width: 614 - height: 947 + width: 624 + height: 630 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - - {fileID: 16} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 16} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -71,8 +71,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1366 + height: 680 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -96,7 +96,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} @@ -117,8 +117,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 660 + width: 1366 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 630 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 19 + controlID: 28 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,12 +166,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1306 - height: 947 + width: 742 + height: 630 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 20 + controlID: 29 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -191,12 +191,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1306 - height: 561 + width: 742 + height: 355 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 21 + controlID: 30 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -214,8 +214,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 242 - height: 561 + width: 139 + height: 355 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -238,10 +238,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 242 + x: 139 y: 0 - width: 1064 - height: 561 + width: 603 + height: 355 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -266,9 +266,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 561 - width: 1306 - height: 386 + y: 355 + width: 742 + height: 275 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 242 - y: 73 - width: 1062 - height: 540 + x: 139 + y: 86 + width: 601 + height: 334 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: 1062, y: 519} + m_TargetSize: {x: 601, y: 313} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -531 - m_HBaseRangeMax: 531 - m_VBaseRangeMin: -259.5 - m_VBaseRangeMax: 259.5 + m_HBaseRangeMin: -300.5 + m_HBaseRangeMax: 300.5 + m_VBaseRangeMin: -156.5 + m_VBaseRangeMax: 156.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1062 - height: 519 + width: 601 + height: 313 m_Scale: {x: 1, y: 1} - m_Translation: {x: 531, y: 259.5} + m_Translation: {x: 300.5, y: 156.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -531 - y: -259.5 - width: 1062 - height: 519 + x: -300.5 + y: -156.5 + width: 601 + height: 313 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1062, y: 540} + m_LastWindowPixelSize: {x: 601, y: 334} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 241 - height: 540 + y: 86 + width: 138 + height: 334 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 14fbffffba6d000094700000 + m_ExpandedIDs: e482ffff5aa7ffff48adffffb6b1ffff20c3ffff1afbfffffa77000056f000001ef1000038f10000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 242 - y: 73 - width: 1062 - height: 540 + x: 139 + y: 86 + width: 601 + height: 334 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: -4.3600006, y: 0, z: -10} + m_Target: {x: -4.524531, y: 0, z: 0} speed: 2 - m_Value: {x: -4.3600006, y: 0, z: -10} + m_Value: {x: -4.524531, y: 0, z: 0} 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: 12.124355 + m_Target: 21.083035 speed: 2 - m_Value: 12.124355 + m_Value: 21.083035 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 634 - width: 1305 - height: 365 + y: 441 + width: 741 + height: 254 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -834,14 +834,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scenes 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: 1a7a0000 - m_LastClickedID: 31258 - m_ExpandedIDs: 00000000067a0000 + m_SelectedIDs: 1c7a0000 + m_LastClickedID: 31260 + m_ExpandedIDs: 00000000fe79000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000067a0000 + m_ExpandedIDs: 00000000fe790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -896,7 +896,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -945,10 +945,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1306 - y: 73 - width: 613 - height: 926 + x: 742 + y: 86 + width: 623 + height: 609 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1306 - y: 73 - width: 613 - height: 926 + x: 742 + y: 86 + width: 623 + 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: 74 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: