Added music, changed how death works.

This commit is contained in:
Randall Dolifka 2017-09-07 10:01:19 -05:00
parent 009d0d196a
commit 2a2fc537df
6 changed files with 92 additions and 3 deletions

30
Game 1/Assets/Levels/Level0.unity Normal file → Executable file
View file

@ -20750,7 +20750,7 @@ GameObject:
- component: {fileID: 440329288} - component: {fileID: 440329288}
m_Layer: 8 m_Layer: 8
m_Name: blocky m_Name: blocky
m_TagString: Untagged m_TagString: Player
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@ -79790,6 +79790,34 @@ SpriteRenderer:
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 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 --- !u!1 &1756437264
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

30
Game 1/Assets/Levels/Level1.unity Normal file → Executable file
View file

@ -56731,7 +56731,7 @@ GameObject:
- component: {fileID: 1305122792} - component: {fileID: 1305122792}
m_Layer: 8 m_Layer: 8
m_Name: blocky m_Name: blocky
m_TagString: Untagged m_TagString: Player
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@ -57702,6 +57702,34 @@ SpriteRenderer:
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 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 --- !u!1 &1321789748
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

BIN
Game 1/Assets/Music/loopable.wav Executable file

Binary file not shown.

View file

@ -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:

8
Game 1/Assets/Scripts/LevelController.cs Normal file → Executable file
View file

@ -44,7 +44,15 @@ public class LevelController : MonoBehaviour {
public IEnumerator DelayLoadLevel(string levelName, float delay) public IEnumerator DelayLoadLevel(string levelName, float delay)
{ {
yield return new WaitForSeconds(delay); yield return new WaitForSeconds(delay);
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); SceneManager.LoadScene (levelName);
}
yield return null; yield return null;
} }
} }

2
Game 1/ProjectSettings/TagManager.asset Normal file → Executable file
View file

@ -6,6 +6,8 @@ TagManager:
tags: tags:
- Finish Line - Finish Line
- Deathbox - Deathbox
- Start
- Character
layers: layers:
- Default - Default
- TransparentFX - TransparentFX