janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-31 13:37:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Weapon Switching/pickup/throw

Browse Source 
[+] added
+ added pickup weapons
+ added throw weapons
+ added weapon switching
+ scrolling searches for next active weapon

[n] needs to be added
n weapon in correct position after pickup
n after weapon throw -> next active weapon needs to be equipt
n throw/pickup/switch weapon animation
This commit is contained in:
Noah4ever
2021-11-20 15:47:58 +01:00
parent facc42b03f
commit a40aec3874
6 changed files with 256 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1536
height: 780.8
m_ShowMode: 4
m_Title: Project
m_Title: Inspector
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 111
controlID: 105
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 112
controlID: 120
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -166,11 +166,11 @@ MonoBehaviour:
x: 0
y: 0
width: 1269
height: 439
height: 439.2
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
controlID: 113
controlID: 121
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -188,8 +188,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 243
height: 439
width: 243.2
height: 439.2
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14}
@@ -212,10 +212,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 243
x: 243.2
y: 0
width: 493
height: 439
width: 492.8
height: 439.2
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 16}
@@ -242,9 +242,9 @@ MonoBehaviour:
x: 736
y: 0
width: 533
height: 439
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
height: 439.2
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -260,23 +260,23 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 439
y: 439.2
width: 1269
height: 292
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17}
height: 291.8
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 17}
- {fileID: 18}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -326,7 +326,7 @@ MonoBehaviour:
x: 736
y: 73.6
width: 531
height: 418
height: 418.2
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -337,7 +337,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 531, y: 397}
m_TargetSize: {x: 531, y: 397.2}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -354,15 +354,15 @@ MonoBehaviour:
vZoomLockedByDefault: 0
m_HBaseRangeMin: -212.40001
m_HBaseRangeMax: 212.40001
m_VBaseRangeMin: -158.8
m_VBaseRangeMax: 158.8
m_VBaseRangeMin: -158.88
m_VBaseRangeMax: 158.88
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
m_VAllowExceedBaseRangeMax: 1
m_ScaleWithWindow: 0
m_HSlider: 1
m_VSlider: 1
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
@@ -374,22 +374,22 @@ MonoBehaviour:
x: 0
y: 21
width: 531
height: 397
m_Scale: {x: 1.2742728, y: 1.2742728}
m_Translation: {x: 260.34442, y: 200.231}
height: 397.2
m_Scale: {x: 1.2349323, y: 1.2349323}
m_Translation: {x: 265.5, y: 198.6}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -204.30823
y: -157.13354
width: 416.70825
height: 311.55023
x: -214.99155
y: -160.81854
width: 429.9831
height: 321.6371
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 663.75, y: 522.5}
m_LastWindowPixelSize: {x: 663.75, y: 522.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -417,8 +417,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73.6
width: 242
height: 418
width: 242.2
height: 418.2
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -426,9 +426,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 2afbffff
m_SelectedIDs: eabaffff
m_LastClickedID: -17686
m_ExpandedIDs: 72bdffff28fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -538,8 +538,8 @@ MonoBehaviour:
serializedVersion: 2
x: 243.2
y: 73.6
width: 491
height: 418
width: 490.8
height: 418.2
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -752,9 +752,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 12.319317, y: 1.3333886, z: 0.22287211}
m_Target: {x: 12.316664, y: 1.3373972, z: 0.22427776}
speed: 2
m_Value: {x: 12.319317, y: 1.3333886, z: 0.22287211}
m_Value: {x: 12.316664, y: 1.3373972, z: 0.22427776}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -801,9 +801,9 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.27131104, y: -0.4891474, z: 0.16330287, w: 0.81269896}
m_Target: {x: 0.2700917, y: -0.4893918, z: 0.16256894, w: 0.813105}
speed: 2
m_Value: {x: 0.27130803, y: -0.48914197, z: 0.16330107, w: 0.81268996}
m_Value: {x: 0.27008873, y: -0.48938638, z: 0.16256714, w: 0.813096}
m_Size:
m_Target: 0.8347519
speed: 2
@@ -853,9 +853,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 512
y: 512.8
width: 1268
height: 271
height: 270.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -886,9 +886,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 120}
m_SelectedIDs: de630000
m_LastClickedID: 25566
m_ExpandedIDs: 00000000ba630000bc630000be630000c0630000c263000000ca9a3b
m_SelectedIDs: 62640000
m_LastClickedID: 25698
m_ExpandedIDs: 00000000426400004464000046640000486400004a64000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -916,7 +916,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ba630000bc630000be630000c0630000c2630000
m_ExpandedIDs: 00000000426400004464000046640000486400004a640000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -943,7 +943,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -993,9 +993,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 512
y: 512.8
width: 1268
height: 271
height: 270.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default