From e59b767dafa0cb0e0425597dd5116021816356d3 Mon Sep 17 00:00:00 2001 From: Noah4ever <66632359+Noah4ever@users.noreply.github.com> Date: Thu, 9 Dec 2021 13:33:54 +0100 Subject: [PATCH] Grenade Fix Grenade is now a Sphere. set Commented the [Command] on CmdFireBullet in Shoot.cs to see how it is in multiplayer --- .../Objects/Weapons/Grenades/Grenade.prefab | 128 +--- .../Weapons/M9/{M92.prefab => Grenade.prefab} | 154 ++--- .../{M92.prefab.meta => Grenade.prefab.meta} | 0 Assets/Scenes/TestScene.unity | 569 +++++++----------- Assets/Scripts/Weapons/Shoot.cs | 7 +- Assets/Scripts/Weapons/WeaponManager.cs | 14 +- UserSettings/Layouts/default-2021.dwlt | 58 +- 7 files changed, 342 insertions(+), 588 deletions(-) rename Assets/Objects/Weapons/M9/{M92.prefab => Grenade.prefab} (70%) rename Assets/Objects/Weapons/M9/{M92.prefab.meta => Grenade.prefab.meta} (100%) diff --git a/Assets/Objects/Weapons/Grenades/Grenade.prefab b/Assets/Objects/Weapons/Grenades/Grenade.prefab index c49ae6a..1e1b81f 100644 --- a/Assets/Objects/Weapons/Grenades/Grenade.prefab +++ b/Assets/Objects/Weapons/Grenades/Grenade.prefab @@ -1,67 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4029497643973095478 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6343894089976463891} - m_Layer: 0 - m_Name: Left_Hand_REF - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6343894089976463891 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4029497643973095478} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: -6.781926, y: -1.6035255, z: 8.611951} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6930424391121909828} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} ---- !u!1 &6307342751337709463 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 201745328857467870} - m_Layer: 0 - m_Name: Right_Hand_REF - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &201745328857467870 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6307342751337709463} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: -6.7219267, y: -1.5935258, z: 8.611951} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6930424391121909828} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} --- !u!1 &6930424391121909826 GameObject: m_ObjectHideFlags: 0 @@ -73,9 +11,6 @@ GameObject: - component: {fileID: 6930424391121909828} - component: {fileID: 6930424391121909829} - component: {fileID: 6930424391121909830} - - component: {fileID: 6930424391121909831} - - component: {fileID: 6930424391121909824} - - component: {fileID: 8559554177058791497} m_Layer: 0 m_Name: Grenade m_TagString: Untagged @@ -94,9 +29,7 @@ Transform: m_LocalPosition: {x: 18.046112, y: 1.8965256, z: -9.051534} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6343894089976463891} - - {fileID: 201745328857467870} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -150,62 +83,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &6930424391121909831 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6930424391121909826} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &6930424391121909824 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6930424391121909826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3} - m_Name: - m_EditorClassIdentifier: - weaponKind: 3 - dropForce: 20 - damage: 45 - firerate: 1 - recoilStrength: 0 - currentAmmunition: 1 - magazinSize: 1 - totalAmmunition: 1 - bulletExit: {fileID: 0} - allowAction: 1 - weaponAnimator: {fileID: 0} - gunRightREF: {fileID: 201745328857467870} - gunLeftREF: {fileID: 6343894089976463891} - isGrenade: 1 - timer: 2 - explosionForce: 2 - grenadeRadius: 3 - hasExploded: 0 - hasBeenThrown: 0 ---- !u!114 &8559554177058791497 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6930424391121909826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: efa52c67441299049b2e2634d9e3e534, type: 3} - m_Name: - m_EditorClassIdentifier: - explodeParticle: {fileID: 6930424391121909826} - weapon: {fileID: 6930424391121909824} - weaponManager: {fileID: 0} diff --git a/Assets/Objects/Weapons/M9/M92.prefab b/Assets/Objects/Weapons/M9/Grenade.prefab similarity index 70% rename from Assets/Objects/Weapons/M9/M92.prefab rename to Assets/Objects/Weapons/M9/Grenade.prefab index 2a94502..f46216f 100644 --- a/Assets/Objects/Weapons/M9/M92.prefab +++ b/Assets/Objects/Weapons/M9/Grenade.prefab @@ -29,7 +29,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 732033708985862910} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3709710254213546924 GameObject: @@ -60,7 +60,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 732033708985862910} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} --- !u!1 &3884320679152247161 GameObject: @@ -91,7 +91,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 732033708985862910} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} --- !u!1 &5071598280516985511 GameObject: @@ -104,10 +104,10 @@ GameObject: - component: {fileID: 732033708985862910} - component: {fileID: 6352645931139448055} - component: {fileID: 5204381087217674634} - - component: {fileID: 3937508078766297979} - component: {fileID: 2072484884} + - component: {fileID: 9082234699677627348} m_Layer: 0 - m_Name: M92 + m_Name: Grenade m_TagString: Weapon m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -125,10 +125,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1584484548595912410} - {fileID: 7502619830433694848} - {fileID: 808197646603973991} - {fileID: 5792494204646893847} + - {fileID: 5918420165866215312} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -166,28 +166,15 @@ MonoBehaviour: totalAmmunition: 0 bulletExit: {fileID: 2236875552107647873} allowAction: 1 - weaponAnimator: {fileID: 4836044225623250080} + weaponAnimator: {fileID: 8776644024920372975} gunRightREF: {fileID: 5792494204646893847} gunLeftREF: {fileID: 808197646603973991} isGrenade: 1 timer: 2 - explosionForce: 2 + explosionForce: 300 grenadeRadius: 3 hasExploded: 0 hasBeenThrown: 1 ---- !u!65 &3937508078766297979 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5071598280516985511} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 0.067302436, y: 0.20004939, z: 0.27977693} - m_Center: {x: 0.0137349535, y: -0.06308114, z: -0.28045207} --- !u!54 &2072484884 Rigidbody: m_ObjectHideFlags: 0 @@ -204,91 +191,104 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!1001 &1330674258901920049 +--- !u!114 &9082234699677627348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5071598280516985511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: efa52c67441299049b2e2634d9e3e534, type: 3} + m_Name: + m_EditorClassIdentifier: + explodeParticle: {fileID: 8367325100912176335, guid: a8150377575143e4ba9ff51ba16504aa, type: 3} + weapon: {fileID: 5204381087217674634} +--- !u!1001 &3607281645661515732 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 732033708985862910} m_Modifications: - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 6930424391121909826, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + propertyPath: m_Name + value: GrenadeObject + objectReference: {fileID: 0} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + propertyPath: m_LocalPosition.x + value: 18.046112 + objectReference: {fileID: 0} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + propertyPath: m_LocalPosition.y + value: 1.8965256 + objectReference: {fileID: 0} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + propertyPath: m_LocalPosition.z + value: -9.051534 + objectReference: {fileID: 0} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_LocalPosition.y - value: -0.054000046 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_LocalPosition.z - value: -0.334 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + - target: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_Name - value: M92 - objectReference: {fileID: 0} - - target: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} ---- !u!1 &2213212323547960416 stripped + m_SourcePrefab: {fileID: 100100000, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} +--- !u!1 &5918420165866215318 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - m_PrefabInstance: {fileID: 1330674258901920049} + m_CorrespondingSourceObject: {fileID: 6930424391121909826, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + m_PrefabInstance: {fileID: 3607281645661515732} m_PrefabAsset: {fileID: 0} ---- !u!4 &1584484548595912410 stripped +--- !u!4 &5918420165866215312 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - m_PrefabInstance: {fileID: 1330674258901920049} + m_CorrespondingSourceObject: {fileID: 6930424391121909828, guid: dbdc6c009fc3f6144933dcf93b67f8cb, type: 3} + m_PrefabInstance: {fileID: 3607281645661515732} m_PrefabAsset: {fileID: 0} ---- !u!95 &4836044225623250080 stripped +--- !u!95 &8776644024920372975 Animator: - m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} - m_PrefabInstance: {fileID: 1330674258901920049} - m_PrefabAsset: {fileID: 0} ---- !u!114 &867143322194457524 -MonoBehaviour: + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2213212323547960416} + m_GameObject: {fileID: 5918420165866215318} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Objects/Weapons/M9/M92.prefab.meta b/Assets/Objects/Weapons/M9/Grenade.prefab.meta similarity index 100% rename from Assets/Objects/Weapons/M9/M92.prefab.meta rename to Assets/Objects/Weapons/M9/Grenade.prefab.meta diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index cb965fe..70ed9a0 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -123,79 +123,16 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &19517396 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.x - value: 12.38 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.y - value: 0.407 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.z - value: -0.0155828 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937508078766297979, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Name - value: M92 (1) - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: dropForce - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: isGrenade - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: weaponKind - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} +--- !u!95 &3385101 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 4797094208700084232, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + m_PrefabInstance: {fileID: 546466828} + m_PrefabAsset: {fileID: 0} +--- !u!4 &37969951 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8382890533894468742, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + m_PrefabInstance: {fileID: 546466828} + m_PrefabAsset: {fileID: 0} --- !u!1 &39659576 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8009987137999418058, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} @@ -465,6 +402,115 @@ MonoBehaviour: available: 1 blocked: 0 position: {x: 0, y: 0, z: 0} +--- !u!1001 &148908490 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalScale.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalScale.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalScale.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalPosition.x + value: 5.871 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalPosition.y + value: 1.885 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalPosition.z + value: -5.008 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2236875552107647873, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3709710254213546924, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3884320679152247161, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3937508078766297979, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Name + value: Grenade + objectReference: {fileID: 0} + - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: hasBeenThrown + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5918420165866215312, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalPosition.x + value: 0.554 + objectReference: {fileID: 0} + - target: {fileID: 5918420165866215312, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalPosition.y + value: 0.514 + objectReference: {fileID: 0} + - target: {fileID: 5918420165866215312, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_LocalPosition.z + value: -0.53 + objectReference: {fileID: 0} + - target: {fileID: 5918420165866215318, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} --- !u!1 &203427802 GameObject: m_ObjectHideFlags: 0 @@ -600,83 +646,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5053925668127403250, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} ---- !u!1001 &342194877 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.x - value: 10.188591 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.y - value: 0.51 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.z - value: 0.06027625 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937508078766297979, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Name - value: M92 - objectReference: {fileID: 0} - - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_TagString - value: Weapon - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: dropForce - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: isGrenade - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: weaponKind - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} --- !u!1 &450235891 stripped GameObject: m_CorrespondingSourceObject: {fileID: -466329591000292508, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} @@ -850,6 +819,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 546097166} m_CullTransparentMesh: 1 +--- !u!1001 &546466828 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1672832146417829139, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: gunLeftREF + value: + objectReference: {fileID: 37969951} + - target: {fileID: 1672832146417829139, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: gunRightREF + value: + objectReference: {fileID: 822253631} + - target: {fileID: 1672832146417829139, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: weaponAnimator + value: + objectReference: {fileID: 3385101} + - target: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_Name + value: USP 1 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalPosition.y + value: 0.52 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797726366404580855, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} --- !u!1 &589432432 stripped GameObject: m_CorrespondingSourceObject: {fileID: -6763858364670572316, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} @@ -869,6 +907,27 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8385836491182413749, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} +--- !u!1 &639091733 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1880099159927430553, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + m_PrefabInstance: {fileID: 546466828} + m_PrefabAsset: {fileID: 0} +--- !u!54 &639091738 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 639091733} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &655071529 GameObject: m_ObjectHideFlags: 0 @@ -1028,7 +1087,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &739500445 PrefabInstance: @@ -1235,6 +1294,11 @@ MonoBehaviour: available: 1 blocked: 0 position: {x: 0, y: 0, z: 0} +--- !u!4 &822253631 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7233769674171919731, guid: 6f5ccb6e55f1676429c170257dc7a411, type: 3} + m_PrefabInstance: {fileID: 546466828} + m_PrefabAsset: {fileID: 0} --- !u!1 &987854204 GameObject: m_ObjectHideFlags: 0 @@ -1408,87 +1472,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -629719859055844128, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} ---- !u!1001 &1243110492 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.x - value: 8.51 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.y - value: 1.43 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.z - value: 0.93 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937508078766297979, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Name - value: Grenade - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: damage - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: dropForce - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: grenadeRadius - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: hasBeenThrown - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: explosionForce - value: 300 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} --- !u!1 &1246681035 GameObject: m_ObjectHideFlags: 0 @@ -1554,38 +1537,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1323619077 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - m_PrefabInstance: {fileID: 1243110492} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1323619081 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - m_PrefabInstance: {fileID: 1243110492} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1323619077} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1323619084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1323619077} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: efa52c67441299049b2e2634d9e3e534, type: 3} - m_Name: - m_EditorClassIdentifier: - explodeParticle: {fileID: 1541885955888442623} - weapon: {fileID: 1323619081} --- !u!1 &1351784389 GameObject: m_ObjectHideFlags: 0 @@ -1705,7 +1658,7 @@ RectTransform: - {fileID: 1684293625} - {fileID: 1430445132} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2006,79 +1959,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1550514412580984892, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} ---- !u!1001 &1515810369 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.x - value: 14.89 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.y - value: 0.389 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalPosition.z - value: -0.141 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3937508078766297979, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: m_Name - value: M92 (2) - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: dropForce - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: isGrenade - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} - propertyPath: weaponKind - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} --- !u!1 &1683546023 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 823e8b39d52b71b4eb5a91dbc8d6d59e, type: 3} @@ -2361,7 +2241,7 @@ Transform: - {fileID: 76630395} - {fileID: 104338203} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119583729 GameObject: @@ -2458,7 +2338,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1496806602367600913 PrefabInstance: @@ -2469,7 +2349,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3365311783543717598, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} propertyPath: m_RootOrder - value: 8 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3365311783543717598, guid: 5cd2e2b44dc49ae44b48fc76a1e09712, type: 3} propertyPath: m_LocalPosition.x @@ -2530,7 +2410,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3147283493333612388, guid: a8150377575143e4ba9ff51ba16504aa, type: 3} propertyPath: m_RootOrder - value: 11 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3147283493333612388, guid: a8150377575143e4ba9ff51ba16504aa, type: 3} propertyPath: m_LocalPosition.x @@ -2578,11 +2458,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8150377575143e4ba9ff51ba16504aa, type: 3} ---- !u!1 &1541885955888442623 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8367325100912176335, guid: a8150377575143e4ba9ff51ba16504aa, type: 3} - m_PrefabInstance: {fileID: 1541885955888442622} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3454029965885532949 PrefabInstance: m_ObjectHideFlags: 0 @@ -2612,7 +2487,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2849906635484503724, guid: f0c1bca3291086d449266d9ed8942180, type: 3} propertyPath: m_RootOrder - value: 9 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2849906635484503724, guid: f0c1bca3291086d449266d9ed8942180, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Weapons/Shoot.cs b/Assets/Scripts/Weapons/Shoot.cs index 368f9da..63abe3a 100644 --- a/Assets/Scripts/Weapons/Shoot.cs +++ b/Assets/Scripts/Weapons/Shoot.cs @@ -46,10 +46,7 @@ public class Shoot : NetworkBehaviour } if (Input.GetButtonDown("Fire")) { updateCanvas = true; - if(weapon.GetComponent().enabled == true) // NACH ANDERE LÖSUNG SUCHEN - { - weapon.GetComponent().enabled = false; - } + // If current weapon kind is a rifle or pistole string weaponKindString = weapon.WeaponKind.ToString(); if(weaponKindString == "Rifle" || weaponKindString == "Pistole") { @@ -89,7 +86,7 @@ public class Shoot : NetworkBehaviour } } - [Command] + // [Command] // This code will be executed on the Server. private void CmdFireBullet() { ray = new Ray(mCamera.transform.position, mCamera.transform.forward); // Raycast from Camera diff --git a/Assets/Scripts/Weapons/WeaponManager.cs b/Assets/Scripts/Weapons/WeaponManager.cs index acec081..d6e95f9 100644 --- a/Assets/Scripts/Weapons/WeaponManager.cs +++ b/Assets/Scripts/Weapons/WeaponManager.cs @@ -104,7 +104,7 @@ public class WeaponManager : NetworkBehaviour hit.transform.parent = gunHolster.transform; // Parent weapon to gunHolster hit.rigidbody.isKinematic = true; hit.rigidbody.useGravity = false; - hit.transform.GetComponent().enabled = false; // Disable Boxcollider + SetAllColliderStatus(hit.transform.gameObject, false); // Disable all Collider switch (hit.transform.GetComponent().WeaponKind.ToString()) { // Adding weapon to inventory slot case "Rifle": putWeaponInArray(0, hit); break; case "Pistole": putWeaponInArray(1, hit); break; @@ -139,7 +139,7 @@ public class WeaponManager : NetworkBehaviour rigid.useGravity = true; rigid.isKinematic = false; rigid.velocity = cam.transform.forward * dropForce + cam.transform.up * 2; - currentWeapon.GetComponent().enabled = true; + SetAllColliderStatus(currentWeapon, true); // Activate all Collider currentWeapon.gameObject.transform.SetParent(null); activeWeapons[currentWeaponIndex] = null; return true; @@ -147,7 +147,15 @@ public class WeaponManager : NetworkBehaviour else { return false; } - + } + + // Set status to all colliders on a gameobject + private void SetAllColliderStatus(GameObject obj, bool newStatus) { + // For every collider on gameobject + foreach(Collider col in obj.GetComponents()) { + // set newStatus (enable, disable) + col.enabled = newStatus; + } } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 8801a0f..d7f0998 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1357 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,9 +39,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1399 + x: 1302 y: 0 - width: 700 + width: 797 height: 378 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -74,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 32784 + controlID: 88 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 43 + controlID: 86 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -195,7 +195,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 44 + controlID: 87 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -221,7 +221,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 91 + controlID: 65 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -318,7 +318,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1399 + width: 1302 height: 378 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -476,23 +476,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: b0eefeffb2eefeffb4eefeffb6eefeff22b8ffff6ec4ffff + m_SelectedIDs: 44faffff + m_LastClickedID: -1468 + m_ExpandedIDs: 28f6ffffe0faffff28fbffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: M92 - m_OriginalName: M92 + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -69966 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 10} m_SearchString: @@ -819,9 +819,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 13.712709, y: 3.5867922, z: 8.880598} + m_Target: {x: 6.000429, y: 0.15912339, z: -5.1404977} speed: 2 - m_Value: {x: 13.712709, y: 3.5867922, z: 8.880598} + m_Value: {x: 6.000429, y: 0.15912339, z: -5.1404977} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -868,13 +868,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.014974507, y: 0.9828559, z: -0.1585104, w: -0.09286305} + m_Target: {x: -0.0611503, y: 0.8793005, z: -0.117552005, w: -0.45744178} speed: 2 - m_Value: {x: -0.014974664, y: 0.9828662, z: -0.15851207, w: -0.09286403} + m_Value: {x: -0.061150905, y: 0.8793092, z: -0.11755317, w: -0.4574463} m_Size: - m_Target: 0.20931786 + m_Target: 0.23524262 speed: 2 - m_Value: 0.20931786 + m_Value: 0.23524262 m_Ortho: m_Target: 0 speed: 2 @@ -921,7 +921,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1002 - width: 1398 + width: 1301 height: 357 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -939,14 +939,14 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 1 + m_SearchArea: 0 m_Folders: [] m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/Player + - Assets/Scripts/Weapons m_LastFoldersGridSize: -1 m_LastProjectPath: C:\.Downloads\Unity\Projects\defrain m_LockTracker: @@ -955,7 +955,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 04ca9a3b m_LastClickedID: 1000000004 - m_ExpandedIDs: 00000000d8960000da960000dc960000f4960000f896000000ca9a3bffffff7f + m_ExpandedIDs: 00000000aa630000ac630000ae630000d663000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -983,7 +983,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000d8960000da960000dc960000 + m_ExpandedIDs: 00000000aa630000ac630000ae630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1011,7 +1011,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e6000003665000060600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1059,9 +1059,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1399 + x: 1302 y: 1002 - width: 698 + width: 795 height: 357 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: