diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index b52b75d..462c58c 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -4052,6 +4052,7 @@ GameObject: - component: {fileID: 197904235} - component: {fileID: 197904237} - component: {fileID: 197904238} + - component: {fileID: 197904239} m_Layer: 0 m_Name: Mangager m_TagString: Untagged @@ -4134,6 +4135,7 @@ MonoBehaviour: - {fileID: 255844036} dobott: 0 dobottEgyszer: 0 + ujradobasszamlalo: 0 --- !u!114 &197904222 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4675,6 +4677,19 @@ MonoBehaviour: threefourText: - {fileID: 663535674} - {fileID: 1583842800} +--- !u!114 &197904239 +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: f1646c9ba4620a0e7861327e11e40849, type: 3} + m_Name: + m_EditorClassIdentifier: + mainCamera: {fileID: 519420031} --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 @@ -11098,7 +11113,7 @@ Camera: far clip plane: 10 field of view: 60 orthographic: 1 - orthographic size: 10.409236 + orthographic size: 10.4 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/Assets/Scripts/AspectRatioHandler.cs b/Assets/Scripts/AspectRatioHandler.cs new file mode 100644 index 0000000..fec30cd --- /dev/null +++ b/Assets/Scripts/AspectRatioHandler.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using System; +using UnityEngine; + +public class AspectRatioHandler : MonoBehaviour +{ + public Camera mainCamera; + + private void Awake() { + double aspectRatio = (double)Screen.width / (double)Screen.height; + aspectRatio = Math.Round(aspectRatio, 2); + 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 + }else if(aspectRatio == 1.6){ + mainCamera.orthographicSize = 11.43f; //16:10 + }else if(aspectRatio == 1.33){ + mainCamera.orthographicSize = 13.72f; //4:3 + }else if(aspectRatio == 1.25){ + mainCamera.orthographicSize = 14.68f; + } + + } +} diff --git a/Assets/Scripts/AspectRatioHandler.cs.meta b/Assets/Scripts/AspectRatioHandler.cs.meta new file mode 100644 index 0000000..bc67f36 --- /dev/null +++ b/Assets/Scripts/AspectRatioHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1646c9ba4620a0e7861327e11e40849 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Source.cs b/Assets/Scripts/Source.cs index ab3229b..bce86d5 100644 --- a/Assets/Scripts/Source.cs +++ b/Assets/Scripts/Source.cs @@ -10,11 +10,13 @@ public class Source : MonoBehaviour private movement movement; public GameObject sourceSprite; + private Ugynok ugynok; private bool oneTime = false; private void Awake() { movement = FindObjectOfType(); + ugynok = FindObjectOfType(); } private void Start() { @@ -28,6 +30,10 @@ public class Source : MonoBehaviour if(isNyitva && oszlop != -1 && sor.Count == 1) { sourceRender(oszlop, sor[0]); if (!oneTime) { + for (int i = 0; i < 3; i++) + { + ugynok.UgynokSorsolas(oszlop, sor[0]); + } printSourceLocation(); oneTime = true; } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 110a6d4..90bc596 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 65 - width: 1470 - height: 806 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 m_Title: Game m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1470 - height: 806 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1470 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 786 - width: 1470 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1470 - height: 756 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 +<<<<<<< HEAD controlID: 32 +======= + controlID: 86 +>>>>>>> b7a6275f0bc9ad64e243e322939afb85c91d1264 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -698,7 +702,7 @@ 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 @@ -834,7 +838,7 @@ MonoBehaviour: m_LastFolders: - Assets/Scenes m_LastFoldersGridSize: 66 - m_LastProjectPath: /Users/bance/Documents/GitHub/findthesource + m_LastProjectPath: E:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: @@ -869,7 +873,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000047a0000 + m_ExpandedIDs: 00000000346f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -913,7 +917,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -969,14 +973,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 - x: 1092.5 - y: 95 - width: 376.5 - height: 735 + x: 1453 + y: 73 + width: 466 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default