Commit f5f30f1d authored by Danny Huang's avatar Danny Huang
Browse files

added more music. Revised spawning and instant death barrier. Updated props in scenes

parent 8dbb473b
......@@ -6,6 +6,8 @@ public class HeroDeathCtrl : DeathCtrl
{
public Text deathTextUI;
public GameObject reviveStartingGun;
protected bool isDead;
protected HeroInventory heroInventory;
......@@ -71,5 +73,14 @@ public class HeroDeathCtrl : DeathCtrl
this.rb.isKinematic = false;
this.transform.position = GameObject.FindGameObjectWithTag ("PlayerSpawn").transform.position;
/* Spawn a weak pistol to give Hero a starting chance */
Vector3 gunSpawnPos = this.transform.position;
gunSpawnPos.x += 1.0f;
GameObject gun = (GameObject) Instantiate (this.reviveStartingGun, gunSpawnPos,
Quaternion.identity, null);
GameObject.FindGameObjectWithTag("ItemGenerator").GetComponent<ItemGeneratorCtrl>().
RemoveCloneStrFromName(gun);
}
}
fileFormatVersion: 2
guid: 5d3ee09f5a819a640996af7558305501
timeCreated: 1479956483
guid: dfa36615711b5234b9a1d69706246c7c
timeCreated: 1480221391
licenseType: Free
AudioImporter:
serializedVersion: 6
......
fileFormatVersion: 2
guid: bb4e251f0456b2645b742f404648ddac
timeCreated: 1479955323
guid: 6dceb6fcf337c8b44b1f837a70569ef7
timeCreated: 1480218634
licenseType: Free
AudioImporter:
serializedVersion: 6
......
fileFormatVersion: 2
guid: 9d58c7ff4dc3aea4586c1162f19f2982
timeCreated: 1480220984
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
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 31b921d7eea8d6042ad4033f3bc6e05c
timeCreated: 1480220422
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
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment