combined ch and gv scene, created bl scene

This commit is contained in:
Bryanna 2023-05-01 18:58:39 -07:00
parent fc8c2e6062
commit 493258f1f9
10 changed files with 43534 additions and 6460 deletions

Binary file not shown.

View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: e3de422ac58aed24490bf1dc3808360d
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

36635
Assets/Scenes/Brasslands.unity Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: fb75a0cdbe99f4b479e5f7ad065f60e3 guid: 5a817ab0714aa8f4d8f8a042586451e0
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -220,6 +220,15 @@ public class PlayerBehavior : MonoBehaviour
Destroy(collision.gameObject); Destroy(collision.gameObject);
StartCoroutine(DestroyPlayer()); StartCoroutine(DestroyPlayer());
} }
//stupid stuff for claude's house
else if (collision.gameObject.tag == "SirJacques")
{
Destroy(collision.gameObject);
}
else if (collision.gameObject.tag == "Door")
{
this.stateController.RespawnPlayer();
}
} }
IEnumerator DestroyPlayer() { IEnumerator DestroyPlayer() {

View File

@ -88,6 +88,13 @@ public class StateController : MonoBehaviour {
unlockedTambourine = false; unlockedTambourine = false;
unlockedClarinet = false; unlockedClarinet = false;
} }
else if (SceneManager.GetActiveScene().name == "Brasslands")
{
unlockedTrumpet = true;
unlockedTambourine = false;
unlockedClarinet = false;
}
else if (SceneManager.GetActiveScene().name == "GrappleScene") { else if (SceneManager.GetActiveScene().name == "GrappleScene") {
unlockedTrumpet = true; unlockedTrumpet = true;
unlockedTambourine = true; unlockedTambourine = true;

File diff suppressed because one or more lines are too long

View File

@ -17,6 +17,9 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/PerformanceisRuined.unity path: Assets/Scenes/PerformanceisRuined.unity
guid: 3bbad64576fbe204283f897f647f3d1c guid: 3bbad64576fbe204283f897f647f3d1c
- enabled: 1
path: Assets/Scenes/Brasslands.unity
guid: 5a817ab0714aa8f4d8f8a042586451e0
- enabled: 1 - enabled: 1
path: Assets/Scenes/Transitions.unity path: Assets/Scenes/Transitions.unity
guid: 18299039bf38c495ea94be3566f986c2 guid: 18299039bf38c495ea94be3566f986c2