From 43e756be25f6944ce6cb4a563e5599eae2ba5557 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 21 Feb 2022 16:28:21 -0600 Subject: [PATCH] Added Walls and Triggers for Wallso The walls update tm --- Assets/Scene 1 Assets/PlayerMovement.cs | 10 + Assets/Scene 1 Assets/Scripts.meta | 8 + Assets/Scene 1 Assets/Scripts/WallTrigger.cs | 52 ++++ .../Scripts/WallTrigger.cs.meta | 11 + Assets/Scenes/Scene1.unity | 290 +++++++++++++++--- ProjectSettings/TagManager.asset | 2 +- UserSettings/EditorUserSettings.asset | 6 +- 7 files changed, 339 insertions(+), 40 deletions(-) create mode 100644 Assets/Scene 1 Assets/Scripts.meta create mode 100644 Assets/Scene 1 Assets/Scripts/WallTrigger.cs create mode 100644 Assets/Scene 1 Assets/Scripts/WallTrigger.cs.meta diff --git a/Assets/Scene 1 Assets/PlayerMovement.cs b/Assets/Scene 1 Assets/PlayerMovement.cs index 1189d7d..dfd5c16 100644 --- a/Assets/Scene 1 Assets/PlayerMovement.cs +++ b/Assets/Scene 1 Assets/PlayerMovement.cs @@ -32,4 +32,14 @@ public class PlayerMovement : MonoBehaviour controller.Move(horizontalMove *Time.fixedDeltaTime, crouch, jump); jump = false; } + + + public void ChangePos(double x, double y) + { + transform.position = new Vector2(); + } + /*void OnTriggerEnter2D(Collider2D col) + { + Debug.Log("Trigger Detected!"); + }*/ } diff --git a/Assets/Scene 1 Assets/Scripts.meta b/Assets/Scene 1 Assets/Scripts.meta new file mode 100644 index 0000000..284ac4a --- /dev/null +++ b/Assets/Scene 1 Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e8d962f546e27c4f9ecbed3f4ab3daf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scene 1 Assets/Scripts/WallTrigger.cs b/Assets/Scene 1 Assets/Scripts/WallTrigger.cs new file mode 100644 index 0000000..2ee4b84 --- /dev/null +++ b/Assets/Scene 1 Assets/Scripts/WallTrigger.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WallTrigger : MonoBehaviour +{ + bool entered = false; + public GameObject cam; + public GameObject cat; + private int counter = 0; + private Vector3 moveCam = new Vector3(20,0,0); + private Vector3 moveCat = new Vector3(4,0,0); + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (entered && counter >=150) + { + cam.transform.position -= moveCam; + cat.transform.position -= moveCat; + entered = false; + } + else + { + counter++; + } + } + + void OnTriggerEnter2D(Collider2D col) + { + if (!entered) + { + entered = true; + + Debug.Log("Trigger detected"); + cam.transform.position += moveCam; + cat.transform.position += moveCat; + Debug.Log(counter); + counter = 0; + //PlayerMovement.ChangePos(1, 2); + } + } + + /*void Interact(Collider2D col, ){ + * + }*/ +} diff --git a/Assets/Scene 1 Assets/Scripts/WallTrigger.cs.meta b/Assets/Scene 1 Assets/Scripts/WallTrigger.cs.meta new file mode 100644 index 0000000..3c1a124 --- /dev/null +++ b/Assets/Scene 1 Assets/Scripts/WallTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e34ddf7efd0cb44ba69abc06b6567d4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Scene1.unity b/Assets/Scenes/Scene1.unity index 2c00a58..a42d8dd 100644 --- a/Assets/Scenes/Scene1.unity +++ b/Assets/Scenes/Scene1.unity @@ -179,7 +179,7 @@ MonoBehaviour: m_AirControl: 1 m_WhatIsGround: serializedVersion: 2 - m_Bits: 55 + m_Bits: 119 m_GroundCheck: {fileID: 1910266859} m_CeilingCheck: {fileID: 1142945770} m_CrouchDisableCollider: {fileID: 187176292} @@ -199,7 +199,7 @@ CircleCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.41, y: -0.83} @@ -266,6 +266,37 @@ MonoBehaviour: m_EditorClassIdentifier: controller: {fileID: 187176290} runSpeed: 40 +--- !u!1 &469248023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 469248024} + m_Layer: 0 + m_Name: Platform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &469248024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 469248023} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 900854139} + m_Father: {fileID: 1510530933} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -342,13 +373,70 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &900854138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 900854139} + - component: {fileID: 900854140} + m_Layer: 0 + m_Name: Platform_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &900854139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 900854138} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 469248024} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &900854140 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 900854138} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &978064013 GameObject: m_ObjectHideFlags: 0 @@ -358,7 +446,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 978064014} - - component: {fileID: 978064015} - component: {fileID: 978064016} m_Layer: 0 m_Name: Wall Boundaries @@ -375,38 +462,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 978064013} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -18.35, y: -2.79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1510530933} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &978064015 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 978064013} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -9, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 2, y: 12} - m_EdgeRadius: 0 --- !u!61 &978064016 BoxCollider2D: m_ObjectHideFlags: 0 @@ -420,7 +481,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 9, y: 0} + m_Offset: {x: 9, y: 3} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -463,6 +524,88 @@ Transform: m_Father: {fileID: 187176289} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1143466186 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1143466187} + - component: {fileID: 1143466188} + m_Layer: 0 + m_Name: Background Duplicate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1143466187 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143466186} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 21.69, y: -0.1, z: 0} + m_LocalScale: {x: 1.8342799, y: 1.8342799, z: 1.8342799} + m_Children: [] + m_Father: {fileID: 1510530933} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1143466188 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143466186} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0fec1a3f5ca37f84d93b1657c5f66fee, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12, y: 6.3} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1457467879 GameObject: m_ObjectHideFlags: 0 @@ -575,6 +718,9 @@ Transform: - {fileID: 1457467880} - {fileID: 2007236407} - {fileID: 978064014} + - {fileID: 1143466187} + - {fileID: 1743185232} + - {fileID: 469248024} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -691,6 +837,78 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1743185231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1743185232} + - component: {fileID: 1743185234} + - component: {fileID: 1743185233} + m_Layer: 7 + m_Name: trigger point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1743185232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1743185231} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 11.74, y: 0.64, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1510530933} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1743185233 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1743185231} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 10} + m_EdgeRadius: 0 +--- !u!114 &1743185234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1743185231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e34ddf7efd0cb44ba69abc06b6567d4, type: 3} + m_Name: + m_EditorClassIdentifier: + cam: {fileID: 519420028} + cat: {fileID: 1684111836} --- !u!1 &1910266858 GameObject: m_ObjectHideFlags: 0 @@ -715,7 +933,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1910266858} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.86, z: 0} + m_LocalPosition: {x: 0.74, y: -1.94, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 187176289} @@ -731,7 +949,7 @@ GameObject: m_Component: - component: {fileID: 2007236407} - component: {fileID: 2007236408} - m_Layer: 0 + m_Layer: 6 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -746,7 +964,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2007236406} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.39, y: -4.64, z: 0} + m_LocalPosition: {x: -0.39, y: -3.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1510530933} @@ -776,5 +994,5 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 22.02, y: 1} + m_Size: {x: 60, y: 1} m_EdgeRadius: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 05da982..4ee3d1f 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,7 +12,7 @@ TagManager: - Water - UI - Background - - + - Interactables - - - diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4cedf1c..cb4a355 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,13 +9,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 + value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 flags: 0 vcSharedLogLevel: value: 0d5e400f0650