Skip to content

Multiplayer-arena-game / Multiplayer-arena-game-GameObjects

Go to a project
Commit 665dc919 by alsunj
Options

improve player movement

parent d4490503
Expand all
Inline Side-by-side
Showing with 306 additions and 49 deletions
Assets/_Game/Code/Player/PlayerAnimator.cs
...@@ -15,10 +15,10 @@ public class PlayerAnimator : NetworkBehaviour ...@@ -15,10 +15,10 @@ public class PlayerAnimator : NetworkBehaviour
private void Update() private void Update()
{ {
if (!IsOwner) // if (!IsOwner)
{ // {
return; // return;
} // }
_animator.SetBool(IS_WALKING, _playerController.IsWalking()); _animator.SetBool(IS_WALKING, _playerController.IsWalking());
} }
......
Assets/_Game/Input/InputReader.asset 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38046858527cd1b4fa2edbe312d75842, type: 3}
m_Name: InputReader
m_EditorClassIdentifier:
Assets/_Game/Input/InputReader.asset.meta 0 → 100644
fileFormatVersion: 2
guid: fae963ae99ce6d14d8bbcd54becb58d7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Input/InputReader.cs
...@@ -5,6 +5,7 @@ using UnityEngine.InputSystem; ...@@ -5,6 +5,7 @@ using UnityEngine.InputSystem;
[CreateAssetMenu(fileName = "InputReader", menuName = "Scriptable Objects/InputReader")] [CreateAssetMenu(fileName = "InputReader", menuName = "Scriptable Objects/InputReader")]
public class InputReader : ScriptableObject, InputSystem_Actions.IPlayerActions, IInputHandler public class InputReader : ScriptableObject, InputSystem_Actions.IPlayerActions, IInputHandler
{ {
private InputSystem_Actions inputActions;
public event Action<Vector2> MoveEvent; public event Action<Vector2> MoveEvent;
public event Action<Vector2> LookEvent; public event Action<Vector2> LookEvent;
public event Action InteractEvent; public event Action InteractEvent;
...@@ -13,6 +14,27 @@ public class InputReader : ScriptableObject, InputSystem_Actions.IPlayerActions, ...@@ -13,6 +14,27 @@ public class InputReader : ScriptableObject, InputSystem_Actions.IPlayerActions,
public event Action<bool> CrouchEvent; public event Action<bool> CrouchEvent;
public event Action AttackEvent; public event Action AttackEvent;
public void InitializeInput()
{
if (inputActions == null)
{
inputActions = new InputSystem_Actions();
inputActions.Player.SetCallbacks(this);
}
inputActions.Enable();
}
private void OnDisable()
{
if (inputActions != null)
{
inputActions.Disable();
inputActions.Player.RemoveCallbacks(this);
inputActions.Dispose();
}
}
public void OnMove(InputAction.CallbackContext context) public void OnMove(InputAction.CallbackContext context)
{ {
if (context.performed) if (context.performed)
...@@ -21,7 +43,7 @@ public class InputReader : ScriptableObject, InputSystem_Actions.IPlayerActions, ...@@ -21,7 +43,7 @@ public class InputReader : ScriptableObject, InputSystem_Actions.IPlayerActions,
} }
else else
{ {
MoveEvent?.Invoke(new Vector2(0, 0)); MoveEvent?.Invoke(Vector2.zero);
} }
} }
......
Assets/_Game/Scenes/SC.unity
...@@ -152,7 +152,7 @@ Transform: ...@@ -152,7 +152,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 645337607} - {fileID: 645337607}
m_Father: {fileID: 0} m_Father: {fileID: 1623128584}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!65 &20099878 --- !u!65 &20099878
BoxCollider: BoxCollider:
...@@ -1159,10 +1159,42 @@ PrefabInstance: ...@@ -1159,10 +1159,42 @@ PrefabInstance:
propertyPath: GlobalObjectIdHash propertyPath: GlobalObjectIdHash
value: 1048055298 value: 1048055298
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3702991396873574320, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: fov
value: 74.36
objectReference: {fileID: 0}
- target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: speed
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: walkSpeed
value: 10.14
objectReference: {fileID: 0}
- target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: _inputReader
value:
objectReference: {fileID: 11400000, guid: fae963ae99ce6d14d8bbcd54becb58d7, type: 2}
- target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: unlimitedSprint
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: playerInteractionSettings
value:
objectReference: {fileID: 11400000, guid: 1bc75bcaab451a44d8a71f0189dc90f8, type: 2}
- target: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3} - target: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Player value: Player
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
...@@ -1355,7 +1387,8 @@ Transform: ...@@ -1355,7 +1387,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 20099877}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1687222682 --- !u!1 &1687222682
...@@ -1375,7 +1408,7 @@ GameObject: ...@@ -1375,7 +1408,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!114 &1687222683 --- !u!114 &1687222683
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1645,7 +1678,7 @@ GameObject: ...@@ -1645,7 +1678,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!114 &1909091470 --- !u!114 &1909091470
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1775,7 +1808,6 @@ SceneRoots: ...@@ -1775,7 +1808,6 @@ SceneRoots:
- {fileID: 1294522714} - {fileID: 1294522714}
- {fileID: 98077555} - {fileID: 98077555}
- {fileID: 1623128584} - {fileID: 1623128584}
- {fileID: 20099877}
- {fileID: 1687222685} - {fileID: 1687222685}
- {fileID: 303522006} - {fileID: 303522006}
- {fileID: 865924118} - {fileID: 865924118}
......
ProjectSettings/EditorBuildSettings.asset
...@@ -11,6 +11,9 @@ EditorBuildSettings: ...@@ -11,6 +11,9 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Scene.unity path: Assets/Scenes/Scene.unity
guid: fb476371a58224b439cbcc569f3d86f0 guid: fb476371a58224b439cbcc569f3d86f0
- enabled: 1
path: Assets/_Game/Scenes/SC.unity
guid: 4bdbbb25aff08a54098c34d6f75b201b
m_configObjects: m_configObjects:
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
m_UseUCBPForAssetBundles: 0 m_UseUCBPForAssetBundles: 0
ProjectSettings/EditorSettings.asset
...@@ -25,7 +25,7 @@ EditorSettings: ...@@ -25,7 +25,7 @@ EditorSettings:
m_AsyncShaderCompilation: 1 m_AsyncShaderCompilation: 1
m_PrefabModeAllowAutoSave: 1 m_PrefabModeAllowAutoSave: 1
m_EnterPlayModeOptionsEnabled: 1 m_EnterPlayModeOptionsEnabled: 1
m_EnterPlayModeOptions: 0 m_EnterPlayModeOptions: 1
m_GameObjectNamingDigits: 1 m_GameObjectNamingDigits: 1
m_GameObjectNamingScheme: 0 m_GameObjectNamingScheme: 0
m_AssetNamingUsesSpace: 1 m_AssetNamingUsesSpace: 1
......
ProjectSettings/ProjectSettings.asset
...@@ -945,7 +945,7 @@ PlayerSettings: ...@@ -945,7 +945,7 @@ PlayerSettings:
qnxGraphicConfPath: qnxGraphicConfPath:
apiCompatibilityLevel: 6 apiCompatibilityLevel: 6
captureStartupLogs: {} captureStartupLogs: {}
activeInputHandler: 2 activeInputHandler: 1
windowsGamepadBackendHint: 0 windowsGamepadBackendHint: 0
cloudProjectId: 3cd49368-e13d-4741-80b2-b4559fc6fe1b cloudProjectId: 3cd49368-e13d-4741-80b2-b4559fc6fe1b
framebufferDepthMemorylessMode: 0 framebufferDepthMemorylessMode: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment