diff --git a/Assets/Assets/Pics/Source.meta b/Assets/Assets/Pics/Source.meta new file mode 100644 index 0000000..c4371a8 --- /dev/null +++ b/Assets/Assets/Pics/Source.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 352fac4e29fb531e3abdd1f6e3f1b12a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/Pics/Source/e58n6l2n4hfb7k77la032njg2u-86aa287283ea89ab88ba08b5c0d54b56.png b/Assets/Assets/Pics/Source/e58n6l2n4hfb7k77la032njg2u-86aa287283ea89ab88ba08b5c0d54b56.png new file mode 100644 index 0000000..ce20437 Binary files /dev/null and b/Assets/Assets/Pics/Source/e58n6l2n4hfb7k77la032njg2u-86aa287283ea89ab88ba08b5c0d54b56.png differ diff --git a/Assets/Assets/Pics/Source/e58n6l2n4hfb7k77la032njg2u-86aa287283ea89ab88ba08b5c0d54b56.png.meta b/Assets/Assets/Pics/Source/e58n6l2n4hfb7k77la032njg2u-86aa287283ea89ab88ba08b5c0d54b56.png.meta new file mode 100644 index 0000000..8efc67c --- /dev/null +++ b/Assets/Assets/Pics/Source/e58n6l2n4hfb7k77la032njg2u-86aa287283ea89ab88ba08b5c0d54b56.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 4cf5fe7c0e65d15508aeaefe5524d48b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index d049d77..7c391d9 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -38102,7 +38102,7 @@ Transform: m_GameObject: {fileID: 1559678231} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -40.29, y: 1.181, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -47356,12 +47356,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0, g: 0.011921406, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: 4cf5fe7c0e65d15508aeaefe5524d48b, 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_Size: {x: 2.56, y: 2.56} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -47375,8 +47375,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1903169755} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -40.2, y: -1.07, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -40.29, y: -1, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Scripts/ControllerHandler.cs b/Assets/Scripts/ControllerHandler.cs index f4236db..f6e77f0 100644 --- a/Assets/Scripts/ControllerHandler.cs +++ b/Assets/Scripts/ControllerHandler.cs @@ -15,6 +15,11 @@ public class ControllerHandler : MonoBehaviour Debug.Log("Controller connected"); for(int i = 0; i < controllers.Length; i++){ Debug.Log(controllers[i]); + + //lock and disable mouse + //Cursor.lockState = CursorLockMode.locked; + //Cursor.visible = false; + //yield break; } }else if(connected && controllers.Length == 0){ diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 6514dd5..47b8dc3 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -5,6 +5,7 @@ using TMPro; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; +using UnityEngine.EventSystems; public class jatekmanager : MonoBehaviour { @@ -143,6 +144,8 @@ public class jatekmanager : MonoBehaviour Pause } + //double click + public void Resume(){ pauseMenuUI.SetActive(false); Time.timeScale = 1f; //normal ido visszainditasa @@ -165,6 +168,24 @@ public class jatekmanager : MonoBehaviour SceneManager.LoadScene("MainMenu"); } + public IEnumerator atlatszo(Button gomb) + { + while (gomb.GetComponent().alpha > 0.25f) + { + gomb.GetComponent().alpha -= 0.5f; + yield return new WaitForSecondsRealtime(0.01f); + } + } + + public IEnumerator megjelen(Button gomb) + { + while (gomb.GetComponent().alpha < 1f) + { + gomb.GetComponent().alpha += 0.5f; + yield return new WaitForSecondsRealtime(0.01f); + } + } + private async void HandleKorkezdet() { rolldice.SetActive(true); diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 09fb39d..e0ac8e6 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: 43 - width: 1920 - height: 997 + y: 28 + width: 1366 + height: 680 m_ShowMode: 4 m_Title: Console m_RootView: {fileID: 3} @@ -39,10 +39,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1421 + x: 1011 y: 0 - width: 499 - height: 947 + width: 355 + height: 630 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} @@ -70,8 +70,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 @@ -95,7 +95,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} @@ -116,8 +116,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} @@ -140,12 +140,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: 91 + controlID: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1421 - height: 947 + width: 1011 + height: 630 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 96 + controlID: 21 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -190,12 +190,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1421 - height: 583 + width: 1011 + height: 379 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 97 + controlID: 22 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -213,8 +213,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 246 - height: 583 + width: 175 + height: 379 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -237,10 +237,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 246 + x: 175 y: 0 - width: 1175 - height: 583 + width: 836 + height: 379 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -265,9 +265,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 583 - width: 1421 - height: 364 + y: 379 + width: 1011 + height: 251 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -307,7 +307,7 @@ MonoBehaviour: m_SaveData: [] m_MixersTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3a790000 + m_SelectedIDs: m_LastClickedID: 31034 m_ExpandedIDs: 12eb343c m_RenameOverlay: @@ -473,10 +473,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 246 - y: 73 - width: 1173 - height: 562 + x: 175 + y: 86 + width: 834 + height: 358 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -487,7 +487,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 962, y: 541} + m_TargetSize: {x: 599, y: 337} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -502,10 +502,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -481 - m_HBaseRangeMax: 481 - m_VBaseRangeMin: -270.5 - m_VBaseRangeMax: 270.5 + m_HBaseRangeMin: -299.5 + m_HBaseRangeMax: 299.5 + m_VBaseRangeMin: -168.5 + m_VBaseRangeMax: 168.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -523,23 +523,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1173 - height: 541 + width: 834 + height: 337 m_Scale: {x: 1, y: 1} - m_Translation: {x: 586.5, y: 270.5} + m_Translation: {x: 417, y: 168.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -586.5 - y: -270.5 - width: 1173 - height: 541 + x: -417 + y: -168.5 + width: 834 + height: 337 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1173, y: 562} + m_LastWindowPixelSize: {x: 834, y: 358} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -566,9 +566,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 245 - height: 562 + y: 86 + width: 174 + height: 358 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -576,23 +576,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 3083fffffea1ffff80a2ffff90a2ffff9aa2ffff64a4ffff70a4ffff42a8ffffc0a8ffff9aaaffffa4aaffff6eacffff8cacffffe6eeffff14fbffffa86e00001271000002760000987600008a8101008c860100228701008c890100 + m_SelectedIDs: 006e0000 + m_LastClickedID: 28160 + m_ExpandedIDs: 1afbffff1e71000020790000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Main Camera - m_OriginalName: Main Camera + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 83486 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 9} m_SearchString: @@ -622,10 +622,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 246 - y: 73 - width: 1173 - height: 562 + x: 175 + y: 86 + width: 834 + height: 358 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -875,16 +875,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: -5.2513833, y: 1.164647, z: 0.02436734} + m_Target: {x: -0.6508466, y: 2.6651125, z: 0.050433118} speed: 2 - m_Value: {x: -5.2513833, y: 1.164647, z: 0.02436734} + m_Value: {x: -0.6508466, y: 2.6651125, z: 0.050433118} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -935,9 +935,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.756741 + m_Target: 9.950926 speed: 2 - m_Value: 12.756741 + m_Value: 9.950926 m_Ortho: m_Target: 1 speed: 2 @@ -983,9 +983,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 656 - width: 1420 - height: 343 + y: 465 + width: 1010 + height: 230 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1011,14 +1011,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts 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: 287b0000 - m_LastClickedID: 31528 - m_ExpandedIDs: 000000001c7b0000247b0000287b0000847d0000 + scrollPos: {x: 0, y: 39} + m_SelectedIDs: 607b0000 + m_LastClickedID: 31584 + m_ExpandedIDs: 000000003c7b00005c7b0000687b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1046,7 +1046,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001c7b0000 + m_ExpandedIDs: 000000003c7b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1071,10 +1071,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000687a00003a790000 + m_SelectedInstanceIDs: aa6f0000 + m_LastClickedInstanceID: 28586 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000687a00003a79000058790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1098,7 +1098,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 89} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 142 @@ -1123,9 +1123,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 656 - width: 1420 - height: 343 + y: 465 + width: 1010 + height: 230 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1150,10 +1150,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1421 - y: 73 - width: 498 - height: 926 + x: 1011 + y: 86 + width: 354 + height: 609 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1165,7 +1165,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 324 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: