From d8a4886d59ea1ce67695e4442dd9a3212150fb39 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Tue, 21 Mar 2023 15:36:23 +0100 Subject: [PATCH] high score after lose --- ...rePack_HDRP_2018.4_v1.22.unitypackage.meta | 7 + ...rePack_LWRP_2018.4_v1.22.unitypackage.meta | 7 + ...urePack_URP_2019.3_v1.22.unitypackage.meta | 7 + Assets/Scenes/HighScore.unity | 445 +++++++++++++++++- Assets/Scenes/Menu.unity | 13 +- .../Scripts/HighScoreTable/HighScoreTable.cs | 4 + Assets/Scripts/Network/DatabaseData.cs | 4 +- Assets/Scripts/UsernameHandler.cs | 1 - Assets/Scripts/jatekmanager.cs | 35 +- UserSettings/EditorUserSettings.asset | 8 +- UserSettings/Layouts/default-2021.dwlt | 168 +++---- 11 files changed, 598 insertions(+), 101 deletions(-) create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta create mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta new file mode 100644 index 0000000..9a23bc2 --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3b4dc5f685f8edc4bbba6fb0c8ea39ba +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta new file mode 100644 index 0000000..552dc86 --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8851c5995be5f704babebf752d60b4e2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta new file mode 100644 index 0000000..f481ade --- /dev/null +++ b/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88c6da05db186cb44a4453fd624b31b2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/HighScore.unity b/Assets/Scenes/HighScore.unity index d5ef7eb..5cdfd11 100644 --- a/Assets/Scenes/HighScore.unity +++ b/Assets/Scenes/HighScore.unity @@ -520,7 +520,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -543,7 +543,7 @@ Canvas: m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 - m_PixelPerfect: 0 + m_PixelPerfect: 1 m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 @@ -565,6 +565,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1241521772} + - {fileID: 1525414361} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -842,6 +843,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 325379084} m_CullTransparentMesh: 1 +--- !u!1 &330514191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 330514192} + - component: {fileID: 330514194} + - component: {fileID: 330514193} + m_Layer: 5 + m_Name: main background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &330514192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330514191} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 18.981365, y: -34.4351, z: 1.4625} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1082942974} + m_RootOrder: 0 + 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_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &330514193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330514191} + 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: 0.38679248, g: 0.38679248, b: 0.38679248, 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: 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 &330514194 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330514191} + m_CullTransparentMesh: 1 --- !u!1 &428203367 GameObject: m_ObjectHideFlags: 0 @@ -910,6 +987,141 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &446898001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446898002} + - component: {fileID: 446898004} + - component: {fileID: 446898003} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &446898002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446898001} + 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: 1525414361} + 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 &446898003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446898001} + 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: Menu + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 72 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + 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 &446898004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446898001} + m_CullTransparentMesh: 1 --- !u!1 &469511725 GameObject: m_ObjectHideFlags: 0 @@ -1978,13 +2190,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e64f87fb66ea20a468ef1bdc205e7484, type: 3} m_Name: m_EditorClassIdentifier: - input: {fileID: 1179658675} players: player: [] htdc: htd: [] hst: {fileID: 0} jsondata: + coins: 0 --- !u!114 &763363916 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1997,6 +2209,107 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4102586368925fe449e8d028a1fee6c2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1082942970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1082942974} + - component: {fileID: 1082942973} + - component: {fileID: 1082942972} + - component: {fileID: 1082942971} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1082942971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082942970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1082942972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082942970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1082942973 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082942970} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1082942974 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082942970} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 330514192} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1148962745 GameObject: m_ObjectHideFlags: 0 @@ -2545,7 +2858,7 @@ RectTransform: m_GameObject: {fileID: 1241521771} 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_LocalScale: {x: 1.525806, y: 1.7068131, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 673799397} @@ -2561,7 +2874,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: -9.826} + m_AnchoredPosition: {x: -0.76243, y: 199} m_SizeDelta: {x: 500, y: 438.252} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1241521773 @@ -2840,6 +3153,128 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1525414360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1525414361} + - component: {fileID: 1525414364} + - component: {fileID: 1525414363} + - component: {fileID: 1525414362} + m_Layer: 5 + m_Name: Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1525414361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525414360} + 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: 446898002} + m_Father: {fileID: 263548834} + m_RootOrder: 1 + 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: -462} + m_SizeDelta: {x: 500, y: 130} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1525414362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525414360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1525414363} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1525414363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525414360} + 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 &1525414364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525414360} + m_CullTransparentMesh: 1 --- !u!1 &1559009164 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 85722d2..2ec3118 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1} + m_IndirectSpecularColor: {r: 0.56158954, g: 0.7218083, b: 0.8178571, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1001,7 +1001,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601898925} - m_LocalRotation: {x: 0.045581315, y: -0.70516795, z: 0.04552063, w: 0.7061079} + m_LocalRotation: {x: 0.045581307, y: -0.70516795, z: 0.045520626, w: 0.7061079} m_LocalPosition: {x: 2.27, y: 4.16525, z: 3.82} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2843,15 +2843,15 @@ GameObject: m_Component: - component: {fileID: 1201779183} - component: {fileID: 1201779186} + - component: {fileID: 1201779192} - component: {fileID: 1201779189} - component: {fileID: 1201779181} - component: {fileID: 1201779182} - component: {fileID: 1201779184} - - component: {fileID: 1201779188} - component: {fileID: 1201779185} + - component: {fileID: 1201779188} - component: {fileID: 1201779190} - component: {fileID: 1201779191} - - component: {fileID: 1201779192} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -2969,6 +2969,11 @@ MonoBehaviour: homeGomb: {fileID: 1543880549} settingsGomb: {fileID: 644899047} shopGomb: {fileID: 835649272} + goLeftButton: {fileID: 2129484386} + jumpButton: {fileID: 284201298} + goRightButton: {fileID: 2069815689} + scoreText: {fileID: 702512603} + timerText: {fileID: 1890329291} --- !u!114 &1201779189 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/HighScoreTable/HighScoreTable.cs b/Assets/Scripts/HighScoreTable/HighScoreTable.cs index 7688eca..1dce799 100644 --- a/Assets/Scripts/HighScoreTable/HighScoreTable.cs +++ b/Assets/Scripts/HighScoreTable/HighScoreTable.cs @@ -11,6 +11,10 @@ public class HighScoreTable : MonoBehaviour private DatabaseData dbData; //Database osztalyhoz referencia private HighScoreTableDataContainer htdc; //A tombot tarolo osztalyhoz referencia + private void Start() { + dbData.GetHighScoreData(); + } + public void CreateTable(HighScoreTableData[] htd){ foreach(HighScoreTableData item in htd){ item.kiir(); //konzolra Debug miatt kiirja az adatokat diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 2f6765c..f05e193 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -144,7 +144,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IGetHighScoreData(){ string uri = "http://localhost:3000/toplist"; - var uwr = new UnityWebRequest(uri, "POST"); + var uwr = new UnityWebRequest(uri, "GET"); //byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+palya_id+"}"); //palya id megadasa //uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend); //felkuldi a palya id-t uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer(); @@ -238,7 +238,7 @@ public class DatabaseData : MonoBehaviour var uwr = new UnityWebRequest(uri, "POST"); byte[] jsonToSend = - new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+playerid+",\"bevitel2\":400,\"bevitel3\":\"00:05:06\"}"); + new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+playerid+",\"bevitel2\":"+score+",\"bevitel3\":\""+time+"\"}"); //playerid, points, time uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend); diff --git a/Assets/Scripts/UsernameHandler.cs b/Assets/Scripts/UsernameHandler.cs index 943ec35..bc10827 100644 --- a/Assets/Scripts/UsernameHandler.cs +++ b/Assets/Scripts/UsernameHandler.cs @@ -68,7 +68,6 @@ public class UsernameHandler : MonoBehaviour usernameInputCanvas.gameObject.SetActive(true); inputBackground.SetActive(true); input.gameObject.SetActive(true); - } if(File.Exists(path)){ diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 825457a..22a358a 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -22,6 +22,13 @@ public class jatekmanager : MonoBehaviour public GameObject settingsGomb; public GameObject shopGomb; + public GameObject goLeftButton; + public GameObject jumpButton; + public GameObject goRightButton; + + public TMP_Text scoreText; + public TMP_Text timerText; + private DatabaseData db; private UsernameHandler usernameHandler; @@ -86,13 +93,24 @@ public class jatekmanager : MonoBehaviour homeGomb.SetActive(true); settingsGomb.SetActive(true); shopGomb.SetActive(true); + goLeftButton.SetActive(false); + jumpButton.SetActive(false); + goRightButton.SetActive(false); + scoreText.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); } private async void HandleHome() - { + { + //deactivate buttons StartCoroutine(TimerHome()); GetComponent().enabled = false; GetComponent().enabled = false; + goLeftButton.SetActive(false); + jumpButton.SetActive(false); + goRightButton.SetActive(false); + scoreText.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); garazs.SetActive(true); } @@ -110,6 +128,11 @@ public class jatekmanager : MonoBehaviour private async void HandleSettings() { playButton.SetActive(false); + goLeftButton.SetActive(false); + jumpButton.SetActive(false); + goRightButton.SetActive(false); + scoreText.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); } public void ChangeToShop() @@ -120,6 +143,11 @@ public class jatekmanager : MonoBehaviour private async void HandleShop() { playButton.SetActive(false); + goLeftButton.SetActive(false); + jumpButton.SetActive(false); + goRightButton.SetActive(false); + scoreText.gameObject.SetActive(false); + timerText.gameObject.SetActive(false); } public void ChangeToGame() @@ -142,6 +170,11 @@ public class jatekmanager : MonoBehaviour StartCoroutine(TimerGame()); GetComponent ().enabled = true; GetComponent ().enabled = true; + goLeftButton.SetActive(true); + jumpButton.SetActive(true); + goRightButton.SetActive(true); + scoreText.gameObject.SetActive(true); + timerText.gameObject.SetActive(true); timer.playTime.Start(); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 82d2927..7d6e6fb 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,14 +9,14 @@ EditorUserSettings: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-1: - value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b - flags: 0 - RecentlyUsedSceneGuid-2: value: 5401000201035c0f5d5e582648710644464f4f2f7a7d24607c2f1b36bab66468 flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-2: value: 5357075101505a0f5b5e0f7745740d4446161a7d79787035287f4a32b3e3303e flags: 0 + RecentlyUsedSceneGuid-3: + value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b + flags: 0 RecentlyUsedSceneGuid-4: value: 51520d5f55010c0f085d5f7142770e424216487e7b2e2035752b4864b1e36d3d flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 779ad01..b411aef 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: 673 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 7} @@ -39,10 +39,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1098 + x: 690 y: 0 - width: 368 - height: 561 + width: 294 + height: 441 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} @@ -69,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 623 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 17 + controlID: 44 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -85,21 +85,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1466 + x: 984 y: 0 - width: 454 - height: 947 - m_MinSize: {x: 276, y: 71} + width: 382 + height: 623 + m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 15} - m_Selected: 0 + - {fileID: 18} + m_Selected: 1 m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: @@ -118,10 +119,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 268 - height: 561 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 213 + height: 441 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -143,17 +144,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 561 - width: 1466 - height: 386 + y: 441 + width: 984 + height: 182 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - - {fileID: 18} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -174,8 +174,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1366 + height: 673 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -199,7 +199,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} @@ -220,8 +220,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 653 + width: 1366 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -244,12 +244,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1466 - height: 947 + width: 984 + height: 623 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 28 + controlID: 45 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -270,12 +270,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1466 - height: 561 + width: 984 + height: 441 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 29 + controlID: 46 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -291,12 +291,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 268 + x: 213 y: 0 - width: 830 - height: 561 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 477 + height: 441 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -322,10 +322,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1098 - y: 73 - width: 366 - height: 540 + x: 690 + y: 86 + width: 292 + height: 420 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -354,7 +354,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 19 + scale: 15 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0 @@ -382,9 +382,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 634 - width: 1465 - height: 365 + y: 527 + width: 983 + height: 161 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -402,22 +402,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 78 + m_StartGridSize: 53 m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: 78 - m_LastProjectPath: E:\dev\zarodolgozat\ColorBall + - Assets/Scenes + m_LastFoldersGridSize: 53 + m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 606c0000 - m_LastClickedID: 27744 - m_ExpandedIDs: 00000000486c0000 + scrollPos: {x: 0, y: 79} + m_SelectedIDs: a46e0000 + m_LastClickedID: 28324 + m_ExpandedIDs: 00000000946e0000a66e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,7 +445,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000486c0000 + m_ExpandedIDs: 00000000946e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -472,7 +472,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -498,7 +498,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 78 + m_GridSize: 53 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 --- !u!114 &15 @@ -521,10 +521,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1466 - y: 73 - width: 453 - height: 926 + x: 984 + y: 86 + width: 381 + height: 602 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -536,7 +536,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 26 + m_LastVerticalScrollValue: 399 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -563,9 +563,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 267 - height: 540 + y: 86 + width: 212 + height: 420 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -575,7 +575,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 12b3ffff18fbffff005c00007a5c0000 + m_ExpandedIDs: 2490ffff6caaffffa0b0ffffd8b4ffff8cb7ffffdaedffff0ef4ffff4a6f000058270100e8270100c6410100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -591,7 +591,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -619,10 +619,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 268 - y: 73 - width: 828 - height: 540 + x: 213 + y: 86 + width: 475 + height: 420 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -857,9 +857,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 750.6812, y: 1350.9152, z: -10.540598} + m_Target: {x: 722.77234, y: 1478.3375, z: -14.634762} speed: 2 - m_Value: {x: 753.43054, y: 1349.652, z: -10.7315645} + m_Value: {x: 722.77234, y: 1478.3375, z: -14.634762} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -910,9 +910,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 405.2743 + m_Target: 1457.7959 speed: 2 - m_Value: 424.37097 + m_Value: 1457.7959 m_Ortho: m_Target: 1 speed: 2 @@ -930,7 +930,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.093103625, y: 0.03881543, z: -0.0036324712, w: 0.99489313} + m_LastSceneViewRotation: {x: 0.07115192, y: -0.84182006, z: 0.114607, w: 0.52264017} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -957,10 +957,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 634 - width: 1465 - height: 365 + x: 984 + y: 86 + width: 381 + height: 602 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default