From 9c18b8fc09c12eacb10d8f65046176e26eeeac95 Mon Sep 17 00:00:00 2001 From: Hazim Bin Ijaz Date: Mon, 6 Oct 2025 21:34:50 +0500 Subject: [PATCH] Added hitbox --- .../GameplayChars/AmericanOfficer.prefab | 270 ++++++++++++++++++ .../Prefabs/Weapons/Pistol_01_New.prefab | 5 +- 2 files changed, 273 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab b/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab index 4b5b795..ee6d533 100644 --- a/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab +++ b/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab @@ -175,6 +175,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2589924686976358406} + - component: {fileID: 2416178670652222355} m_Layer: 0 m_Name: upperarm_r m_TagString: Untagged @@ -198,6 +199,28 @@ Transform: - {fileID: 8275036016518471325} m_Father: {fileID: 3793154013559960428} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2416178670652222355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852708595044853378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.19, y: 0.09, z: 0.06} + CapsuleExtents: 0 + Offset: {x: 0.18, y: 0.06, z: 0} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &987767375065041371 GameObject: m_ObjectHideFlags: 0 @@ -574,6 +597,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3104595847817127360} + - component: {fileID: 6583598197634565849} m_Layer: 0 m_Name: spine_02 m_TagString: Untagged @@ -597,6 +621,28 @@ Transform: - {fileID: 8066548832295038903} m_Father: {fileID: 5071155087518691706} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6583598197634565849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3355196737316978968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.27, y: 0.15, z: 0.15} + CapsuleExtents: 0 + Offset: {x: 0, y: 0.04, z: 0} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &4235242348640882406 GameObject: m_ObjectHideFlags: 0 @@ -732,6 +778,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8060476877403171786} + - component: {fileID: 6722139353915714409} m_Layer: 0 m_Name: head m_TagString: Untagged @@ -755,6 +802,28 @@ Transform: - {fileID: 7724508032064389750} m_Father: {fileID: 943742752725445870} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6722139353915714409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4442883773415541770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 2 + SphereRadius: 0.15 + CapsuleRadius: 0 + BoxExtents: {x: 0, y: 0, z: 0} + CapsuleExtents: 0 + Offset: {x: 0, y: 0.45, z: 0} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &4522475816514070176 GameObject: m_ObjectHideFlags: 0 @@ -764,6 +833,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8729396520773120850} + - component: {fileID: 8575789175067276795} m_Layer: 0 m_Name: calf_l m_TagString: Untagged @@ -787,6 +857,28 @@ Transform: - {fileID: 8829297824227964790} m_Father: {fileID: 884438843749810621} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8575789175067276795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4522475816514070176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.12, y: 0.09, z: 0.06} + CapsuleExtents: 0 + Offset: {x: 0.18, y: 0, z: 0.03} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &4803031034953745319 GameObject: m_ObjectHideFlags: 0 @@ -796,6 +888,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8275036016518471325} + - component: {fileID: 2566310893985845649} m_Layer: 0 m_Name: lowerarm_r m_TagString: Untagged @@ -820,6 +913,28 @@ Transform: - {fileID: 1684396840028169620} m_Father: {fileID: 2589924686976358406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2566310893985845649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4803031034953745319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.19, y: 0.09, z: 0.06} + CapsuleExtents: 0 + Offset: {x: 0.3, y: 0, z: 0} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &4946825695229643136 GameObject: m_ObjectHideFlags: 0 @@ -1017,6 +1132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1523008303231568506} + - component: {fileID: 8461927587324676015} m_Layer: 0 m_Name: upperarm_l m_TagString: Untagged @@ -1040,6 +1156,28 @@ Transform: - {fileID: 2236502663337388947} m_Father: {fileID: 2150054105934968523} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8461927587324676015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216368157232932537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.19, y: 0.09, z: 0.06} + CapsuleExtents: 0 + Offset: {x: -0.18, y: 0, z: 0} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &6569825970021859931 GameObject: m_ObjectHideFlags: 0 @@ -1136,6 +1274,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2189108019632793090} + - component: {fileID: 1519231801474657022} m_Layer: 0 m_Name: thigh_r m_TagString: Untagged @@ -1159,6 +1298,28 @@ Transform: - {fileID: 1820230339230641925} m_Father: {fileID: 4623789363647403237} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1519231801474657022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6863696959827158552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.15, y: 0.09, z: 0.08} + CapsuleExtents: 0 + Offset: {x: -0.15, y: -0.03, z: -0.03} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &6871690393847668870 GameObject: m_ObjectHideFlags: 0 @@ -1231,6 +1392,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1820230339230641925} + - component: {fileID: 6892728160245607452} m_Layer: 0 m_Name: calf_r m_TagString: Untagged @@ -1254,6 +1416,28 @@ Transform: - {fileID: 4052002594243660257} m_Father: {fileID: 2189108019632793090} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6892728160245607452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7219913735023296050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.12, y: 0.09, z: 0.06} + CapsuleExtents: 0 + Offset: {x: -0.18, y: 0, z: -0.03} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &7321084097578659671 GameObject: m_ObjectHideFlags: 0 @@ -1329,6 +1513,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 884438843749810621} + - component: {fileID: 5329026424196591802} m_Layer: 0 m_Name: thigh_l m_TagString: Untagged @@ -1352,6 +1537,28 @@ Transform: - {fileID: 8729396520773120850} m_Father: {fileID: 4623789363647403237} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5329026424196591802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8782181612133634729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.15, y: 0.09, z: 0.08} + CapsuleExtents: 0 + Offset: {x: 0.15, y: 0.03, z: 0.03} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &8785627177373138484 GameObject: m_ObjectHideFlags: 0 @@ -1361,6 +1568,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2236502663337388947} + - component: {fileID: 281011511665122064} m_Layer: 0 m_Name: lowerarm_l m_TagString: Untagged @@ -1385,6 +1593,28 @@ Transform: - {fileID: 1856385373551976205} m_Father: {fileID: 1523008303231568506} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &281011511665122064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8785627177373138484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8e6ed021e4c493f9300a2832209fca7, type: 3} + m_Name: + m_EditorClassIdentifier: + Type: 1 + SphereRadius: 0 + CapsuleRadius: 0 + BoxExtents: {x: 0.19, y: 0.09, z: 0.06} + CapsuleExtents: 0 + Offset: {x: -0.3, y: 0, z: 0} + Root: {fileID: 6673352558305043023} + GizmosColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + _damageMultiplier: 1 + _isCritical: 0 --- !u!1 &8849575994565932726 GameObject: m_ObjectHideFlags: 0 @@ -1472,6 +1702,46 @@ PrefabInstance: propertyPath: Hitboxes.Array.size value: 10 objectReference: {fileID: 0} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[0]' + value: + objectReference: {fileID: 5329026424196591802} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[1]' + value: + objectReference: {fileID: 1519231801474657022} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[2]' + value: + objectReference: {fileID: 6583598197634565849} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[3]' + value: + objectReference: {fileID: 8575789175067276795} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[4]' + value: + objectReference: {fileID: 6892728160245607452} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[5]' + value: + objectReference: {fileID: 8461927587324676015} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[6]' + value: + objectReference: {fileID: 2416178670652222355} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[7]' + value: + objectReference: {fileID: 6722139353915714409} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[8]' + value: + objectReference: {fileID: 281011511665122064} + - target: {fileID: 1018819908989435078, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: 'Hitboxes.Array.data[9]' + value: + objectReference: {fileID: 2566310893985845649} - target: {fileID: 1208594558769093153, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 7 diff --git a/Assets/TPSBR/Prefabs/Weapons/Pistol_01_New.prefab b/Assets/TPSBR/Prefabs/Weapons/Pistol_01_New.prefab index 73c502b..75ac649 100644 --- a/Assets/TPSBR/Prefabs/Weapons/Pistol_01_New.prefab +++ b/Assets/TPSBR/Prefabs/Weapons/Pistol_01_New.prefab @@ -52,7 +52,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 64760863244378544, guid: ac1c6ad684980db4f817a093a7b9b1a0, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -72,7 +73,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 763487563457959582, guid: 2535781479f893d40abcaa4c4fc5ab58, type: 3} propertyPath: m_Name - value: Pistol_01_German + value: Pistol_01_New objectReference: {fileID: 0} - target: {fileID: 2823422647949271355, guid: 2535781479f893d40abcaa4c4fc5ab58, type: 3} propertyPath: _weaponID