This commit is contained in:
Zoe J committed 2022-02-25 23:15:55 -06:00
1 parent 9c4f6c304f
commit 8539237c26
7 files changed
+2447 -19

No files matched your search

+2 -2
View File
@@ -25,9 +25,9 @@ public class BeatCrowds : MonoBehaviour
void BeatLevel()
{
if (currentLevel == 2)
if (currentLevel == 3)
{
PlayerPrefs.SetInt("CurrentLevel", 3);
PlayerPrefs.SetInt("CurrentLevel", 4);
SceneManager.LoadScene("Real World");
}else
{
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3682e0ded37465040be539f2372ae27b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+6 -1
View File
@@ -2263,7 +2263,7 @@ PrefabInstance:
objectReference: {fileID: 1477723291}
- target: {fileID: 3617937272123271708, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value:
value: Level3
objectReference: {fileID: 0}
- target: {fileID: 3617937272123271708, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
@@ -4212,6 +4212,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
cam: {fileID: 443521626}
cat: {fileID: 1059758829}
box: {fileID: 0}
camOffset: 10
catOffset: 5
countOffset: 10
--- !u!61 &2982002898913631351
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -4481,6 +4485,7 @@ MonoBehaviour:
m_CeilingCheck: {fileID: 4133722626273276155}
m_CrouchDisableCollider: {fileID: 4133722625369930933}
m_Grounded: 0
m_FacingRight: 1
m_Velocity: {x: 0, y: 0, z: 0}
OnLandEvent:
m_PersistentCalls:
+1 -1
View File
@@ -46,7 +46,7 @@ public class WorldScreenController : MonoBehaviour
{
if (currentLevel >= 3)
{
SceneManager.LoadScene("Crowds Level");
SceneManager.LoadScene("Dark Level");
}
}
@@ -17,6 +17,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Game Scenes/Heights Level.unity
guid: b23f36c2e3b3a284baae9cff59bb54e7
- enabled: 1
path: Assets/Scenes/Game Scenes/Dark Level.unity
guid: 3682e0ded37465040be539f2372ae27b
- enabled: 0
path: Assets/Scenes/Scene1.unity
guid: 2cda990e2423bbf4892e6590ba056729
+7 -15
View File
@@ -6,6 +6,7 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
<<<<<<< Updated upstream
<<<<<<< HEAD
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367f6d7717e1351027
flags: 0
@@ -37,25 +38,14 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
=======
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
=======
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7e1304180822232a2f31633c133af6f9
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
<<<<<<< Updated upstream
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7e0103160822232a2f31633c133af6f9
flags: 0
@@ -66,6 +56,8 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
>>>>>>> origin/main
flags: 0
=======
>>>>>>> Stashed changes
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0