From d530d0c995e34e3bd48bcae163c62732cee2bfc5 Mon Sep 17 00:00:00 2001 From: benxidosz <benxidosz@sch.bme.hu> Date: Mon, 12 Jul 2021 16:13:28 +0200 Subject: [PATCH] Revert "Merge branch 'Jump_v3_and_movement' into 'master'" This reverts merge request !5 --- Assets/Jump_v2.meta | 8 - Assets/Jump_v2/Prefabs/Bosses.meta | 8 - Assets/Jump_v2/Prefabs/Bosses/Owl.prefab | 150 ----- Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta | 7 - Assets/Jump_v2/Prefabs/Ground.prefab.meta | 7 - Assets/Jump_v2/Prefabs/Owl_route_1.prefab | 32 - Assets/Jump_v2/Prefabs/Owl_route_2.prefab | 32 - Assets/Jump_v2/Prefabs/Player.prefab.meta | 7 - Assets/Jump_v2/Scenes/Game_over.unity | 454 ------------- Assets/Jump_v2/Scenes/Jump.unity | 627 ------------------ Assets/Jump_v2/Scripts/Bounce.cs | 17 - Assets/Jump_v2/Scripts/Main_camera.cs | 14 - Assets/Jump_v2/Scripts/Owl.cs | 56 -- Assets/Jump_v2/Scripts/Owl.cs.meta | 11 - Assets/Jump_v2/Scripts/Player.cs | 47 -- Assets/Jump_v2/Scripts/Player.cs.meta | 11 - Assets/Jump_v2/Sprites.meta | 8 - Assets/Jump_v2/Sprites/Owl_sprite.png | Bin 11647 -> 0 bytes Assets/Jump_v2/Sprites/Owl_sprite.png.meta | 96 --- Assets/{Jump_v2 => }/Prefabs.meta | 2 +- .../Prefabs/Bosses => Prefabs}/PotZH.prefab | 0 .../Bosses => Prefabs}/PotZH.prefab.meta | 0 .../Bosses => Prefabs}/PotpotZH.prefab | 0 .../Bosses => Prefabs}/PotpotZH.prefab.meta | 0 .../Prefabs/Bosses => Prefabs}/ZH.prefab | 0 .../Prefabs/Bosses => Prefabs}/ZH.prefab.meta | 0 .../Prefabs/Bosses => Prefabs}/eloadas.prefab | 0 .../Bosses => Prefabs}/eloadas.prefab.meta | 0 .../Prefabs/Bosses => Prefabs}/ground.prefab | 0 .../Bosses => Prefabs}/ground.prefab.meta | 0 .../Prefabs/Bosses => Prefabs}/kisZH.prefab | 0 .../Bosses => Prefabs}/kisZH.prefab.meta | 0 .../Prefabs/Bosses => Prefabs}/konzi.prefab | 0 .../Bosses => Prefabs}/konzi.prefab.meta | 0 .../Prefabs/Bosses => Prefabs}/labor.prefab | 0 .../Bosses => Prefabs}/labor.prefab.meta | 0 .../Ground.prefab => Prefabs/platform.prefab} | 104 ++- .../platform.prefab.meta} | 2 +- .../Player.prefab => Prefabs/player.prefab} | 92 +-- .../player.prefab.meta} | 2 +- .../Prefabs/Bosses => Prefabs}/vizsga.prefab | 0 .../Bosses => Prefabs}/vizsga.prefab.meta | 0 Assets/{Jump_v2 => }/Scenes.meta | 2 +- .../Basic_fizika.unity.meta} | 2 +- Assets/Scenes/SampleScene.unity | 208 ++++++ .../SampleScene.unity.meta} | 2 +- Assets/{Jump_v2 => }/Scripts.meta | 2 +- Assets/Scripts/GameManager.cs | 38 ++ .../GameManager.cs.meta} | 2 +- .../PlayerMove.cs.meta} | 2 +- Packages/manifest.json | 0 Packages/packages-lock.json | 0 ProjectSettings/AudioManager.asset | 0 ProjectSettings/ClusterInputManager.asset | 0 ProjectSettings/DynamicsManager.asset | 0 ProjectSettings/EditorBuildSettings.asset | 7 +- ProjectSettings/EditorSettings.asset | 0 ProjectSettings/GraphicsSettings.asset | 0 ProjectSettings/InputManager.asset | 0 ProjectSettings/NavMeshAreas.asset | 0 ProjectSettings/NetworkManager.asset | 0 ProjectSettings/PackageManagerSettings.asset | 0 ProjectSettings/Physics2DSettings.asset | 2 +- ProjectSettings/PresetManager.asset | 0 ProjectSettings/ProjectSettings.asset | 0 ProjectSettings/ProjectVersion.txt | 0 ProjectSettings/QualitySettings.asset | 0 ProjectSettings/TagManager.asset | 1 - ProjectSettings/TimeManager.asset | 0 ProjectSettings/TimelineSettings.asset | 15 - ProjectSettings/UnityConnectSettings.asset | 0 ProjectSettings/VFXManager.asset | 0 ProjectSettings/VersionControlSettings.asset | 0 ProjectSettings/XRSettings.asset | 0 README.md | 0 75 files changed, 339 insertions(+), 1738 deletions(-) delete mode 100755 Assets/Jump_v2.meta delete mode 100755 Assets/Jump_v2/Prefabs/Bosses.meta delete mode 100755 Assets/Jump_v2/Prefabs/Bosses/Owl.prefab delete mode 100755 Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta delete mode 100755 Assets/Jump_v2/Prefabs/Ground.prefab.meta delete mode 100755 Assets/Jump_v2/Prefabs/Owl_route_1.prefab delete mode 100755 Assets/Jump_v2/Prefabs/Owl_route_2.prefab delete mode 100755 Assets/Jump_v2/Prefabs/Player.prefab.meta delete mode 100755 Assets/Jump_v2/Scenes/Game_over.unity delete mode 100755 Assets/Jump_v2/Scenes/Jump.unity delete mode 100755 Assets/Jump_v2/Scripts/Bounce.cs delete mode 100755 Assets/Jump_v2/Scripts/Main_camera.cs delete mode 100755 Assets/Jump_v2/Scripts/Owl.cs delete mode 100755 Assets/Jump_v2/Scripts/Owl.cs.meta delete mode 100755 Assets/Jump_v2/Scripts/Player.cs delete mode 100755 Assets/Jump_v2/Scripts/Player.cs.meta delete mode 100755 Assets/Jump_v2/Sprites.meta delete mode 100755 Assets/Jump_v2/Sprites/Owl_sprite.png delete mode 100755 Assets/Jump_v2/Sprites/Owl_sprite.png.meta rename Assets/{Jump_v2 => }/Prefabs.meta (77%) mode change 100755 => 100644 rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/PotZH.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/PotZH.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/PotpotZH.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/PotpotZH.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/ZH.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/ZH.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/eloadas.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/eloadas.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/ground.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/ground.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/kisZH.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/kisZH.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/konzi.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/konzi.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/labor.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/labor.prefab.meta (100%) rename Assets/{Jump_v2/Prefabs/Ground.prefab => Prefabs/platform.prefab} (59%) mode change 100755 => 100644 rename Assets/{Jump_v2/Prefabs/Owl_route_1.prefab.meta => Prefabs/platform.prefab.meta} (74%) mode change 100755 => 100644 rename Assets/{Jump_v2/Prefabs/Player.prefab => Prefabs/player.prefab} (71%) mode change 100755 => 100644 rename Assets/{Jump_v2/Prefabs/Owl_route_2.prefab.meta => Prefabs/player.prefab.meta} (74%) mode change 100755 => 100644 rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/vizsga.prefab (100%) rename Assets/{Jump_v2/Prefabs/Bosses => Prefabs}/vizsga.prefab.meta (100%) rename Assets/{Jump_v2 => }/Scenes.meta (77%) mode change 100755 => 100644 rename Assets/{Jump_v2/Scenes/Game_over.unity.meta => Scenes/Basic_fizika.unity.meta} (74%) mode change 100755 => 100644 create mode 100644 Assets/Scenes/SampleScene.unity rename Assets/{Jump_v2/Scenes/Jump.unity.meta => Scenes/SampleScene.unity.meta} (74%) mode change 100755 => 100644 rename Assets/{Jump_v2 => }/Scripts.meta (77%) mode change 100755 => 100644 create mode 100644 Assets/Scripts/GameManager.cs rename Assets/{Jump_v2/Scripts/Bounce.cs.meta => Scripts/GameManager.cs.meta} (83%) mode change 100755 => 100644 rename Assets/{Jump_v2/Scripts/Main_camera.cs.meta => Scripts/PlayerMove.cs.meta} (83%) mode change 100755 => 100644 mode change 100755 => 100644 Packages/manifest.json mode change 100755 => 100644 Packages/packages-lock.json mode change 100755 => 100644 ProjectSettings/AudioManager.asset mode change 100755 => 100644 ProjectSettings/ClusterInputManager.asset mode change 100755 => 100644 ProjectSettings/DynamicsManager.asset mode change 100755 => 100644 ProjectSettings/EditorBuildSettings.asset mode change 100755 => 100644 ProjectSettings/EditorSettings.asset mode change 100755 => 100644 ProjectSettings/GraphicsSettings.asset mode change 100755 => 100644 ProjectSettings/InputManager.asset mode change 100755 => 100644 ProjectSettings/NavMeshAreas.asset mode change 100755 => 100644 ProjectSettings/NetworkManager.asset mode change 100755 => 100644 ProjectSettings/PackageManagerSettings.asset mode change 100755 => 100644 ProjectSettings/Physics2DSettings.asset mode change 100755 => 100644 ProjectSettings/PresetManager.asset mode change 100755 => 100644 ProjectSettings/ProjectSettings.asset mode change 100755 => 100644 ProjectSettings/ProjectVersion.txt mode change 100755 => 100644 ProjectSettings/QualitySettings.asset mode change 100755 => 100644 ProjectSettings/TagManager.asset mode change 100755 => 100644 ProjectSettings/TimeManager.asset delete mode 100755 ProjectSettings/TimelineSettings.asset mode change 100755 => 100644 ProjectSettings/UnityConnectSettings.asset mode change 100755 => 100644 ProjectSettings/VFXManager.asset mode change 100755 => 100644 ProjectSettings/VersionControlSettings.asset mode change 100755 => 100644 ProjectSettings/XRSettings.asset mode change 100755 => 100644 README.md diff --git a/Assets/Jump_v2.meta b/Assets/Jump_v2.meta deleted file mode 100755 index 1a564c1..0000000 --- a/Assets/Jump_v2.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 552f50ef219d0474ebb7226473ba658f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Prefabs/Bosses.meta b/Assets/Jump_v2/Prefabs/Bosses.meta deleted file mode 100755 index a6ac4c6..0000000 --- a/Assets/Jump_v2/Prefabs/Bosses.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3687e4b4590c0b4697b8773609b754b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab b/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab deleted file mode 100755 index 44526cb..0000000 --- a/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab +++ /dev/null @@ -1,150 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4801316083981629696 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 892912047864463552} - - component: {fileID: 7128364637203850880} - - component: {fileID: 5894145876422095546} - - component: {fileID: 2961547324600838389} - - component: {fileID: 9169748850168761451} - m_Layer: 0 - m_Name: Owl - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &892912047864463552 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4801316083981629696} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.646, y: 3.94, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7128364637203850880 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4801316083981629696} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 9e780c6e8dd3ccd48ba74a14229cc09a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.91, y: 0.99} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!50 &5894145876422095546 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4801316083981629696} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 6 ---- !u!114 &2961547324600838389 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4801316083981629696} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b32d6ec32dc879d4aa72699d13122519, type: 3} - m_Name: - m_EditorClassIdentifier: - waypoints: - - {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - - {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - speed: 3 ---- !u!61 &9169748850168761451 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4801316083981629696} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.019260168, y: -0.07049596} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.91, y: 0.99} - newSize: {x: 0.91, y: 0.99} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.57475805, y: 0.74193263} - m_EdgeRadius: 0 diff --git a/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta deleted file mode 100755 index d09227f..0000000 --- a/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 397a87147f92f034fb2b031ffe8e210a -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Prefabs/Ground.prefab.meta b/Assets/Jump_v2/Prefabs/Ground.prefab.meta deleted file mode 100755 index b95a20f..0000000 --- a/Assets/Jump_v2/Prefabs/Ground.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4ad0a8a6236d0ae45a63d9b2570bf72b -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Prefabs/Owl_route_1.prefab b/Assets/Jump_v2/Prefabs/Owl_route_1.prefab deleted file mode 100755 index c49e482..0000000 --- a/Assets/Jump_v2/Prefabs/Owl_route_1.prefab +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8692242005622736142 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8692242005622736141} - m_Layer: 0 - m_Name: point_one - m_TagString: Untagged - m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8692242005622736141 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8692242005622736142} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Jump_v2/Prefabs/Owl_route_2.prefab b/Assets/Jump_v2/Prefabs/Owl_route_2.prefab deleted file mode 100755 index a8e02a2..0000000 --- a/Assets/Jump_v2/Prefabs/Owl_route_2.prefab +++ /dev/null @@ -1,32 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1028929502861646268 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1028929502861646243} - m_Layer: 0 - m_Name: point_two - m_TagString: Untagged - m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1028929502861646243 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028929502861646268} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Jump_v2/Prefabs/Player.prefab.meta b/Assets/Jump_v2/Prefabs/Player.prefab.meta deleted file mode 100755 index 41dbb37..0000000 --- a/Assets/Jump_v2/Prefabs/Player.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 65c1d3be1ee65b34684b5dc2cd7d012a -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Scenes/Game_over.unity b/Assets/Jump_v2/Scenes/Game_over.unity deleted file mode 100755 index 780bfbd..0000000 --- a/Assets/Jump_v2/Scenes/Game_over.unity +++ /dev/null @@ -1,454 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &17338988 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 17338989} - - component: {fileID: 17338992} - - component: {fileID: 17338991} - - component: {fileID: 17338990} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &17338989 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 17338988} - 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_Children: - - {fileID: 375724444} - m_Father: {fileID: 446289499} - m_RootOrder: 0 - 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!114 &17338990 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 17338988} - 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 &17338991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 17338988} - 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 &17338992 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 17338988} - 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!1 &375724443 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 375724444} - - component: {fileID: 375724446} - - component: {fileID: 375724445} - m_Layer: 5 - m_Name: Game_over_text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &375724444 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375724443} - 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_Children: [] - m_Father: {fileID: 17338989} - 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 &375724445 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375724443} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.04995054, b: 0, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: GAME OVER ---- !u!222 &375724446 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375724443} - m_CullTransparentMesh: 1 ---- !u!1 &446289496 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 446289499} - - component: {fileID: 446289498} - - component: {fileID: 446289497} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &446289497 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446289496} - m_Enabled: 1 ---- !u!20 &446289498 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446289496} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &446289499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446289496} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 17338989} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1728155819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1728155822} - - component: {fileID: 1728155821} - - component: {fileID: 1728155820} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1728155820 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728155819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1728155821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728155819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1728155822 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728155819} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Jump_v2/Scenes/Jump.unity b/Assets/Jump_v2/Scenes/Jump.unity deleted file mode 100755 index 9936746..0000000 --- a/Assets/Jump_v2/Scenes/Jump.unity +++ /dev/null @@ -1,627 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &292300488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 292300491} - - component: {fileID: 292300490} - - component: {fileID: 292300489} - - component: {fileID: 292300492} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &292300489 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292300488} - m_Enabled: 1 ---- !u!20 &292300490 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292300488} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &292300491 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292300488} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &292300492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 292300488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a0c42cbebab6874bb58399262d23698, type: 3} - m_Name: - m_EditorClassIdentifier: - player: {fileID: 1164973729} ---- !u!1001 &694041354 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalPosition.x - value: -3 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalPosition.y - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736141, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8692242005622736142, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} - propertyPath: m_Name - value: Owl_route_2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad7dd5a3f39dfbb46885878c0975e048, type: 3} ---- !u!1001 &821107634 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3937850987948675980, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_Name - value: Ground (2) - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.x - value: 0.33 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.y - value: 1.14 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} ---- !u!4 &1164973729 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - m_PrefabInstance: {fileID: 1910342114400395083} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1954660609 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalPosition.x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalPosition.y - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646243, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1028929502861646268, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} - propertyPath: m_Name - value: Owl_route_1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3e70b0b3937b6ab43b7b42dd919febc0, type: 3} ---- !u!1001 &2131448077 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3937850987948675980, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_Name - value: Ground (1) - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.x - value: -0.62 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.y - value: -1.28 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} ---- !u!1001 &1910342114400395083 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 170168264389159768, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalPosition.y - value: -3.5 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4011485038236981232, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2191201871525670885, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 65c1d3be1ee65b34684b5dc2cd7d012a, type: 3} ---- !u!1001 &3937850988153571880 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3937850987948675980, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_Name - value: Ground - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.x - value: -0.05 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.y - value: -4.71 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937850987948675983, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4ad0a8a6236d0ae45a63d9b2570bf72b, type: 3} ---- !u!1001 &7958720903446977720 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalPosition.x - value: 4.646 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalPosition.y - value: 3.94 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 892912047864463552, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4801316083981629696, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} - propertyPath: m_Name - value: Owl - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} diff --git a/Assets/Jump_v2/Scripts/Bounce.cs b/Assets/Jump_v2/Scripts/Bounce.cs deleted file mode 100755 index 47dc50b..0000000 --- a/Assets/Jump_v2/Scripts/Bounce.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// Script az ugralasra (tobb unity, kevesebb matek) -public class Bounce : MonoBehaviour { - // Ha a jatekosunk talazik ezzel a platformmal - void OnCollisionEnter2D(Collision2D col) { - // Csinaljunk egy valtozot a jatekosbol - Player player = col.collider.GetComponent<Player>(); - // Ha jo iranybol esnunk, (meg amugy tenyleg a playerrel utkozunk) - if (player && col.relativeVelocity.y <= 0) { - // ugorjon a player - player.jump(); - } - } -} diff --git a/Assets/Jump_v2/Scripts/Main_camera.cs b/Assets/Jump_v2/Scripts/Main_camera.cs deleted file mode 100755 index 3971c7f..0000000 --- a/Assets/Jump_v2/Scripts/Main_camera.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Main_camera : MonoBehaviour -{ - // Itt megadjuk hogy kit kovessen a kamera az editorban - [SerializeField] private Transform player; - - // Mindig legyen a kamera pozicioja ugyan az mint a jatekose - void Update() { - transform.position = new Vector3(transform.position.x, player.transform.position.y, transform.position.z); - } -} diff --git a/Assets/Jump_v2/Scripts/Owl.cs b/Assets/Jump_v2/Scripts/Owl.cs deleted file mode 100755 index ed51a2f..0000000 --- a/Assets/Jump_v2/Scripts/Owl.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -// Az infoc-s bagoly scriptje -public class Owl : MonoBehaviour -{ - // Itt adjuk meg, hogy mik lesznek a pontok amik kozt mozog - // Ezeket termeszetesen lehet generalni is egy gamecontrollerbol, de most demozasra igy a legegyszerubb - [SerializeField] private Transform[] waypoints; - // Ez a mozgasi sebessege - [SerializeField] private float speed = 3f; - private int index = 0; - - // Kezdjen az elso waypoint-tol - void Start() { - transform.position = waypoints[index].transform.position; - } - - void Update() { - // Menj a következo waypoint fele - transform.position = Vector2.MoveTowards(transform.position, waypoints[index].transform.position, speed * Time.deltaTime); - // Ha elerted a waypointot - if (transform.position == waypoints[index].transform.position) - // Menj az elozo fele - index = index == 0 ? 1 : 0; - } - - // Ezt a fuggvenyt hivjuk ha meg akarjuk olni ezt az enemyt - // Ha akarnank valami effektet amikor meghal az enemy (particle effect vagy ilyesmi), akkor azt ide kell majd betenni - public void hurt() { - Destroy(gameObject); - } - - // A fuggveny ami megoli az enemyk-et - void OnCollisionEnter2D(Collision2D col) { - // Elkerjuk az utkozestol az enemyt - Player player = col.collider.GetComponent<Player>(); - // Megnezzuk, hogy tenyleg egy ellenseggel utkoztunk e - if (player) { - // Vegigmegyunk az utkozesi pontokon - foreach (ContactPoint2D point in col.contacts) { - // Normalvektoros magic, hogy fentrol esunk e ra - if (point.normal.y <= -0.9f) { - // Ha igen akkor az enemy sebzodjon - hurt(); - player.jump(); - } - else { - // Amugy meg a jatekost kell sebezni - player.hurt(); - } - } - } - } -} diff --git a/Assets/Jump_v2/Scripts/Owl.cs.meta b/Assets/Jump_v2/Scripts/Owl.cs.meta deleted file mode 100755 index 5692a2e..0000000 --- a/Assets/Jump_v2/Scripts/Owl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b32d6ec32dc879d4aa72699d13122519 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Scripts/Player.cs b/Assets/Jump_v2/Scripts/Player.cs deleted file mode 100755 index 0790b9a..0000000 --- a/Assets/Jump_v2/Scripts/Player.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine.SceneManagement; -using UnityEngine; - -// Script a jatekos mozgatasara -public class Player : MonoBehaviour { - // Sebesseg, hogy editorbol is allithato legyen - [SerializeField] float speed = 10f; - // A jatekos ugrasi sebessege - [SerializeField] float jump_force = 10f; - // Eltaroljuk rb-t, hogy tudjunk jatszani a Player fizikajaval - private Rigidbody2D rb; - - void Start() { - // Megmondjuk, hogy azt az rb-t akarjuk hasznalni, ami azon a gameobjecten van, mint ez a script - rb = GetComponent<Rigidbody2D>(); - } - - // Hozzaadjuk az accelerometer mereseit (by: Balázs) - // Ha kiprobalnad akkor szedd le a unityremote-ot a telodra, kosd a gepedre usb-vel, es csinald vegig a beallitast amit az app ir (ket lepes) - // Es nezd meg hogy File->Build ne iphone ra legyen bejelolve / ha iphone-od van, akkor szedd le a gepedre az itunest, allitsd be, szedd le az ios bovitmenyt unity hub-bol es - // allitsd at, hogy iphone-re buildeljen a unity - private void Update() { - // Letrehozunk egy uj vectort - Vector3 acc = Vector3.zero; - // Csak az x iranyu gyorsulas erdekel minket - acc.x = Input.acceleration.x; - // Nem hagyjuk, hogy elszalljon a gyorsulas - if (acc.sqrMagnitude > 1) - acc.Normalize(); - // Legyen a sebesseg 10 m/s 10 m/frame helyett - acc *= Time.deltaTime; - // Mozgassuk a jatekost - transform.Translate(acc * speed); - } - - public void jump() { - rb.velocity = new Vector2(rb.velocity.x, jump_force); - } - - // Ebben a fuggvenyben meg lehet adni, ha esetleg van plusz eletunk, es akkor nem hal meg egybol a jatekos ha nekimegy valaminek - public void hurt() { - // Toltsuk be a jatek vege screent. - SceneManager.LoadScene("Game_over"); - } -} diff --git a/Assets/Jump_v2/Scripts/Player.cs.meta b/Assets/Jump_v2/Scripts/Player.cs.meta deleted file mode 100755 index 536d1a9..0000000 --- a/Assets/Jump_v2/Scripts/Player.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 32e9197c00c0bbc47b2854eeca7d7157 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Sprites.meta b/Assets/Jump_v2/Sprites.meta deleted file mode 100755 index e938be0..0000000 --- a/Assets/Jump_v2/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a792366b0265a44485c6f5fd7e71649 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Sprites/Owl_sprite.png b/Assets/Jump_v2/Sprites/Owl_sprite.png deleted file mode 100755 index d6e0d916deeee9c675a0e3856bd492b064d02a37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11647 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 Dz7V4X diff --git a/Assets/Jump_v2/Sprites/Owl_sprite.png.meta b/Assets/Jump_v2/Sprites/Owl_sprite.png.meta deleted file mode 100755 index cbf89b1..0000000 --- a/Assets/Jump_v2/Sprites/Owl_sprite.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 9e780c6e8dd3ccd48ba74a14229cc09a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Jump_v2/Prefabs.meta b/Assets/Prefabs.meta old mode 100755 new mode 100644 similarity index 77% rename from Assets/Jump_v2/Prefabs.meta rename to Assets/Prefabs.meta index 0bb21a2..b281497 --- a/Assets/Jump_v2/Prefabs.meta +++ b/Assets/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66ad04f5eef844843830438e13b8ff45 +guid: 2c9abac9b124dbe48937f95a66a6fbd4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab b/Assets/Prefabs/PotZH.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab rename to Assets/Prefabs/PotZH.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab.meta b/Assets/Prefabs/PotZH.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab.meta rename to Assets/Prefabs/PotZH.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab b/Assets/Prefabs/PotpotZH.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab rename to Assets/Prefabs/PotpotZH.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab.meta b/Assets/Prefabs/PotpotZH.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab.meta rename to Assets/Prefabs/PotpotZH.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/ZH.prefab b/Assets/Prefabs/ZH.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/ZH.prefab rename to Assets/Prefabs/ZH.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/ZH.prefab.meta b/Assets/Prefabs/ZH.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/ZH.prefab.meta rename to Assets/Prefabs/ZH.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab b/Assets/Prefabs/eloadas.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab rename to Assets/Prefabs/eloadas.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab.meta b/Assets/Prefabs/eloadas.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab.meta rename to Assets/Prefabs/eloadas.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/ground.prefab b/Assets/Prefabs/ground.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/ground.prefab rename to Assets/Prefabs/ground.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/ground.prefab.meta b/Assets/Prefabs/ground.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/ground.prefab.meta rename to Assets/Prefabs/ground.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab b/Assets/Prefabs/kisZH.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab rename to Assets/Prefabs/kisZH.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab.meta b/Assets/Prefabs/kisZH.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab.meta rename to Assets/Prefabs/kisZH.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/konzi.prefab b/Assets/Prefabs/konzi.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/konzi.prefab rename to Assets/Prefabs/konzi.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/konzi.prefab.meta b/Assets/Prefabs/konzi.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/konzi.prefab.meta rename to Assets/Prefabs/konzi.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Bosses/labor.prefab b/Assets/Prefabs/labor.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/labor.prefab rename to Assets/Prefabs/labor.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/labor.prefab.meta b/Assets/Prefabs/labor.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/labor.prefab.meta rename to Assets/Prefabs/labor.prefab.meta diff --git a/Assets/Jump_v2/Prefabs/Ground.prefab b/Assets/Prefabs/platform.prefab old mode 100755 new mode 100644 similarity index 59% rename from Assets/Jump_v2/Prefabs/Ground.prefab rename to Assets/Prefabs/platform.prefab index ffc545b..09e6318 --- a/Assets/Jump_v2/Prefabs/Ground.prefab +++ b/Assets/Prefabs/platform.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3937850987948675980 +--- !u!1 &4453978921199124268 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3937850987948675983} - - component: {fileID: 3937850987948675982} - - component: {fileID: 3937850987948675981} - - component: {fileID: 3341762009739044945} - - component: {fileID: 941549712944446877} + - component: {fileID: 4453978921199124264} + - component: {fileID: 4453978921199124265} + - component: {fileID: 4453978921199124270} + - component: {fileID: 4453978921199124271} m_Layer: 0 - m_Name: Ground - m_TagString: Untagged + m_Name: platform + m_TagString: Platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3937850987948675983 +--- !u!4 &4453978921199124264 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3937850987948675980} + m_GameObject: {fileID: 4453978921199124268} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.08, y: -2.93, z: 0} - m_LocalScale: {x: 1.2523, y: 0.1086, z: 1} + m_LocalPosition: {x: -1.3155, y: -2.12, z: 0} + m_LocalScale: {x: 1.3, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3937850987948675982 +--- !u!212 &4453978921199124265 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3937850987948675980} + m_GameObject: {fileID: 4453978921199124268} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -74,63 +73,24 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -9095717837082945937, guid: bd3cb4af8406d4436a2ae8c2aafe1f8d, type: 3} - m_Color: {r: 1, g: 0, b: 0.2546935, a: 1} + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 2} + m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!68 &3937850987948675981 -EdgeCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3937850987948675980} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 1 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_EdgeRadius: 0 - m_Points: - - {x: -0.4912205, y: 0.556815} - - {x: -0.294073, y: 0.8949568} - - {x: -0.00990217, y: 0.95123327} - - {x: -0.0044416552, y: 0.9686274} - - {x: 0.2818529, y: 0.86693716} - - {x: 0.49012303, y: 0.5947776} - m_AdjacentStartPoint: {x: 0, y: 0} - m_AdjacentEndPoint: {x: 0, y: 0} - m_UseAdjacentStartPoint: 0 - m_UseAdjacentEndPoint: 0 ---- !u!114 &3341762009739044945 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3937850987948675980} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 801ecf453d3c7204baf958db09a3e01a, type: 3} - m_Name: - m_EditorClassIdentifier: - jump_force: 10 ---- !u!251 &941549712944446877 +--- !u!251 &4453978921199124270 PlatformEffector2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3937850987948675980} + m_GameObject: {fileID: 4453978921199124268} m_Enabled: 1 m_UseColliderMask: 1 m_ColliderMask: @@ -142,4 +102,30 @@ PlatformEffector2D: m_SurfaceArc: 1 m_UseSideFriction: 0 m_UseSideBounce: 0 - m_SideArc: 1 + m_SideArc: 0 +--- !u!61 &4453978921199124271 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4453978921199124268} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Jump_v2/Prefabs/Owl_route_1.prefab.meta b/Assets/Prefabs/platform.prefab.meta old mode 100755 new mode 100644 similarity index 74% rename from Assets/Jump_v2/Prefabs/Owl_route_1.prefab.meta rename to Assets/Prefabs/platform.prefab.meta index 1f30b10..b4d3e6d --- a/Assets/Jump_v2/Prefabs/Owl_route_1.prefab.meta +++ b/Assets/Prefabs/platform.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ad7dd5a3f39dfbb46885878c0975e048 +guid: 57d8c28883dc89d479dc2408de8ae21a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Jump_v2/Prefabs/Player.prefab b/Assets/Prefabs/player.prefab old mode 100755 new mode 100644 similarity index 71% rename from Assets/Jump_v2/Prefabs/Player.prefab rename to Assets/Prefabs/player.prefab index f5de77e..80a6dfe --- a/Assets/Jump_v2/Prefabs/Player.prefab +++ b/Assets/Prefabs/player.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &170168264389159768 +--- !u!1 &571624519960107877 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,41 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4011485038236981232} - - component: {fileID: 1381307596294452710} - - component: {fileID: 5778041772232646850} - - component: {fileID: 3150104906654853613} - - component: {fileID: 7187755788854997103} + - component: {fileID: 571624519960107864} + - component: {fileID: 571624519960107865} + - component: {fileID: 571624519960107878} + - component: {fileID: 571624519960107876} + - component: {fileID: 571624519960107879} + - component: {fileID: 4514677622845617104} + - component: {fileID: 3392931749209146625} m_Layer: 0 - m_Name: Player + m_Name: player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4011485038236981232 +--- !u!4 &571624519960107864 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170168264389159768} + m_GameObject: {fileID: 571624519960107877} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.89, y: -1.15, z: 0} - m_LocalScale: {x: 0.7388, y: 1.2394, z: 1} + m_LocalPosition: {x: 1.41, y: -3.67, z: 0} + m_LocalScale: {x: 0.5875369, y: 0.5875369, z: 0.5875369} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1381307596294452710 +--- !u!212 &571624519960107865 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170168264389159768} + m_GameObject: {fileID: 571624519960107877} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -75,7 +77,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 0.041627884, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -85,41 +87,20 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!50 &5778041772232646850 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170168264389159768} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 5 ---- !u!61 &3150104906654853613 +--- !u!61 &571624519960107878 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170168264389159768} + m_GameObject: {fileID: 571624519960107877} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: -0.4039722} + m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -130,21 +111,8 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 0.19205558} + m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!114 &7187755788854997103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170168264389159768} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 32e9197c00c0bbc47b2854eeca7d7157, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 20 --- !u!50 &571624519960107876 Rigidbody2D: serializedVersion: 4 @@ -166,6 +134,18 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 +--- !u!114 &571624519960107879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571624519960107877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bfd9ecff286f6741937310d086f3876, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &4514677622845617104 MonoBehaviour: m_ObjectHideFlags: 0 @@ -176,8 +156,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1ec99057bf5aab44a9f8b4de80368a22, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _balance: 4500 --- !u!114 &3392931749209146625 MonoBehaviour: @@ -189,5 +169,5 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 19a743e1a1d3bf946ac9035f3cd73746, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Jump_v2/Prefabs/Owl_route_2.prefab.meta b/Assets/Prefabs/player.prefab.meta old mode 100755 new mode 100644 similarity index 74% rename from Assets/Jump_v2/Prefabs/Owl_route_2.prefab.meta rename to Assets/Prefabs/player.prefab.meta index 136644d..4a7d710 --- a/Assets/Jump_v2/Prefabs/Owl_route_2.prefab.meta +++ b/Assets/Prefabs/player.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e70b0b3937b6ab43b7b42dd919febc0 +guid: 8bbb0e114d109cb4f8ebd6db45522f89 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab b/Assets/Prefabs/vizsga.prefab similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab rename to Assets/Prefabs/vizsga.prefab diff --git a/Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab.meta b/Assets/Prefabs/vizsga.prefab.meta similarity index 100% rename from Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab.meta rename to Assets/Prefabs/vizsga.prefab.meta diff --git a/Assets/Jump_v2/Scenes.meta b/Assets/Scenes.meta old mode 100755 new mode 100644 similarity index 77% rename from Assets/Jump_v2/Scenes.meta rename to Assets/Scenes.meta index ef56e79..025044e --- a/Assets/Jump_v2/Scenes.meta +++ b/Assets/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afc3b65e350b4cf44b487e40fd5147cb +guid: b9c046f9aefb9c748a98f82ad25550f3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Jump_v2/Scenes/Game_over.unity.meta b/Assets/Scenes/Basic_fizika.unity.meta old mode 100755 new mode 100644 similarity index 74% rename from Assets/Jump_v2/Scenes/Game_over.unity.meta rename to Assets/Scenes/Basic_fizika.unity.meta index a77745a..7a69ee6 --- a/Assets/Jump_v2/Scenes/Game_over.unity.meta +++ b/Assets/Scenes/Basic_fizika.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 427e079d0e117414eb69a100ae74a6c9 +guid: 154cdf801e0eb4943a60b0862d97484a DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity new file mode 100644 index 0000000..9421266 --- /dev/null +++ b/Assets/Scenes/SampleScene.unity @@ -0,0 +1,208 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &519420028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 519420032} + - component: {fileID: 519420031} + - component: {fileID: 519420029} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &519420029 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 +--- !u!20 &519420031 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 0 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &519420032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Jump_v2/Scenes/Jump.unity.meta b/Assets/Scenes/SampleScene.unity.meta old mode 100755 new mode 100644 similarity index 74% rename from Assets/Jump_v2/Scenes/Jump.unity.meta rename to Assets/Scenes/SampleScene.unity.meta index f3db46b..c1e3c88 --- a/Assets/Jump_v2/Scenes/Jump.unity.meta +++ b/Assets/Scenes/SampleScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6f0967da4c9b6249b11854ff894ae4c +guid: 2cda990e2423bbf4892e6590ba056729 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Jump_v2/Scripts.meta b/Assets/Scripts.meta old mode 100755 new mode 100644 similarity index 77% rename from Assets/Jump_v2/Scripts.meta rename to Assets/Scripts.meta index e1ec5eb..0fff801 --- a/Assets/Jump_v2/Scripts.meta +++ b/Assets/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 014d7fc605b20b74aac8ccb583317024 +guid: e3063d3a1b41f6445b588983612be431 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs new file mode 100644 index 0000000..3d8b056 --- /dev/null +++ b/Assets/Scripts/GameManager.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class GameManager : MonoBehaviour { + private static GameManager _instance; + public static GameManager Instance => _instance; + + [Header("Forces")] + public float jumpForce = 6; + public float sideForce = 6; + [Space] + public PlayerMove player; + + private Text _pressAnyText; + + private void Awake() { + if (!(_instance is null) && _instance != this) { + Destroy(gameObject); + } else { + _instance = this; + } + } + + void Start() { + _pressAnyText = GameObject.Find("PressAny").GetComponent<Text>(); + } + + + void Update() { + if (Input.anyKey) { + player.EnablePlayer = true; + _pressAnyText.enabled = false; + } + } +} \ No newline at end of file diff --git a/Assets/Jump_v2/Scripts/Bounce.cs.meta b/Assets/Scripts/GameManager.cs.meta old mode 100755 new mode 100644 similarity index 83% rename from Assets/Jump_v2/Scripts/Bounce.cs.meta rename to Assets/Scripts/GameManager.cs.meta index f4bf065..fc3d324 --- a/Assets/Jump_v2/Scripts/Bounce.cs.meta +++ b/Assets/Scripts/GameManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 801ecf453d3c7204baf958db09a3e01a +guid: c3d018e8a40ac1a49b8166bc0d9e348b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Jump_v2/Scripts/Main_camera.cs.meta b/Assets/Scripts/PlayerMove.cs.meta old mode 100755 new mode 100644 similarity index 83% rename from Assets/Jump_v2/Scripts/Main_camera.cs.meta rename to Assets/Scripts/PlayerMove.cs.meta index a102247..735e8d6 --- a/Assets/Jump_v2/Scripts/Main_camera.cs.meta +++ b/Assets/Scripts/PlayerMove.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a0c42cbebab6874bb58399262d23698 +guid: 8bfd9ecff286f6741937310d086f3876 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/manifest.json b/Packages/manifest.json old mode 100755 new mode 100644 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json old mode 100755 new mode 100644 diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset old mode 100755 new mode 100644 index a5a8b11..82ab0f5 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,9 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Jump_v2/Scenes/Jump.unity - guid: b6f0967da4c9b6249b11854ff894ae4c - - enabled: 1 - path: Assets/Jump_v2/Scenes/Game_over.unity - guid: 427e079d0e117414eb69a100ae74a6c9 + path: Assets/Scenes/SampleScene.unity + guid: 2cda990e2423bbf4892e6590ba056729 m_configObjects: {} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset old mode 100755 new mode 100644 index 2f5c7a3..6cfcdda --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -4,7 +4,7 @@ Physics2DSettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_Gravity: {x: 0, y: -13} + m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 m_PositionIterations: 3 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt old mode 100755 new mode 100644 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset old mode 100755 new mode 100644 index d91bf6f..90c2dcf --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,7 +6,6 @@ TagManager: tags: - Platform - InteractivePlatform - - Enemy layers: - Default - TransparentFX diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset deleted file mode 100755 index b4fbdb0..0000000 --- a/ProjectSettings/TimelineSettings.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 61 - 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: a287be6c49135cd4f9b2b8666c39d999, type: 3} - m_Name: - m_EditorClassIdentifier: - assetDefaultFramerate: 60 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 -- GitLab