From 799acc0215fd3df8b00c572edc1b079e563d69e0 Mon Sep 17 00:00:00 2001 From: KOSMOGOR Date: Mon, 28 Apr 2025 01:16:56 +0300 Subject: [PATCH] fix: minigun --- Assets/Prefabs/Game/Player.prefab | 126 +++++++++--------- ...{Minigun_0.1.prefab => Minigun_0.2.prefab} | 92 ++++++------- ....1.prefab.meta => Minigun_0.2.prefab.meta} | 2 +- 3 files changed, 108 insertions(+), 112 deletions(-) rename Assets/Prefabs/Weapons/{Minigun_0.1.prefab => Minigun_0.2.prefab} (51%) rename Assets/Prefabs/Weapons/{Minigun_0.1.prefab.meta => Minigun_0.2.prefab.meta} (74%) diff --git a/Assets/Prefabs/Game/Player.prefab b/Assets/Prefabs/Game/Player.prefab index 31e894e..63158ea 100644 --- a/Assets/Prefabs/Game/Player.prefab +++ b/Assets/Prefabs/Game/Player.prefab @@ -134,7 +134,7 @@ Transform: m_Children: - {fileID: 3053641561535516023} - {fileID: 7306251229952926972} - - {fileID: 851240011176901326} + - {fileID: 4942982111120058040} m_Father: {fileID: 6890030909251295590} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &1094126809165627842 @@ -514,68 +514,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 3191971078612809307, guid: af6264663cfc3ba499db761a90d861ca, type: 3} m_PrefabInstance: {fileID: 444904299868781356} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1950725631141517034 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4506534449155536579} - m_Modifications: - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalPosition.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalPosition.y - value: -0.4 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1984319744774026910, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - propertyPath: m_Name - value: Minigun_0.1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} ---- !u!4 &851240011176901326 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1207642995709242404, guid: f72348c5ba5fe034fa680b14fa422ebc, type: 3} - m_PrefabInstance: {fileID: 1950725631141517034} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6803844382836373506 PrefabInstance: m_ObjectHideFlags: 0 @@ -638,3 +576,65 @@ Transform: m_CorrespondingSourceObject: {fileID: 4253958408851774718, guid: a8be43ab8737b9b4bb440fd60a5e6ce5, type: 3} m_PrefabInstance: {fileID: 6803844382836373506} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8155802924672098842 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4506534449155536579} + m_Modifications: + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539042566925426200, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + propertyPath: m_Name + value: Minigun_0.2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} +--- !u!4 &4942982111120058040 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3870346380631852194, guid: 80e9936a6c30c3f42acbf6abfb37b379, type: 3} + m_PrefabInstance: {fileID: 8155802924672098842} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Weapons/Minigun_0.1.prefab b/Assets/Prefabs/Weapons/Minigun_0.2.prefab similarity index 51% rename from Assets/Prefabs/Weapons/Minigun_0.1.prefab rename to Assets/Prefabs/Weapons/Minigun_0.2.prefab index e27ef9d..d2e1488 100644 --- a/Assets/Prefabs/Weapons/Minigun_0.1.prefab +++ b/Assets/Prefabs/Weapons/Minigun_0.2.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7933855279006059416 +--- !u!1 &311363120135289033 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1344317373945794566} + - component: {fileID: 5781402321035331460} m_Layer: 0 m_Name: Muzzle m_TagString: Untagged @@ -16,22 +16,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1344317373945794566 +--- !u!4 &5781402321035331460 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7933855279006059416} + m_GameObject: {fileID: 311363120135289033} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 10.5} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.105, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1207642995709242404} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1677821322698263503 + m_Father: {fileID: 3870346380631852194} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1001 &3619912217362342729 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -39,94 +39,90 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalScale.x - value: 0.12 + value: 10 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalScale.y - value: 0.12 + value: 10 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalScale.z - value: 0.12 + value: 10 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalPosition.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalPosition.y value: -0.4 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalPosition.z value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071067 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - target: {fileID: 919132149155446097, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} propertyPath: m_Name - value: Minigun_0.1 + value: Minigun_0.2 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} insertIndex: -1 - addedObject: {fileID: 1344317373945794566} + addedObject: {fileID: 5781402321035331460} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} insertIndex: -1 - addedObject: {fileID: 956903261267722487} - m_SourcePrefab: {fileID: 100100000, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} ---- !u!4 &1207642995709242404 stripped + addedObject: {fileID: 1263276489685787483} + m_SourcePrefab: {fileID: 100100000, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} +--- !u!4 &3870346380631852194 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} - m_PrefabInstance: {fileID: 1677821322698263503} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} + m_PrefabInstance: {fileID: 3619912217362342729} m_PrefabAsset: {fileID: 0} ---- !u!1 &1984319744774026910 stripped +--- !u!1 &4539042566925426200 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a55dc7c2ce4f9ee28aa8628d5eea7613, type: 3} - m_PrefabInstance: {fileID: 1677821322698263503} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 60dc7f20e5cb43144a1f1077891fd4a4, type: 3} + m_PrefabInstance: {fileID: 3619912217362342729} m_PrefabAsset: {fileID: 0} ---- !u!114 &956903261267722487 +--- !u!114 &1263276489685787483 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984319744774026910} + m_GameObject: {fileID: 4539042566925426200} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bc7add7c3de58ca4d802a6eb169808fa, type: 3} @@ -134,6 +130,6 @@ MonoBehaviour: m_EditorClassIdentifier: bulletType: 3 projectilePrefab: {fileID: 1562924000103655330, guid: 65c4fcf91c2d6644e978a1005753ca66, type: 3} - spawnPosition: {fileID: 1344317373945794566} + spawnPosition: {fileID: 5781402321035331460} fireRate: 10 currentDelay: 0 diff --git a/Assets/Prefabs/Weapons/Minigun_0.1.prefab.meta b/Assets/Prefabs/Weapons/Minigun_0.2.prefab.meta similarity index 74% rename from Assets/Prefabs/Weapons/Minigun_0.1.prefab.meta rename to Assets/Prefabs/Weapons/Minigun_0.2.prefab.meta index d6da8c7..26d8154 100644 --- a/Assets/Prefabs/Weapons/Minigun_0.1.prefab.meta +++ b/Assets/Prefabs/Weapons/Minigun_0.2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f72348c5ba5fe034fa680b14fa422ebc +guid: 80e9936a6c30c3f42acbf6abfb37b379 PrefabImporter: externalObjects: {} userData: