diff --git a/Game 1/Assets/Levels/Level0.unity b/Game 1/Assets/Levels/Level0.unity old mode 100644 new mode 100755 index 283a398..39f0957 --- a/Game 1/Assets/Levels/Level0.unity +++ b/Game 1/Assets/Levels/Level0.unity @@ -20750,7 +20750,7 @@ GameObject: - component: {fileID: 440329288} m_Layer: 8 m_Name: blocky - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -79790,6 +79790,34 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &1755057800 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1755057801} + m_Layer: 0 + m_Name: Start + m_TagString: Start + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1755057801 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1755057800} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.03, y: -1.22, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1756437264 GameObject: m_ObjectHideFlags: 0 diff --git a/Game 1/Assets/Levels/Level1.unity b/Game 1/Assets/Levels/Level1.unity old mode 100644 new mode 100755 index 7e4ad85..005485d --- a/Game 1/Assets/Levels/Level1.unity +++ b/Game 1/Assets/Levels/Level1.unity @@ -56731,7 +56731,7 @@ GameObject: - component: {fileID: 1305122792} m_Layer: 8 m_Name: blocky - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -57702,6 +57702,34 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1 &1321058054 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1321058055} + m_Layer: 0 + m_Name: Start + m_TagString: Start + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1321058055 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1321058054} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.03, y: -1.22, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1321789748 GameObject: m_ObjectHideFlags: 0 diff --git a/Game 1/Assets/Music/loopable.wav b/Game 1/Assets/Music/loopable.wav new file mode 100755 index 0000000..68128dd Binary files /dev/null and b/Game 1/Assets/Music/loopable.wav differ diff --git a/Game 1/Assets/Music/loopable.wav.meta b/Game 1/Assets/Music/loopable.wav.meta new file mode 100755 index 0000000..bc9942d --- /dev/null +++ b/Game 1/Assets/Music/loopable.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9a4ecab2d68c16d4e8bba5b49848bafe +timeCreated: 1504796165 +licenseType: Free +AudioImporter: + 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/Game 1/Assets/Scripts/LevelController.cs b/Game 1/Assets/Scripts/LevelController.cs old mode 100644 new mode 100755 index d0a69fb..307fa73 --- a/Game 1/Assets/Scripts/LevelController.cs +++ b/Game 1/Assets/Scripts/LevelController.cs @@ -44,7 +44,15 @@ public class LevelController : MonoBehaviour { public IEnumerator DelayLoadLevel(string levelName, float delay) { yield return new WaitForSeconds(delay); - SceneManager.LoadScene(levelName); + if (SceneManager.GetActiveScene ().name == levelName) { + // soft restart - just reset location + GameObject player = GameObject.FindGameObjectWithTag ("Player"); + GameObject start = GameObject.FindGameObjectWithTag ("Start"); + player.transform.position = start.transform.position; + winText.text = ""; + } else { + SceneManager.LoadScene (levelName); + } yield return null; } } diff --git a/Game 1/ProjectSettings/TagManager.asset b/Game 1/ProjectSettings/TagManager.asset old mode 100644 new mode 100755 index 00b3003..e43d2c5 --- a/Game 1/ProjectSettings/TagManager.asset +++ b/Game 1/ProjectSettings/TagManager.asset @@ -6,6 +6,8 @@ TagManager: tags: - Finish Line - Deathbox + - Start + - Character layers: - Default - TransparentFX