diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 1bdb792..4ef91e9 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -1436,13 +1436,6 @@ Transform: - {fileID: 241734411} - {fileID: 1532540192886921385} - {fileID: 1949077063} - - {fileID: 874637333} - - {fileID: 5113659104536846700} - - {fileID: 796526694} - - {fileID: 987689138} - - {fileID: 604728745} - - {fileID: 681930983} - - {fileID: 6067357455631746734} - {fileID: 1853180256} - {fileID: 538618498} - {fileID: 9336441} @@ -2026,7 +2019,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -2105,7 +2098,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 2835502344937141734, guid: 7a8b76a212391334ea8e3937df152874, type: 3} @@ -2397,7 +2390,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} @@ -2628,7 +2621,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 251845578051121456, guid: 62927df188f2d924abbd1345eb9d2cdf, type: 3} @@ -3216,7 +3209,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1340421038 Transform: m_ObjectHideFlags: 0 @@ -3229,6 +3222,13 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 874637333} + - {fileID: 5113659104536846700} + - {fileID: 796526694} + - {fileID: 987689138} + - {fileID: 604728745} + - {fileID: 681930983} + - {fileID: 6067357455631746734} - {fileID: 411421604} m_Father: {fileID: 0} m_RootOrder: 4 @@ -4205,7 +4205,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1851812988 Transform: m_ObjectHideFlags: 0 @@ -4819,7 +4819,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 8558524283348193081, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -4834,7 +4834,7 @@ PrefabInstance: - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} propertyPath: m_LocalPosition.x - value: 3 + value: 3.306 objectReference: {fileID: 0} - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -4844,7 +4844,7 @@ PrefabInstance: - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} propertyPath: m_LocalPosition.z - value: 0.75 + value: 0.78 objectReference: {fileID: 0} - target: {fileID: 8558524283348193085, guid: 47b21ad213905c342b92fc5b384878c4, type: 3} @@ -5271,13 +5271,18 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 872448883161704311, guid: 511d605163a2abf49a0f1f69be067561, type: 3} propertyPath: m_Name value: Button Emitter objectReference: {fileID: 0} + - target: {fileID: 1019683130525926234, guid: 511d605163a2abf49a0f1f69be067561, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.01 + objectReference: {fileID: 0} - target: {fileID: 5691171783781926815, guid: 511d605163a2abf49a0f1f69be067561, type: 3} propertyPath: m_RootOrder @@ -5350,7 +5355,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 411421604} + m_TransformParent: {fileID: 1340421038} m_Modifications: - target: {fileID: 463845462802249093, guid: b05b36186d7fa524aaec74a927b37b71, type: 3} diff --git a/Assets/Station46/Modules/Laser/Laser Button Emitter.prefab b/Assets/Station46/Modules/Laser/Laser Button Emitter.prefab index 534141f..89adeb4 100644 --- a/Assets/Station46/Modules/Laser/Laser Button Emitter.prefab +++ b/Assets/Station46/Modules/Laser/Laser Button Emitter.prefab @@ -21,17 +21,17 @@ PrefabInstance: - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.2882 objectReference: {fileID: 0} - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d, type: 3} propertyPath: m_LocalPosition.y - value: 0.25 + value: -0.0299 objectReference: {fileID: 0} - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.038 objectReference: {fileID: 0} - target: {fileID: 5662938544958052762, guid: 66e96758671198f4cbb877705317cb9d, type: 3} @@ -107,7 +107,7 @@ PrefabInstance: - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} propertyPath: m_RootOrder - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2835502344937141734, guid: 2013ed7eebc36b54e8fab3b09e08b6de, type: 3} diff --git a/Assets/Station46/Modules/Laser/Laser Emitter.prefab b/Assets/Station46/Modules/Laser/Laser Emitter.prefab index f0d8a7a..32aa05a 100644 --- a/Assets/Station46/Modules/Laser/Laser Emitter.prefab +++ b/Assets/Station46/Modules/Laser/Laser Emitter.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1568127473552123573 +--- !u!1 &362595194500590152 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4670783296661506346} - - component: {fileID: 6468653525613329624} - - component: {fileID: 4501746835798391577} - - component: {fileID: 3136224479957931608} + - component: {fileID: 5441085339793724718} + - component: {fileID: 1342748799802057757} + - component: {fileID: 1001779179735857324} + - component: {fileID: 7552326853916205793} m_Layer: 0 - m_Name: Cube + m_Name: Focus 3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4670783296661506346 +--- !u!4 &5441085339793724718 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568127473552123573} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.125, y: 0.25, z: 0.125} + m_GameObject: {fileID: 362595194500590152} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0.322803, y: 0.08545312, z: 0.0000005811453} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2161470782926054222} + m_Father: {fileID: 8886367670000349127} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6468653525613329624 +--- !u!33 &1342748799802057757 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568127473552123573} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &4501746835798391577 + m_GameObject: {fileID: 362595194500590152} + m_Mesh: {fileID: 6166858023568385291, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!23 &1001779179735857324 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568127473552123573} + m_GameObject: {fileID: 362595194500590152} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 3e334d6799a0d0040a41fe4794da90f5, type: 2} + - {fileID: 2100000, guid: 87b30a6b0282cd044b3a9ee02a86fc13, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -84,13 +84,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &3136224479957931608 -BoxCollider: +--- !u!64 &7552326853916205793 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568127473552123573} + m_GameObject: {fileID: 362595194500590152} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -102,9 +102,328 @@ BoxCollider: 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} + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4537195048234371842, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!1 &867973463372484192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7662063326369858826} + - component: {fileID: 2717001780467241847} + - component: {fileID: 5393397602646762478} + - component: {fileID: 7898104456201878345} + m_Layer: 0 + m_Name: Focus 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7662063326369858826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867973463372484192} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0.14280297, y: 0.08545312, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8886367670000349127} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2717001780467241847 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867973463372484192} + m_Mesh: {fileID: 6166858023568385291, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!23 &5393397602646762478 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867973463372484192} + 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: 87b30a6b0282cd044b3a9ee02a86fc13, 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!64 &7898104456201878345 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867973463372484192} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4537195048234371842, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!1 &1024302324044786983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6357043765357639321} + - component: {fileID: 3003333249418598762} + - component: {fileID: 1125063153117388206} + - component: {fileID: 963430987117991046} + m_Layer: 0 + m_Name: Focus 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6357043765357639321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024302324044786983} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0.232803, y: 0.08545312, z: 0.00000029057264} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8886367670000349127} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3003333249418598762 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024302324044786983} + m_Mesh: {fileID: 6166858023568385291, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!23 &1125063153117388206 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024302324044786983} + 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: 87b30a6b0282cd044b3a9ee02a86fc13, 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!64 &963430987117991046 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024302324044786983} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4537195048234371842, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!1 &2908079006868685856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8916645039986051625} + - component: {fileID: 4107388987895253609} + - component: {fileID: 2633029130440344229} + - component: {fileID: 353281471644964265} + m_Layer: 0 + m_Name: Base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8916645039986051625 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908079006868685856} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8886367670000349127} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4107388987895253609 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908079006868685856} + m_Mesh: {fileID: 3909233067320746374, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!23 &2633029130440344229 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908079006868685856} + 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: 87b30a6b0282cd044b3a9ee02a86fc13, 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!64 &353281471644964265 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908079006868685856} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -7436808556831099223, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} --- !u!1 &3102359450922407050 GameObject: m_ObjectHideFlags: 0 @@ -166,7 +485,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4670783296661506346} + - {fileID: 8886367670000349127} m_Father: {fileID: 8658779252248553235} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -181,6 +500,7 @@ GameObject: - component: {fileID: 2835502344937141734} - component: {fileID: 2394984000857638811} - component: {fileID: 1660506592467587114} + - component: {fileID: 768397253265410432} m_Layer: 0 m_Name: Laser Emitter m_TagString: Untagged @@ -202,7 +522,7 @@ Transform: m_Children: - {fileID: 8658779252248553235} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2394984000857638811 MonoBehaviour: @@ -231,7 +551,63 @@ MonoBehaviour: m_EditorClassIdentifier: firing: 1 laserStart: {fileID: 5831954408757011522} + emission: {fileID: 768397253265410432} laserLineRenderer: {fileID: 8529185019471240263} +--- !u!114 &768397253265410432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7329942003389928718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5125296c087d4666ab772574843e6896, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 9.849155, g: 0.07902167, b: 0.07902167, a: 0} + startActive: 0 + emissionRenderer: {fileID: 8615445280271272154} + additionalEmissionRenderers: + - {fileID: 5393397602646762478} + - {fileID: 1125063153117388206} + - {fileID: 1001779179735857324} +--- !u!1 &8077602841483720061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8886367670000349127} + m_Layer: 0 + m_Name: Emitter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8886367670000349127 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8077602841483720061} + m_LocalRotation: {x: -0, y: 0.70710576, z: -0, w: 0.70710784} + m_LocalPosition: {x: 0, y: -0.125, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8916645039986051625} + - {fileID: 2096408915414627328} + - {fileID: 7662063326369858826} + - {fileID: 6357043765357639321} + - {fileID: 5441085339793724718} + m_Father: {fileID: 2161470782926054222} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &8756285610275872068 GameObject: m_ObjectHideFlags: 0 @@ -368,3 +744,108 @@ LineRenderer: m_UseWorldSpace: 0 m_Loop: 0 m_ApplyActiveColorSpace: 0 +--- !u!1 &8816284600343781036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2096408915414627328} + - component: {fileID: 4204516117017888886} + - component: {fileID: 8615445280271272154} + - component: {fileID: 3750814060858869800} + m_Layer: 0 + m_Name: Emitter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2096408915414627328 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816284600343781036} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0.12142457, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8886367670000349127} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4204516117017888886 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816284600343781036} + m_Mesh: {fileID: -4684713559383613005, guid: 70d2550a94dcf964f884282e8cd8627e, type: 3} +--- !u!23 &8615445280271272154 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816284600343781036} + 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: 87b30a6b0282cd044b3a9ee02a86fc13, 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!135 &3750814060858869800 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816284600343781036} + 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_Radius: 0.10474553 + m_Center: {x: 0, y: 0.000000022351738, z: 2.2728657e-26} diff --git a/Assets/Station46/Modules/Laser/Laser Redirector.prefab b/Assets/Station46/Modules/Laser/Laser Redirector.prefab index 5327d53..aae9b05 100644 --- a/Assets/Station46/Modules/Laser/Laser Redirector.prefab +++ b/Assets/Station46/Modules/Laser/Laser Redirector.prefab @@ -11,10 +11,11 @@ GameObject: - component: {fileID: 1524393306245076783} - component: {fileID: 897376356061303010} - component: {fileID: 2812559121526871782} + - component: {fileID: 9002810865585121788} + - component: {fileID: 65979914628935854} - component: {fileID: 4164828007642968986} - component: {fileID: 5156043258505205515} - component: {fileID: 7231726315279509463} - - component: {fileID: 65979914628935854} m_Layer: 0 m_Name: Laser Redirector m_TagString: Untagged @@ -53,6 +54,7 @@ MonoBehaviour: m_EditorClassIdentifier: firing: 0 laserStart: {fileID: 8905692309860668305} + emission: {fileID: 9002810865585121788} laserLineRenderer: {fileID: 2519225079777001152} --- !u!114 &2812559121526871782 MonoBehaviour: @@ -66,6 +68,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4c152de8a63080540ad136a98dd86dc8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &9002810865585121788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251845578051121456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 + emissionRenderer: {fileID: 7970933086109947689} +--- !u!114 &65979914628935854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251845578051121456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 883312c0b43e43d4bd9b113d29da2ee2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &4164828007642968986 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,19 +268,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 2 ---- !u!114 &65979914628935854 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251845578051121456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 883312c0b43e43d4bd9b113d29da2ee2, type: 3} - m_Name: - m_EditorClassIdentifier: - spawn: {fileID: 0} --- !u!1 &452836741980269854 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Modules/Laser/Materials/Emitter.mat b/Assets/Station46/Modules/Laser/Materials/Emitter.mat new file mode 100644 index 0000000..8363031 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Emitter.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5305918857259637390 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Emitter + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _OCCLUSIONMAP + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 059a39f38f5378a43a519a76b9d31007, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: c2b32c2088774cf44952e5c4e8d600e9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 209a658c98d6fa646a411e3c14426f65, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 059a39f38f5378a43a519a76b9d31007, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: a5a324b29babfea4bb0d0327c1849a63, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 7f4dba96d165bec40b31c52674f8a9f8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 9.849155, g: 0.07902167, b: 0.07902167, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Station46/Modules/Laser/Materials/Emitter.mat.meta b/Assets/Station46/Modules/Laser/Materials/Emitter.mat.meta new file mode 100644 index 0000000..deee011 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Emitter.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87b30a6b0282cd044b3a9ee02a86fc13 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_AlbedoTransparency.png b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_AlbedoTransparency.png new file mode 100644 index 0000000..1c9a9ce --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_AlbedoTransparency.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:535970a5a139c43b1af8a077cb9007ccdb6b2f3a97efe9fe951197ad859ee39c +size 13144793 diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_AlbedoTransparency.png.meta b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_AlbedoTransparency.png.meta new file mode 100644 index 0000000..1783fc2 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_AlbedoTransparency.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 059a39f38f5378a43a519a76b9d31007 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Emission.png b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Emission.png new file mode 100644 index 0000000..650ab5a --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Emission.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fae868e0abba6e44b5e61f797a937b4034a4e5bd6b3b16688cbabc1f900d8e44 +size 85301 diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Emission.png.meta b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Emission.png.meta new file mode 100644 index 0000000..1cee246 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Emission.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 209a658c98d6fa646a411e3c14426f65 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_MetallicSmoothness.png b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_MetallicSmoothness.png new file mode 100644 index 0000000..4a4fbd0 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_MetallicSmoothness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e39cdce43d01fe5f876b91264cf98c00630eb014c3e7ea3f591d19a9983c1f7 +size 11448849 diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_MetallicSmoothness.png.meta b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_MetallicSmoothness.png.meta new file mode 100644 index 0000000..f11cf42 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_MetallicSmoothness.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: a5a324b29babfea4bb0d0327c1849a63 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Normal.png b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Normal.png new file mode 100644 index 0000000..80c3bbe --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9a42efc6ee4e5e7d4daacb63ee13b73dfc56acb88d298a192e97bc4a3d6358b +size 8857553 diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Normal.png.meta b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Normal.png.meta new file mode 100644 index 0000000..59b173e --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Normal.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: c2b32c2088774cf44952e5c4e8d600e9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Occlusion.png b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Occlusion.png new file mode 100644 index 0000000..a67d8cb --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Occlusion.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dcc471304f6ab5df55e46a5e3b9b3afb305fe6386806bf6a941c2b297a72cca +size 5560091 diff --git a/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Occlusion.png.meta b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Occlusion.png.meta new file mode 100644 index 0000000..d7e2cd7 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Materials/Textures/Emitter_Emitter_Occlusion.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 7f4dba96d165bec40b31c52674f8a9f8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Models/Emitter.blend b/Assets/Station46/Modules/Laser/Models/Emitter.blend new file mode 100644 index 0000000..263bcd4 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Models/Emitter.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fc5082aca42dff2a934a22f55c825ffe8c116b4b6e09d2683eab83047ea4ec5 +size 1087376 diff --git a/Assets/Station46/Modules/Laser/Models/Emitter.blend.meta b/Assets/Station46/Modules/Laser/Models/Emitter.blend.meta new file mode 100644 index 0000000..c62c4c8 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Models/Emitter.blend.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 70d2550a94dcf964f884282e8cd8627e +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Models/Emitter.blend1 b/Assets/Station46/Modules/Laser/Models/Emitter.blend1 new file mode 100644 index 0000000..bcb122b Binary files /dev/null and b/Assets/Station46/Modules/Laser/Models/Emitter.blend1 differ diff --git a/Assets/Station46/Modules/Laser/Models/Emitter.blend1.meta b/Assets/Station46/Modules/Laser/Models/Emitter.blend1.meta new file mode 100644 index 0000000..ce989b3 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Models/Emitter.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6c65fc1d15a491e4ea351c658607ad23 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Models/Emitter.fbx b/Assets/Station46/Modules/Laser/Models/Emitter.fbx new file mode 100644 index 0000000..4edf8af --- /dev/null +++ b/Assets/Station46/Modules/Laser/Models/Emitter.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28e98b199926ac35360b55daae1b5daa8ad1c27ba3e608be2e123601863a2aba +size 327244 diff --git a/Assets/Station46/Modules/Laser/Models/Emitter.fbx.meta b/Assets/Station46/Modules/Laser/Models/Emitter.fbx.meta new file mode 100644 index 0000000..95c3192 --- /dev/null +++ b/Assets/Station46/Modules/Laser/Models/Emitter.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 26df10e7020d0314a94eb8bcac8cf897 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Laser/Scripts/Laser.cs b/Assets/Station46/Modules/Laser/Scripts/Laser.cs index 2a066ca..b89c0ae 100644 --- a/Assets/Station46/Modules/Laser/Scripts/Laser.cs +++ b/Assets/Station46/Modules/Laser/Scripts/Laser.cs @@ -1,16 +1,20 @@ +using System; using NaughtyAttributes; +using Station46.Scripts; using UnityEngine; namespace Station46.Modules.Laser.Scripts { + [RequireComponent(typeof(Emission))] public class Laser : MonoBehaviour { private const float MaxDistance = 1000; public bool firing; [BoxGroup("Internal")] [SerializeField] private Transform laserStart; + [BoxGroup("Internal")] [SerializeField] private Emission emission; [BoxGroup("Internal")] [SerializeField] private LineRenderer laserLineRenderer; - + private LaserReceiver CurrentReceiver { get => _currentReceiver; @@ -45,14 +49,15 @@ namespace Station46.Modules.Laser.Scripts protected virtual void Update() { laserLineRenderer.enabled = firing; - + emission.active = firing; + if (firing && Physics.Raycast( - laserStart.position, - transform.TransformDirection(Vector3.forward), - out var hit, - MaxDistance, - ~0, - QueryTriggerInteraction.Ignore + laserStart.position, + transform.TransformDirection(Vector3.forward), + out var hit, + MaxDistance, + ~0, + QueryTriggerInteraction.Ignore )) { SetHitPosition(hit.distance); diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index 39b2607..aab6cf8 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} m_Name: Test Theme m_EditorClassIdentifier: - minRoomSize: {x: 2, y: 3} - playSpace: {x: 2, y: 3} + minRoomSize: {x: 2, y: 4} + playSpace: {x: 2, y: 4} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, @@ -32,4 +32,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2} + - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2}