From 1eab2072015895d6b1c1e15141310baaf7c19193 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Wed, 28 Apr 2021 19:25:30 +0100 Subject: [PATCH] wip --- game/Assets/Prefabs/Teleporter.prefab | 115 +++++++++++++++++++++++- game/Assets/Scenes/Teleport.unity | 44 +++++++-- game/Assets/Scripts/Traps/Teleporter.cs | 2 +- 3 files changed, 152 insertions(+), 9 deletions(-) diff --git a/game/Assets/Prefabs/Teleporter.prefab b/game/Assets/Prefabs/Teleporter.prefab index c9b5552..0843e12 100644 --- a/game/Assets/Prefabs/Teleporter.prefab +++ b/game/Assets/Prefabs/Teleporter.prefab @@ -1,5 +1,115 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4601491045995653740 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3356516348541898668} + - component: {fileID: 4334263519663086871} + - component: {fileID: 505163306643718394} + - component: {fileID: 6452352337385269504} + - component: {fileID: 6415469282782220505} + m_Layer: 0 + m_Name: Out + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3356516348541898668 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4601491045995653740} + 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: [] + m_Father: {fileID: 4916783602103456685} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4334263519663086871 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4601491045995653740} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &505163306643718394 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4601491045995653740} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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!65 &6452352337385269504 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4601491045995653740} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6415469282782220505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4601491045995653740} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b15bb066372add4681022c90a1e6859, type: 3} + m_Name: + m_EditorClassIdentifier: + _other: {fileID: 0} + _sender: 0 --- !u!1 &4916783602103456681 GameObject: m_ObjectHideFlags: 0 @@ -30,7 +140,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.07, y: -7.884474, z: 6.6539707} m_LocalScale: {x: 6, y: 1, z: 6} - m_Children: [] + m_Children: + - {fileID: 3356516348541898668} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -108,3 +219,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b15bb066372add4681022c90a1e6859, type: 3} m_Name: m_EditorClassIdentifier: + _other: {fileID: 0} + _sender: 0 diff --git a/game/Assets/Scenes/Teleport.unity b/game/Assets/Scenes/Teleport.unity index c950ce7..63424ce 100644 --- a/game/Assets/Scenes/Teleport.unity +++ b/game/Assets/Scenes/Teleport.unity @@ -132,11 +132,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.034657672 + value: 0.034657635 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0019043607 + value: 0.0019043589 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -164,15 +164,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.22933817 + value: 0.22933815 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.058453508 + value: 0.0584535 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.013799001 + value: -0.013798998 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -244,10 +244,40 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.396033 + value: 0.39603296 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} +--- !u!1 &372801871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 372801872} + m_Layer: 0 + m_Name: Teleporter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &372801872 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 372801871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.73985577, y: 2.9125066, z: 1.857008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &740670902 GameObject: m_ObjectHideFlags: 0 @@ -970,7 +1000,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1682726330 Transform: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scripts/Traps/Teleporter.cs b/game/Assets/Scripts/Traps/Teleporter.cs index cf4ec61..d989fd1 100644 --- a/game/Assets/Scripts/Traps/Teleporter.cs +++ b/game/Assets/Scripts/Traps/Teleporter.cs @@ -6,7 +6,7 @@ using UnityEngine; [RequireComponent(typeof(BoxCollider))] public class Teleporter : MonoBehaviour { - [SerializeField] private Teleporter _other; + [SerializeField] private public bool IsSender => _sender; [SerializeField] private bool _sender;