Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6a78ae7

Browse files
More Local Multiplayer Work
fixed issues with shooting now working on implementing the UI for the multiplayer
1 parent 49bd736 commit 6a78ae7

16 files changed

+1425
-218
lines changed

‎Native_Compilation_Project/Assets/Input Systems/PlayerInputs.cs‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,24 @@ public @PlayerInputs()
107107
""processors"": """",
108108
""interactions"": """",
109109
""initialStateCheck"": false
110+
},
111+
{
112+
""name"": ""PvP_Shoot2"",
113+
""type"": ""Button"",
114+
""id"": ""a72dd228-e1ea-4627-a81b-09c563e8c525"",
115+
""expectedControlType"": ""Button"",
116+
""processors"": """",
117+
""interactions"": """",
118+
""initialStateCheck"": false
119+
},
120+
{
121+
""name"": ""PvP_Dodge"",
122+
""type"": ""Button"",
123+
""id"": ""6d51d189-9077-4ce0-9279-11cc49582eb8"",
124+
""expectedControlType"": ""Button"",
125+
""processors"": """",
126+
""interactions"": """",
127+
""initialStateCheck"": false
110128
}
111129
],
112130
""bindings"": [
@@ -329,6 +347,28 @@ public @PlayerInputs()
329347
""action"": ""PvP_WeaponSwapRight"",
330348
""isComposite"": false,
331349
""isPartOfComposite"": false
350+
},
351+
{
352+
""name"": """",
353+
""id"": ""b1c51355-da60-4103-9708-c42c4b2a9a0b"",
354+
""path"": ""<Gamepad>/rightTrigger"",
355+
""interactions"": """",
356+
""processors"": """",
357+
""groups"": """",
358+
""action"": ""PvP_Shoot2"",
359+
""isComposite"": false,
360+
""isPartOfComposite"": false
361+
},
362+
{
363+
""name"": """",
364+
""id"": ""d7494bb9-a04d-4673-89a4-d6132e7e99f3"",
365+
""path"": ""<Gamepad>/leftTrigger"",
366+
""interactions"": """",
367+
""processors"": """",
368+
""groups"": """",
369+
""action"": ""PvP_Dodge"",
370+
""isComposite"": false,
371+
""isPartOfComposite"": false
332372
}
333373
]
334374
},
@@ -530,6 +570,8 @@ public @PlayerInputs()
530570
m_Player_Map_Pause = m_Player_Map.FindAction("Pause", throwIfNotFound: true);
531571
m_Player_Map_PvP_WeaponSwapLeft = m_Player_Map.FindAction("PvP_WeaponSwapLeft", throwIfNotFound: true);
532572
m_Player_Map_PvP_WeaponSwapRight = m_Player_Map.FindAction("PvP_WeaponSwapRight", throwIfNotFound: true);
573+
m_Player_Map_PvP_Shoot2 = m_Player_Map.FindAction("PvP_Shoot2", throwIfNotFound: true);
574+
m_Player_Map_PvP_Dodge = m_Player_Map.FindAction("PvP_Dodge", throwIfNotFound: true);
533575
// Menus_Map
534576
m_Menus_Map = asset.FindActionMap("Menus_Map", throwIfNotFound: true);
535577
m_Menus_Map_Up = m_Menus_Map.FindAction("Up", throwIfNotFound: true);
@@ -606,6 +648,8 @@ public int FindBinding(InputBinding bindingMask, out InputAction action)
606648
private readonly InputAction m_Player_Map_Pause;
607649
private readonly InputAction m_Player_Map_PvP_WeaponSwapLeft;
608650
private readonly InputAction m_Player_Map_PvP_WeaponSwapRight;
651+
private readonly InputAction m_Player_Map_PvP_Shoot2;
652+
private readonly InputAction m_Player_Map_PvP_Dodge;
609653
public struct Player_MapActions
610654
{
611655
private @PlayerInputs m_Wrapper;
@@ -619,6 +663,8 @@ public struct Player_MapActions
619663
public InputAction @Pause => m_Wrapper.m_Player_Map_Pause;
620664
public InputAction @PvP_WeaponSwapLeft => m_Wrapper.m_Player_Map_PvP_WeaponSwapLeft;
621665
public InputAction @PvP_WeaponSwapRight => m_Wrapper.m_Player_Map_PvP_WeaponSwapRight;
666+
public InputAction @PvP_Shoot2 => m_Wrapper.m_Player_Map_PvP_Shoot2;
667+
public InputAction @PvP_Dodge => m_Wrapper.m_Player_Map_PvP_Dodge;
622668
public InputActionMap Get() { return m_Wrapper.m_Player_Map; }
623669
public void Enable() { Get().Enable(); }
624670
public void Disable() { Get().Disable(); }
@@ -655,6 +701,12 @@ public void SetCallbacks(IPlayer_MapActions instance)
655701
@PvP_WeaponSwapRight.started -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_WeaponSwapRight;
656702
@PvP_WeaponSwapRight.performed -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_WeaponSwapRight;
657703
@PvP_WeaponSwapRight.canceled -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_WeaponSwapRight;
704+
@PvP_Shoot2.started -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_Shoot2;
705+
@PvP_Shoot2.performed -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_Shoot2;
706+
@PvP_Shoot2.canceled -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_Shoot2;
707+
@PvP_Dodge.started -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_Dodge;
708+
@PvP_Dodge.performed -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_Dodge;
709+
@PvP_Dodge.canceled -= m_Wrapper.m_Player_MapActionsCallbackInterface.OnPvP_Dodge;
658710
}
659711
m_Wrapper.m_Player_MapActionsCallbackInterface = instance;
660712
if (instance != null)
@@ -686,6 +738,12 @@ public void SetCallbacks(IPlayer_MapActions instance)
686738
@PvP_WeaponSwapRight.started += instance.OnPvP_WeaponSwapRight;
687739
@PvP_WeaponSwapRight.performed += instance.OnPvP_WeaponSwapRight;
688740
@PvP_WeaponSwapRight.canceled += instance.OnPvP_WeaponSwapRight;
741+
@PvP_Shoot2.started += instance.OnPvP_Shoot2;
742+
@PvP_Shoot2.performed += instance.OnPvP_Shoot2;
743+
@PvP_Shoot2.canceled += instance.OnPvP_Shoot2;
744+
@PvP_Dodge.started += instance.OnPvP_Dodge;
745+
@PvP_Dodge.performed += instance.OnPvP_Dodge;
746+
@PvP_Dodge.canceled += instance.OnPvP_Dodge;
689747
}
690748
}
691749
}
@@ -783,6 +841,8 @@ public interface IPlayer_MapActions
783841
void OnPause(InputAction.CallbackContext context);
784842
void OnPvP_WeaponSwapLeft(InputAction.CallbackContext context);
785843
void OnPvP_WeaponSwapRight(InputAction.CallbackContext context);
844+
void OnPvP_Shoot2(InputAction.CallbackContext context);
845+
void OnPvP_Dodge(InputAction.CallbackContext context);
786846
}
787847
public interface IMenus_MapActions
788848
{

‎Native_Compilation_Project/Assets/Input Systems/PlayerInputs.inputactions‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,24 @@
8585
"processors": "",
8686
"interactions": "",
8787
"initialStateCheck": false
88+
},
89+
{
90+
"name": "PvP_Shoot2",
91+
"type": "Button",
92+
"id": "a72dd228-e1ea-4627-a81b-09c563e8c525",
93+
"expectedControlType": "Button",
94+
"processors": "",
95+
"interactions": "",
96+
"initialStateCheck": false
97+
},
98+
{
99+
"name": "PvP_Dodge",
100+
"type": "Button",
101+
"id": "6d51d189-9077-4ce0-9279-11cc49582eb8",
102+
"expectedControlType": "Button",
103+
"processors": "",
104+
"interactions": "",
105+
"initialStateCheck": false
88106
}
89107
],
90108
"bindings": [
@@ -307,6 +325,28 @@
307325
"action": "PvP_WeaponSwapRight",
308326
"isComposite": false,
309327
"isPartOfComposite": false
328+
},
329+
{
330+
"name": "",
331+
"id": "b1c51355-da60-4103-9708-c42c4b2a9a0b",
332+
"path": "<Gamepad>/rightTrigger",
333+
"interactions": "",
334+
"processors": "",
335+
"groups": "",
336+
"action": "PvP_Shoot2",
337+
"isComposite": false,
338+
"isPartOfComposite": false
339+
},
340+
{
341+
"name": "",
342+
"id": "d7494bb9-a04d-4673-89a4-d6132e7e99f3",
343+
"path": "<Gamepad>/leftTrigger",
344+
"interactions": "",
345+
"processors": "",
346+
"groups": "",
347+
"action": "PvP_Dodge",
348+
"isComposite": false,
349+
"isPartOfComposite": false
310350
}
311351
]
312352
},

