Grenade Fix

Grenade is now a Sphere.
set Commented the [Command] on CmdFireBullet in Shoot.cs to see how it is in multiplayer
This commit is contained in:
Noah4ever
2021-12-09 13:33:54 +01:00
parent 3a1a279530
commit e59b767daf
7 changed files with 342 additions and 588 deletions

View File

@@ -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}