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 42e3d01

Browse files
PvP Balencing & Finished
finished the PVP changing the spawning and making the movement and wepaons more balnced as well as making the map smaller and zooming the camera out a bit
1 parent 6ca02a5 commit 42e3d01

File tree

6 files changed

+896
-216
lines changed

6 files changed

+896
-216
lines changed

‎Native/Assets/Input Systems/PlayerInputs.cs

Lines changed: 7 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -258,17 +258,6 @@ public @PlayerInputs()
258258
""isComposite"": false,
259259
""isPartOfComposite"": false
260260
},
261-
{
262-
""name"": """",
263-
""id"": ""be25bcf6-96e8-47b1-91b7-d6458d41118e"",
264-
""path"": ""<Keyboard>/e"",
265-
""interactions"": """",
266-
""processors"": """",
267-
""groups"": """",
268-
""action"": ""Pickup"",
269-
""isComposite"": false,
270-
""isPartOfComposite"": false
271-
},
272261
{
273262
""name"": """",
274263
""id"": ""17f88af1-628b-4732-b247-5e0f8307bb16"",
@@ -280,17 +269,6 @@ public @PlayerInputs()
280269
""isComposite"": false,
281270
""isPartOfComposite"": false
282271
},
283-
{
284-
""name"": """",
285-
""id"": ""94039e73-4ce2-42a5-b06f-2f81646a8340"",
286-
""path"": ""<Keyboard>/q"",
287-
""interactions"": """",
288-
""processors"": """",
289-
""groups"": """",
290-
""action"": ""Throw"",
291-
""isComposite"": false,
292-
""isPartOfComposite"": false
293-
},
294272
{
295273
""name"": """",
296274
""id"": ""0113af9d-0a10-4cdb-b214-aae28436edf6"",
@@ -302,17 +280,6 @@ public @PlayerInputs()
302280
""isComposite"": false,
303281
""isPartOfComposite"": false
304282
},
305-
{
306-
""name"": """",
307-
""id"": ""ccbf5078-a0e1-4522-b470-e84f2c8ce0fc"",
308-
""path"": ""<Mouse>/leftButton"",
309-
""interactions"": """",
310-
""processors"": """",
311-
""groups"": """",
312-
""action"": ""Shoot"",
313-
""isComposite"": false,
314-
""isPartOfComposite"": false
315-
},
316283
{
317284
""name"": """",
318285
""id"": ""548fdf14-f1db-4d9b-b75d-b280e8aeb6d7"",
@@ -324,17 +291,6 @@ public @PlayerInputs()
324291
""isComposite"": false,
325292
""isPartOfComposite"": false
326293
},
327-
{
328-
""name"": """",
329-
""id"": ""40562cea-5221-472d-ac9c-a274703f7ece"",
330-
""path"": ""<Keyboard>/leftShift"",
331-
""interactions"": """",
332-
""processors"": """",
333-
""groups"": """",
334-
""action"": ""Dodge"",
335-
""isComposite"": false,
336-
""isPartOfComposite"": false
337-
},
338294
{
339295
""name"": """",
340296
""id"": ""72a7b33c-ebe7-434f-9161-b9202ca2c26f"",
@@ -346,17 +302,6 @@ public @PlayerInputs()
346302
""isComposite"": false,
347303
""isPartOfComposite"": false
348304
},
349-
{
350-
""name"": """",
351-
""id"": ""9c8ec5ed-9a48-4897-a82c-e23bac77923a"",
352-
""path"": ""<Keyboard>/escape"",
353-
""interactions"": """",
354-
""processors"": """",
355-
""groups"": """",
356-
""action"": ""Pause"",
357-
""isComposite"": false,
358-
""isPartOfComposite"": false
359-
},
360305
{
361306
""name"": """",
362307
""id"": ""60ebb146-67c0-408f-bb2f-ce4b55ba42a4"",
@@ -368,17 +313,6 @@ public @PlayerInputs()
368313
""isComposite"": false,
369314
""isPartOfComposite"": false
370315
},
371-
{
372-
""name"": """",
373-
""id"": ""17f98b3d-991a-4e5b-8c81-0c4a3c61aceb"",
374-
""path"": ""<Keyboard>/q"",
375-
""interactions"": """",
376-
""processors"": """",
377-
""groups"": """",
378-
""action"": ""PvP_WeaponSwapLeft"",
379-
""isComposite"": false,
380-
""isPartOfComposite"": false
381-
},
382316
{
383317
""name"": """",
384318
""id"": ""2b24f6d7-26c8-4b3f-91ed-d88ada35f2f9"",
@@ -390,17 +324,6 @@ public @PlayerInputs()
390324
""isComposite"": false,
391325
""isPartOfComposite"": false
392326
},
393-
{
394-
""name"": """",
395-
""id"": ""d721f7e6-e5f9-4bc7-be4c-6a216309a870"",
396-
""path"": ""<Keyboard>/e"",
397-
""interactions"": """",
398-
""processors"": """",
399-
""groups"": """",
400-
""action"": ""PvP_WeaponSwapRight"",
401-
""isComposite"": false,
402-
""isPartOfComposite"": false
403-
},
404327
{
405328
""name"": """",
406329
""id"": ""b1c51355-da60-4103-9708-c42c4b2a9a0b"",
@@ -412,17 +335,6 @@ public @PlayerInputs()
412335
""isComposite"": false,
413336
""isPartOfComposite"": false
414337
},
415-
{
416-
""name"": """",
417-
""id"": ""601684d9-ef4f-40f9-ac93-98c7bd825b15"",
418-
""path"": ""<Mouse>/leftButton"",
419-
""interactions"": """",
420-
""processors"": """",
421-
""groups"": """",
422-
""action"": ""PvP_Shoot2"",
423-
""isComposite"": false,
424-
""isPartOfComposite"": false
425-
},
426338
{
427339
""name"": """",
428340
""id"": ""d7494bb9-a04d-4673-89a4-d6132e7e99f3"",
@@ -435,20 +347,20 @@ public @PlayerInputs()
435347
""isPartOfComposite"": false
436348
},
437349
{
438-
""name"": """",
439-
""id"": ""478791f3-88e9-4c87-bf2d-04a75b9757e6"",
440-
""path"": ""<Keyboard>/leftShift"",
350+
""name"": ""A Button"",
351+
""id"": ""c557534f-bd0b-4e59-b625-f85d106235f7"",
352+
""path"": ""<Gamepad>/buttonSouth"",
441353
""interactions"": """",
442354
""processors"": """",
443355
""groups"": """",
444-
""action"": ""PvP_Dodge"",
356+
""action"": ""A Buttton"",
445357
""isComposite"": false,
446358
""isPartOfComposite"": false
447359
},
448360
{
449-
""name"": ""A Button"",
450-
""id"": ""c557534f-bd0b-4e59-b625-f85d106235f7"",
451-
""path"": ""<Gamepad>/buttonSouth"",
361+
""name"": """",
362+
""id"": ""6f31fde3-54a1-488d-9471-d040117a69e1"",
363+
""path"": ""<Keyboard>/a"",
452364
""interactions"": """",
453365
""processors"": """",
454366
""groups"": """",

‎Native/Assets/Input Systems/PlayerInputs.inputactions

Lines changed: 7 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,6 @@
236236
"isComposite": false,
237237
"isPartOfComposite": false
238238
},
239-
{
240-
"name": "",
241-
"id": "be25bcf6-96e8-47b1-91b7-d6458d41118e",
242-
"path": "<Keyboard>/e",
243-
"interactions": "",
244-
"processors": "",
245-
"groups": "",
246-
"action": "Pickup",
247-
"isComposite": false,
248-
"isPartOfComposite": false
249-
},
250239
{
251240
"name": "",
252241
"id": "17f88af1-628b-4732-b247-5e0f8307bb16",
@@ -258,17 +247,6 @@
258247
"isComposite": false,
259248
"isPartOfComposite": false
260249
},
261-
{
262-
"name": "",
263-
"id": "94039e73-4ce2-42a5-b06f-2f81646a8340",
264-
"path": "<Keyboard>/q",
265-
"interactions": "",
266-
"processors": "",
267-
"groups": "",
268-
"action": "Throw",
269-
"isComposite": false,
270-
"isPartOfComposite": false
271-
},
272250
{
273251
"name": "",
274252
"id": "0113af9d-0a10-4cdb-b214-aae28436edf6",
@@ -280,17 +258,6 @@
280258
"isComposite": false,
281259
"isPartOfComposite": false
282260
},
283-
{
284-
"name": "",
285-
"id": "ccbf5078-a0e1-4522-b470-e84f2c8ce0fc",
286-
"path": "<Mouse>/leftButton",
287-
"interactions": "",
288-
"processors": "",
289-
"groups": "",
290-
"action": "Shoot",
291-
"isComposite": false,
292-
"isPartOfComposite": false
293-
},
294261
{
295262
"name": "",
296263
"id": "548fdf14-f1db-4d9b-b75d-b280e8aeb6d7",
@@ -302,17 +269,6 @@
302269
"isComposite": false,
303270
"isPartOfComposite": false
304271
},
305-
{
306-
"name": "",
307-
"id": "40562cea-5221-472d-ac9c-a274703f7ece",
308-
"path": "<Keyboard>/leftShift",
309-
"interactions": "",
310-
"processors": "",
311-
"groups": "",
312-
"action": "Dodge",
313-
"isComposite": false,
314-
"isPartOfComposite": false
315-
},
316272
{
317273
"name": "",
318274
"id": "72a7b33c-ebe7-434f-9161-b9202ca2c26f",
@@ -324,17 +280,6 @@
324280
"isComposite": false,
325281
"isPartOfComposite": false
326282
},
327-
{
328-
"name": "",
329-
"id": "9c8ec5ed-9a48-4897-a82c-e23bac77923a",
330-
"path": "<Keyboard>/escape",
331-
"interactions": "",
332-
"processors": "",
333-
"groups": "",
334-
"action": "Pause",
335-
"isComposite": false,
336-
"isPartOfComposite": false
337-
},
338283
{
339284
"name": "",
340285
"id": "60ebb146-67c0-408f-bb2f-ce4b55ba42a4",
@@ -346,17 +291,6 @@
346291
"isComposite": false,
347292
"isPartOfComposite": false
348293
},
349-
{
350-
"name": "",
351-
"id": "17f98b3d-991a-4e5b-8c81-0c4a3c61aceb",
352-
"path": "<Keyboard>/q",
353-
"interactions": "",
354-
"processors": "",
355-
"groups": "",
356-
"action": "PvP_WeaponSwapLeft",
357-
"isComposite": false,
358-
"isPartOfComposite": false
359-
},
360294
{
361295
"name": "",
362296
"id": "2b24f6d7-26c8-4b3f-91ed-d88ada35f2f9",
@@ -368,17 +302,6 @@
368302
"isComposite": false,
369303
"isPartOfComposite": false
370304
},
371-
{
372-
"name": "",
373-
"id": "d721f7e6-e5f9-4bc7-be4c-6a216309a870",
374-
"path": "<Keyboard>/e",
375-
"interactions": "",
376-
"processors": "",
377-
"groups": "",
378-
"action": "PvP_WeaponSwapRight",
379-
"isComposite": false,
380-
"isPartOfComposite": false
381-
},
382305
{
383306
"name": "",
384307
"id": "b1c51355-da60-4103-9708-c42c4b2a9a0b",
@@ -390,17 +313,6 @@
390313
"isComposite": false,
391314
"isPartOfComposite": false
392315
},
393-
{
394-
"name": "",
395-
"id": "601684d9-ef4f-40f9-ac93-98c7bd825b15",
396-
"path": "<Mouse>/leftButton",
397-
"interactions": "",
398-
"processors": "",
399-
"groups": "",
400-
"action": "PvP_Shoot2",
401-
"isComposite": false,
402-
"isPartOfComposite": false
403-
},
404316
{
405317
"name": "",
406318
"id": "d7494bb9-a04d-4673-89a4-d6132e7e99f3",
@@ -413,20 +325,20 @@
413325
"isPartOfComposite": false
414326
},
415327
{
416-
"name": "",
417-
"id": "478791f3-88e9-4c87-bf2d-04a75b9757e6",
418-
"path": "<Keyboard>/leftShift",
328+
"name": "A Button",
329+
"id": "c557534f-bd0b-4e59-b625-f85d106235f7",
330+
"path": "<Gamepad>/buttonSouth",
419331
"interactions": "",
420332
"processors": "",
421333
"groups": "",
422-
"action": "PvP_Dodge",
334+
"action": "A Buttton",
423335
"isComposite": false,
424336
"isPartOfComposite": false
425337
},
426338
{
427-
"name": "A Button",
428-
"id": "c557534f-bd0b-4e59-b625-f85d106235f7",
429-
"path": "<Gamepad>/buttonSouth",
339+
"name": "",
340+
"id": "6f31fde3-54a1-488d-9471-d040117a69e1",
341+
"path": "<Keyboard>/a",
430342
"interactions": "",
431343
"processors": "",
432344
"groups": "",

0 commit comments

Comments
(0)

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