diff --git a/Assets/Prefabs/Corridor.prefab b/Assets/Prefabs/Corridor.prefab index e35703b..2e27b72 100644 --- a/Assets/Prefabs/Corridor.prefab +++ b/Assets/Prefabs/Corridor.prefab @@ -1,5 +1,110 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &578036070311343251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6375265755228478749} + - component: {fileID: 7349801921063550056} + - component: {fileID: 1288135443971990664} + - component: {fileID: 1153652185336495192} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6375265755228478749 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578036070311343251} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.11245103, z: -0, w: 0.99365735} + m_LocalPosition: {x: -3.527, y: 0, z: 0.404} + m_LocalScale: {x: 1.7852, y: 1, z: 0.27412} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3010340117121041265} + m_LocalEulerAnglesHint: {x: 0, y: -12.913, z: 0} +--- !u!33 &7349801921063550056 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578036070311343251} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1288135443971990664 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578036070311343251} + 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!65 &1153652185336495192 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578036070311343251} + 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_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1870748515751205382 GameObject: m_ObjectHideFlags: 0 @@ -106,6 +211,38 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &3078679710954158078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3221870984457002302} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3221870984457002302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3078679710954158078} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6598751219793324018} + m_Father: {fileID: 4872202698225962268} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3292909469865275622 GameObject: m_ObjectHideFlags: 0 @@ -379,6 +516,38 @@ Transform: - {fileID: 5493579008734275341} m_Father: {fileID: 4872202698225962268} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5264540080681821220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3010340117121041265} + m_Layer: 0 + m_Name: Crates + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3010340117121041265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5264540080681821220} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6375265755228478749} + m_Father: {fileID: 4872202698225962268} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5540910097206383729 GameObject: m_ObjectHideFlags: 0 @@ -1057,6 +1226,8 @@ Transform: - {fileID: 7928204924144417048} - {fileID: 5442320894528003744} - {fileID: 1882264671035603731} + - {fileID: 3221870984457002302} + - {fileID: 3010340117121041265} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8959804508983558599 @@ -2127,6 +2298,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6880022047870062870} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7026109706193733391 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3221870984457002302} + m_Modifications: + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.175 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.716 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.30662957 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.95182896 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 144.288 + objectReference: {fileID: 0} + - target: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6036120470499022404, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + propertyPath: m_Name + value: Enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6c08ab4a95014ae4db1eebdc5d104b17, type: 3} +--- !u!4 &6598751219793324018 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4184610175437431037, guid: 6c08ab4a95014ae4db1eebdc5d104b17, + type: 3} + m_PrefabInstance: {fileID: 7026109706193733391} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8914622132557679064 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/CorridorParts/Enemy.prefab b/Assets/Prefabs/CorridorParts/Enemy.prefab new file mode 100644 index 0000000..2a006b6 --- /dev/null +++ b/Assets/Prefabs/CorridorParts/Enemy.prefab @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &602539943244629249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1276636676886672381} + - component: {fileID: 6635606047864050309} + - component: {fileID: 429684865035491331} + - component: {fileID: 6804987971673265968} + m_Layer: 0 + m_Name: Renderer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1276636676886672381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 602539943244629249} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.75, z: -0} + m_LocalScale: {x: 0.07, y: 1, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4184610175437431037} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &6635606047864050309 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 602539943244629249} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &429684865035491331 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 602539943244629249} + 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!64 &6804987971673265968 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 602539943244629249} + 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: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &6036120470499022404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4184610175437431037} + m_Layer: 0 + m_Name: Enemy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4184610175437431037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6036120470499022404} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1276636676886672381} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/CorridorParts/Enemy.prefab.meta b/Assets/Prefabs/CorridorParts/Enemy.prefab.meta new file mode 100644 index 0000000..7f0e61d --- /dev/null +++ b/Assets/Prefabs/CorridorParts/Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6c08ab4a95014ae4db1eebdc5d104b17 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PlayerReplayer.prefab b/Assets/Prefabs/PlayerReplayer.prefab index e15b5fd..172fd55 100644 --- a/Assets/Prefabs/PlayerReplayer.prefab +++ b/Assets/Prefabs/PlayerReplayer.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &260851893664485351 +--- !u!1 &356687226755228914 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,24 +8,55 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5796497713327476773} + - component: {fileID: 5020301824866751461} m_Layer: 0 - m_Name: LerpPosition1 + m_Name: TracerStart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5796497713327476773 +--- !u!4 &5020301824866751461 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 260851893664485351} + m_GameObject: {fileID: 356687226755228914} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3, y: 1.5, z: -10} + m_LocalPosition: {x: -0.3, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1807660236798938897} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2714223452157441578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8852994287323472227} + m_Layer: 0 + m_Name: TracerEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8852994287323472227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2714223452157441578} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.3, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -63,10 +94,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5796497713327476773} - - {fileID: 610066107528471671} - - {fileID: 2261120547841137775} - - {fileID: 2084853467828932600} + - {fileID: 7845453783053460798} + - {fileID: 5020301824866751461} + - {fileID: 8852994287323472227} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &7220179918976106526 @@ -176,7 +206,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42603e4f95b24efa85355a04450c20e2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7157254949447541528 + BulletTracerRenderer: {fileID: 1440177105284983216} + BulletTracerStart: {fileID: 5020301824866751461} + BulletTracerEnd: {fileID: 8852994287323472227} + FrameIndex: 0 +--- !u!1 &6013909295272487250 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -184,88 +218,131 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2261120547841137775} + - component: {fileID: 7845453783053460798} + - component: {fileID: 1440177105284983216} m_Layer: 0 - m_Name: LerpPosition3 + m_Name: Gun m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2261120547841137775 +--- !u!4 &7845453783053460798 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7157254949447541528} + m_GameObject: {fileID: 6013909295272487250} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3, y: 1.5, z: 0} + 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1807660236798938897} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8551904799974569781 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2084853467828932600} - m_Layer: 0 - m_Name: LerpPosition4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2084853467828932600 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8551904799974569781} +--- !u!120 &1440177105284983216 +LineRenderer: serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3, y: 1.5, z: 10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1807660236798938897} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &9118715726176433314 -GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 610066107528471671} - m_Layer: 0 - m_Name: LerpPosition2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &610066107528471671 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9118715726176433314} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3, y: 1.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1807660236798938897} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 6013909295272487250} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6412be81563725c40bfc6c75b1a58af8, 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_Positions: + - {x: -0.3, y: 0, z: 0} + - {x: -0.3, y: 0, z: 100} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.060869217 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 1 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 4803ba8..cbb8a66 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -7,7 +7,14 @@ namespace InterfaceOff.WorldScene { private static PlayerController Instance; private PlayerFrameInfo[] Frames; - private int FrameIndex = 0; + + [Header("Bullet Tracer Info")] + [SerializeField] private LineRenderer BulletTracerRenderer; + [SerializeField] private Transform BulletTracerStart; + [SerializeField] private Transform BulletTracerEnd; + + [Header("Dev View")] + [SerializeField] private int FrameIndex; private float LerpValue; @@ -24,6 +31,7 @@ namespace InterfaceOff.WorldScene private void Update() { + /* Updates the position according to the lerp */ LerpValue = (LerpValue + Time.deltaTime * 20f) % 1f; PlayerFrameInfo frameA = Frames[FrameIndex + 0]; @@ -33,6 +41,13 @@ namespace InterfaceOff.WorldScene Vector2 rotation = Vector2.Lerp(frameA.Rotation, frameB.Rotation, LerpValue); transform.rotation = Quaternion.Euler(rotation.x, rotation.y, 0); + + /* Updates the gun state */ + BulletTracerRenderer.positionCount = 2; + BulletTracerRenderer.SetPosition(index: 0, BulletTracerStart.position); + BulletTracerRenderer.SetPosition(index: 1, BulletTracerEnd.position); + + //BulletTracerRenderer.enabled = Frames[FrameIndex].ShootGun; } } } \ No newline at end of file