diff --git a/Assets/AssetsFORELLE/AnimationBeta2604 1.scenetemplate b/Assets/AssetsFORELLE/AnimationBeta2604 1.scenetemplate index 692727f..9828965 100644 --- a/Assets/AssetsFORELLE/AnimationBeta2604 1.scenetemplate +++ b/Assets/AssetsFORELLE/AnimationBeta2604 1.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 3a7e66d5a44a93a4c92b1ec5adbbbab9, type: 3} instantiationMode: 0 - dependency: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} diff --git a/Assets/AssetsFORELLE/AnimationBeta2604.scenetemplate b/Assets/AssetsFORELLE/AnimationBeta2604.scenetemplate index eb005ea..5ebf58a 100644 --- a/Assets/AssetsFORELLE/AnimationBeta2604.scenetemplate +++ b/Assets/AssetsFORELLE/AnimationBeta2604.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 3a7e66d5a44a93a4c92b1ec5adbbbab9, type: 3} instantiationMode: 0 - dependency: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} diff --git a/Assets/AssetsFORELLE/Script/ChangeScene.cs b/Assets/AssetsFORELLE/Script/ChangeScene.cs index d007f92..af7cd7b 100644 --- a/Assets/AssetsFORELLE/Script/ChangeScene.cs +++ b/Assets/AssetsFORELLE/Script/ChangeScene.cs @@ -6,6 +6,8 @@ using UnityEngine.SceneManagement; public class ChangeScene : MonoBehaviour { + public string SceneName; + public Scene changeTo; // Start is called before the first frame update void Start() @@ -19,11 +21,11 @@ public class ChangeScene : MonoBehaviour } - private void OnCollisionEnter2D(Collision2D other) + private void OnTriggerEnter2D(Collider2D other) { - if (other.gameObject.CompareTag("SceneChanger")) + if (other.gameObject.CompareTag("Player")) { - SceneManager.LoadScene(other.gameObject.name); + SceneManager.LoadScene(SceneName); } } } diff --git a/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate b/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate index e2624a7..96773a6 100644 --- a/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate +++ b/Assets/Scenes/2023-05-04 Pressure Plates.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 0ccc508108fa6ed4fa11b4a467d7f609, type: 3} instantiationMode: 0 - dependency: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} @@ -43,6 +45,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 311925a002f4447b3a28927169b83ea6, type: 3} instantiationMode: 0 + - dependency: {fileID: 7400000, guid: 0d8a15d729d2fbb4cbbabb7eb120825e, type: 2} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: f0562aa725f59684cbbf4dac90ab7aae, type: 3} diff --git a/Assets/Scenes/AnimationBeta2-2704.scenetemplate b/Assets/Scenes/AnimationBeta2-2704.scenetemplate index 45a128b..a05ce16 100644 --- a/Assets/Scenes/AnimationBeta2-2704.scenetemplate +++ b/Assets/Scenes/AnimationBeta2-2704.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 0ccc508108fa6ed4fa11b4a467d7f609, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 3a7e66d5a44a93a4c92b1ec5adbbbab9, type: 3} @@ -35,10 +37,12 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} instantiationMode: 0 - - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + - dependency: {fileID: 7400000, guid: 0d8a15d729d2fbb4cbbabb7eb120825e, type: 2} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: f0562aa725f59684cbbf4dac90ab7aae, type: 3} diff --git a/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate b/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate index f08e0ff..6ed1dd3 100644 --- a/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate +++ b/Assets/Scenes/AnimationBeta2-2704Even.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 0ccc508108fa6ed4fa11b4a467d7f609, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 3a7e66d5a44a93a4c92b1ec5adbbbab9, type: 3} @@ -35,10 +37,12 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} instantiationMode: 0 - - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + - dependency: {fileID: 7400000, guid: 0d8a15d729d2fbb4cbbabb7eb120825e, type: 2} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: f0562aa725f59684cbbf4dac90ab7aae, type: 3} diff --git a/Assets/Scenes/BoxMovable.scenetemplate b/Assets/Scenes/BoxMovable.scenetemplate index 6888c41..7d3d1f0 100644 --- a/Assets/Scenes/BoxMovable.scenetemplate +++ b/Assets/Scenes/BoxMovable.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 0ccc508108fa6ed4fa11b4a467d7f609, type: 3} instantiationMode: 0 - dependency: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} @@ -37,10 +39,12 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} instantiationMode: 0 - - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + - dependency: {fileID: 7400000, guid: 0d8a15d729d2fbb4cbbabb7eb120825e, type: 2} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: f0562aa725f59684cbbf4dac90ab7aae, type: 3} diff --git a/Assets/Scenes/ButtonTypes.scenetemplate b/Assets/Scenes/ButtonTypes.scenetemplate index 81e224e..94d2c3a 100644 --- a/Assets/Scenes/ButtonTypes.scenetemplate +++ b/Assets/Scenes/ButtonTypes.scenetemplate @@ -17,6 +17,8 @@ MonoBehaviour: description: preview: {fileID: 0} dependencies: + - dependency: {fileID: 2800000, guid: 1455a3c98fe793a4782adb5e07c09200, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 309b1d5a294fd6c43ae9cf77656c1852, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 0ccc508108fa6ed4fa11b4a467d7f609, type: 3} @@ -39,10 +41,12 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: d393166e35af62140af2d003436dba4f, type: 3} instantiationMode: 0 - - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + - dependency: {fileID: 7400000, guid: 0d8a15d729d2fbb4cbbabb7eb120825e, type: 2} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 748ae8b33df036b46a86e0387f1602cf, type: 3} instantiationMode: 0 + - dependency: {fileID: 2800000, guid: 194aedcc234be71428a25e32d62ccd9d, type: 3} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 311925a002f4447b3a28927169b83ea6, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: bc1e36585ebd79d4db8ca18c1637587d, type: 3} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ab07a48..bcf464e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1425,10 +1425,9 @@ GameObject: - component: {fileID: 792973170} - component: {fileID: 792973171} - component: {fileID: 792973172} - - component: {fileID: 792973173} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1579,20 +1578,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5c8672c5b58eae84da6091aa48615de7, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &792973173 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 792973161} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: deb75ec73a5f4ec2b6cd07709279ceba, type: 3} - m_Name: - m_EditorClassIdentifier: - changeTo: - m_Handle: 0 --- !u!4 &921148901 stripped Transform: m_CorrespondingSourceObject: {fileID: 1690754592808301329, guid: b689b743b78fab64ba927428b8f042ac, type: 3} @@ -2036,9 +2021,10 @@ GameObject: - component: {fileID: 1949346886} - component: {fileID: 1949346888} - component: {fileID: 1949346889} + - component: {fileID: 1949346890} m_Layer: 0 - m_Name: Prototype - m_TagString: SceneChanger + m_Name: ChangeScene Prototype + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -2136,6 +2122,21 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &1949346890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949346885} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deb75ec73a5f4ec2b6cd07709279ceba, type: 3} + m_Name: + m_EditorClassIdentifier: + SceneName: Prototype + changeTo: + m_Handle: 0 --- !u!1 &2021624529 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8a7b9e9..e74d4f0 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - Item - Openable - SceneChanger + - DimShiftBlocker layers: - Default - TransparentFX