diff --git a/Assets/Prefabs/VanishingCube.prefab b/Assets/Prefabs/VanishingCube.prefab index 0edfc7f..87980b7 100644 --- a/Assets/Prefabs/VanishingCube.prefab +++ b/Assets/Prefabs/VanishingCube.prefab @@ -112,3 +112,4 @@ MonoBehaviour: m_EditorClassIdentifier: timeToVanish: 2 timeToAppear: 1 + magnitude: 3 diff --git a/Assets/Scenes/Obstacles.unity b/Assets/Scenes/Obstacles.unity index 13c3c0d..8d24a8c 100644 --- a/Assets/Scenes/Obstacles.unity +++ b/Assets/Scenes/Obstacles.unity @@ -1402,118 +1402,12 @@ MonoBehaviour: duration: 1 knockback: 1 stunDir: {x: 1000, y: 1000} ---- !u!1 &1026411779 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1026411780} - - component: {fileID: 1026411783} - - component: {fileID: 1026411782} - - component: {fileID: 1026411781} - - component: {fileID: 1026411784} - m_Layer: 6 - m_Name: Cube - m_TagString: Vanishing - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1026411780 +--- !u!4 &1026411780 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + m_PrefabInstance: {fileID: 7967733336058495705} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026411779} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 20.08, y: 12.45, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 663828001} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1026411781 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026411779} - 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!23 &1026411782 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026411779} - 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 &1026411783 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026411779} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1026411784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1026411779} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9701f1b28a113754d906bf5b88f98178, type: 3} - m_Name: - m_EditorClassIdentifier: - timeToVanish: 2 - timeToAppear: 1 --- !u!1 &1070079036 GameObject: m_ObjectHideFlags: 0 @@ -1611,26 +1505,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070079036} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1094313414 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 507150368010421230, guid: 9723b3e4256aab94e99ca1c7527bb38d, - type: 3} - m_PrefabInstance: {fileID: 507150369097360936} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1094313422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094313414} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9701f1b28a113754d906bf5b88f98178, type: 3} - m_Name: - m_EditorClassIdentifier: - timeToVanish: 1 - timeToAppear: 2 --- !u!1 &1166806157 GameObject: m_ObjectHideFlags: 0 @@ -2684,11 +2558,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 663828001} m_Modifications: - - target: {fileID: 507150368010421230, guid: 9723b3e4256aab94e99ca1c7527bb38d, - type: 3} - propertyPath: m_TagString - value: Vanishing - objectReference: {fileID: 0} - target: {fileID: 507150368245936245, guid: 9723b3e4256aab94e99ca1c7527bb38d, type: 3} propertyPath: m_Name @@ -2894,3 +2763,77 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1558bd1d64999848ac885c752595324, type: 3} +--- !u!1001 &7967733336058495705 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 663828001} + m_Modifications: + - target: {fileID: 7967733336278028241, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: magnitude + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028250, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_Name + value: VanishingCube + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.12 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalPosition.y + value: 6.26 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967733336278028253, guid: bb451447e74142046902fe2a6e583147, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb451447e74142046902fe2a6e583147, type: 3} diff --git a/Assets/Scripts/Vanisher.cs b/Assets/Scripts/Vanisher.cs index 780ea5b..c126c0a 100644 --- a/Assets/Scripts/Vanisher.cs +++ b/Assets/Scripts/Vanisher.cs @@ -8,6 +8,8 @@ public class Vanisher : MonoBehaviour private float timeToVanish; [SerializeField] private float timeToAppear; + [SerializeField] + private float magnitude; private float timer = 0; private GrappleHook grapple; private bool isVanishing = false; @@ -21,8 +23,8 @@ public class Vanisher : MonoBehaviour timer += Time.deltaTime; if(isVanishing){//Shake float speed = timer / timeToVanish; - float x = Random.Range(-.5f, .5f) * speed * .01f; - float y = Random.Range(-.5f, .5f) * speed * .01f; + float x = Random.Range(-.5f, .5f) * speed * magnitude/100; + float y = Random.Range(-.5f, .5f) * speed * magnitude/100; transform.localPosition += new Vector3(x, y, originalPos.z); }