From e0f3c3e580e0f157cd14bcb92a911ff8cdc424f2 Mon Sep 17 00:00:00 2001 From: "LAPTOP-NFGSIHNQ\\shump" <16t2163k@gmail.com> Date: Mon, 4 Apr 2022 18:31:12 +0300 Subject: [PATCH] Fixed door interaction --- .../Scripts/Shumpei/TriggerDoorController.cs | 21 ++- Assets/Scenes/Shumpei/SampleScene.unity | 165 +++++++++++++++--- 2 files changed, 157 insertions(+), 29 deletions(-) diff --git a/Assets/Project Files/Scripts/Shumpei/TriggerDoorController.cs b/Assets/Project Files/Scripts/Shumpei/TriggerDoorController.cs index 11412268..4f6122ae 100644 --- a/Assets/Project Files/Scripts/Shumpei/TriggerDoorController.cs +++ b/Assets/Project Files/Scripts/Shumpei/TriggerDoorController.cs @@ -6,8 +6,8 @@ public class TriggerDoorController : MonoBehaviour { [SerializeField] private Animator myDoor = null; - [SerializeField] private bool openTrigger = false; - [SerializeField] private bool closeTrigger = false; + [SerializeField] private bool Trigger = false; + //[SerializeField] private bool closeTrigger = false; [SerializeField] private string doorOpen = "DoorOpen"; [SerializeField] private string doorClose = "DoorClose"; @@ -19,17 +19,26 @@ public class TriggerDoorController : MonoBehaviour if (other.CompareTag("Player")) { Debug.Log("col"); - if (openTrigger) + if (Trigger) { Debug.Log("open"); myDoor.Play(doorOpen, 0, 0.0f); - gameObject.SetActive(false); } - else if (closeTrigger) + /*else if (closeTrigger) + { + myDoor.Play(doorClose, 0, 0.0f); + }*/ + } + } + + public void OnTriggerExit(Collider other) + { + if (other.CompareTag("Player")) + { + if (Trigger) { myDoor.Play(doorClose, 0, 0.0f); - gameObject.SetActive(false); } } } diff --git a/Assets/Scenes/Shumpei/SampleScene.unity b/Assets/Scenes/Shumpei/SampleScene.unity index c65ac6a5..91c63b1b 100644 --- a/Assets/Scenes/Shumpei/SampleScene.unity +++ b/Assets/Scenes/Shumpei/SampleScene.unity @@ -144,7 +144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &177104309 MonoBehaviour: m_ObjectHideFlags: 0 @@ -158,8 +158,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: myDoor: {fileID: 965267758} - openTrigger: 0 - closeTrigger: 1 + Trigger: 0 doorOpen: DoorOpen doorClose: DoorClose --- !u!65 &177104310 @@ -2327,6 +2326,121 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1095491857} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1267549690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1267549695} + - component: {fileID: 1267549694} + - component: {fileID: 1267549693} + - component: {fileID: 1267549692} + - component: {fileID: 1267549691} + m_Layer: 0 + m_Name: TriggerArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1267549691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267549690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47a5e670191c5504b9c5b97a17d4678f, type: 3} + m_Name: + m_EditorClassIdentifier: + myDoor: {fileID: 965267758} + Trigger: 1 + doorOpen: DoorOpen + doorClose: DoorClose +--- !u!136 &1267549692 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267549690} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5000001 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!23 &1267549693 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267549690} + m_Enabled: 0 + 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 &1267549694 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267549690} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1267549695 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267549690} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.11000013, y: 0.5, z: 0} + m_LocalScale: {x: 10, y: 0.5, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1670983100} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1319628112 GameObject: m_ObjectHideFlags: 0 @@ -2480,7 +2594,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1425787479 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2494,8 +2608,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: myDoor: {fileID: 965267758} - openTrigger: 1 - closeTrigger: 0 + Trigger: 0 doorOpen: DoorOpen doorClose: DoorClose --- !u!65 &1425787480 @@ -2568,14 +2681,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1425787478} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.0026874666, y: 0.0010753783, z: -0.0002913369, w: 0.99999577} m_LocalPosition: {x: 5.1598744, y: 0.5, z: 2.82} m_LocalScale: {x: 3.1486, y: 0.84891, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0.308, y: 0.123, z: -0.033} --- !u!1 &1438037894 GameObject: m_ObjectHideFlags: 0 @@ -2849,8 +2962,8 @@ GameObject: - component: {fileID: 1613503999} - component: {fileID: 1613503998} - component: {fileID: 1613503997} - - component: {fileID: 1613503996} - component: {fileID: 1613504001} + - component: {fileID: 1613504002} m_Layer: 0 m_Name: Plane (2) m_TagString: Untagged @@ -2879,20 +2992,6 @@ RectTransform: m_AnchoredPosition: {x: -170, y: 93} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1613503996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1613503993} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a16108a6f7081d14f9f5a046ac04b8c2, type: 3} - m_Name: - m_EditorClassIdentifier: - enterColor: {r: 1, g: 0.032075405, b: 0.032075405, a: 1} - exitColor: {r: 1, g: 1, b: 1, a: 1} --- !u!54 &1613503997 Rigidbody: m_ObjectHideFlags: 0 @@ -2986,6 +3085,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LocomotionSystem: {fileID: 1651537451} +--- !u!114 &1613504002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613503993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae634ea4fe8cb874487372a3d7c595bf, type: 3} + m_Name: + m_EditorClassIdentifier: + enterColor: {r: 1, g: 0, b: 0, a: 1} + exitColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &1651537451 GameObject: m_ObjectHideFlags: 0 @@ -3195,6 +3308,12 @@ MonoBehaviour: ForwardDirection: {fileID: 1319628112} Player: {fileID: 1578543174} Speed: 100 +--- !u!4 &1670983100 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1346911494, guid: 81b76af0503adc246b3bbb53da35a6e7, + type: 3} + m_PrefabInstance: {fileID: 966686443} + m_PrefabAsset: {fileID: 0} --- !u!1 &1694204682 GameObject: m_ObjectHideFlags: 0