janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fack

Browse Source
This commit is contained in:
juliuse98
2021-11-24 18:15:29 +01:00
parent 6bbe58799d
commit b02f77419b
3 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Prefabs/Player/Player Animation Test.prefab
View File

@@ -435,9 +435,9 @@ MonoBehaviour:
rotationMultX: 5 rotationMultX: 5
rotationOffsetX: 0.1 rotationOffsetX: 0.1
rotY: 1 rotY: 1
rotationMultY: 5 rotationMultY: 0
rotZ: 1 rotZ: 1
rotationMultZ: 15 rotationMultZ: 0
sideSwey: 1 sideSwey: 1
sweyMultX: 1 sweyMultX: 1
sweyMultY: 0 sweyMultY: 0

4
Assets/Scripts/Weapons/WeaponManager.cs
View File

@@ -24,7 +24,7 @@ public class WeaponManager : NetworkBehaviour
void Update() { void Update() {
if (isLocalPlayer) { if (isLocalPlayer) {
counter = 0; counter = 0;
if(Input.GetAxis("Mouse ScrollWheel") > 0f){ // Scroll up if(Input.GetAxis("Mouse ScrollWheel") > 0f && false){ // Scroll up
do do
{ {
if (currentWeaponIndex <= 0) if (currentWeaponIndex <= 0)
@@ -39,7 +39,7 @@ public class WeaponManager : NetworkBehaviour
//Debug.Log(activeWeapons[currentWeaponIndex]); //Debug.Log(activeWeapons[currentWeaponIndex]);
} while (activeWeapons[currentWeaponIndex] == null); } while (activeWeapons[currentWeaponIndex] == null);
} }
else if (Input.GetAxis("Mouse ScrollWheel") < 0f){ // Scroll down else if (Input.GetAxis("Mouse ScrollWheel") < 0f && false){ // Scroll down
do do
{ {
if (currentWeaponIndex >= activeWeapons.Length - 1) if (currentWeaponIndex >= activeWeapons.Length - 1)

154
UserSettings/Layouts/default-2021.dwlt
View File

@@ -14,16 +14,16 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 573.60004
y: 43.2 y: 38.4
width: 1536 width: 1521.6
height: 780.8 height: 780.8
m_ShowMode: 4 m_ShowMode: 4
m_Title: Game m_Title: Game
m_RootView: {fileID: 2} m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1 m_Maximized: 0
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -44,8 +44,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1536 width: 1521.6
height: 781 height: 780.8
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1 m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1536 width: 1521.6
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 761 y: 760.8
width: 1536 width: 1521.6
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
@@ -114,12 +114,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1536 width: 1521.6
height: 731 height: 730.8
m_MinSize: {x: 400, y: 200} m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192} m_MaxSize: {x: 32384, y: 16192}
vertical: 0 vertical: 0
controlID: 93 controlID: 112
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1130 width: 1119.2
height: 731 height: 730.8
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 1 vertical: 1
controlID: 94 controlID: 113
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -165,12 +165,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1130 width: 1119.2
height: 439 height: 438.4
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096} m_MaxSize: {x: 24288, y: 8096}
vertical: 0 vertical: 0
controlID: 85 controlID: 114
--- !u!114 &8 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -188,10 +188,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 328 width: 324.8
height: 439 height: 438.4
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
@@ -212,10 +212,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 328 x: 324.8
y: 0 y: 0
width: 321 width: 317.60004
height: 439 height: 438.4
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
@@ -239,12 +239,12 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 649 x: 642.4
y: 0 y: 0
width: 481 width: 476.79993
height: 439 height: 438.4
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 13}
@@ -266,9 +266,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 439 y: 438.4
width: 1130 width: 1119.2
height: 292 height: 292.4
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 17}
@@ -292,10 +292,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1130 x: 1119.2
y: 0 y: 0
width: 406 width: 402.40002
height: 731 height: 730.8
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 19}
@@ -323,10 +323,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 648.8 x: 649.60004
y: 73.6 y: 80.8
width: 479 width: 474.79993
height: 418 height: 417.4
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -337,7 +337,7 @@ MonoBehaviour:
m_ShowGizmos: 0 m_ShowGizmos: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0} m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 479, y: 397} m_TargetSize: {x: 474.79993, y: 396.4}
m_TextureFilterMode: 0 m_TextureFilterMode: 0
m_TextureHideFlags: 61 m_TextureHideFlags: 61
m_RenderIMGUI: 1 m_RenderIMGUI: 1
@@ -352,10 +352,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -191.6 m_HBaseRangeMin: -189.91997
m_HBaseRangeMax: 191.6 m_HBaseRangeMax: 189.91997
m_VBaseRangeMin: -158.8 m_VBaseRangeMin: -158.56
m_VBaseRangeMax: 158.8 m_VBaseRangeMax: 158.56
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
@@ -373,23 +373,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 479 width: 474.79993
height: 397 height: 396.4
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 239.5, y: 198.5} m_Translation: {x: 237.39996, y: 198.2}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -239.5 x: -237.39996
y: -198.5 y: -198.2
width: 479 width: 474.79993
height: 397 height: 396.4
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_LastWindowPixelSize: {x: 598.75, y: 522.5} m_LastWindowPixelSize: {x: 593.4999, y: 521.75}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
@@ -415,10 +415,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 7.2000003
y: 73.6 y: 80.8
width: 327 width: 323.8
height: 418 height: 417.4
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -426,7 +426,7 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs: 5ef0ffff
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 2afbffff m_ExpandedIDs: 2afbffff
m_RenameOverlay: m_RenameOverlay:
@@ -553,10 +553,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 328 x: 332
y: 73.6 y: 80.8
width: 319 width: 315.60004
height: 418 height: 417.4
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -869,10 +869,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 7.2000003
y: 512 y: 519.2
width: 1129 width: 1118.2
height: 271 height: 271.4
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -890,22 +890,22 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Prefabs/Player - Assets/Scripts/Weapons
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Prefabs/Player - Assets/Scripts/Weapons
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 191} scrollPos: {x: 0, y: 191}
m_SelectedIDs: 1a650000 m_SelectedIDs: ce660000
m_LastClickedID: 25882 m_LastClickedID: 26318
m_ExpandedIDs: 00000000ce640000d0640000d2640000ee64000000ca9a3bffffff7f m_ExpandedIDs: 00000000d6640000d8640000da640000f0640000f464000000ca9a3bffffff7f
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -933,7 +933,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000ce640000d0640000d2640000 m_ExpandedIDs: 00000000d6640000d8640000da640000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -960,7 +960,7 @@ MonoBehaviour:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
@@ -1037,10 +1037,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1130.4 x: 1126.4
y: 73.6 y: 80.8
width: 405 width: 401.40002
height: 710 height: 709.8
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default