From b94c80b2934c11b3ea832560a7d4faadda75fe57 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Tue, 2 May 2023 13:46:38 +0200 Subject: [PATCH] coin db working --- Assets/Adaptive Performance.meta | 8 - .../AdaptivePerformanceGeneralSettings.asset | 46 --- ...ptivePerformanceGeneralSettings.asset.meta | 8 - Assets/Adaptive Performance/Settings.meta | 8 - .../Simulator Provider Settings.asset | 315 ----------------- .../Simulator Provider Settings.asset.meta | 8 - ...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 - .../{World Objects.meta => WorldObjects.meta} | 0 .../World1.meta | 0 .../World1/haz1.prefab | 0 .../World1/haz1.prefab.meta | 0 .../World1/haz2.prefab | 2 +- .../World1/haz2.prefab.meta | 0 Assets/Scenes/Menu.unity | 44 ++- Assets/Scripts/CoinCounter.cs | 12 +- Assets/Scripts/ColorManager.cs | 51 --- Assets/Scripts/GroundController.cs | 46 ++- Assets/Scripts/IsGrounded.cs | 13 + ...olorManager.cs.meta => IsGrounded.cs.meta} | 2 +- Assets/Scripts/Network/DatabaseData.cs | 62 +++- Assets/Scripts/PlayerController.cs | 26 +- Assets/Scripts/UsernameHandler.cs | 17 +- Assets/Scripts/jatekmanager.cs | 12 +- UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2021.dwlt | 326 ++++++++++-------- 27 files changed, 379 insertions(+), 652 deletions(-) delete mode 100644 Assets/Adaptive Performance.meta delete mode 100644 Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset delete mode 100644 Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset.meta delete mode 100644 Assets/Adaptive Performance/Settings.meta delete mode 100644 Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset delete mode 100644 Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset.meta delete mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta delete mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta delete mode 100644 Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta rename Assets/Resources/Prefabs/{World Objects.meta => WorldObjects.meta} (100%) rename Assets/Resources/Prefabs/{World Objects => WorldObjects}/World1.meta (100%) rename Assets/Resources/Prefabs/{World Objects => WorldObjects}/World1/haz1.prefab (100%) rename Assets/Resources/Prefabs/{World Objects => WorldObjects}/World1/haz1.prefab.meta (100%) rename Assets/Resources/Prefabs/{World Objects => WorldObjects}/World1/haz2.prefab (99%) rename Assets/Resources/Prefabs/{World Objects => WorldObjects}/World1/haz2.prefab.meta (100%) delete mode 100644 Assets/Scripts/ColorManager.cs create mode 100644 Assets/Scripts/IsGrounded.cs rename Assets/Scripts/{ColorManager.cs.meta => IsGrounded.cs.meta} (83%) diff --git a/Assets/Adaptive Performance.meta b/Assets/Adaptive Performance.meta deleted file mode 100644 index 527fd40..0000000 --- a/Assets/Adaptive Performance.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b0a795f90d876744b921b3441c4a3ce -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset b/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset deleted file mode 100644 index 3453b5f..0000000 --- a/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset +++ /dev/null @@ -1,46 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2758277150226478847 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 179fc3111e144bc4688dca4038b3265d, type: 3} - m_Name: Android Settings - m_EditorClassIdentifier: - m_LoaderManagerInstance: {fileID: 7951869756074961481} - m_InitManagerOnStart: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb0ece14d1f711a4fb9325ca819dee95, type: 3} - m_Name: AdaptivePerformanceGeneralSettings - m_EditorClassIdentifier: - Keys: 07000000 - Values: - - {fileID: -2758277150226478847} ---- !u!114 &7951869756074961481 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 536372c49e1ca914d822849d36de938c, type: 3} - m_Name: Android Providers - m_EditorClassIdentifier: - m_AutomaticLoading: 0 - m_AutomaticRunning: 0 - m_Loaders: [] diff --git a/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset.meta b/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset.meta deleted file mode 100644 index b7878a2..0000000 --- a/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e470b0a1c0a80ec4eada7630c914d271 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Adaptive Performance/Settings.meta b/Assets/Adaptive Performance/Settings.meta deleted file mode 100644 index c032447..0000000 --- a/Assets/Adaptive Performance/Settings.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f7d59f7a63599f64b8baffe0fe2e8eac -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset b/Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset deleted file mode 100644 index 0f7e9f8..0000000 --- a/Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset +++ /dev/null @@ -1,315 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b592865877cb54284a5d1d88aec9cfbb, type: 3} - m_Name: Simulator Provider Settings - m_EditorClassIdentifier: - m_Logging: 1 - m_AutomaticPerformanceModeEnabled: 1 - m_EnableBoostOnStartup: 1 - m_StatsLoggingFrequencyInFrames: 50 - m_IndexerSettings: - m_Active: 1 - m_ThermalActionDelay: 10 - m_PerformanceActionDelay: 4 - m_ScalerSettings: - m_AdaptiveFramerate: - m_Name: Adaptive Framerate - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 7 - m_MaxLevel: 45 - m_MinBound: 15 - m_MaxBound: 60 - m_AdaptiveResolution: - m_Name: Adaptive Resolution - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 6 - m_MaxLevel: 9 - m_MinBound: 0.5 - m_MaxBound: 1 - m_AdaptiveBatching: - m_Name: Adaptive Batching - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 1 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveLOD: - m_Name: Adaptive LOD - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 2 - m_MaxLevel: 3 - m_MinBound: 0.4 - m_MaxBound: 1 - m_AdaptiveLut: - m_Name: Adaptive Lut - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 3 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveMSAA: - m_Name: Adaptive MSAA - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 6 - m_MaxLevel: 2 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveShadowCascade: - m_Name: Adaptive Shadow Cascade - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 3 - m_MaxLevel: 2 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveShadowDistance: - m_Name: Adaptive Shadow Distance - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 2 - m_MaxLevel: 3 - m_MinBound: 0.15 - m_MaxBound: 1 - m_AdaptiveShadowmapResolution: - m_Name: Adaptive Shadowmap Resolution - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 2 - m_MaxLevel: 3 - m_MinBound: 0.15 - m_MaxBound: 1 - m_AdaptiveShadowQuality: - m_Name: Adaptive Shadow Quality - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 3 - m_MaxLevel: 3 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveSorting: - m_Name: Adaptive Sorting - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 1 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveTransparency: - m_Name: Adaptive Transparency - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 2 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveViewDistance: - m_Name: Adaptive View Distance - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 2 - m_MaxLevel: 40 - m_MinBound: 50 - m_MaxBound: 1000 - m_AdaptivePhysics: - m_Name: Adaptive Physics - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 1 - m_MaxLevel: 5 - m_MinBound: 0.5 - m_MaxBound: 1 - m_AdaptiveDecals: - m_Name: Adaptive Decals - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 2 - m_MaxLevel: 20 - m_MinBound: 0.01 - m_MaxBound: 1 - m_AdaptiveLayerCulling: - m_Name: Adaptive Layer Culling - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 1 - m_MaxLevel: 40 - m_MinBound: 0.01 - m_MaxBound: 1 - m_scalerProfileList: - - m_AdaptiveFramerate: - m_Name: Adaptive Framerate - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 7 - m_MaxLevel: 45 - m_MinBound: 15 - m_MaxBound: 60 - m_AdaptiveResolution: - m_Name: Adaptive Resolution - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 6 - m_MaxLevel: 9 - m_MinBound: 0.5 - m_MaxBound: 1 - m_AdaptiveBatching: - m_Name: Adaptive Batching - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 1 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveLOD: - m_Name: Adaptive LOD - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 2 - m_MaxLevel: 3 - m_MinBound: 0.4 - m_MaxBound: 1 - m_AdaptiveLut: - m_Name: Adaptive Lut - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 3 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveMSAA: - m_Name: Adaptive MSAA - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 6 - m_MaxLevel: 2 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveShadowCascade: - m_Name: Adaptive Shadow Cascade - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 3 - m_MaxLevel: 2 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveShadowDistance: - m_Name: Adaptive Shadow Distance - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 2 - m_MaxLevel: 3 - m_MinBound: 0.15 - m_MaxBound: 1 - m_AdaptiveShadowmapResolution: - m_Name: Adaptive Shadowmap Resolution - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 2 - m_MaxLevel: 3 - m_MinBound: 0.15 - m_MaxBound: 1 - m_AdaptiveShadowQuality: - m_Name: Adaptive Shadow Quality - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 3 - m_MaxLevel: 3 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveSorting: - m_Name: Adaptive Sorting - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 1 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveTransparency: - m_Name: Adaptive Transparency - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 2 - m_MaxLevel: 1 - m_MinBound: 0 - m_MaxBound: 1 - m_AdaptiveViewDistance: - m_Name: Adaptive View Distance - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 2 - m_Target: 2 - m_MaxLevel: 40 - m_MinBound: 50 - m_MaxBound: 1000 - m_AdaptivePhysics: - m_Name: Adaptive Physics - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 0 - m_Target: 1 - m_MaxLevel: 5 - m_MinBound: 0.5 - m_MaxBound: 1 - m_AdaptiveDecals: - m_Name: Adaptive Decals - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 2 - m_MaxLevel: 20 - m_MinBound: 0.01 - m_MaxBound: 1 - m_AdaptiveLayerCulling: - m_Name: Adaptive Layer Culling - m_Enabled: 0 - m_Scale: 1 - m_VisualImpact: 1 - m_Target: 1 - m_MaxLevel: 40 - m_MinBound: 0.01 - m_MaxBound: 1 - m_Name: Default Scaler Profile - m_DefaultScalerProfilerIndex: 0 - k_AssetVersion: 2 diff --git a/Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset.meta b/Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset.meta deleted file mode 100644 index 8f63ce1..0000000 --- a/Assets/Adaptive Performance/Settings/Simulator Provider Settings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 15f99888c21c02c46b338a1aebdfe4de -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: 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 deleted file mode 100644 index 9a23bc2..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 552dc86..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_LWRP_2018.4_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index f481ade..0000000 --- a/Assets/Asset Store/SimpleNaturePack/SimpleNaturePack_URP_2019.3_v1.22.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 88c6da05db186cb44a4453fd624b31b2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/World Objects.meta b/Assets/Resources/Prefabs/WorldObjects.meta similarity index 100% rename from Assets/Resources/Prefabs/World Objects.meta rename to Assets/Resources/Prefabs/WorldObjects.meta diff --git a/Assets/Resources/Prefabs/World Objects/World1.meta b/Assets/Resources/Prefabs/WorldObjects/World1.meta similarity index 100% rename from Assets/Resources/Prefabs/World Objects/World1.meta rename to Assets/Resources/Prefabs/WorldObjects/World1.meta diff --git a/Assets/Resources/Prefabs/World Objects/World1/haz1.prefab b/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab similarity index 100% rename from Assets/Resources/Prefabs/World Objects/World1/haz1.prefab rename to Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab diff --git a/Assets/Resources/Prefabs/World Objects/World1/haz1.prefab.meta b/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/World Objects/World1/haz1.prefab.meta rename to Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta diff --git a/Assets/Resources/Prefabs/World Objects/World1/haz2.prefab b/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab similarity index 99% rename from Assets/Resources/Prefabs/World Objects/World1/haz2.prefab rename to Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab index ec2891b..3e7e8ca 100644 --- a/Assets/Resources/Prefabs/World Objects/World1/haz2.prefab +++ b/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab @@ -1873,7 +1873,7 @@ GameObject: - component: {fileID: 8333322021456490412} m_Layer: 0 m_Name: haz2 - m_TagString: Untagged + m_TagString: SideObject m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Resources/Prefabs/World Objects/World1/haz2.prefab.meta b/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/World Objects/World1/haz2.prefab.meta rename to Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 10ddb0d..9ba4a99 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.56158954, g: 0.7218083, b: 0.8178571, a: 1} + m_IndirectSpecularColor: {r: 0.5615895, g: 0.72180885, b: 0.81785697, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1704,6 +1704,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 645543792} + 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 &645543795 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1777,7 +1789,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: -264.60254, y: 560.00006} + m_AnchoredPosition: {x: -291, y: 745} m_SizeDelta: {x: 431.1149, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &702512603 @@ -1912,7 +1924,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: -227, y: 749.9} + m_AnchoredPosition: {x: -253.39745, y: 934.9001} m_SizeDelta: {x: 506.3254, y: 168.2041} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &788008818 @@ -1935,7 +1947,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Coins: 0' + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1962,7 +1974,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 + m_fontSize: 60 m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -3313,7 +3325,7 @@ MonoBehaviour: m_EditorClassIdentifier: rb: {fileID: 7917514869596290073} jumpforce: 350 - holdTime: 0.2 + holdTime: 0.4 activeControllType: 1 leftButton: {fileID: 2129484388} jumpButton: {fileID: 284201300} @@ -3925,7 +3937,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1572233529} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3934,7 +3946,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: 300.03, y: 546} + m_AnchoredPosition: {x: 273.63257, y: 731.00006} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1572233531 @@ -4616,7 +4628,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: 367.5, y: 750} + m_AnchoredPosition: {x: 341.10257, y: 935.00006} m_SizeDelta: {x: 265.0578, y: 168.0133} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1890329291 @@ -13963,6 +13975,7 @@ GameObject: - component: {fileID: 7917514869596290071} - component: {fileID: 7917514869596290073} - component: {fileID: 7917514869596290074} + - component: {fileID: 7917514869596290075} m_Layer: 0 m_Name: Boby m_TagString: Player @@ -14674,6 +14687,19 @@ CapsuleCollider: m_Height: 6.3698125 m_Direction: 1 m_Center: {x: -0.03604698, y: 3.18, z: -0.06167984} +--- !u!114 &7917514869596290075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398140401948337837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 434812251bf6e1f44a54fa63754df2af, type: 3} + m_Name: + m_EditorClassIdentifier: + isGrounded: 1 --- !u!4 &7986884067029569574 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CoinCounter.cs b/Assets/Scripts/CoinCounter.cs index 1d42df1..973a95b 100644 --- a/Assets/Scripts/CoinCounter.cs +++ b/Assets/Scripts/CoinCounter.cs @@ -7,16 +7,20 @@ using System.Text; public class CoinCounter : MonoBehaviour { - public ulong coin = ulong.MaxValue; //szedje le db-bol a playerhez a coint + public ulong coin; //szedje le db-bol a playerhez a coint public TMP_Text coinCounterUI; private string path; private StreamWriter writer; private StreamReader reader; private DatabaseData db; + private UsernameHandler usernameHandler; private void Awake() { db = FindObjectOfType(); + usernameHandler = FindObjectOfType(); + + /*path = Application.persistentDataPath + "/coins.txt"; if(!File.Exists(path)){ //ha nincs meg ilyen fajl hozza letre @@ -37,6 +41,10 @@ public class CoinCounter : MonoBehaviour coinCounterUI.text = "Coins: " + coin.ToString();*/ } + public void SetCoin(ulong number){ + coin = number; + coinCounterUI.text = "Coins: " + coin.ToString(); + } public void AddCoin(ulong number){ coin += number; @@ -49,7 +57,7 @@ public class CoinCounter : MonoBehaviour public void RemoveCoin(ulong number){ coin -= number; - //coinCounterUI.text = "Coins: " + coin.ToString(); + coinCounterUI.text = "Coins: " + coin.ToString(); /*writer = new StreamWriter(path, false, Encoding.Default); writer.Write(coin); diff --git a/Assets/Scripts/ColorManager.cs b/Assets/Scripts/ColorManager.cs deleted file mode 100644 index 29f3f4f..0000000 --- a/Assets/Scripts/ColorManager.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System; -using UnityEngine; - -public enum Colors { - None = -1, - Grey, - Red, - Blue, - Green, - Yellow, - Rainbow -}; - -public class ColorManager : MonoBehaviour -{ - public Material[] colorMaterials = new Material[Enum.GetNames(typeof(Colors)).Length]; - - public void WashColor(GameObject washed) { - SetColor(Colors.Grey, washed); - } - - public void SetColor(Colors color, GameObject toPaint, Collision collision = null) { - if(color == Colors.None) { - if (collision.transform.CompareTag("ColorChanger")) { - toPaint.GetComponent().material.color = collision.transform.GetComponent().material.color; - } - } else { - toPaint.GetComponent().material.color = colorMaterials[(int)color].color; - } - - } - - public void CheckGroundColor(GameObject collided) { - if (transform.GetComponent().material.color != collided.transform.GetComponent().material.color) { - Debug.Log("The colors are not the same! GroundColor: " + collided.transform.GetComponent().material.color + " PlayerColor: " - + transform.GetComponent().material.color); - } - } - - private void OnCollisionEnter(Collision collision) { - if (collision.collider.CompareTag("Water")) { - WashColor(collision.gameObject); - } else if (collision.collider.CompareTag("Ground")) { - CheckGroundColor(collision.gameObject); - } else if (collision.collider.CompareTag("ColorChanger")) { - SetColor(Colors.None, transform.gameObject, collision); - } - } -} diff --git a/Assets/Scripts/GroundController.cs b/Assets/Scripts/GroundController.cs index 3d7ab39..353b09c 100644 --- a/Assets/Scripts/GroundController.cs +++ b/Assets/Scripts/GroundController.cs @@ -20,7 +20,7 @@ public class GroundController : MonoBehaviour //Loading modules loadFrom = LoadPrefabs("Prefabs/Modulok"); - sideObjects = LoadPrefabs("Prefabs/World Objects/World 1"); + sideObjects = LoadPrefabs("Prefabs/WorldObjects/World1/"); Debug.Log("loadFrom length: " + loadFrom.Length); Debug.Log("sideObjects Length: " + sideObjects.Length); @@ -35,16 +35,27 @@ public class GroundController : MonoBehaviour private void Update() { ground = GameObject.FindGameObjectsWithTag("Ground"); //torles miatt ujra le kell kerni a ground objecteket - OrderGroundArrayByZ(); //rendezzuk z szerint hogy sorba legyenek + sideObjectsSpawned = GameObject.FindGameObjectsWithTag("SideObject"); + + OrderArrayByZ(ground); //rendezzuk z szerint a talajt + OrderArrayByZ(sideObjectsSpawned); + + if(sideObjectsSpawned.Length > 0){ + lastSideObjectPos = sideObjectsSpawned[sideObjectsSpawned.Length-1].transform.position; + } for (int i = 0; i < ground.Length; i++){ //ground objecteket mozgatja ground[i].transform.position = ground[i].transform.position + new Vector3(0,0, -groundMoveSpeed * Time.deltaTime); - } + } + + for(int i = 0; i < sideObjectsSpawned.Length; i++){ + sideObjectsSpawned[i].transform.position = sideObjectsSpawned[i].transform.position + new Vector3(0,0, -groundMoveSpeed * Time.deltaTime); + } //uj ground letrehozas if(ground[ground.Length-1].transform.position.z <= 120){ CreateNewGround(); - CreateNewSideObjects(); + CreateNewSideObjects(false); ground = GameObject.FindGameObjectsWithTag("Ground"); @@ -82,10 +93,21 @@ public class GroundController : MonoBehaviour return arr; } - private void CreateNewSideObjects(){ + private void CreateNewSideObjects(bool isLeftSide){ int random = UnityEngine.Random.Range(0, sideObjects.Length); - Instantiate(sideObjects[random], lastSideObjectPos + new Vector3(0,0,20), ground[0].transform.rotation); + GameObject inst = sideObjects[random]; + Vector3 pos = new Vector3(0,0,0); + + if(inst.name == "haz1" && !isLeftSide){ + pos = new Vector3(4,0,0); //check pos in editor TODO!! + }else if(inst.name == "haz2"){ + pos = new Vector3(9,0,0); + } + + if(isLeftSide) pos.x = -pos.x; + + Instantiate(inst, lastSideObjectPos + pos, ground[0].transform.rotation); } public void changeMaterialIndex(){ @@ -102,14 +124,14 @@ public class GroundController : MonoBehaviour return false; //nem torolheto } - private void OrderGroundArrayByZ(){ + private void OrderArrayByZ(GameObject[] array){ GameObject csere; - for (int i = 0; i < ground.Length; i++){ + for (int i = 0; i < array.Length; i++){ for(int j = 0; j < i; j++){ - if(ground[j].transform.position.z > ground[j+1].transform.position.z){ - csere = ground[j]; - ground[j] = ground[j+1]; - ground[j+1] = csere; + if(array[j].transform.position.z > array[j+1].transform.position.z){ + csere = array[j]; + array[j] = array[j+1]; + array[j+1] = csere; } } } diff --git a/Assets/Scripts/IsGrounded.cs b/Assets/Scripts/IsGrounded.cs new file mode 100644 index 0000000..712b36c --- /dev/null +++ b/Assets/Scripts/IsGrounded.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class IsGrounded : MonoBehaviour +{ + public bool isGrounded = true; + + private void OnCollisionEnter(Collision other) { + //Debug.Log("pc "+other.gameObject.name+""); + isGrounded = true; + } +} diff --git a/Assets/Scripts/ColorManager.cs.meta b/Assets/Scripts/IsGrounded.cs.meta similarity index 83% rename from Assets/Scripts/ColorManager.cs.meta rename to Assets/Scripts/IsGrounded.cs.meta index 27ff4ca..5a9d213 100644 --- a/Assets/Scripts/ColorManager.cs.meta +++ b/Assets/Scripts/IsGrounded.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab4fe611c9713254e9fcc6e0de77f87f +guid: 434812251bf6e1f44a54fa63754df2af MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Network/DatabaseData.cs b/Assets/Scripts/Network/DatabaseData.cs index 65c75a0..9bedea9 100644 --- a/Assets/Scripts/Network/DatabaseData.cs +++ b/Assets/Scripts/Network/DatabaseData.cs @@ -21,12 +21,27 @@ public class DatabaseData : MonoBehaviour public ulong coins = 0; + private string url; + private bool forceLocalUrl = true; + private const int PORT = 24002; + private void Awake() { hst = FindObjectOfType(); //High Score Table referencia htdc = new HighScoreTableDataContainer(); //High Score Table Container objektum coinc = FindObjectOfType(); //writer = new StreamWriter(Application.persistentDataPath + "/coins.txt", false, Encoding.Default); + + if((Application.platform == RuntimePlatform.WindowsEditor || Application.platform == RuntimePlatform.LinuxEditor || Application.platform == RuntimePlatform.OSXEditor) && forceLocalUrl){ + //ha az editorba van + url = "http://localhost:" + PORT.ToString(); + }else if(!forceLocalUrl){ + url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + }else{ + url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); + } + + //url = "nodejs.dszcbaross.edu.hu:" + PORT.ToString(); } private void Start() { @@ -44,6 +59,7 @@ public class DatabaseData : MonoBehaviour } public void ParserCoin(string jsondata){ + //Debug.Log("JsonDataCoin:" + jsondata + ""); string data = ""; for (int i = 0; i < jsondata.Length; i++) { @@ -51,8 +67,10 @@ public class DatabaseData : MonoBehaviour data += jsondata[i]; //kiszedi a szamokat a stringbol } } - Debug.Log(data); + Debug.Log("data coin: " + data); coins = ulong.Parse(data); + Debug.Log("db coins: " + coins + ""); + coinc.SetCoin(coins); } //fuggvenyek amik meghivjak a rutint @@ -62,14 +80,19 @@ public class DatabaseData : MonoBehaviour public void PostNewScoreData(int playerid, ulong score, string time) => StartCoroutine(IPostNewScoreData(playerid, score, time)); public void PostNewPalyaData() => StartCoroutine(IPostNewPalyaData()); + public void GetCoinDataCall(int userid) => StartCoroutine(GetCoinData(userid)); + public void PostNewCoinData(ulong coins, int userid) => StartCoroutine(IPostNewCoinData(coins, userid)); + public ulong GetCoins(int userid){ StartCoroutine(GetCoinData(userid)); + Debug.Log(" Return coin: " + coins + ""); + return coins; } private IEnumerator GetCoinData(int userid){ - string uri = "http://localhost:3000/coinget"; + string uri = url + "/coinget"; var uwr = new UnityWebRequest(uri, "GET"); byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+userid+"}"); @@ -92,7 +115,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IGetPlayerData() { //input.text = "Loading..."; //ideiglenes szoveg amig nem jelenik meg az adat szoveg - string uri = "http://localhost:3000/player"; //backend vegpont linkje + string uri = url + "/player"; //backend vegpont linkje using (UnityWebRequest request = UnityWebRequest.Get(uri)) { //uj webrequest objektum letrehozasa, aminek megadjuk hogy ez egy get-es lekerdezes yield return request.SendWebRequest(); //amig be nem fejezodik az fv ide fog visszaterni @@ -120,7 +143,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IGetCurretPlayer(int userid){ - string uri = "http://localhost:3000/currentplayer"; + string uri = url + "/currentplayer"; var uwr = new UnityWebRequest(uri, "POST"); byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+userid+"}"); //palya id megadasa @@ -144,7 +167,7 @@ public class DatabaseData : MonoBehaviour } private IEnumerator IGetHighScoreData(){ - string uri = "http://localhost:3000/toplist"; + string uri = url + "/toplist"; var uwr = new UnityWebRequest(uri, "GET"); //byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+palya_id+"}"); //palya id megadasa @@ -167,7 +190,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IGetHighScoreDataNew(){ - string uri = "http://localhost:3000/toplist"; + string uri = url + "/toplist"; var uwr = new UnityWebRequest(uri, "GET"); uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer(); @@ -188,7 +211,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IGetPlayerCoins(string username){ - string uri = "http://localhost:3000/coinget"; + string uri = url + "/coinget"; var uwr = new UnityWebRequest(uri, "POST"); byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+username+"}"); //palya id megadasa @@ -211,7 +234,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IPostNewPlayerData() { //input.text = "loading..."; - string uri = "http://localhost:3000/newplayer"; + string uri = url + "/newplayer"; var uwr = new UnityWebRequest(uri, "POST"); //post beallitasa byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{ \"bevitel1\":\"postusername\"}"); //felviteli json @@ -232,7 +255,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IPostNewScoreData(int playerid, ulong score, string time) { //input.text = "loading..."; - string uri = "http://localhost:3000/newscore"; + string uri = url + "/newscore"; //felhasznalonevet ki kell irni fajlba //ha username keresve lenne es ha nincs akkor kap egy uj id-t ami ideiglenesen tarolodik (ures string a visszateres?) @@ -261,7 +284,7 @@ public class DatabaseData : MonoBehaviour private IEnumerator IPostNewPalyaData() { //input.text = "loading..."; - string uri = "http://localhost:3000/newpalya"; + string uri = url + "/newpalya"; var uwr = new UnityWebRequest(uri, "POST"); byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{ \"bevitel1\":\"Easy3\"}"); @@ -271,6 +294,25 @@ public class DatabaseData : MonoBehaviour yield return uwr.SendWebRequest(); + if (uwr.isNetworkError) { + Debug.Log(uwr.error); + } else { + //input.text = uwr.downloadHandler.text; + Debug.Log(uwr.downloadHandler.text); + } + } + + private IEnumerator IPostNewCoinData(ulong coins, int userid) { + string uri = url + "/coinUpdate"; + + var uwr = new UnityWebRequest(uri, "POST"); + byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes("{\"bevitel1\":"+coins+",\"bevitel2\":"+userid+"}"); + uwr.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend); + uwr.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer(); + uwr.SetRequestHeader("Content-Type", "application/json"); + + yield return uwr.SendWebRequest(); + if (uwr.isNetworkError) { Debug.Log(uwr.error); } else { diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index ba5bd99..e84da11 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -7,6 +7,8 @@ public class PlayerController : MonoBehaviour { public Rigidbody rb; //jatekos teste private CameraController cc; + private IsGrounded isGrounded; + public float jumpforce = 5f; //mekkorat tudjon ugorni private float sideMovement = 3f; //oldalra mennyit mozogjon private Vector3 direction; //jatkos pozicio @@ -17,13 +19,13 @@ public class PlayerController : MonoBehaviour private Vector2 startTouchPosition; //erintes kezdo pozicio private Vector2 endTouchPosition; //erintes vegpozicio - public ControllType activeControllType; //ezt kell atallitani hogy swipe-os vagy button-os legyen a mozgas + public ControlType activeControllType; //ezt kell atallitani hogy swipe-os vagy button-os legyen a mozgas public Button leftButton; public Button jumpButton; public Button rightButton; - public enum ControllType + public enum ControlType { Swipe, Button @@ -31,16 +33,18 @@ public class PlayerController : MonoBehaviour private void Awake() { cc = FindObjectOfType(); //kamera vezerlo referencia - activeControllType = ControllType.Button; + isGrounded = FindObjectOfType(); + + //activeControllType = ControlType.Button; } - public void setControllType(ControllType controlltype){ + public void setControllType(ControlType controlltype){ activeControllType = controlltype; } private void Update(){ - if(activeControllType == ControllType.Swipe){ + if(activeControllType == ControlType.Swipe){ leftButton.gameObject.SetActive(false); jumpButton.gameObject.SetActive(false); rightButton.gameObject.SetActive(false); @@ -59,7 +63,7 @@ public class PlayerController : MonoBehaviour timeSinceLastTap = 0f; } - if(isTapped && rb.transform.position.y <= 0.16f){ + if(isTapped && isGrounded.isGrounded){ if(Time.time - timeSinceLastTap >= holdTime){ //ha nyomva tartotta a beallitott ideig Debug.Log("Long tapped"); jump(); @@ -84,7 +88,7 @@ public class PlayerController : MonoBehaviour goRight(); } } - }else if(activeControllType == ControllType.Button){ + }else if(activeControllType == ControlType.Button){ //jumpforce = 100; /*leftButton.onClick.AddListener(goRight); jumpButton.onClick.AddListener(jump); @@ -119,9 +123,13 @@ public class PlayerController : MonoBehaviour } public void jump(){ - if(rb.transform.position.y <= 0.16f) + if(isGrounded.isGrounded){ rb.AddForce(new Vector3(0, jumpforce, 0)); //ugras - + isGrounded.isGrounded = false; + } + Debug.Log("jumped"); } + + } \ No newline at end of file diff --git a/Assets/Scripts/UsernameHandler.cs b/Assets/Scripts/UsernameHandler.cs index a7920ed..f049c40 100644 --- a/Assets/Scripts/UsernameHandler.cs +++ b/Assets/Scripts/UsernameHandler.cs @@ -19,11 +19,13 @@ public class UsernameHandler : MonoBehaviour private StreamReader reader; private DatabaseData db; private PlayerList playerList; + private CoinCounter cc; private void Awake() { input.gameObject.SetActive(false); inputBackground.SetActive(false); path = Application.persistentDataPath + "/username.txt"; + cc = FindObjectOfType(); db = FindObjectOfType(); db.GetPlayerData(); } @@ -54,6 +56,8 @@ public class UsernameHandler : MonoBehaviour userid = item.player_id; } } + + db.GetCoinDataCall(userid); } private void usernameCheck(){ @@ -85,7 +89,11 @@ public class UsernameHandler : MonoBehaviour username = data; Debug.Log("username: " + username); - getId(); + getId(); + + //StartCoroutine(waitForCoins()); + + input.gameObject.SetActive(false); inputBackground.SetActive(false); @@ -93,4 +101,11 @@ public class UsernameHandler : MonoBehaviour } } } + + private IEnumerator waitForCoins(){ + yield return new WaitUntil(() => db.coins != 0); + + cc.SetCoin(db.GetCoins(userid)); + Debug.Log("uh coin"+cc.coin); + } } \ No newline at end of file diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 37bd0b0..d579a31 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -34,6 +34,7 @@ public class jatekmanager : MonoBehaviour private UsernameHandler usernameHandler; private Score score; private Timer timer; + private CoinCounter cc; private void Awake() { @@ -44,6 +45,7 @@ public class jatekmanager : MonoBehaviour usernameHandler = FindObjectOfType(); score = FindObjectOfType(); timer = FindObjectOfType(); + cc = FindObjectOfType(); } private void Start() @@ -156,6 +158,7 @@ public class jatekmanager : MonoBehaviour homeGomb.SetActive(false); settingsGomb.SetActive(false); shopGomb.SetActive(false); + playButton.SetActive(false); UpdateGameState(GameState.Game); } @@ -167,15 +170,18 @@ public class jatekmanager : MonoBehaviour private async void HandleGame() { - playButton.SetActive(false); 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); + playButton.SetActive(false); + timer.playTime.Start(); } @@ -193,9 +199,11 @@ public class jatekmanager : MonoBehaviour //toltse fel az adatokat a run-rol db.PostNewScoreData(usernameHandler.userid, score.score, timer.convertTimeToString()); + //coin feltoltes + db.PostNewCoinData(cc.coin, usernameHandler.userid); + SceneUIManager.LoadScene(1); //HighScore scene - // /*playButton.SetActive(false); homeGomb.SetActive(true); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d3f6a6f..66b7765 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 5357075101505a0f5b5e0f7745740d4446161a7d79787035287f4a32b3e3303e flags: 0 RecentlyUsedSceneGuid-3: - value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b + value: 51520d5f55010c0f085d5f7142770e424216487e7b2e2035752b4864b1e36d3d flags: 0 RecentlyUsedSceneGuid-4: - value: 51520d5f55010c0f085d5f7142770e424216487e7b2e2035752b4864b1e36d3d + value: 5b55515706060d025a5f0d2043260744414f482c7e2b7263747d4a32b0b9313b flags: 0 UnityRemoteCompression: value: 337f73 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 1011529..8f6a1f1 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,16 +15,93 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 680 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 m_Title: Console - m_RootView: {fileID: 7} + m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 775 + y: 0 + width: 662 + height: 290 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 0 + y: 657 + width: 1437 + height: 290 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 63 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 470 + height: 657 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -39,18 +116,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 646 + x: 884 y: 0 - width: 401 - height: 496 + width: 553 + height: 657 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,19 +140,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 4} + - {fileID: 12} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 630 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 142 ---- !u!114 &4 + controlID: 151 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,18 +167,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1047 + x: 1437 y: 0 - width: 319 - height: 630 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 15} + width: 483 + height: 947 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,50 +188,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 239 - height: 496 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 775 + height: 290 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 496 - width: 1047 - height: 134 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 14} - - {fileID: 18} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -167,22 +217,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 3} - - {fileID: 9} + - {fileID: 10} + - {fileID: 6} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 680 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &8 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -199,12 +249,12 @@ 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} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -220,12 +270,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 660 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -238,19 +288,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 6} + - {fileID: 13} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1047 - height: 630 + width: 1437 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 143 ---- !u!114 &11 + controlID: 55 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -263,20 +313,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 4} + - {fileID: 14} - {fileID: 5} - - {fileID: 12} - - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1047 - height: 496 + width: 1437 + height: 657 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 controlID: 56 ---- !u!114 &12 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -291,18 +341,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 239 + x: 470 y: 0 - width: 407 - height: 496 + width: 414 + height: 657 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -322,10 +372,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 646 - y: 86 - width: 399 - height: 475 + x: 884 + y: 73 + width: 551 + height: 636 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -354,14 +404,14 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 17 + scale: 23 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0 friendlyName: Apple iPhone 13 Pro networkReachability: 1 systemLanguage: 10 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -382,9 +432,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 582 - width: 1046 - height: 113 + y: 730 + width: 774 + height: 269 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -402,22 +452,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Materials + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 53 + m_StartGridSize: 74 m_LastFolders: - - Assets/Resources/Materials - m_LastFoldersGridSize: 53 - m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner + - Assets/Scenes + m_LastFoldersGridSize: 74 + m_LastProjectPath: E:\dev\zarodolgozat\ColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 127} - m_SelectedIDs: 9e5f0000 - m_LastClickedID: 24478 - m_ExpandedIDs: 000000008a5f00008c5f00008e5f0000905f000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: a65f0000 + m_LastClickedID: 24486 + m_ExpandedIDs: 00000000965f0000a45f0000ae5f0000b05f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,7 +495,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000008a5f00008c5f00008e5f0000905f0000 + m_ExpandedIDs: 00000000965f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -489,7 +539,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 8} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -498,10 +548,10 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 53 + m_GridSize: 74 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -521,10 +571,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1047 - y: 86 - width: 318 - height: 609 + x: 1437 + y: 73 + width: 482 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -536,13 +586,13 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 216 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -562,10 +612,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 86 - width: 238 - height: 475 + x: 775 + y: 730 + width: 660 + height: 269 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -573,9 +623,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: f8b3ffff5eb4ffff78b5ffffaabdffff86f5ffff18fbffff + m_SelectedIDs: 82490100 + m_LastClickedID: 84354 + m_ExpandedIDs: 8eccffff18fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -591,7 +641,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -599,7 +649,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -619,10 +669,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 239 - y: 86 - width: 405 - height: 475 + x: 470 + y: 73 + width: 412 + height: 636 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -719,7 +769,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -857,9 +907,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -3.0000005, y: 0, z: 37.199997} + m_Target: {x: -42.686497, y: 5.8833237, z: 31.033562} speed: 2 - m_Value: {x: -3.0000005, y: 0, z: 37.199997} + m_Value: {x: -42.686497, y: 5.8833237, z: 31.033562} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -906,13 +956,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.058660932, y: 0.9411822, z: -0.22614713, w: 0.2441374} + m_Target: {x: 0.03978299, y: -0.8525561, z: 0.06561682, w: 0.51698434} speed: 2 - m_Value: {x: 0.058660623, y: 0.94117725, z: -0.22614594, w: 0.24413612} + m_Value: {x: 0.039782733, y: -0.8525506, z: 0.06561639, w: 0.516981} m_Size: - m_Target: 20.056421 + m_Target: 35.189785 speed: 2 - m_Value: 20.056421 + m_Value: 35.189785 m_Ortho: m_Target: 0 speed: 2 @@ -930,14 +980,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.18727255, y: 0.45572704, z: -0.09871261, w: -0.8645814} + m_LastSceneViewRotation: {x: -0.0429292, y: 0.31860214, z: -0.01444534, w: -0.94681174} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -958,9 +1008,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 582 - width: 1046 - height: 113 + y: 73 + width: 469 + height: 636 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default