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

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