diff --git a/Assets/Pixel Adventure 1.meta b/Assets/Pixel Adventure 1.meta index 6ae6044..0f6f08b 100644 --- a/Assets/Pixel Adventure 1.meta +++ b/Assets/Pixel Adventure 1.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Pixel Adventure 1.meta -guid: b9a58e3ec317ea54fa03fa02736aff6d +guid: b94e92762de952a31bb92b0898f19f0d folderAsset: yes ======== guid: b4b05324b8438b7479ff551644c14b4f diff --git a/Assets/Prefabs/Enemy/Circle.prefab b/Assets/Prefabs/Enemy/Circle.prefab index 7fd2c1d..ba0b14e 100644 --- a/Assets/Prefabs/Enemy/Circle.prefab +++ b/Assets/Prefabs/Enemy/Circle.prefab @@ -11,10 +11,10 @@ GameObject: - component: {fileID: 2157864364840506741} - component: {fileID: 1417250189635142134} - component: {fileID: 5819494892187875797} + - component: {fileID: -2591212885737334371} - component: {fileID: -7955960088100232682} - component: {fileID: 6019109341514027303} - - component: {fileID: 8988046855811930432} - - component: {fileID: -2591212885737334371} + - component: {fileID: -8024352693128602536} m_Layer: 0 m_Name: Circle m_TagString: Untagged @@ -101,6 +101,21 @@ Halo: serializedVersion: 2 rgba: 4286611584 m_Size: 0.4 +--- !u!114 &-2591212885737334371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637587245857244965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e4e7b319cf7f934a88b9da8907ed7ee, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 2 + speed: 0 + resetTime: 5 --- !u!114 &-7955960088100232682 MonoBehaviour: m_ObjectHideFlags: 0 @@ -110,10 +125,10 @@ MonoBehaviour: m_GameObject: {fileID: 3637587245857244965} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ce7d4303eff169c07af4515380161304, type: 3} + m_Script: {fileID: 11500000, guid: ef0b9bb5bbc606a4c85a76663c67cce2, type: 3} m_Name: m_EditorClassIdentifier: - bulletSpeed: 7 + bulletSpeed: 4 --- !u!61 &6019109341514027303 BoxCollider2D: m_ObjectHideFlags: 0 @@ -124,7 +139,7 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -140,7 +155,7 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!50 &8988046855811930432 +--- !u!50 &-8024352693128602536 Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 @@ -152,7 +167,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 + m_Mass: 0.0001 m_LinearDrag: 0 m_AngularDrag: 0 m_GravityScale: 0 @@ -161,18 +176,3 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &-2591212885737334371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3637587245857244965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6e4e7b319cf7f934a88b9da8907ed7ee, type: 3} - m_Name: - m_EditorClassIdentifier: - damage: 7 - speed: 0 - resetTime: 9 diff --git a/Assets/Prefabs/Enemy/FlyingEnemy.prefab b/Assets/Prefabs/Enemy/FlyingEnemy.prefab index 3ccdd71..5e859cb 100644 --- a/Assets/Prefabs/Enemy/FlyingEnemy.prefab +++ b/Assets/Prefabs/Enemy/FlyingEnemy.prefab @@ -42,7 +42,6 @@ GameObject: - component: {fileID: 84820332779584235} - component: {fileID: 84820332779584236} - component: {fileID: 84820332779584237} - - component: {fileID: 84820332779584233} m_Layer: 0 m_Name: FlyingEnemy m_TagString: Untagged @@ -127,33 +126,13 @@ MonoBehaviour: m_GameObject: {fileID: 84820332779584238} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5555c26d189c9fa6e8bde05f68ddcfe3, type: 3} + m_Script: {fileID: 11500000, guid: 69e814f5e23b85734b83b074e93164e3, type: 3} m_Name: m_EditorClassIdentifier: - speed: 4 + speed: 5 lineOfSite: 10 - bulletRange: 4 + bulletRange: 6 bullet: {fileID: 3637587245857244965, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} bulletParent: {fileID: 84820332161536273} fireRate: 1 nextFireTime: 0 ---- !u!114 &84820332779584233 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 84820332779584238} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41fdbc9db2d9d5245bd0400c220220bb, type: 3} - m_Name: - m_EditorClassIdentifier: - attackCooldown: 0 - range: 0 - damage: 2 - colliderDistance: 1 - boxCollider: {fileID: 0} - firepoint: {fileID: 84820332161536272} - fireballs: [] - odparents: {fileID: 0} diff --git a/Assets/Prefabs/Enemy/HomingBulletEnemy.prefab b/Assets/Prefabs/Enemy/HomingBulletEnemy.prefab new file mode 100644 index 0000000..8f0e168 --- /dev/null +++ b/Assets/Prefabs/Enemy/HomingBulletEnemy.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8970212626547973400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8970212626547973403} + - component: {fileID: 8970212626547973402} + - component: {fileID: 8970212626547973401} + m_Layer: 0 + m_Name: HomingBulletEnemy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8970212626547973403 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970212626547973400} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 19.24, y: 5.97, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8970212627477606795} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8970212626547973402 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970212626547973400} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: f682c22c8cbd73536a00a3a021f1d1b6, 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.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8970212626547973401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970212626547973400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69e814f5e23b85734b83b074e93164e3, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 + lineOfSite: 10 + bulletRange: 5 + bullet: {fileID: 4301114826325031261, guid: ee9da5bbe36dcce0abf245e537bd200a, type: 3} + bulletParent: {fileID: 8970212627477606794} + fireRate: 1 + nextFireTime: 0 +--- !u!1 &8970212627477606794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8970212627477606795} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8970212627477606795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8970212627477606794} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8970212626547973403} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Enemy/HomingBulletEnemy.prefab.meta b/Assets/Prefabs/Enemy/HomingBulletEnemy.prefab.meta new file mode 100644 index 0000000..57ab00b --- /dev/null +++ b/Assets/Prefabs/Enemy/HomingBulletEnemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 79f77dd8496ad85ee9a6018929c89547 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemy/homingBullet.prefab b/Assets/Prefabs/Enemy/homingBullet.prefab index 6fbbfed..6f79e24 100644 --- a/Assets/Prefabs/Enemy/homingBullet.prefab +++ b/Assets/Prefabs/Enemy/homingBullet.prefab @@ -11,6 +11,10 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: -2591212885737334371, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1417250189635142134, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} propertyPath: m_Color.b value: 0.12726949 @@ -75,14 +79,19 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 6019109341514027303, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: -7955960088100232682, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} --- !u!1 &4301114826325031261 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3637587245857244965, guid: 0ee702f217cd4f2d9a76ab46cf43d17f, type: 3} m_PrefabInstance: {fileID: 705921059879452280} m_PrefabAsset: {fileID: 0} ---- !u!114 &-4717444892966850761 +--- !u!114 &3130110914220481978 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -91,7 +100,7 @@ MonoBehaviour: m_GameObject: {fileID: 4301114826325031261} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1f1aeca88e4cfde269cba8dac4452457, type: 3} + m_Script: {fileID: 11500000, guid: a8979ad34c80e938ba71b757d153b38a, type: 3} m_Name: m_EditorClassIdentifier: - speed: 5 + speed: 4 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index d47fd1a..758cb16 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -14,6 +14,8 @@ GameObject: - component: {fileID: 2011379590425458061} - component: {fileID: 2011379590425458060} - component: {fileID: 1589843406376573292} + - component: {fileID: 5341837890519840338} + - component: {fileID: 8598643918754794941} m_Layer: 0 m_Name: Player m_TagString: Player @@ -154,6 +156,7 @@ MonoBehaviour: groundLayer: serializedVersion: 2 m_Bits: 8 + AudioSource1: {fileID: 5341837890519840338} --- !u!114 &1589843406376573292 MonoBehaviour: m_ObjectHideFlags: 0 @@ -168,6 +171,199 @@ MonoBehaviour: m_EditorClassIdentifier: health: 10 maxHealth: 10 + AudioSource2: {fileID: 8598643918754794941} +--- !u!82 &5341837890519840338 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2011379590425458291} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1891125ad5bf60e8296cec46bf69f9e7, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.761 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &8598643918754794941 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2011379590425458291} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f366a4a57ce626707a5e752c6a0f8245, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2011379590841250917 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Sounds.meta b/Assets/Prefabs/Sounds.meta new file mode 100644 index 0000000..444f360 --- /dev/null +++ b/Assets/Prefabs/Sounds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 220a7fabfbaa02206985b2a866144108 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sounds/BakgroundMusic.prefab b/Assets/Prefabs/Sounds/BakgroundMusic.prefab new file mode 100644 index 0000000..e2a54db --- /dev/null +++ b/Assets/Prefabs/Sounds/BakgroundMusic.prefab @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7569825804096134559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 933606320119083421} + - component: {fileID: 7794973320043013712} + m_Layer: 0 + m_Name: BakgroundMusic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &933606320119083421 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569825804096134559} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 14.859336, y: 6.0694604, z: -1.3689138} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &7794973320043013712 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7569825804096134559} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 65c4cfd5a898dd3bab38e234456d5dcc, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.474 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Prefabs/Sounds/BakgroundMusic.prefab.meta b/Assets/Prefabs/Sounds/BakgroundMusic.prefab.meta new file mode 100644 index 0000000..9e815cd --- /dev/null +++ b/Assets/Prefabs/Sounds/BakgroundMusic.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 11339925d1fa06a3f932c425539c5c72 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sounds/Hit 1.wav b/Assets/Prefabs/Sounds/Hit 1.wav new file mode 100644 index 0000000..2fca618 Binary files /dev/null and b/Assets/Prefabs/Sounds/Hit 1.wav differ diff --git a/Assets/Prefabs/Sounds/Hit 1.wav.meta b/Assets/Prefabs/Sounds/Hit 1.wav.meta new file mode 100644 index 0000000..f753b7a --- /dev/null +++ b/Assets/Prefabs/Sounds/Hit 1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f366a4a57ce626707a5e752c6a0f8245 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sounds/Jump 1.wav b/Assets/Prefabs/Sounds/Jump 1.wav new file mode 100644 index 0000000..ae39281 Binary files /dev/null and b/Assets/Prefabs/Sounds/Jump 1.wav differ diff --git a/Assets/Prefabs/Sounds/Jump 1.wav.meta b/Assets/Prefabs/Sounds/Jump 1.wav.meta new file mode 100644 index 0000000..2b840be --- /dev/null +++ b/Assets/Prefabs/Sounds/Jump 1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1891125ad5bf60e8296cec46bf69f9e7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sounds/stone_road.mp3 b/Assets/Prefabs/Sounds/stone_road.mp3 new file mode 100644 index 0000000..7cd8818 Binary files /dev/null and b/Assets/Prefabs/Sounds/stone_road.mp3 differ diff --git a/Assets/Prefabs/Sounds/stone_road.mp3.meta b/Assets/Prefabs/Sounds/stone_road.mp3.meta new file mode 100644 index 0000000..c6c3ea0 --- /dev/null +++ b/Assets/Prefabs/Sounds/stone_road.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 97385a8c6aa1a75b5a51477b06107f99 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sounds/the_last_parsec.mp3 b/Assets/Prefabs/Sounds/the_last_parsec.mp3 new file mode 100644 index 0000000..359132b Binary files /dev/null and b/Assets/Prefabs/Sounds/the_last_parsec.mp3 differ diff --git a/Assets/Prefabs/Sounds/the_last_parsec.mp3.meta b/Assets/Prefabs/Sounds/the_last_parsec.mp3.meta new file mode 100644 index 0000000..9ac67bd --- /dev/null +++ b/Assets/Prefabs/Sounds/the_last_parsec.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 65c4cfd5a898dd3bab38e234456d5dcc +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Leaderboard.unity.meta b/Assets/Scenes/Leaderboard.unity.meta index 6ae6044..d147563 100644 --- a/Assets/Scenes/Leaderboard.unity.meta +++ b/Assets/Scenes/Leaderboard.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Pixel Adventure 1.meta -guid: b9a58e3ec317ea54fa03fa02736aff6d +guid: 1343cd8f6f6f91ee793966af58edb72e folderAsset: yes ======== guid: b4b05324b8438b7479ff551644c14b4f diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 87c772e..e0581a0 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.9045844, g: 0.65660375, b: 0.41840586, a: 1} + m_IndirectSpecularColor: {r: 0.90458417, g: 0.65660524, b: 0.41840824, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -201,7 +201,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.92759466, y: 8.829999, z: -10} + m_LocalPosition: {x: -0.7887578, y: 8.829999, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -330,90 +330,6 @@ MonoBehaviour: m_MaximumFOV: 60 m_MinimumOrthoSize: 1 m_MaximumOrthoSize: 5000 ---- !u!1 &557102312 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 557102313} - - component: {fileID: 557102314} - m_Layer: 0 - m_Name: companylogo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &557102313 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 557102312} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 113.3, y: 5.9, z: 0} - m_LocalScale: {x: 1.8413798, y: 1.8832538, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 912328463} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &557102314 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 557102312} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: -1431570693 - m_SortingLayer: -3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: b7f0493c640243243b211936e7ed6063, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 19.8, y: 10.8} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &747113276 GameObject: m_ObjectHideFlags: 0 @@ -512,39 +428,6 @@ MonoBehaviour: Ground3: {fileID: 2540297463834358759, guid: c034499ae67fe8d48bd015330e4eda2d, type: 3} speed: 20 duration: 40 ---- !u!1 &912328462 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 912328463} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &912328463 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 912328462} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 557102313} - - {fileID: 1433820584} - m_Father: {fileID: 2118991096} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &991463999 stripped Transform: m_CorrespondingSourceObject: {fileID: 2011379590425458288, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} @@ -620,7 +503,7 @@ Transform: m_Children: - {fileID: 533796324} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1397981395 MonoBehaviour: @@ -648,7 +531,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6238310992476499585, guid: 40b8be0ab680209458c439cb8168fcc2, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6238310992476499585, guid: 40b8be0ab680209458c439cb8168fcc2, type: 3} propertyPath: m_LocalPosition.x @@ -696,90 +579,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 40b8be0ab680209458c439cb8168fcc2, type: 3} ---- !u!1 &1433820583 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1433820584} - - component: {fileID: 1433820585} - m_Layer: 0 - m_Name: backgroundtxtlvl1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1433820584 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433820583} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 61, y: 7.9, z: 0} - m_LocalScale: {x: 2.6088886, y: 2.4286673, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 912328463} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1433820585 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433820583} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: -1431570693 - m_SortingLayer: -3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 912c60766e1c5f14188b6746d608fee9, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 19.2, y: 10.8} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1483957753 GameObject: m_ObjectHideFlags: 0 @@ -811,7 +610,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1483957756 BoxCollider2D: @@ -858,6 +657,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2011379590425458061, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2011379590425458288, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} propertyPath: m_RootOrder value: 2 @@ -902,10 +705,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2011379590425458290, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} + propertyPath: m_Simulated + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2011379590425458290, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2011379590425458291, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 8598643918754794941, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} + propertyPath: m_Volume + value: 0.946 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} --- !u!60 &1727101026 stripped @@ -913,38 +728,6 @@ PolygonCollider2D: m_CorrespondingSourceObject: {fileID: 6942989081182281135, guid: ea9b308720dc0cf40b5c3cbefb0973c9, type: 3} m_PrefabInstance: {fileID: 6942989081625781709} m_PrefabAsset: {fileID: 0} ---- !u!1 &2118991095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2118991096} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2118991096 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2118991095} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 912328463} - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1764367076508549175 PrefabInstance: m_ObjectHideFlags: 0 @@ -1013,6 +796,10 @@ PrefabInstance: propertyPath: m_Name value: StartPlatform objectReference: {fileID: 0} + - target: {fileID: 2192680188471073871, guid: d5fc924ac3e92494996d4e40aad693b9, type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2192680188471073873, guid: d5fc924ac3e92494996d4e40aad693b9, type: 3} propertyPath: m_RootOrder value: 5 @@ -1133,7 +920,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6942989081182281129, guid: ea9b308720dc0cf40b5c3cbefb0973c9, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6942989081182281129, guid: ea9b308720dc0cf40b5c3cbefb0973c9, type: 3} propertyPath: m_LocalPosition.x @@ -1181,3 +968,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ea9b308720dc0cf40b5c3cbefb0973c9, type: 3} +--- !u!1001 &7663787400618420140 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.x + value: 14.859336 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.y + value: 6.0694604 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3689138 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569825804096134559, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_Name + value: BakgroundMusic + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index d650bce..fd6e3ef 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.9045844, g: 0.65660375, b: 0.41840586, a: 1} + m_IndirectSpecularColor: {r: 0.90458417, g: 0.65660524, b: 0.41840824, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -276,7 +276,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.9799986, y: 20.79, z: -10} + m_LocalPosition: {x: 0, y: 20.79, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -502,6 +502,67 @@ Transform: m_Father: {fileID: 497543476} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &809551393 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.x + value: 14.859336 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.y + value: 6.0694604 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3689138 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569825804096134559, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_Name + value: BakgroundMusic + objectReference: {fileID: 0} + - target: {fileID: 7794973320043013712, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_Volume + value: 0.357 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} --- !u!1 &956827112 GameObject: m_ObjectHideFlags: 0 @@ -573,7 +634,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1431570693 - m_SortingLayer: -1 + m_SortingLayer: -3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 9261e186105133245bb20553340c54b8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -901,7 +962,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1431570693 - m_SortingLayer: -1 + m_SortingLayer: -3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: b7f0493c640243243b211936e7ed6063, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -985,7 +1046,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1431570693 - m_SortingLayer: -1 + m_SortingLayer: -3 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 9261e186105133245bb20553340c54b8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/Level 3.unity b/Assets/Scenes/Level 3.unity index 7f47441..53e3090 100644 --- a/Assets/Scenes/Level 3.unity +++ b/Assets/Scenes/Level 3.unity @@ -498,6 +498,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &433900658 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_RootOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.x + value: 14.859336 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.y + value: 6.0694604 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3689138 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569825804096134559, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_Name + value: BakgroundMusic + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} --- !u!4 &543547043 stripped Transform: m_CorrespondingSourceObject: {fileID: 8397596546407035746, guid: a4c462f241afd01498cfd880cefc675d, type: 3} @@ -2512,18 +2569,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 46486950876923109, guid: 6298283b85c387f46bc317e4f7cd49b2, type: 3} propertyPath: m_Name value: Checkpoint @@ -2572,6 +2617,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6298283b85c387f46bc317e4f7cd49b2, type: 3} --- !u!1001 &2896477239364540032 diff --git a/Assets/Scenes/Level 4.unity b/Assets/Scenes/Level 4.unity index 8128ded..8ae90e4 100644 --- a/Assets/Scenes/Level 4.unity +++ b/Assets/Scenes/Level 4.unity @@ -132,7 +132,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 6238310992476499585, guid: 40b8be0ab680209458c439cb8168fcc2, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 12 +======= + value: 7 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 6238310992476499585, guid: 40b8be0ab680209458c439cb8168fcc2, type: 3} propertyPath: m_LocalPosition.x @@ -193,7 +197,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 25 +======= + value: 19 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_LocalPosition.x @@ -278,7 +286,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4507883391871139454, guid: 223b000b47e0ea544baf4af60f924b59, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 19 +======= + value: 14 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 4507883391871139454, guid: 223b000b47e0ea544baf4af60f924b59, type: 3} propertyPath: m_LocalPosition.x @@ -343,7 +355,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 22 +======= + value: 17 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_LocalPosition.x @@ -407,6 +423,63 @@ MonoBehaviour: playerLayer: serializedVersion: 2 m_Bits: 0 +--- !u!1001 &417437253 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_RootOrder + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.x + value: 14.859336 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.y + value: 6.0694604 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalPosition.z + value: -1.3689138 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 933606320119083421, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569825804096134559, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} + propertyPath: m_Name + value: BakgroundMusic + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 11339925d1fa06a3f932c425539c5c72, type: 3} --- !u!4 &493526015 stripped Transform: m_CorrespondingSourceObject: {fileID: 2011379590425458288, guid: bf34c5d9e39225546b5ad395c2e486d6, type: 3} @@ -499,7 +572,7 @@ Transform: m_Children: - {fileID: 1493526936} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &605834896 PrefabInstance: @@ -649,7 +722,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2408005310133925317, guid: 33fba1a5eebd7834eb428b4c2c44aa8c, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 10 +======= + value: 5 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 2408005310133925317, guid: 33fba1a5eebd7834eb428b4c2c44aa8c, type: 3} propertyPath: m_LocalPosition.x @@ -800,7 +877,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 28 +======= + value: 22 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} propertyPath: m_LocalPosition.x @@ -869,7 +950,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 15 +======= + value: 9 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 1434552552372214437, guid: 3d855290a8782484283f952db4faa37a, type: 3} propertyPath: m_LocalPosition.x @@ -983,7 +1068,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 24 +======= + value: 18 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_LocalPosition.x @@ -1040,7 +1129,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 26 +======= + value: 20 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_LocalPosition.x @@ -1170,7 +1263,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1910228688890403461, guid: a4c462f241afd01498cfd880cefc675d, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 32 +======= + value: 25 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 1910228688890403461, guid: a4c462f241afd01498cfd880cefc675d, type: 3} propertyPath: m_LocalPosition.x @@ -1497,7 +1594,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 21 +======= + value: 16 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 3552486056586948796, guid: 5bcd53ab84a78a44d8392a350a0341f4, type: 3} propertyPath: m_LocalPosition.x @@ -1558,7 +1659,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3344005234253200076, guid: b79861e62e0579947a71f3dfcebd78ff, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3344005234253200076, guid: b79861e62e0579947a71f3dfcebd78ff, type: 3} propertyPath: m_LocalPosition.x @@ -1655,7 +1756,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6876090395593934002, guid: 97f4132089ac3bf449ddcbed9dec08fa, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 33 +======= + value: 26 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 6876090395593934002, guid: 97f4132089ac3bf449ddcbed9dec08fa, type: 3} propertyPath: m_LocalPosition.x @@ -1729,7 +1834,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3344005234253200076, guid: b79861e62e0579947a71f3dfcebd78ff, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3344005234253200076, guid: b79861e62e0579947a71f3dfcebd78ff, type: 3} propertyPath: m_LocalPosition.x @@ -1790,7 +1895,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2192680188471073873, guid: d5fc924ac3e92494996d4e40aad693b9, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 11 +======= + value: 6 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 2192680188471073873, guid: d5fc924ac3e92494996d4e40aad693b9, type: 3} propertyPath: m_LocalPosition.x @@ -1855,7 +1964,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2408005310133925317, guid: 33fba1a5eebd7834eb428b4c2c44aa8c, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 9 +======= + value: 4 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 2408005310133925317, guid: 33fba1a5eebd7834eb428b4c2c44aa8c, type: 3} propertyPath: m_LocalPosition.x @@ -2001,7 +2114,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1910228688890403461, guid: a4c462f241afd01498cfd880cefc675d, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 30 +======= + value: 24 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 1910228688890403461, guid: a4c462f241afd01498cfd880cefc675d, type: 3} propertyPath: m_LocalPosition.x @@ -2175,7 +2292,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7562902992742722146, guid: 38e48527e9a40a8499b71cdd3c7c88df, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 16 +======= + value: 11 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 7562902992742722146, guid: 38e48527e9a40a8499b71cdd3c7c88df, type: 3} propertyPath: m_LocalPosition.x @@ -2336,7 +2457,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2059534000 PrefabInstance: @@ -2347,7 +2468,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 6942989081182281129, guid: ea9b308720dc0cf40b5c3cbefb0973c9, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 14 +======= + value: 8 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 6942989081182281129, guid: ea9b308720dc0cf40b5c3cbefb0973c9, type: 3} propertyPath: m_LocalScale.x @@ -2444,7 +2569,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4507883391871139454, guid: 223b000b47e0ea544baf4af60f924b59, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 27 +======= + value: 21 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 4507883391871139454, guid: 223b000b47e0ea544baf4af60f924b59, type: 3} propertyPath: m_LocalPosition.x @@ -2525,7 +2654,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1910228688890403461, guid: a4c462f241afd01498cfd880cefc675d, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 29 +======= + value: 23 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 1910228688890403461, guid: a4c462f241afd01498cfd880cefc675d, type: 3} propertyPath: m_LocalPosition.x @@ -2653,6 +2786,7 @@ PrefabInstance: Animator: serializedVersion: 5 m_ObjectHideFlags: 0 +<<<<<<< Updated upstream m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4436,6 +4570,77 @@ PrefabInstance: --- !u!1001 &6268069149087934279 PrefabInstance: m_ObjectHideFlags: 0 +======= + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6092931704978306357, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_Name + value: PlatfromaNeprijatelja + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306362, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_Color.b + value: 0.80271804 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306362, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_Color.g + value: 0.8396226 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306362, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_Color.r + value: 0.74061054 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalPosition.x + value: 78.3 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalPosition.y + value: 5.3 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6092931704978306363, guid: a45217c7a3a14d9498614079af111d1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a45217c7a3a14d9498614079af111d1e, type: 3} +--- !u!1001 &6268069149087934279 +PrefabInstance: + m_ObjectHideFlags: 0 +>>>>>>> Stashed changes serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} @@ -4446,7 +4651,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6268069148186546078, guid: ce44c8fecbe023748a8109f0bcee78d1, type: 3} propertyPath: m_RootOrder +<<<<<<< Updated upstream value: 20 +======= + value: 15 +>>>>>>> Stashed changes objectReference: {fileID: 0} - target: {fileID: 6268069148186546078, guid: ce44c8fecbe023748a8109f0bcee78d1, type: 3} propertyPath: m_LocalPosition.x @@ -4498,6 +4707,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce44c8fecbe023748a8109f0bcee78d1, type: 3} +<<<<<<< Updated upstream --- !u!4 &6372508576359168970 Transform: m_ObjectHideFlags: 0 @@ -5992,3 +6202,5 @@ Transform: m_Father: {fileID: 6372508576359168970} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +======= +>>>>>>> Stashed changes diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 95ebd74..8e26d9f 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -391,6 +391,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 67161866} m_CullTransparentMesh: 1 +--- !u!1 &232088979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 232088981} + - component: {fileID: 232088980} + m_Layer: 0 + m_Name: MenuMusic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &232088980 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232088979} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 97385a8c6aa1a75b5a51477b06107f99, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.403 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &232088981 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232088979} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 75.85713, y: 15.405024, z: -1.9533864} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &237845705 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BulletDirection.cs b/Assets/Scripts/BulletDirection.cs index 00c10cf..50f0afd 100644 --- a/Assets/Scripts/BulletDirection.cs +++ b/Assets/Scripts/BulletDirection.cs @@ -7,19 +7,28 @@ public class BulletDirection : MonoBehaviour GameObject target; public float bulletSpeed; Rigidbody2D bulletRB; + private GameObject go; + public PlayerController scriptb; void Start() { - bulletRB = GetComponent(); - target = GameObject.FindGameObjectWithTag("Player"); + go = GameObject.Find("Player"); + bulletRB = GetComponent(); + target = GameObject.FindGameObjectWithTag("Player"); Vector2 moveDir = (target.transform.position - transform.position).normalized * bulletSpeed; bulletRB.velocity = new Vector2(moveDir.x, moveDir.y); Destroy(this.gameObject, 2); } - private void OnCollisionDestroy(Collision2D collision) - { - Destroy(collision.gameObject); + private void OnCollisionEnter2D(Collision2D collision) + { + if(collision.collider.name != "Player"){ + print(collision.collider.name); + return; + } + + go.GetComponent().TakeDamage(2); + Destroy(this.gameObject); } } diff --git a/Assets/Scripts/Enemy/BulletDirection.cs b/Assets/Scripts/Enemy/BulletDirection.cs deleted file mode 100644 index 108f1c2..0000000 --- a/Assets/Scripts/Enemy/BulletDirection.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class BulletDirection : MonoBehaviour -{ - GameObject target; - public float bulletSpeed; - Rigidbody2D bulletRB; - - void Start() - { - bulletRB = GetComponent(); - target = GameObject.FindGameObjectWithTag("Player"); - Vector2 moveDir = (target.transform.position - transform.position).normalized * bulletSpeed; - bulletRB.velocity = new Vector2(moveDir.x, moveDir.y); - /*if(target.transform.position - transform.position < new Vector2(0,0)){ - transform.Translate(transform.right); - }*/ - - // = Vector2.MoveTowards(transform.position, target.position, bulletSpeed * Time.deltaTime); - //transform.LookAt(target.transform.position - transform.position); - Destroy(this.gameObject, 2); - } - /*private void OnCollisionDestroy(Collision2D collision) - { - Destroy(collision.gameObject); - - } -*/ -} diff --git a/Assets/Scripts/Enemy/BulletDirection.cs.meta b/Assets/Scripts/Enemy/BulletDirection.cs.meta deleted file mode 100644 index 4a3590a..0000000 --- a/Assets/Scripts/Enemy/BulletDirection.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ce7d4303eff169c07af4515380161304 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyProjectile.cs b/Assets/Scripts/Enemy/EnemyProjectile.cs index 139a9e5..9c76859 100644 --- a/Assets/Scripts/Enemy/EnemyProjectile.cs +++ b/Assets/Scripts/Enemy/EnemyProjectile.cs @@ -29,7 +29,10 @@ public void ActivateProjectile() } private void Update() { - if (hit) return; + if (hit) + { + return; + } float movementSpeed = speed * Time.deltaTime * (-1); transform.Translate(movementSpeed, 0, 0); @@ -39,7 +42,7 @@ private void Update() gameObject.SetActive(false); } - private new void OnTriggerEnter2D(Collider2D collision) + /* private new void OnTriggerEnter2D(Collider2D collision) { hit = true; base.OnTriggerEnter2D(collision); //Execute logic from parent script first @@ -49,7 +52,7 @@ private void Update() anim.SetTrigger("explode"); //When the object is a fireball explode it else gameObject.SetActive(false); //When this hits any object deactivate arrow - } + }*/ private void Deactivate() { gameObject.SetActive(false); diff --git a/Assets/Scripts/Enemy/FlyingEnemy.cs b/Assets/Scripts/Enemy/FlyingEnemy.cs deleted file mode 100644 index fe98bc6..0000000 --- a/Assets/Scripts/Enemy/FlyingEnemy.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class FlyingEnemy : MonoBehaviour -{ - public float speed; - public float lineOfSite; - public float bulletRange; - public GameObject bullet; - public GameObject bulletParent; - public float fireRate = 1f; - public float nextFireTime; - private Transform player; - private Vector2 player1; - //private double angleConst = 180.0; - // Start is called before the first frame update - void Start() - { - player = GameObject.FindGameObjectWithTag("Player").transform; - } - - // Update is called once per frame - void Update() - { - // dodajemo range za pracenje - - float distanceFromPlayer = Vector2.Distance(player.position, transform.position); - if(distanceFromPlayer < lineOfSite && distanceFromPlayer>bulletRange) - { - transform.position = Vector2.MoveTowards(this.transform.position, player.position, speed * Time.deltaTime); - } - - else if(distanceFromPlayer 0) { health -= dmg; - + AudioSource2.Play(); if (health <= 0) { gameManager.PlayerDeath(); diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index a877148..11af9a5 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -22,6 +22,7 @@ public class PlayerMovement : MonoBehaviour [SerializeField] private Transform groundCheck; [SerializeField] private float groundCheckRadius = 0.2f; [SerializeField] private LayerMask groundLayer; + public AudioSource AudioSource1; private Rigidbody2D lastGround; private void Awake() @@ -93,6 +94,7 @@ private void Update() isJumpCut = true; isJumpFalling = false; Jump(); + AudioSource1.Play(); } if (rb.velocity.y < 0 && moveInput.y < 0) diff --git a/Assets/Scripts/Enemy/RangedEnemy.cs b/Assets/Scripts/RangedEnemy.cs similarity index 100% rename from Assets/Scripts/Enemy/RangedEnemy.cs rename to Assets/Scripts/RangedEnemy.cs diff --git a/Assets/Scripts/Enemy/RangedEnemy.cs.meta b/Assets/Scripts/RangedEnemy.cs.meta similarity index 100% rename from Assets/Scripts/Enemy/RangedEnemy.cs.meta rename to Assets/Scripts/RangedEnemy.cs.meta diff --git a/Assets/Scripts/StaticEnemy.cs.meta b/Assets/Scripts/StaticEnemy.cs.meta index 0162cfc..d534ee7 100644 --- a/Assets/Scripts/StaticEnemy.cs.meta +++ b/Assets/Scripts/StaticEnemy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: efffca181b2fe4b8d9c1140f9fbeec4a +guid: c32bc7a8f1fd45a5f86b2c2afe67545c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/homingBulet.cs b/Assets/Scripts/homingBulet.cs index 4b26412..2ce5ee1 100644 --- a/Assets/Scripts/homingBulet.cs +++ b/Assets/Scripts/homingBulet.cs @@ -7,9 +7,12 @@ public class homingBulet : MonoBehaviour // Start is called before the first frame update public float speed; Transform player; + private GameObject go; void Start() { + go = GameObject.Find("Player"); player = GameObject.FindGameObjectWithTag("Player").transform; + Destroy(this.gameObject, 2); } // Update is called once per frame @@ -17,4 +20,16 @@ void Update() { transform.position = Vector2.MoveTowards(transform.position, player.position, speed * Time.deltaTime); } + + private void OnCollisionEnter2D(Collision2D collision) + + { + if(collision.collider.name != "Player"){ + Destroy(this.gameObject); + return; + } + + go.GetComponent().TakeDamage(2); + Destroy(this.gameObject); + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b51b6e8..756fbd2 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,25 +12,25 @@ EditorUserSettings: value: 535201045c54500c5f5f5f7513275b44144f1c282a7b2365782c446ab2e16c3a flags: 0 RecentlyUsedSceneGuid-2: - value: 5004520351075d5f5c5f5e7446760e44144f1b2c757d7235752a4d32b4b43068 + value: 0105565650065b0f0f56587148210844414e1e2c797d7766797d1e62b6e2603e flags: 0 RecentlyUsedSceneGuid-3: - value: 525556530104505a0b0d0d74437606444e164a2c7529776729794935b3b7626b + value: 50000d535c530a595b0f092643700c44134e1d292e7b76362b2d1f63e4e3316e flags: 0 RecentlyUsedSceneGuid-4: - value: 50000d535c530a595b0f092643700c44134e1d292e7b76362b2d1f63e4e3316e + value: 525556530104505a0b0d0d74437606444e164a2c7529776729794935b3b7626b flags: 0 RecentlyUsedSceneGuid-5: - value: 0105565650065b0f0f56587148210844414e1e2c797d7766797d1e62b6e2603e + value: 01050656040559035f5b582416750744174e1a2c7e2d72327b701e30bbb6363b flags: 0 RecentlyUsedSceneGuid-6: - value: 5b0955575d0c0b030e085c754226594440164e7f752b20612c794d67e6b36368 + value: 5004520351075d5f5c5f5e7446760e44144f1b2c757d7235752a4d32b4b43068 flags: 0 RecentlyUsedSceneGuid-7: - value: 0202505e07575d0f5a0f5e7643705e444e4e4b7d7d2e7e63782d4f61bab4603b + value: 5b0955575d0c0b030e085c754226594440164e7f752b20612c794d67e6b36368 flags: 0 RecentlyUsedSceneGuid-8: - value: 01050656040559035f5b582416750744174e1a2c7e2d72327b701e30bbb6363b + value: 0202505e07575d0f5a0f5e7643705e444e4e4b7d7d2e7e63782d4f61bab4603b flags: 0 RecentlyUsedSceneGuid-9: value: 065401535054515a5f565e2346730a444f164b797c2c7e312e2c1b30e3e2613b diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 6cbfbe0..e337b06 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 - width: 1920 - height: 997 + x: 56 + y: 64 + width: 932 + height: 991 m_ShowMode: 4 - m_Title: Project + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 932 + height: 991 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 932 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 971 + width: 932 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 932 + height: 941 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 122 + controlID: 16 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1349 - height: 947 + width: 636 + height: 941 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 127 + controlID: 17 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1349 - height: 561 + width: 636 + height: 559 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 128 + controlID: 18 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 334 - height: 561 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 151 + height: 559 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 334 + x: 151 y: 0 - width: 1015 - height: 561 + width: 485 + height: 559 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -240,9 +240,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 561 - width: 1349 - height: 386 + y: 559 + width: 636 + height: 382 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 17} @@ -266,12 +266,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1349 + x: 636 y: 0 - width: 571 - height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 296 + height: 941 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 634 - width: 1348 - height: 365 + x: 56 + y: 678 + width: 635 + height: 361 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -326,10 +326,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73 - width: 333 - height: 540 + x: 56 + y: 119 + width: 150 + height: 538 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -340,7 +340,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0efbffff + m_ExpandedIDs: 74aaffff0efbffff10fbfffff4ffffff52630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -356,7 +356,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -384,10 +384,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 334 - y: 73 - width: 1013 - height: 540 + x: 207 + y: 119 + width: 483 + height: 538 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -645,9 +645,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 68.66253, y: 6.198049, z: -0.094596714} + m_Target: {x: 9.257125, y: 6.263896, z: -1.8070143} speed: 2 - m_Value: {x: 68.66253, y: 6.198049, z: -0.094596714} + m_Value: {x: 9.257125, y: 6.263896, z: -1.8070143} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -698,9 +698,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 19.459612 + m_Target: 9.669685 speed: 2 - m_Value: 19.459612 + m_Value: 9.669685 m_Ortho: m_Target: 1 speed: 2 @@ -745,10 +745,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 333 - y: 73 - width: 1013 - height: 540 + x: 207 + y: 119 + width: 483 + height: 538 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -760,7 +760,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1013, y: 519} + m_TargetSize: {x: 483, y: 517} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -775,10 +775,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -506.5 - m_HBaseRangeMax: 506.5 - m_VBaseRangeMin: -259.5 - m_VBaseRangeMax: 259.5 + m_HBaseRangeMin: -241.5 + m_HBaseRangeMax: 241.5 + m_VBaseRangeMin: -258.5 + m_VBaseRangeMax: 258.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -796,23 +796,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1013 - height: 519 + width: 483 + height: 517 m_Scale: {x: 1, y: 1} - m_Translation: {x: 506.5, y: 259.5} + m_Translation: {x: 241.5, y: 258.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -506.5 - y: -259.5 - width: 1013 - height: 519 + x: -241.5 + y: -258.5 + width: 483 + height: 517 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1013, y: 540} + m_LastWindowPixelSize: {x: 483, y: 538} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -838,10 +838,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 363 - y: 73 - width: 1099 - height: 540 + x: 217 + y: 119 + width: 491 + height: 536 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -903,10 +903,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 634 - width: 1348 - height: 365 + x: 56 + y: 678 + width: 635 + height: 361 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -925,36 +925,36 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Prefabs/Enemy m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Prefabs/Enemy m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\Unity projects\PI-Projekt + m_LastProjectPath: /home/teo/Desktop/projekt/PI-Projekt m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 103} - m_SelectedIDs: 94670000 - m_LastClickedID: 26516 - m_ExpandedIDs: 0000000056670000586700005a6700005c6700005e67000060670000626700006467000066670000686700006a6700006c6700006e67000000ca9a3b + scrollPos: {x: 0, y: 63} + m_SelectedIDs: 36660000 + m_LastClickedID: 26166 + m_ExpandedIDs: 00000000a8650000aa650000ac6500004666000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Level4 + m_OriginalName: Level4 m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 26174 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_SearchString: @@ -968,7 +968,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000056670000586700005a6700005c6700005e67000060670000626700006467000066670000686700006a6700006c6700006e670000 + m_ExpandedIDs: 00000000a8650000aa650000ac650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -995,8 +995,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000d85f000086600000ea61000000000000f0660000 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d85f000086600000ea61000000000000f066000086720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1012,7 +1012,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1044,10 +1044,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1349 - y: 73 - width: 570 - height: 926 + x: 692 + y: 119 + width: 295 + height: 920 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default