Merge pull request #7 from MoAzza98/Toyo-v0.3.5-demo

Trainer battles basic
MoAzza98 · Dec 4, 2023 · ecdfe44 · ecdfe44
2 parents 38a9a08 + 9460566
commit ecdfe44
Show file tree

Hide file tree

Showing 124 changed files with 323,016 additions and 180,249 deletions.
diff --git a/ToyoWorld/Assets/Christmas_Log_Village/DemoScene/Christmas_Log_Village_Interior.unity b/ToyoWorld/Assets/Christmas_Log_Village/DemoScene/Christmas_Log_Village_Interior.unity
diff --git a/...rld/Assets/Christmas_Log_Village/DemoScene/DoorLogic/Script/Door_SceneChange_Christmas.cs b/...rld/Assets/Christmas_Log_Village/DemoScene/DoorLogic/Script/Door_SceneChange_Christmas.cs
@@ -41,7 +41,7 @@ public void OnTriggerEnter(Collider Col){
 					gameManager.HouseTypeTarget =this.gameObject.GetComponent<Door_SceneChange_Christmas>().HouseType;
 				}
 			}
-			StartCoroutine(PlayOneShot());
+			//StartCoroutine(PlayOneShot());
 		}
 	}
 
@@ -50,7 +50,7 @@ public void OnTriggerEnter(Collider Col){
 	public IEnumerator PlayOneShot ()
 	{
 		yield return new WaitForSeconds(1);
-		Application.LoadLevel(level_id);
+		SceneManager.LoadScene(level_id);
 	}