diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 4225ce1..d76ae07 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -7096,7 +7096,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &365240013 RectTransform: m_ObjectHideFlags: 0 @@ -7952,7 +7952,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &425448839 RectTransform: m_ObjectHideFlags: 0 @@ -8730,7 +8730,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &465754578 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9383,7 +9383,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter name + m_text: "N\xE9v" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -10271,7 +10271,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &526512436 RectTransform: m_ObjectHideFlags: 0 @@ -10725,7 +10725,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &548868624 RectTransform: m_ObjectHideFlags: 0 @@ -11554,7 +11554,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &644024316 RectTransform: m_ObjectHideFlags: 0 @@ -13501,10 +13501,10 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 0} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 0} + m_PressedColor: {r: 1, g: 1, b: 1, a: 0} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + m_DisabledColor: {r: 1, g: 1, b: 1, a: 0} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -19349,7 +19349,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &961148286 RectTransform: m_ObjectHideFlags: 0 @@ -24744,7 +24744,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1202715285 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 6c48872..22b6f70 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -417,82 +417,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 45143193} m_CullTransparentMesh: 1 ---- !u!1 &57176555 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 57176556} - - component: {fileID: 57176558} - - component: {fileID: 57176557} - m_Layer: 5 - m_Name: Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &57176556 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57176555} - 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: 850122247} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &57176557 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57176555} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &57176558 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57176555} - m_CullTransparentMesh: 1 --- !u!1 &97446639 GameObject: m_ObjectHideFlags: 0 @@ -892,7 +816,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: 404, y: -65} + m_AnchoredPosition: {x: 404, y: -180} m_SizeDelta: {x: 85.471, y: 76.781} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &267579259 @@ -1046,7 +970,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &345853270 RectTransform: m_ObjectHideFlags: 0 @@ -1061,7 +985,6 @@ RectTransform: m_Children: - {fileID: 415922101} - {fileID: 267579258} - - {fileID: 1834896933} m_Father: {fileID: 500113176} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1146,7 +1069,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: 400, y: 90} + m_AnchoredPosition: {x: 400, y: 70} m_SizeDelta: {x: 433.849, y: 95.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &415922102 @@ -1582,7 +1505,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &500113176 RectTransform: m_ObjectHideFlags: 0 @@ -1673,18 +1596,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!114 &500113178 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2452,83 +2363,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788560222} m_CullTransparentMesh: 1 ---- !u!1 &850122246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 850122247} - - component: {fileID: 850122249} - - component: {fileID: 850122248} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &850122247 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850122246} - 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: - - {fileID: 57176556} - m_Father: {fileID: 1834896933} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &850122248 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850122246} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &850122249 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 850122246} - m_CullTransparentMesh: 1 --- !u!1 &882912777 GameObject: m_ObjectHideFlags: 0 @@ -2824,22 +2658,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1704647066} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1274410647} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 1386328425} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: OptionMenu + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -2962,141 +2784,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1023402264} m_CullTransparentMesh: 1 ---- !u!1 &1077206447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1077206448} - - component: {fileID: 1077206450} - - component: {fileID: 1077206449} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &1077206448 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077206447} - 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: 1834896933} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -946, y: 10} - m_SizeDelta: {x: 258.70892, y: 60.25596} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1077206449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077206447} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Vsync - 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: 1 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - topRight: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - bottomLeft: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - bottomRight: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - m_fontColorGradientPreset: {fileID: 11400000, guid: 3993022102250764cb128dc715602c65, type: 2} - 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: 65 - m_fontSizeBase: 48 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 30 - m_fontSizeMax: 65 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - 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 &1077206450 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077206447} - m_CullTransparentMesh: 1 --- !u!1 &1092561535 GameObject: m_ObjectHideFlags: 0 @@ -4027,7 +3714,6 @@ GameObject: - component: {fileID: 1386328417} - component: {fileID: 1386328422} - component: {fileID: 1386328425} - - component: {fileID: 1386328424} - component: {fileID: 1386328423} m_Layer: 0 m_Name: Main Camera @@ -4149,18 +3835,6 @@ MonoBehaviour: m_EditorClassIdentifier: resolutionDropdown: {fileID: 415922102} mixer: {fileID: 24100000, guid: 833dc20f7f9e5b244a756827a43d874d, type: 2} ---- !u!114 &1386328424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386328416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30554c5b5d693404cab81430d7e894ea, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1386328425 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4173,6 +3847,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b9102add15fe89844a6f103c51332836, type: 3} m_Name: m_EditorClassIdentifier: + MainMenuObj: {fileID: 1704647066} + OptionsMenu: {fileID: 1274410647} + VideoButton: {fileID: 500113175} --- !u!1 &1421471717 GameObject: m_ObjectHideFlags: 0 @@ -4954,7 +4631,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1804663945 RectTransform: m_ObjectHideFlags: 0 @@ -5105,105 +4782,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1831593193} m_CullTransparentMesh: 1 ---- !u!1 &1834896932 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1834896933} - - component: {fileID: 1834896934} - m_Layer: 5 - m_Name: VsyncToggle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &1834896933 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1834896932} - 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: - - {fileID: 1077206448} - - {fileID: 850122247} - m_Father: {fileID: 345853270} - 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: 404, y: -202} - m_SizeDelta: {x: 85.471, y: 76.781} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1834896934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1834896932} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 850122248} - toggleTransition: 1 - graphic: {fileID: 57176557} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1386328423} - m_TargetAssemblyTypeName: OptionMenu, Assembly-CSharp - m_MethodName: setVsync - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_IsOn: 1 --- !u!1 &1847040547 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index 3329f85..8810a98 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -127,6 +127,32 @@ public class Dice : MonoBehaviour { if(mehet){ Debug.Log("belep mehet"); Debug.Log("List: 0: " + ujertek[0] + " 1: " + ujertek[1]); + //ha tul nagy vagy tul kicsi erteket ad meg az elso kockanak valtsa at az erteket + if(targyak.ujertek1 > 6 && diceResult[1] != 6 && targyak.ujertek2 != 6){ //ha tul nagy szamot adott meg legyen 6 az ertek + targyak.ujertek1 = 6; + }else if(targyak.ujertek1 > 6 && (diceResult[1] == 6 || targyak.ujertek2 == 6)){ //ha a masik ertek 6 akkor legyen az ertek 5 + targyak.ujertek1 = 5; + }else if(targyak.ujertek1 < 1 && diceResult[1] != 1 && targyak.ujertek2 != 1){ + targyak.ujertek1 = 1; + }else if(targyak.ujertek1 < 1 && (diceResult[1] == 1 || targyak.ujertek2 == 1)){ + targyak.ujertek1 = 2; + } + + // + + //ha tul nagy vagy tul kicsi erteket ad meg az masodik kockanak valtsa at az erteket + if(targyak.ujertek2 > 6 && diceResult[0] != 6 && targyak.ujertek1 != 6){ //ha tul nagy szamot adott meg legyen 6 az ertek + targyak.ujertek2 = 6; + }else if(targyak.ujertek2 > 6 && (diceResult[0] == 6 || targyak.ujertek1 == 6)){ //ha a masik ertek 6 akkor legyen az ertek 5 + targyak.ujertek2 = 5; + }else if(targyak.ujertek2 < 1 && diceResult[0] != 1 && targyak.ujertek1 != 1){ + targyak.ujertek2 = 1; + }else if(targyak.ujertek2 < 1 && (diceResult[0] == 1 || targyak.ujertek1 == 1)){ + targyak.ujertek2 = 2; + } + + + diceResult[0] = targyak.ujertek1; diceResult[1] = targyak.ujertek2; } diff --git a/Assets/Scripts/Targyak.cs b/Assets/Scripts/Targyak.cs index dc186cb..6245525 100644 --- a/Assets/Scripts/Targyak.cs +++ b/Assets/Scripts/Targyak.cs @@ -105,6 +105,8 @@ public class Targyak : MonoBehaviour var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue); yield return waitForButton.Reset(); + + //nem szam karakter levedes? ujertek1 = int.Parse(kocka1ertek.text); ujertek2 = int.Parse(kocka2ertek.text); //hogy tunik el az elozo? || egymas melle kerul a ket input vagy gomb ami deaktivalja a inputot diff --git a/Assets/Scripts/menu/MainMenu.cs b/Assets/Scripts/menu/MainMenu.cs index 05cf459..e6c8aad 100644 --- a/Assets/Scripts/menu/MainMenu.cs +++ b/Assets/Scripts/menu/MainMenu.cs @@ -5,16 +5,35 @@ using UnityEngine.SceneManagement; public class MainMenu : MonoBehaviour { - public void PlayGame() { + public GameObject MainMenuObj; + public GameObject OptionsMenu; + public GameObject VideoButton; + + public void PlayGame() + { SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1); } - public void QuitGame() { + public void QuitGame() + { Debug.Log("Application is quitting!!"); Application.Quit(); } - public void GoToMenu(){ + public void GoToMenu() + { SceneManager.LoadScene("MainMenu"); } + + public void OptionMenu() + { + MainMenuObj.SetActive(false); //kikapcsolni a fomenu dolgokat + OptionsMenu.SetActive(true); //bekapcsolni a beallitas menu dolgokat + + //megvizsgalni hogy a platform szamitogep, es ha nem csak a hangerot lehessen allitani + if (Application.platform == RuntimePlatform.WindowsPlayer || Application.platform == RuntimePlatform.OSXPlayer || Application.platform == RuntimePlatform.LinuxPlayer || Application.platform == RuntimePlatform.WindowsEditor || Application.platform == RuntimePlatform.OSXEditor || Application.platform == RuntimePlatform.LinuxEditor) + { + VideoButton.SetActive(true); + } + } } diff --git a/Assets/Scripts/menu/MainMenuQuit.cs b/Assets/Scripts/menu/MainMenuQuit.cs deleted file mode 100644 index 662c605..0000000 --- a/Assets/Scripts/menu/MainMenuQuit.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MainMenuQuit : MonoBehaviour -{ - public void QuitGame() { - Debug.Log("Application is quitting!!"); - Application.Quit(); - } -} diff --git a/Assets/Scripts/menu/MainMenuQuit.cs.meta b/Assets/Scripts/menu/MainMenuQuit.cs.meta deleted file mode 100644 index aeb12ad..0000000 --- a/Assets/Scripts/menu/MainMenuQuit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 30554c5b5d693404cab81430d7e894ea -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/menu/OptionMenu.cs b/Assets/Scripts/menu/OptionMenu.cs index f9638bd..239de75 100644 --- a/Assets/Scripts/menu/OptionMenu.cs +++ b/Assets/Scripts/menu/OptionMenu.cs @@ -61,7 +61,7 @@ public class OptionMenu : MonoBehaviour Screen.fullScreen = isFullscreen; } - public void setVsync(bool value) { + /*public void setVsync(bool value) { int num = 0; if (value) num = 1; @@ -71,5 +71,5 @@ public class OptionMenu : MonoBehaviour else Debug.Log("vsync off"); QualitySettings.vSyncCount = num; - } + }*/ } diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json new file mode 100644 index 0000000..421bf3d --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json @@ -0,0 +1,16 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0b38132..c92ef5e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 0.6 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -370,6 +370,66 @@ PlayerSettings: m_SubKind: App Store - m_BuildTarget: Android m_Icons: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: - m_Textures: [] m_Width: 432 m_Height: 432 @@ -400,66 +460,6 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: @@ -662,6 +662,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -761,6 +762,7 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -772,6 +774,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 + selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 @@ -849,6 +852,7 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index d80ab58..a5acf9b 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,114 +6,6 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 0 m_QualitySettings: - - serializedVersion: 2 - name: Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Medium - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.7 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: High - pixelLightCount: 2 - shadows: 2 - shadowResolution: 1 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 0 - lodBias: 1 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 256 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2} - excludedTargetPlatforms: [] - serializedVersion: 2 name: Ultra pixelLightCount: 4 @@ -151,18 +43,18 @@ QualitySettings: customRenderPipeline: {fileID: 11400000, guid: f14ceadaeba9f6c47ae9db7e84441a57, type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 1 - GameCoreScarlett: 3 - GameCoreXboxOne: 3 - Lumin: 3 - Nintendo Switch: 3 - PS4: 3 - PS5: 3 + Android: 0 + GameCoreScarlett: 0 + GameCoreXboxOne: 0 + Lumin: 0 + Nintendo Switch: 0 + PS4: 0 + PS5: 0 Server: 0 - Stadia: 3 - Standalone: 3 - WebGL: 2 - Windows Store Apps: 3 - XboxOne: 3 - iPhone: 1 - tvOS: 1 + Stadia: 0 + Standalone: 0 + WebGL: 0 + Windows Store Apps: 0 + XboxOne: 0 + iPhone: 0 + tvOS: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index acea475..7480f94 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -19,12 +19,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 622 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 84 + controlID: 13575 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 201 - y: 86 - width: 808 - height: 356 + x: 312 + y: 19 + width: 1108 + height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 808, y: 335} + m_TargetSize: {x: 1108, y: 532} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -404 - m_HBaseRangeMax: 404 - m_VBaseRangeMin: -167.5 - m_VBaseRangeMax: 167.5 + m_HBaseRangeMin: -554 + m_HBaseRangeMax: 554 + m_VBaseRangeMin: -266 + m_VBaseRangeMax: 266 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -86,7 +86,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 808 - height: 335 + width: 1108 + height: 532 m_Scale: {x: 1, y: 1} - m_Translation: {x: 404, y: 167.5} + m_Translation: {x: 554, y: 266} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -404 - y: -167.5 - width: 808 - height: 335 + x: -554 + y: -266 + width: 1108 + height: 532 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 808, y: 356} + m_LastWindowPixelSize: {x: 1108, y: 553} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1011 - height: 622 + width: 1421 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 85 + controlID: 13576 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1011 - height: 377 + width: 1421 + height: 574 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 86 + controlID: 13537 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,8 +184,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 201 - height: 377 + width: 311 + height: 574 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} @@ -214,19 +214,19 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 200 - height: 356 + y: 73 + width: 310 + height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 188} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 88f9ffff28fbffff067000005a7800001e790000 + m_ExpandedIDs: b2b3ffff88b7ffff2eb8ffff0abaffff12bafffff6bbffff00bcffff96e4ffff28fbffff306f000014700000ea730000b4ae0000f4ae00001caf0000d2af000006b000001eb0000046b0000012f5000040f70000a6fa00004cfe0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -242,7 +242,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 201 + x: 311 y: 0 - width: 810 - height: 377 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 1110 + height: 574 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 201 - y: 86 - width: 808 - height: 356 + x: 311 + y: 73 + width: 1108 + height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -550,16 +550,16 @@ 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 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.720564, y: 3.6059585, z: -0.039103076} + m_Target: {x: -5.220311, y: -0.793674, z: -0.07745893} speed: 2 - m_Value: {x: -4.720564, y: 3.6059585, z: -0.039103076} + m_Value: {x: -5.220311, y: -0.793674, z: -0.07745893} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 9.726926 + m_Target: 12.106108 speed: 2 - m_Value: 9.726926 + m_Value: 12.106108 m_Ortho: m_Target: 1 speed: 2 @@ -653,11 +653,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 377 - width: 1011 - height: 245 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + y: 574 + width: 1421 + height: 373 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -685,9 +685,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 - width: 1010 - height: 224 + y: 647 + width: 1420 + height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,22 +705,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 66 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: 66 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4c6f0000 - m_LastClickedID: 28492 - m_ExpandedIDs: 00000000426f000000ca9a3bffffff7f + m_SelectedIDs: 50790000 + m_LastClickedID: 31056 + m_ExpandedIDs: 000000002079000052790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -748,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000426f0000 + m_ExpandedIDs: 0000000020790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -773,8 +773,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 0c1c0000 - m_LastClickedInstanceID: 7180 + m_SelectedInstanceIDs: 96f30000 + m_LastClickedInstanceID: 62358 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -825,9 +825,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 - width: 1010 - height: 224 + y: 647 + width: 1420 + height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -847,10 +847,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1011 + x: 1421 y: 0 - width: 355 - height: 622 + width: 499 + height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -878,10 +878,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1011 - y: 86 - width: 354 - height: 601 + x: 1421 + y: 73 + width: 498 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -892,7 +892,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 7180 + m_LastInspectedObjectInstanceID: 62358 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 78c3d82..a57d6a8 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: 28 - width: 1366 - height: 672 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Scene + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 672 + 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: 1366 + 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: 652 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 622 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 60 + controlID: 66 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1011 - height: 622 + width: 1421 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 61 + controlID: 67 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1011 - height: 377 + width: 1421 + height: 574 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 62 + controlID: 68 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 221 - height: 377 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 311 + height: 574 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 221 + x: 311 y: 0 - width: 790 - height: 377 + width: 1110 + height: 574 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -233,23 +233,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 377 - width: 1011 - height: 245 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + y: 574 + width: 1421 + height: 373 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1011 + x: 1421 y: 0 - width: 355 - height: 622 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 499 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 221 - y: 86 - width: 788 - height: 356 + x: 312 + y: 19 + width: 1108 + height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,11 +310,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 788, y: 335} + m_TargetSize: {x: 1108, y: 532} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 1 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -394 - m_HBaseRangeMax: 394 - m_VBaseRangeMin: -167.5 - m_VBaseRangeMax: 167.5 + m_HBaseRangeMin: -554 + m_HBaseRangeMax: 554 + m_VBaseRangeMin: -266 + m_VBaseRangeMax: 266 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 788 - height: 335 + width: 1108 + height: 532 m_Scale: {x: 1, y: 1} - m_Translation: {x: 394, y: 167.5} + m_Translation: {x: 554, y: 266} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -394 - y: -167.5 - width: 788 - height: 335 + x: -554 + y: -266 + width: 1108 + height: 532 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 788, y: 356} + m_LastWindowPixelSize: {x: 1108, y: 553} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 220 - height: 356 + y: 73 + width: 310 + height: 553 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: 28fbffff + m_ExpandedIDs: 56b7fffff8b7ffffd4b9ffffdcb9ffff8abbffffa6bbffff8cc1ffff2ec2ffff44c2ffff4cc2fffffac3ffff04c4ffff20c7ffffc2c7ffffa6c9ffffaec9ffff5ccbffff78cbffff58e2fffffae2ffffd6e4ffffdee4ffff8ce6ffffa8e6ffff28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 221 - y: 86 - width: 788 - height: 356 + x: 311 + y: 73 + width: 1108 + height: 553 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: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -10.445913, y: -4.9539175, z: -2.1106043} + m_Target: {x: -5.220311, y: -0.793674, z: -0.07745893} speed: 2 - m_Value: {x: -10.445913, y: -4.9539175, z: -2.1106045} + m_Value: {x: -5.220311, y: -0.793674, z: -0.07745893} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -738,7 +738,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -756,11 +756,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.0000003994276, y: 0.000004121967, z: -0.0000009643036, w: -1} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.6079035 + m_Target: 12.106108 speed: 2 - m_Value: 12.06498 + m_Value: 12.106108 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 - width: 1010 - height: 224 + y: 647 + width: 1420 + height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -826,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 66 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: 66 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e0860000 - m_LastClickedID: 34528 - m_ExpandedIDs: 000000001879000000ca9a3b + m_SelectedIDs: 26790000 + m_LastClickedID: 31014 + m_ExpandedIDs: 000000001c790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000018790000 + m_ExpandedIDs: 000000001c790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -894,9 +894,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 746c0000 - m_LastClickedInstanceID: 27764 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -921,7 +921,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 91} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 66 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 - width: 1010 - height: 224 + y: 647 + width: 1420 + height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1011 - y: 86 - width: 354 - height: 601 + x: 1421 + y: 73 + width: 498 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default