diff --git a/Assets/1OurScripts/BoundAirScript.cs b/Assets/1OurScripts/BoundAirScript.cs new file mode 100644 index 0000000..0bc9796 --- /dev/null +++ b/Assets/1OurScripts/BoundAirScript.cs @@ -0,0 +1,123 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BoundAirScript : MonoBehaviour +{ + public ParticleSystem masterEmitter; // Assign in the inspector + public ParticleSystem slaveEmitter; // Assign in the inspector + + + public GameObject moreSpirals; + private float defaultLifetime = 0.5f; // Default start lifetime, adjust as needed + public float fasterLifetime = 2.0f; // Example faster lifetime, adjust as needed + public bool isWindActive = false; + private bool canActivateAir = false; + + public GameObject TestAir; + public AudioSource audioSource; + public AudioClip narrationClip; + + // Start is called before the first frame update + void Start() + { + defaultLifetime = masterEmitter.main.startLifetime.constant; + + } + + + + //Use Yield return to like not make it start instantly???? + public void OnTriggerEnter(Collider other) + { + if (other.CompareTag("BoundHMD")) // + { + Debug.Log("Entered Earth"); + TestAir.SetActive(true); + + //Play narration and remove other temp + StartCoroutine(NarrationAndSignalCoroutine()); + canActivateAir = true; + } + } + + /*public void OnTriggerExit(Collider other) + { + if (other.CompareTag("BoundHMD")) // + { + + } + }*/ + + + IEnumerator NarrationAndSignalCoroutine() + { + audioSource.PlayOneShot(narrationClip); + yield return new WaitForSeconds(narrationClip.length); + + } + + + + + + + //Air effects + public void AdjustParticleSpeed() + { + if (!isWindActive && canActivateAir) + { + var masterMain = masterEmitter.main; + masterMain.startLifetime = fasterLifetime; // Adjust master emitter lifetime + + var slaveMain = slaveEmitter.main; + slaveMain.duration = fasterLifetime; // Adjust slave emitter duration to match + + // Restart the particle systems to apply the changes immediately + masterEmitter.Stop(); + masterEmitter.Play(); + + slaveEmitter.Stop(); + slaveEmitter.Play(); + + moreSpirals.SetActive(true); + + isWindActive = true; + + StartCoroutine(ResetParticleSpeed(5.0f)); // Assuming gesture lasts for * seconds + } + + } + + IEnumerator ResetParticleSpeed(float delay) + { + yield return new WaitForSeconds(delay); + + // Reset particle system speed to default + + AdjustParticleSpeedReset(); + } + + public void AdjustParticleSpeedReset() + { + var masterMain = masterEmitter.main; + masterMain.startLifetime = defaultLifetime; // Adjust master emitter lifetime + + var slaveMain = slaveEmitter.main; + slaveMain.duration = defaultLifetime; // Adjust slave emitter duration to match + + // Restart the particle systems to apply the changes immediately + masterEmitter.Stop(); + masterEmitter.Play(); + + slaveEmitter.Stop(); + slaveEmitter.Play(); + + moreSpirals.SetActive(false); + + isWindActive = false; + canActivateAir = false; + + } + +} diff --git a/Assets/1OurScripts/BoundAirScript.cs.meta b/Assets/1OurScripts/BoundAirScript.cs.meta new file mode 100644 index 0000000..2402a75 --- /dev/null +++ b/Assets/1OurScripts/BoundAirScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 08326b74dc55e449f9db5b90e65d5cb9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1OurScripts/BoundEarthScript.cs b/Assets/1OurScripts/BoundEarthScript.cs new file mode 100644 index 0000000..a20d085 --- /dev/null +++ b/Assets/1OurScripts/BoundEarthScript.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BoundEarthScript : MonoBehaviour +{ + + public GameObject TestEarth; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + //Use Yield return to like not make it start instantly???? + public void OnTriggerEnter(Collider other) + { + if (other.CompareTag("BoundHMD")) // + { + Debug.Log("Entered Earth"); + TestEarth.SetActive(true); + //Play narration and remove other temp + } + } + +} diff --git a/Assets/1OurScripts/BoundEarthScript.cs.meta b/Assets/1OurScripts/BoundEarthScript.cs.meta new file mode 100644 index 0000000..97bf668 --- /dev/null +++ b/Assets/1OurScripts/BoundEarthScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc0e3798309a94a59a7f394d52b61915 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1OurScripts/BoundFireScript.cs b/Assets/1OurScripts/BoundFireScript.cs new file mode 100644 index 0000000..f01d547 --- /dev/null +++ b/Assets/1OurScripts/BoundFireScript.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BoundFireScript : MonoBehaviour +{ + + public GameObject TestFire; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + //Use Yield return to like not make it start instantly???? + public void OnTriggerEnter(Collider other) + { + if (other.CompareTag("BoundHMD")) // + { + Debug.Log("Entered Fire"); + TestFire.SetActive(true); + //Play narration and remove other temp + } + } + +} diff --git a/Assets/1OurScripts/BoundFireScript.cs.meta b/Assets/1OurScripts/BoundFireScript.cs.meta new file mode 100644 index 0000000..92ccb0a --- /dev/null +++ b/Assets/1OurScripts/BoundFireScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: afeef29dbc53a4764a5da22a5577a58f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1OurScripts/BoundWaterScript.cs b/Assets/1OurScripts/BoundWaterScript.cs new file mode 100644 index 0000000..ba1dd6e --- /dev/null +++ b/Assets/1OurScripts/BoundWaterScript.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BoundWaterScript : MonoBehaviour +{ + + public GameObject TestWater; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + //Use Yield return to like not make it start instantly???? + public void OnTriggerEnter(Collider other) + { + if (other.CompareTag("BoundHMD")) // + { + Debug.Log("Entered Water"); + TestWater.SetActive(true); + //Play narration and remove other temp + } + + } + +} diff --git a/Assets/1OurScripts/BoundWaterScript.cs.meta b/Assets/1OurScripts/BoundWaterScript.cs.meta new file mode 100644 index 0000000..f5392ca --- /dev/null +++ b/Assets/1OurScripts/BoundWaterScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a08ac8c45c8c34d2892774a34ab9fef6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1OurScripts/ConnectUnityWithSensors.cs b/Assets/1OurScripts/ConnectUnityWithSensors.cs index 5df6252..9298847 100644 --- a/Assets/1OurScripts/ConnectUnityWithSensors.cs +++ b/Assets/1OurScripts/ConnectUnityWithSensors.cs @@ -20,7 +20,7 @@ public class ConnectUnityWithSensors : MonoBehaviour void Start() { ConnectWithESP32(); - //StartCoroutine(NarrationAndSignalCoroutine()); + } public void ConnectWithESP32() @@ -47,15 +47,7 @@ public class ConnectUnityWithSensors : MonoBehaviour Debug.Log("Websocket state - " + ws.ReadyState); } - /*IEnumerator NarrationAndSignalCoroutine() - { - audioSource.PlayOneShot(narrationClip); - yield return new WaitForSeconds(narrationClip.length); - if (ws.IsAlive) - { - ws.Send("Need Force"); - } - }*/ + void Update() { diff --git a/Assets/1OurScripts/GameManagerScript.cs b/Assets/1OurScripts/GameManagerScript.cs new file mode 100644 index 0000000..1e517d2 --- /dev/null +++ b/Assets/1OurScripts/GameManagerScript.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameManagerScript : MonoBehaviour +{ + public GameObject TestFire; + public GameObject TestAir; + public GameObject TestEarth; + public GameObject TestWater; + + // Start is called before the first frame update + void Start() + { + Debug.Log("Hello World"); + } + + // Update is called once per frame + void Update() + { + + } + + //Use Yield return to like not make it start instantly???? + public void OnTriggerEnter(Collider other) + { + if (other.CompareTag("BoundEarth")) // + { + Debug.Log("Entered Earth"); + TestEarth.SetActive(true); + //Play narration and remove other temp + } + else if (other.CompareTag("BoundWater")) + { + Debug.Log("Entered Water"); + TestWater.SetActive(true); + //Play narration and remove ot + } + else if (other.CompareTag("BoundFire")) + { + Debug.Log("Entered Fire"); + TestFire.SetActive(true); + //Play narration and remove otehr temp + } + else if (other.CompareTag("BoundAir")) + { + Debug.Log("Entered Air"); + TestAir.SetActive(true); + //Play narration and remove otehr temp + } + } +} diff --git a/Assets/1OurScripts/GameManagerScript.cs.meta b/Assets/1OurScripts/GameManagerScript.cs.meta new file mode 100644 index 0000000..baa35bc --- /dev/null +++ b/Assets/1OurScripts/GameManagerScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a4f7787c3dc6a48fc926b4089740e305 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 1b7e613..56e8ad9 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.1822677, g: 0.2279737, b: 0.3073407, a: 1} + m_IndirectSpecularColor: {r: 0.18226734, g: 0.22797284, b: 0.3073396, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1456,6 +1456,104 @@ Transform: type: 3} m_PrefabInstance: {fileID: 144520200} m_PrefabAsset: {fileID: 0} +--- !u!1 &171465759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 171465760} + - component: {fileID: 171465763} + - component: {fileID: 171465762} + - component: {fileID: 171465761} + m_Layer: 0 + m_Name: BoundriesHMD + m_TagString: BoundHMD + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &171465760 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171465759} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.1, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1043933591} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &171465761 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171465759} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &171465762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171465759} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4f7787c3dc6a48fc926b4089740e305, type: 3} + m_Name: + m_EditorClassIdentifier: + TestFire: {fileID: 586309512} + TestAir: {fileID: 1458529866} + TestEarth: {fileID: 1019338306} + TestWater: {fileID: 707071907} +--- !u!65 &171465763 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171465759} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &173036998 PrefabInstance: m_ObjectHideFlags: 0 @@ -1751,6 +1849,56 @@ Transform: type: 3} m_PrefabInstance: {fileID: 188348271} m_PrefabAsset: {fileID: 0} +--- !u!1 &189380543 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100006, guid: 126d619cf4daa52469682f85c1378b4a, + type: 3} + m_PrefabInstance: {fileID: 1903699833} + m_PrefabAsset: {fileID: 0} +--- !u!114 &189380546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189380543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 --- !u!1001 &196412783 PrefabInstance: m_ObjectHideFlags: 0 @@ -4692,7 +4840,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 433101001} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 58b38b40da00849fbad8dfe983cc19d6, type: 3} m_Name: @@ -7014,7 +7162,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3} propertyPath: m_LocalPosition.x - value: -4.85 + value: -5.02 objectReference: {fileID: 0} - target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3} propertyPath: m_LocalPosition.y @@ -7022,7 +7170,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3} propertyPath: m_LocalPosition.z - value: 4.2 + value: 4.82 objectReference: {fileID: 0} - target: {fileID: 4437828550375150, guid: 01e6eda157781cd4cb6577afa06cd694, type: 3} propertyPath: m_LocalRotation.w @@ -7165,9 +7313,12 @@ GameObject: m_Component: - component: {fileID: 579970256} - component: {fileID: 579970257} + - component: {fileID: 579970258} + - component: {fileID: 579970259} + - component: {fileID: 579970260} m_Layer: 0 m_Name: BoundriesAir - m_TagString: Untagged + m_TagString: BoundAir m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -7202,12 +7353,155 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 3.7841072, y: 4.1946783, z: 4.7852945} - m_Center: {x: 0.26700783, y: -1.65883, z: -0.8878751} + m_Size: {x: 3.7841072, y: 4.1946783, z: 3.9059215} + m_Center: {x: 0.26700783, y: -1.6588302, z: -1.3275616} +--- !u!54 &579970258 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579970255} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &579970259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579970255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08326b74dc55e449f9db5b90e65d5cb9, type: 3} + m_Name: + m_EditorClassIdentifier: + masterEmitter: {fileID: 1801039557} + slaveEmitter: {fileID: 1801039556} + moreSpirals: {fileID: 1505324148} + fasterLifetime: 2 + isWindActive: 0 + TestAir: {fileID: 1458529866} + audioSource: {fileID: 579970260} + narrationClip: {fileID: 0} +--- !u!82 &579970260 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579970255} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &580290181 PrefabInstance: m_ObjectHideFlags: 0 @@ -7317,6 +7611,111 @@ Transform: - {fileID: 1282274189} m_Father: {fileID: 1228021353} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &586309512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 586309516} + - component: {fileID: 586309515} + - component: {fileID: 586309514} + - component: {fileID: 586309513} + m_Layer: 0 + m_Name: Fire + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &586309513 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586309512} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &586309514 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586309512} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &586309515 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586309512} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &586309516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586309512} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.6, y: 0.62, z: -2.16} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &595446642 PrefabInstance: m_ObjectHideFlags: 0 @@ -7904,9 +8303,11 @@ GameObject: m_Component: - component: {fileID: 634926186} - component: {fileID: 634926187} + - component: {fileID: 634926188} + - component: {fileID: 634926189} m_Layer: 0 m_Name: BoundriesFire - m_TagString: Untagged + m_TagString: BoundFire m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -7941,12 +8342,52 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 6.579611, y: 4.1946783, z: 6.3152065} - m_Center: {x: -1.130744, y: -1.6588302, z: -0.8253856} + m_Size: {x: 5.5507927, y: 4.1946783, z: 3.4677224} + m_Center: {x: -1.645153, y: -1.6588302, z: -0.65601563} +--- !u!54 &634926188 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634926185} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &634926189 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 634926185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afeef29dbc53a4764a5da22a5577a58f, type: 3} + m_Name: + m_EditorClassIdentifier: + TestFire: {fileID: 586309512} --- !u!1001 &636743900 PrefabInstance: m_ObjectHideFlags: 0 @@ -8227,6 +8668,111 @@ Transform: type: 3} m_PrefabInstance: {fileID: 693393391} m_PrefabAsset: {fileID: 0} +--- !u!1 &707071907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 707071911} + - component: {fileID: 707071910} + - component: {fileID: 707071909} + - component: {fileID: 707071908} + m_Layer: 0 + m_Name: Water + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &707071908 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707071907} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &707071909 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707071907} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &707071910 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707071907} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &707071911 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707071907} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.65, y: 0.62, z: 1.71} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &712240319 GameObject: m_ObjectHideFlags: 0 @@ -10881,6 +11427,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1535956261} + - {fileID: 1596973208} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &978370099 @@ -11454,6 +12001,111 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016249659} m_PrefabAsset: {fileID: 0} +--- !u!1 &1019338306 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1019338310} + - component: {fileID: 1019338309} + - component: {fileID: 1019338308} + - component: {fileID: 1019338307} + m_Layer: 0 + m_Name: Earth + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &1019338307 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019338306} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1019338308 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019338306} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1019338309 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019338306} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1019338310 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019338306} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.6, y: 0.62, z: 1.33} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1020134478 PrefabInstance: m_ObjectHideFlags: 0 @@ -11829,6 +12481,62 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1039127009} m_PrefabAsset: {fileID: 0} +--- !u!1 &1043933590 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 126d619cf4daa52469682f85c1378b4a, + type: 3} + m_PrefabInstance: {fileID: 1903699833} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1043933591 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 126d619cf4daa52469682f85c1378b4a, + type: 3} + m_PrefabInstance: {fileID: 1903699833} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1043933593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1043933590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 --- !u!1001 &1044319957 PrefabInstance: m_ObjectHideFlags: 0 @@ -13102,7 +13810,6 @@ Transform: m_Children: - {fileID: 1119211996} - {fileID: 1726060520} - - {fileID: 1596973208} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1119211995 @@ -16819,6 +17526,111 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1453859643} m_PrefabAsset: {fileID: 0} +--- !u!1 &1458529866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1458529870} + - component: {fileID: 1458529869} + - component: {fileID: 1458529868} + - component: {fileID: 1458529867} + m_Layer: 0 + m_Name: Air + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &1458529867 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458529866} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1458529868 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458529866} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1458529869 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458529866} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1458529870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1458529866} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.65, y: 0.62, z: -1.768} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1464229153 PrefabInstance: m_ObjectHideFlags: 0 @@ -18184,9 +18996,11 @@ GameObject: m_Component: - component: {fileID: 1596973208} - component: {fileID: 1596973209} + - component: {fileID: 1596973210} + - component: {fileID: 1596973211} m_Layer: 0 m_Name: BoundriesEarth - m_TagString: Untagged + m_TagString: BoundEarth m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -18200,11 +19014,11 @@ Transform: m_GameObject: {fileID: 1596973207} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.05, y: 0.3216927, z: -0.58} + m_LocalPosition: {x: 3.05, y: 0.3216927, z: -0.5799999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1117825302} + m_Father: {fileID: 977726988} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1596973209 BoxCollider: @@ -18221,12 +19035,52 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 4.218858, y: 4.1946783, z: 5.139434} - m_Center: {x: 0.04963243, y: -1.6588302, z: -1.0649447} + m_Size: {x: 3.5559282, y: 4.1946783, z: 4.4535546} + m_Center: {x: -0.28183222, y: -1.6588302, z: -0.7220056} +--- !u!54 &1596973210 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596973207} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1596973211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596973207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc0e3798309a94a59a7f394d52b61915, type: 3} + m_Name: + m_EditorClassIdentifier: + TestEarth: {fileID: 1019338306} --- !u!1001 &1601739639 PrefabInstance: m_ObjectHideFlags: 0 @@ -20143,9 +20997,11 @@ GameObject: m_Component: - component: {fileID: 1726060520} - component: {fileID: 1726060521} + - component: {fileID: 1726060522} + - component: {fileID: 1726060523} m_Layer: 0 m_Name: BoundriesWater - m_TagString: Untagged + m_TagString: BoundWater m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -20159,7 +21015,7 @@ Transform: m_GameObject: {fileID: 1726060519} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 6.93, y: 0.3216927, z: -0.58} + m_LocalPosition: {x: 6.93, y: 0.29, z: -0.58} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -20180,12 +21036,52 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 3.7841072, y: 4.1946783, z: 4.7852945} - m_Center: {x: 0.26700783, y: -1.65883, z: -0.8878751} + m_Size: {x: 2.7604768, y: 4.1946783, z: 4.7852945} + m_Center: {x: -0.24480736, y: -1.6588302, z: -0.8878751} +--- !u!54 &1726060522 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726060519} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1726060523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726060519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a08ac8c45c8c34d2892774a34ab9fef6, type: 3} + m_Name: + m_EditorClassIdentifier: + TestWater: {fileID: 707071907} --- !u!1001 &1741286464 PrefabInstance: m_ObjectHideFlags: 0 @@ -22308,6 +23204,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 380061765} + - targetCorrespondingSourceObject: {fileID: 400000, guid: 126d619cf4daa52469682f85c1378b4a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 171465760} - targetCorrespondingSourceObject: {fileID: 482130, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} insertIndex: -1 @@ -22324,7 +23224,15 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 476424588} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100006, guid: 126d619cf4daa52469682f85c1378b4a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 189380546} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 126d619cf4daa52469682f85c1378b4a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1043933593} m_SourcePrefab: {fileID: 100100000, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} --- !u!114 &1903699834 stripped MonoBehaviour: @@ -24130,3 +25038,7 @@ SceneRoots: - {fileID: 1117825302} - {fileID: 350103768} - {fileID: 979159585} + - {fileID: 1458529870} + - {fileID: 707071911} + - {fileID: 586309516} + - {fileID: 1019338310} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 9f0821f..adb2104 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,11 @@ TagManager: - Fire - GroundTag - CampFireTag + - BoundAir + - BoundFire + - BoundWater + - BoundEarth + - BoundHMD layers: - Default - TransparentFX diff --git a/asdfg_BurstDebugInformation_DoNotShip/tempburstlibs/arm64-v8a/lib_burst_generated.txt b/asdfg_BurstDebugInformation_DoNotShip/tempburstlibs/arm64-v8a/lib_burst_generated.txt index e5c63ea..84cc094 100644 --- a/asdfg_BurstDebugInformation_DoNotShip/tempburstlibs/arm64-v8a/lib_burst_generated.txt +++ b/asdfg_BurstDebugInformation_DoNotShip/tempburstlibs/arm64-v8a/lib_burst_generated.txt @@ -38,6 +38,7 @@ Library: /Users/nicklasbourelius/Unity Learn /NNMDETGroupProject/Temp/BurstOutpu --assembly-defines=Unity.XR.Management; --assembly-defines=Unity.XR.Oculus; --assembly-defines=UnityEngine; +--assembly-defines=websocket-sharp; --generate-link-xml=Temp/burst.link.xml --temp-folder=/Users/nicklasbourelius/Unity Learn /NNMDETGroupProject/Temp/Burst --key-folder=/Applications/Unity/Hub/Editor/2022.3.18f1/PlaybackEngines/AndroidPlayer @@ -85,6 +86,7 @@ Library: /Users/nicklasbourelius/Unity Learn /NNMDETGroupProject/Temp/BurstOutpu --assembly-defines=Unity.XR.Management; --assembly-defines=Unity.XR.Oculus; --assembly-defines=UnityEngine; +--assembly-defines=websocket-sharp; --generate-link-xml=Temp/burst.link.xml --temp-folder=/Users/nicklasbourelius/Unity Learn /NNMDETGroupProject/Temp/Burst --key-folder=/Applications/Unity/Hub/Editor/2022.3.18f1/PlaybackEngines/AndroidPlayer