From 8ea5bc896eaca40f1d6ce17c94ce112f15c88fd9 Mon Sep 17 00:00:00 2001 From: KOSMOGOR Date: Mon, 10 Mar 2025 10:23:51 +0300 Subject: [PATCH] update: player prefab and Composing scene update: Pistol shoots bullets with spawnPosition rotation --- Assets/Prefabs/Bullet.prefab | 3 +- Assets/Prefabs/Player.prefab | 157 ++++++++++++++- Assets/Scenes/Composing.unity | 368 +--------------------------------- Assets/Scripts/Pistol.cs | 2 +- 4 files changed, 157 insertions(+), 373 deletions(-) diff --git a/Assets/Prefabs/Bullet.prefab b/Assets/Prefabs/Bullet.prefab index af47b91..15e2746 100644 --- a/Assets/Prefabs/Bullet.prefab +++ b/Assets/Prefabs/Bullet.prefab @@ -149,5 +149,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7a451ad0b53e8c0ca82f7ce15114c38, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1 + speed: 5 damage: 20 + timeToLive: 5 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index e3d66e3..f85e46d 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -62,7 +62,9 @@ Transform: m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6673119647171785291} + - {fileID: 1643315469074404677} m_Father: {fileID: 6890030909251295590} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &1094126809165627842 @@ -147,8 +149,8 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 + m_RenderPostProcessing: 1 + m_Antialiasing: 1 m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 @@ -168,6 +170,37 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 +--- !u!1 &8550168148493531477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1643315469074404677} + m_Layer: 0 + m_Name: Muzzle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1643315469074404677 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8550168148493531477} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: -0.3, z: 1.8} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4506534449155536579} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9016311960615966999 GameObject: m_ObjectHideFlags: 0 @@ -182,6 +215,7 @@ GameObject: - component: {fileID: 1437407097293080706} - component: {fileID: 397169322893853401} - component: {fileID: 1198108720433238150} + - component: {fileID: 3263211181679880648} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -198,7 +232,7 @@ Transform: m_GameObject: {fileID: 9016311960615966999} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -326,3 +360,118 @@ MonoBehaviour: verSpeed: 200 verUpperBound: 90 verLowerBound: -90 +--- !u!114 &3263211181679880648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9016311960615966999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3724861d6ef4a112910a3ef14207757, type: 3} + m_Name: + m_EditorClassIdentifier: + weapons: [] + currentWeapon: 0 +--- !u!1001 &5007862695471124980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4506534449155536579} + m_Modifications: + - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} + - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} + - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: 'm_Materials.Array.data[2]' + value: + objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} + - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: 'm_Materials.Array.data[3]' + value: + objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} + - target: {fileID: 1346574968092522757, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_Name + value: Pistol_0.1 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalRotation.w + value: 0.06162845 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalRotation.x + value: -0.70441604 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70441604 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalRotation.z + value: -0.06162845 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1346574968092522757, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + insertIndex: -1 + addedObject: {fileID: 8320176447420130494} + m_SourcePrefab: {fileID: 100100000, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} +--- !u!1 &6327696402472954097 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1346574968092522757, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + m_PrefabInstance: {fileID: 5007862695471124980} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8320176447420130494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6327696402472954097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b5e56940d7855caeb2d584265db0624, type: 3} + m_Name: + m_EditorClassIdentifier: + projectilePrefab: {fileID: 1562924000103655330, guid: bfe7100930f24fd52b5b66832f59cfa8, type: 3} + spawnPosition: {fileID: 1643315469074404677} + fireRate: 1 +--- !u!4 &6673119647171785291 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} + m_PrefabInstance: {fileID: 5007862695471124980} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Composing.unity b/Assets/Scenes/Composing.unity index 1a5133c..e151425 100644 --- a/Assets/Scenes/Composing.unity +++ b/Assets/Scenes/Composing.unity @@ -124,11 +124,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4357511284367880818, guid: 73c9d3d3ea6065747956699e5d1f5392, type: 3} m_PrefabInstance: {fileID: 1168105054} m_PrefabAsset: {fileID: 0} ---- !u!4 &99598608 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4506534449155536579, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3} - m_PrefabInstance: {fileID: 3997104640432974468} - m_PrefabAsset: {fileID: 0} --- !u!4 &244018640 stripped Transform: m_CorrespondingSourceObject: {fileID: 6025933111829980118, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3} @@ -354,124 +349,6 @@ Transform: - {fileID: 1690414898} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &700479631 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalPosition.x - value: 14.779945 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalPosition.y - value: -0.0000076293945 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalPosition.z - value: 99.28143 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalRotation.w - value: -0.7071067 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalRotation.x - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} - propertyPath: m_Name - value: Lava_Area_Light - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6138e5e208ffca64f8e03f475c1a904a, type: 3} ---- !u!1001 &792221756 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalPosition.x - value: 14.779945 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalPosition.y - value: -0.0000076293945 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalPosition.z - value: 99.28143 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalRotation.x - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_Name - value: Ceiling_Area_Light_1 - objectReference: {fileID: 0} - - target: {fileID: 4935003872567433204, guid: 4b5486799c646a640a580e1c6831d332, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4b5486799c646a640a580e1c6831d332, type: 3} --- !u!4 &814580603 stripped Transform: m_CorrespondingSourceObject: {fileID: 6025933111829980118, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3} @@ -593,11 +470,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 795996269680244239, guid: 5157f3098ce9b0d4282980ecd17a9ec3, type: 3} m_PrefabInstance: {fileID: 1341570327} m_PrefabAsset: {fileID: 0} ---- !u!4 &1126042470 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - m_PrefabInstance: {fileID: 2159189467885668185} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1168105054 PrefabInstance: m_ObjectHideFlags: 0 @@ -722,107 +594,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6025933111829980118, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3} m_PrefabInstance: {fileID: 1903976060} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1555151540 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7853120362946791194, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -6367444929722157375, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -4976235030035833125, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -3143558483194166149, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -662909361366826300, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Name - value: Level1_0.1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2818826380887570562, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5733911823876726600, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5856117470861584492, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8345129058921690494, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8613709593378099745, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7eb279b00f6fbf4bb09461381196875, type: 3} --- !u!1 &1560783767 GameObject: m_ObjectHideFlags: 0 @@ -1006,63 +777,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 795996269680244239, guid: 5157f3098ce9b0d4282980ecd17a9ec3, type: 3} m_PrefabInstance: {fileID: 823861237} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1733140263 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalPosition.x - value: 14.779945 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalPosition.y - value: -0.0000076293945 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalPosition.z - value: 99.28143 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalRotation.w - value: -0.061628412 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalRotation.x - value: -0.0616285 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalRotation.y - value: 0.704416 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7044161 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} - propertyPath: m_Name - value: Spot_Light_1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8b691628bb5135f44ae31e89e436113a, type: 3} --- !u!1001 &1777178255 PrefabInstance: m_ObjectHideFlags: 0 @@ -1467,79 +1181,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a6d9f24857a5d742b9df2df7da4a192, type: 3} ---- !u!1001 &2159189467885668185 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 99598608} - m_Modifications: - - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} - - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: 'm_Materials.Array.data[1]' - value: - objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} - - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: 'm_Materials.Array.data[2]' - value: - objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} - - target: {fileID: 697779476867176656, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: 'm_Materials.Array.data[3]' - value: - objectReference: {fileID: 2100000, guid: 5eaf2c2de6813ae458216f3d63a8f0e1, type: 2} - - target: {fileID: 1346574968092522757, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_Name - value: Pistol_0.1 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalPosition.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalPosition.y - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalRotation.w - value: 0.06162845 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalRotation.x - value: -0.70441604 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalRotation.y - value: -0.70441604 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalRotation.z - value: -0.06162845 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -180 - objectReference: {fileID: 0} - - target: {fileID: 1865667135861564351, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9535c81cc2dffc94db2f5cbbc66cc790, type: 3} --- !u!1001 &2657052385640200812 PrefabInstance: m_ObjectHideFlags: 0 @@ -1659,10 +1300,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 4506534449155536579, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3} - insertIndex: -1 - addedObject: {fileID: 1126042470} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 53e225dcb536a6f46b5844bb8db07fe4, type: 3} --- !u!1001 &6825853474636966005 @@ -1789,10 +1427,6 @@ SceneRoots: m_Roots: - {fileID: 1560783769} - {fileID: 3997104640432974468} - - {fileID: 1555151540} - {fileID: 840308438} - - {fileID: 1733140263} - - {fileID: 700479631} - - {fileID: 792221756} - {fileID: 690075884} - {fileID: 219120118920238392} diff --git a/Assets/Scripts/Pistol.cs b/Assets/Scripts/Pistol.cs index e02287f..d11503a 100644 --- a/Assets/Scripts/Pistol.cs +++ b/Assets/Scripts/Pistol.cs @@ -10,7 +10,7 @@ public class Pistol : Weapon public override void Shoot(bool keyDown, bool keyHold) { if (keyDown && (fireRate == 0 || currentDelay == 1 / fireRate)) { - Instantiate(projectilePrefab, spawnPosition.position, transform.rotation); + Instantiate(projectilePrefab, spawnPosition.position, spawnPosition.rotation); currentDelay = 0; } }