diff --git a/Assets/Jump_v2.meta b/Assets/Jump_v2.meta new file mode 100755 index 0000000000000000000000000000000000000000..1a564c19b531dcad028c8c90734af141c5c72ee7 --- /dev/null +++ b/Assets/Jump_v2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 552f50ef219d0474ebb7226473ba658f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs.meta b/Assets/Jump_v2/Prefabs.meta old mode 100644 new mode 100755 similarity index 77% rename from Assets/Prefabs.meta rename to Assets/Jump_v2/Prefabs.meta index b281497172417fc1a766e212aec5528c7f730c40..0bb21a2d21de71eef4b417154b32adb26e560c43 --- a/Assets/Prefabs.meta +++ b/Assets/Jump_v2/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c9abac9b124dbe48937f95a66a6fbd4 +guid: 66ad04f5eef844843830438e13b8ff45 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Jump_v2/Prefabs/Bosses.meta b/Assets/Jump_v2/Prefabs/Bosses.meta new file mode 100755 index 0000000000000000000000000000000000000000..a6ac4c651ad9ff54eba3fff417ca8ca3d2dac427 --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Bosses.meta @@ -0,0 +1,8 @@ +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 new file mode 100755 index 0000000000000000000000000000000000000000..44526cb1f3832155107e5fed57a4fd628a827723 --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab @@ -0,0 +1,150 @@ +%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/Prefabs/platform.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta old mode 100644 new mode 100755 similarity index 74% rename from Assets/Prefabs/platform.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta index b4d3e6d1cd5820a6636b4942a561960ca983572f..d09227fc491884c65d37d7ca90a51e006b4697bb --- a/Assets/Prefabs/platform.prefab.meta +++ b/Assets/Jump_v2/Prefabs/Bosses/Owl.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 57d8c28883dc89d479dc2408de8ae21a +guid: 397a87147f92f034fb2b031ffe8e210a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/PotZH.prefab b/Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab similarity index 100% rename from Assets/Prefabs/PotZH.prefab rename to Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab diff --git a/Assets/Prefabs/PotZH.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab.meta similarity index 100% rename from Assets/Prefabs/PotZH.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/PotZH.prefab.meta diff --git a/Assets/Prefabs/PotpotZH.prefab b/Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab similarity index 100% rename from Assets/Prefabs/PotpotZH.prefab rename to Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab diff --git a/Assets/Prefabs/PotpotZH.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab.meta similarity index 100% rename from Assets/Prefabs/PotpotZH.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/PotpotZH.prefab.meta diff --git a/Assets/Prefabs/ZH.prefab b/Assets/Jump_v2/Prefabs/Bosses/ZH.prefab similarity index 100% rename from Assets/Prefabs/ZH.prefab rename to Assets/Jump_v2/Prefabs/Bosses/ZH.prefab diff --git a/Assets/Prefabs/ZH.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/ZH.prefab.meta similarity index 100% rename from Assets/Prefabs/ZH.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/ZH.prefab.meta diff --git a/Assets/Prefabs/eloadas.prefab b/Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab similarity index 100% rename from Assets/Prefabs/eloadas.prefab rename to Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab diff --git a/Assets/Prefabs/eloadas.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab.meta similarity index 100% rename from Assets/Prefabs/eloadas.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/eloadas.prefab.meta diff --git a/Assets/Prefabs/ground.prefab b/Assets/Jump_v2/Prefabs/Bosses/ground.prefab similarity index 100% rename from Assets/Prefabs/ground.prefab rename to Assets/Jump_v2/Prefabs/Bosses/ground.prefab diff --git a/Assets/Prefabs/ground.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/ground.prefab.meta similarity index 100% rename from Assets/Prefabs/ground.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/ground.prefab.meta diff --git a/Assets/Prefabs/kisZH.prefab b/Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab similarity index 100% rename from Assets/Prefabs/kisZH.prefab rename to Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab diff --git a/Assets/Prefabs/kisZH.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab.meta similarity index 100% rename from Assets/Prefabs/kisZH.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/kisZH.prefab.meta diff --git a/Assets/Prefabs/konzi.prefab b/Assets/Jump_v2/Prefabs/Bosses/konzi.prefab similarity index 100% rename from Assets/Prefabs/konzi.prefab rename to Assets/Jump_v2/Prefabs/Bosses/konzi.prefab diff --git a/Assets/Prefabs/konzi.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/konzi.prefab.meta similarity index 100% rename from Assets/Prefabs/konzi.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/konzi.prefab.meta diff --git a/Assets/Prefabs/labor.prefab b/Assets/Jump_v2/Prefabs/Bosses/labor.prefab similarity index 100% rename from Assets/Prefabs/labor.prefab rename to Assets/Jump_v2/Prefabs/Bosses/labor.prefab diff --git a/Assets/Prefabs/labor.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/labor.prefab.meta similarity index 100% rename from Assets/Prefabs/labor.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/labor.prefab.meta diff --git a/Assets/Prefabs/vizsga.prefab b/Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab similarity index 100% rename from Assets/Prefabs/vizsga.prefab rename to Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab diff --git a/Assets/Prefabs/vizsga.prefab.meta b/Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab.meta similarity index 100% rename from Assets/Prefabs/vizsga.prefab.meta rename to Assets/Jump_v2/Prefabs/Bosses/vizsga.prefab.meta diff --git a/Assets/Prefabs/platform.prefab b/Assets/Jump_v2/Prefabs/Ground.prefab old mode 100644 new mode 100755 similarity index 59% rename from Assets/Prefabs/platform.prefab rename to Assets/Jump_v2/Prefabs/Ground.prefab index 09e63189afe5962861c3b932123fd84c51d0f6f8..ffc545b545644a457913dd7afc2c54156f0a2f13 --- a/Assets/Prefabs/platform.prefab +++ b/Assets/Jump_v2/Prefabs/Ground.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4453978921199124268 +--- !u!1 &3937850987948675980 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,38 +8,39 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4453978921199124264} - - component: {fileID: 4453978921199124265} - - component: {fileID: 4453978921199124270} - - component: {fileID: 4453978921199124271} + - component: {fileID: 3937850987948675983} + - component: {fileID: 3937850987948675982} + - component: {fileID: 3937850987948675981} + - component: {fileID: 3341762009739044945} + - component: {fileID: 941549712944446877} m_Layer: 0 - m_Name: platform - m_TagString: Platform + m_Name: Ground + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4453978921199124264 +--- !u!4 &3937850987948675983 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4453978921199124268} + m_GameObject: {fileID: 3937850987948675980} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3155, y: -2.12, z: 0} - m_LocalScale: {x: 1.3, y: 0.2, z: 1} + m_LocalPosition: {x: 1.08, y: -2.93, z: 0} + m_LocalScale: {x: 1.2523, y: 0.1086, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4453978921199124265 +--- !u!212 &3937850987948675982 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4453978921199124268} + m_GameObject: {fileID: 3937850987948675980} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -73,24 +74,63 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: -9095717837082945937, guid: bd3cb4af8406d4436a2ae8c2aafe1f8d, type: 3} + m_Color: {r: 1, g: 0, b: 0.2546935, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 1, y: 2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!251 &4453978921199124270 +--- !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 PlatformEffector2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4453978921199124268} + m_GameObject: {fileID: 3937850987948675980} m_Enabled: 1 m_UseColliderMask: 1 m_ColliderMask: @@ -102,30 +142,4 @@ PlatformEffector2D: m_SurfaceArc: 1 m_UseSideFriction: 0 m_UseSideBounce: 0 - 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 + m_SideArc: 1 diff --git a/Assets/Prefabs/player.prefab.meta b/Assets/Jump_v2/Prefabs/Ground.prefab.meta old mode 100644 new mode 100755 similarity index 74% rename from Assets/Prefabs/player.prefab.meta rename to Assets/Jump_v2/Prefabs/Ground.prefab.meta index 4a7d7108bd6082d94826e50265be58ff16a50256..b95a20f0f6555feaf58883cbd122b11bf5222fb0 --- a/Assets/Prefabs/player.prefab.meta +++ b/Assets/Jump_v2/Prefabs/Ground.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8bbb0e114d109cb4f8ebd6db45522f89 +guid: 4ad0a8a6236d0ae45a63d9b2570bf72b PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Jump_v2/Prefabs/Owl_route_1.prefab b/Assets/Jump_v2/Prefabs/Owl_route_1.prefab new file mode 100755 index 0000000000000000000000000000000000000000..c49e48276098b7d0d237135040a294bd7321f95e --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Owl_route_1.prefab @@ -0,0 +1,32 @@ +%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_1.prefab.meta b/Assets/Jump_v2/Prefabs/Owl_route_1.prefab.meta new file mode 100755 index 0000000000000000000000000000000000000000..1f30b10824d60fe03d3335a70368f0872686bd2d --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Owl_route_1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ad7dd5a3f39dfbb46885878c0975e048 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Jump_v2/Prefabs/Owl_route_2.prefab b/Assets/Jump_v2/Prefabs/Owl_route_2.prefab new file mode 100755 index 0000000000000000000000000000000000000000..a8e02a2977e0603b234c1e01fdab43d5c30ea7e9 --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Owl_route_2.prefab @@ -0,0 +1,32 @@ +%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/Owl_route_2.prefab.meta b/Assets/Jump_v2/Prefabs/Owl_route_2.prefab.meta new file mode 100755 index 0000000000000000000000000000000000000000..136644d444840f893d12d5aabe5f516c25c8f409 --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Owl_route_2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e70b0b3937b6ab43b7b42dd919febc0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/player.prefab b/Assets/Jump_v2/Prefabs/Player.prefab old mode 100644 new mode 100755 similarity index 71% rename from Assets/Prefabs/player.prefab rename to Assets/Jump_v2/Prefabs/Player.prefab index 80a6dfeb0227f1611a0054a09bc08b90ffafcb98..f5de77e595f3efeb54c42e4d0775c18aa39c6945 --- a/Assets/Prefabs/player.prefab +++ b/Assets/Jump_v2/Prefabs/Player.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &571624519960107877 +--- !u!1 &170168264389159768 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,41 +8,39 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 571624519960107864} - - component: {fileID: 571624519960107865} - - component: {fileID: 571624519960107878} - - component: {fileID: 571624519960107876} - - component: {fileID: 571624519960107879} - - component: {fileID: 4514677622845617104} - - component: {fileID: 3392931749209146625} + - component: {fileID: 4011485038236981232} + - component: {fileID: 1381307596294452710} + - component: {fileID: 5778041772232646850} + - component: {fileID: 3150104906654853613} + - component: {fileID: 7187755788854997103} 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 &571624519960107864 +--- !u!4 &4011485038236981232 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571624519960107877} + m_GameObject: {fileID: 170168264389159768} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.41, y: -3.67, z: 0} - m_LocalScale: {x: 0.5875369, y: 0.5875369, z: 0.5875369} + m_LocalPosition: {x: -0.89, y: -1.15, z: 0} + m_LocalScale: {x: 0.7388, y: 1.2394, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &571624519960107865 +--- !u!212 &1381307596294452710 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571624519960107877} + m_GameObject: {fileID: 170168264389159768} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -77,7 +75,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 0.041627884, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -87,20 +85,41 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!61 &571624519960107878 +--- !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 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571624519960107877} + m_GameObject: {fileID: 170168264389159768} 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} + m_Offset: {x: 0, y: -0.4039722} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -111,8 +130,21 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 1, y: 0.19205558} 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 @@ -134,18 +166,6 @@ 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 @@ -156,8 +176,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: @@ -169,5 +189,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/Player.prefab.meta b/Assets/Jump_v2/Prefabs/Player.prefab.meta new file mode 100755 index 0000000000000000000000000000000000000000..41dbb37e7860ff147ca36e4c0a8412e570ac886f --- /dev/null +++ b/Assets/Jump_v2/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 65c1d3be1ee65b34684b5dc2cd7d012a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes.meta b/Assets/Jump_v2/Scenes.meta old mode 100644 new mode 100755 similarity index 77% rename from Assets/Scenes.meta rename to Assets/Jump_v2/Scenes.meta index 025044e8bd52753ffc06f22e7486d65f88503503..ef56e79391d7ce409c92c4242ebbd1addf1f4e87 --- a/Assets/Scenes.meta +++ b/Assets/Jump_v2/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b9c046f9aefb9c748a98f82ad25550f3 +guid: afc3b65e350b4cf44b487e40fd5147cb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Jump_v2/Scenes/Game_over.unity b/Assets/Jump_v2/Scenes/Game_over.unity new file mode 100755 index 0000000000000000000000000000000000000000..780bfbdba523d056551044f472b9a07bcddb572d --- /dev/null +++ b/Assets/Jump_v2/Scenes/Game_over.unity @@ -0,0 +1,454 @@ +%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/Scenes/Basic_fizika.unity.meta b/Assets/Jump_v2/Scenes/Game_over.unity.meta old mode 100644 new mode 100755 similarity index 74% rename from Assets/Scenes/Basic_fizika.unity.meta rename to Assets/Jump_v2/Scenes/Game_over.unity.meta index 7a69ee679bd6fa6bc8d6590fbc23a1f86aa266ec..a77745a22f08f2c2f0f0990bdd4af4ce1a52dc73 --- a/Assets/Scenes/Basic_fizika.unity.meta +++ b/Assets/Jump_v2/Scenes/Game_over.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 154cdf801e0eb4943a60b0862d97484a +guid: 427e079d0e117414eb69a100ae74a6c9 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Jump_v2/Scenes/Jump.unity b/Assets/Jump_v2/Scenes/Jump.unity new file mode 100755 index 0000000000000000000000000000000000000000..99367468d8277de51793b0ee7d963ffe8f0bd932 --- /dev/null +++ b/Assets/Jump_v2/Scenes/Jump.unity @@ -0,0 +1,627 @@ +%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/Scenes/SampleScene.unity.meta b/Assets/Jump_v2/Scenes/Jump.unity.meta old mode 100644 new mode 100755 similarity index 74% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Jump_v2/Scenes/Jump.unity.meta index c1e3c88e1cf25569cfffa5347eb9289085ed7d63..f3db46b89e8cbb461d838f293c0e3842202d42a0 --- a/Assets/Scenes/SampleScene.unity.meta +++ b/Assets/Jump_v2/Scenes/Jump.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2cda990e2423bbf4892e6590ba056729 +guid: b6f0967da4c9b6249b11854ff894ae4c DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts.meta b/Assets/Jump_v2/Scripts.meta old mode 100644 new mode 100755 similarity index 77% rename from Assets/Scripts.meta rename to Assets/Jump_v2/Scripts.meta index 0fff801036ae48c4023a83df2604347ab05d6c7e..e1ec5ebc2a642f67a0731b697cb18ed554168457 --- a/Assets/Scripts.meta +++ b/Assets/Jump_v2/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3063d3a1b41f6445b588983612be431 +guid: 014d7fc605b20b74aac8ccb583317024 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Jump_v2/Scripts/Bounce.cs b/Assets/Jump_v2/Scripts/Bounce.cs new file mode 100755 index 0000000000000000000000000000000000000000..47dc50b7e21ed01099921e8d463076245dab6be6 --- /dev/null +++ b/Assets/Jump_v2/Scripts/Bounce.cs @@ -0,0 +1,17 @@ +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/Scripts/GameManager.cs.meta b/Assets/Jump_v2/Scripts/Bounce.cs.meta old mode 100644 new mode 100755 similarity index 83% rename from Assets/Scripts/GameManager.cs.meta rename to Assets/Jump_v2/Scripts/Bounce.cs.meta index fc3d324104532401b3b420880c7ec43c05d7653d..f4bf065c7eb249b551e6af4cfb8a18883852d235 --- a/Assets/Scripts/GameManager.cs.meta +++ b/Assets/Jump_v2/Scripts/Bounce.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c3d018e8a40ac1a49b8166bc0d9e348b +guid: 801ecf453d3c7204baf958db09a3e01a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Jump_v2/Scripts/Main_camera.cs b/Assets/Jump_v2/Scripts/Main_camera.cs new file mode 100755 index 0000000000000000000000000000000000000000..3971c7f050419e1109bb7206670d3060c91bc6ab --- /dev/null +++ b/Assets/Jump_v2/Scripts/Main_camera.cs @@ -0,0 +1,14 @@ +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/Scripts/PlayerMove.cs.meta b/Assets/Jump_v2/Scripts/Main_camera.cs.meta old mode 100644 new mode 100755 similarity index 83% rename from Assets/Scripts/PlayerMove.cs.meta rename to Assets/Jump_v2/Scripts/Main_camera.cs.meta index 735e8d68278da018be37daec3968d81b53c749b8..a1022478c95087f41c7140c377d667f1c8623bb0 --- a/Assets/Scripts/PlayerMove.cs.meta +++ b/Assets/Jump_v2/Scripts/Main_camera.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8bfd9ecff286f6741937310d086f3876 +guid: 8a0c42cbebab6874bb58399262d23698 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Jump_v2/Scripts/Owl.cs b/Assets/Jump_v2/Scripts/Owl.cs new file mode 100755 index 0000000000000000000000000000000000000000..ed51a2f033f101f88b323f6da20595ec388c13b3 --- /dev/null +++ b/Assets/Jump_v2/Scripts/Owl.cs @@ -0,0 +1,56 @@ +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 new file mode 100755 index 0000000000000000000000000000000000000000..5692a2e47f86eb9c8d053fccb54dd84c3d8f75e2 --- /dev/null +++ b/Assets/Jump_v2/Scripts/Owl.cs.meta @@ -0,0 +1,11 @@ +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 new file mode 100755 index 0000000000000000000000000000000000000000..0790b9a0b60159b84bb8083fbc6f785269ba0e9a --- /dev/null +++ b/Assets/Jump_v2/Scripts/Player.cs @@ -0,0 +1,47 @@ +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 new file mode 100755 index 0000000000000000000000000000000000000000..536d1a950e8dccb6564e03a7f2ccfa568bbe1021 --- /dev/null +++ b/Assets/Jump_v2/Scripts/Player.cs.meta @@ -0,0 +1,11 @@ +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 new file mode 100755 index 0000000000000000000000000000000000000000..e938be044f21a8cd2846040821e898c2a70ed1ec --- /dev/null +++ b/Assets/Jump_v2/Sprites.meta @@ -0,0 +1,8 @@ +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 new file mode 100755 index 0000000000000000000000000000000000000000..d6e0d916deeee9c675a0e3856bd492b064d02a37 Binary files /dev/null and b/Assets/Jump_v2/Sprites/Owl_sprite.png differ diff --git a/Assets/Jump_v2/Sprites/Owl_sprite.png.meta b/Assets/Jump_v2/Sprites/Owl_sprite.png.meta new file mode 100755 index 0000000000000000000000000000000000000000..cbf89b12caa6e87cec7466037d0985d7631d3753 --- /dev/null +++ b/Assets/Jump_v2/Sprites/Owl_sprite.png.meta @@ -0,0 +1,96 @@ +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/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity deleted file mode 100644 index 9421266f599529785e406348fca3a151e412e7e6..0000000000000000000000000000000000000000 --- a/Assets/Scenes/SampleScene.unity +++ /dev/null @@ -1,208 +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: 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/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs deleted file mode 100644 index 3d8b05628b87d147fa7dd52b460f074fb5b4a1a1..0000000000000000000000000000000000000000 --- a/Assets/Scripts/GameManager.cs +++ /dev/null @@ -1,38 +0,0 @@ -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/Packages/manifest.json b/Packages/manifest.json old mode 100644 new mode 100755 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json old mode 100644 new mode 100755 diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset old mode 100644 new mode 100755 index 82ab0f5910d77eeadb7c1c203cda1daaeac0327f..a5a8b1127e5460a530b49bd0a68e503c01a9e60c --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,9 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 2cda990e2423bbf4892e6590ba056729 + path: Assets/Jump_v2/Scenes/Jump.unity + guid: b6f0967da4c9b6249b11854ff894ae4c + - enabled: 1 + path: Assets/Jump_v2/Scenes/Game_over.unity + guid: 427e079d0e117414eb69a100ae74a6c9 m_configObjects: {} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset old mode 100644 new mode 100755 index 6cfcddaacd6468d283a2d3f7017eaca4762ca6a7..2f5c7a33613c0505263efebf9234b3162b537f15 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -4,7 +4,7 @@ Physics2DSettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_Gravity: {x: 0, y: -9.81} + m_Gravity: {x: 0, y: -13} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 m_PositionIterations: 3 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt old mode 100644 new mode 100755 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset old mode 100644 new mode 100755 index 90c2dcfe98c768ed2bf978e2a607baa59c8f5ac6..d91bf6f4721fd4aa556426e1e2e0f156f3c72d88 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Platform - InteractivePlatform + - Enemy layers: - Default - TransparentFX diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100755 index 0000000000000000000000000000000000000000..b4fbdb097ab44d84a11a1208e7385d3e6b53eea7 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,15 @@ +%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 100644 new mode 100755 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset old mode 100644 new mode 100755 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755