‎Native_Compilation_Project/Assets/PvP/Prefab/Player Main.prefab‎

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ GameObject:
4343
m_Component:
4444
- component: {fileID: 1957821137954597677}
4545
- component: {fileID: 1957821137954597674}
46-
- component: {fileID: 1957821137954597675}
4746
- component: {fileID: 1957821137954597676}
4847
- component: {fileID: 1957821137954597679}
4948
- component: {fileID: 1957821137954597678}
@@ -113,14 +112,6 @@ Camera:
113112
m_OcclusionCulling: 1
114113
m_StereoConvergence: 10
115114
m_StereoSeparation: 0.022
116-
--- !u!81 &1957821137954597675
117-
AudioListener:
118-
m_ObjectHideFlags: 0
119-
m_CorrespondingSourceObject: {fileID: 0}
120-
m_PrefabInstance: {fileID: 0}
121-
m_PrefabAsset: {fileID: 0}
122-
m_GameObject: {fileID: 1957821137954597672}
123-
m_Enabled: 1
124115
--- !u!114 &1957821137954597676
125116
MonoBehaviour:
126117
m_ObjectHideFlags: 0
@@ -219,6 +210,7 @@ GameObject:
219210
- component: {fileID: 3756487323612738286}
220211
- component: {fileID: 1932445829075690022}
221212
- component: {fileID: 8967843991548711179}
213+
- component: {fileID: 6419488113367083187}
222214
m_Layer: 0
223215
m_Name: Player
224216
m_TagString: Player
@@ -393,8 +385,8 @@ MonoBehaviour:
393385
m_Calls:
394386
- m_Target: {fileID: 8967843991548711179}
395387
m_TargetAssemblyTypeName: PvP_WeaponManager, Assembly-CSharp
396-
m_MethodName: Shoot
397-
m_Mode: 1
388+
m_MethodName: ShootHeld
389+
m_Mode: 0
398390
m_Arguments:
399391
m_ObjectArgument: {fileID: 0}
400392
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -406,19 +398,7 @@ MonoBehaviour:
406398
m_ActionId: 9c22cf6c-49a2-4811-9d4c-a7ffd330b11a
407399
m_ActionName: Player_Map/Shoot[/XInputControllerWindows/rightTrigger,/XInputControllerWindows1/rightTrigger,/Mouse/leftButton]
408400
- m_PersistentCalls:
409-
m_Calls:
410-
- m_Target: {fileID: 3756487323612738286}
411-
m_TargetAssemblyTypeName: PvP_Movement, Assembly-CSharp
412-
m_MethodName: Dodge
413-
m_Mode: 0
414-
m_Arguments:
415-
m_ObjectArgument: {fileID: 0}
416-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
417-
m_IntArgument: 0
418-
m_FloatArgument: 0
419-
m_StringArgument:
420-
m_BoolArgument: 0
421-
m_CallState: 2
401+
m_Calls: []
422402
m_ActionId: ed9b8d3c-985c-479e-8cd2-98ffc7e28786
423403
m_ActionName: Player_Map/Dodge[/XInputControllerWindows/leftShoulder,/XInputControllerWindows1/leftShoulder]
424404
- m_PersistentCalls:
@@ -453,8 +433,8 @@ MonoBehaviour:
453433
m_Calls:
454434
- m_Target: {fileID: 8967843991548711179}
455435
m_TargetAssemblyTypeName: PvP_WeaponManager, Assembly-CSharp
456-
m_MethodName: leftTrigger
457-
m_Mode: 1
436+
m_MethodName: LeftTrigger
437+
m_Mode: 0
458438
m_Arguments:
459439
m_ObjectArgument: {fileID: 0}
460440
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -469,8 +449,8 @@ MonoBehaviour:
469449
m_Calls:
470450
- m_Target: {fileID: 8967843991548711179}
471451
m_TargetAssemblyTypeName: PvP_WeaponManager, Assembly-CSharp
472-
m_MethodName: rightTrigger
473-
m_Mode: 1
452+
m_MethodName: RightTrigger
453+
m_Mode: 0
474454
m_Arguments:
475455
m_ObjectArgument: {fileID: 0}
476456
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -481,6 +461,38 @@ MonoBehaviour:
481461
m_CallState: 2
482462
m_ActionId: b9387764-88a7-4c38-8d47-83bbe0384ab9
483463
m_ActionName: Player_Map/PvP_WeaponSwapRight[/XInputControllerWindows/rightShoulder,/XInputControllerWindows1/rightShoulder]
464+
- m_PersistentCalls:
465+
m_Calls:
466+
- m_Target: {fileID: 8967843991548711179}
467+
m_TargetAssemblyTypeName: PvP_WeaponManager, Assembly-CSharp
468+
m_MethodName: ShootPressed
469+
m_Mode: 0
470+
m_Arguments:
471+
m_ObjectArgument: {fileID: 0}
472+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
473+
m_IntArgument: 0
474+
m_FloatArgument: 0
475+
m_StringArgument:
476+
m_BoolArgument: 0
477+
m_CallState: 2
478+
m_ActionId: a72dd228-e1ea-4627-a81b-09c563e8c525
479+
m_ActionName: Player_Map/PvP_Shoot2[/XInputControllerWindows/rightTrigger,/XInputControllerWindows1/rightTrigger]
480+
- m_PersistentCalls:
481+
m_Calls:
482+
- m_Target: {fileID: 3756487323612738286}
483+
m_TargetAssemblyTypeName: PvP_Movement, Assembly-CSharp
484+
m_MethodName: Dodge
485+
m_Mode: 0
486+
m_Arguments:
487+
m_ObjectArgument: {fileID: 0}
488+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
489+
m_IntArgument: 0
490+
m_FloatArgument: 0
491+
m_StringArgument:
492+
m_BoolArgument: 0
493+
m_CallState: 2
494+
m_ActionId: 6d51d189-9077-4ce0-9279-11cc49582eb8
495+
m_ActionName: Player_Map/PvP_Dodge[/XInputControllerWindows/leftTrigger,/XInputControllerWindows1/leftTrigger]
484496
m_NeverAutoSwitchControlSchemes: 0
485497
m_DefaultControlScheme: PvP
486498
m_DefaultActionMap: Player_Map
@@ -613,7 +625,7 @@ MonoBehaviour:
613625
m_Script: {fileID: 11500000, guid: 50eeb6c2877bc3746a7261a61647a2b7, type: 3}
614626
m_Name:
615627
m_EditorClassIdentifier:
616-
maxHealth: 0
628+
maxHealth: 100
617629
currentHealth: 0
618630
--- !u!114 &8967843991548711179
619631
MonoBehaviour:
@@ -633,6 +645,19 @@ MonoBehaviour:
633645
- {fileID: 6484319980946712239}
634646
- {fileID: 2949030253956671647}
635647
- {fileID: 8980065298096166442}
648+
--- !u!114 &6419488113367083187
649+
MonoBehaviour:
650+
m_ObjectHideFlags: 0
651+
m_CorrespondingSourceObject: {fileID: 0}
652+
m_PrefabInstance: {fileID: 0}
653+
m_PrefabAsset: {fileID: 0}
654+
m_GameObject: {fileID: 8182102944818014917}
655+
m_Enabled: 1
656+
m_EditorHideFlags: 0
657+
m_Script: {fileID: 11500000, guid: 699dc1b4e6daa2e479f26761daba8f5f, type: 3}
658+
m_Name:
659+
m_EditorClassIdentifier:
660+
playerID: 0
636661
--- !u!1 &8182102945063474393
637662
GameObject:
638663
m_ObjectHideFlags: 0

‎Native_Compilation_Project/Assets/PvP/Prefab/PvP_Assult.prefab‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,9 @@ MonoBehaviour:
266266
clip: {fileID: 8300000, guid: b39ec697f76aec04fb8081c0c4f6dbae, type: 3}
267267
ammoText: {fileID: 0}
268268
damage: 5
269+
bulletID: 0
269270
firePoint: {fileID: 2073090860442250870}
270-
bullet: {fileID: 4778730020531401928, guid: fe970cd94c4da694f91a7f969510c3a6, type: 3}
271+
bullet: {fileID: 7652618037008810816, guid: 436c1b9b608f38b43a2557aa0b11179f, type: 3}
271272
bulletSpeed: 500
272273
maxAmmo: 30
273274
curAmmo: 30

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /