Complete movement update

2026-06-04 13:10:09 +07:00
parent f70082a350
commit 6c8c372f9d
6 changed files with 145053 additions and 285 deletions
--- a/Assets/Prefabs/Shooter/Player/vShooterMelee_Inventory.prefab
+++ b/Assets/Prefabs/Shooter/Player/vShooterMelee_Inventory.prefab
@@ -3593,135 +3593,7 @@ MonoBehaviour:
  cc: {fileID: 0}
  hud: {fileID: 0}
  lockMoveInput: 0
-  weakAttackInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Mouse0
-    keyboardAxis: 0
-    joystick: RB
-    joystickAxis: 0
-    mobile: RB
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  strongAttackInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Alpha1
-    keyboardAxis: 0
-    joystick: RT
-    joystickAxis: 1
-    mobile: RT
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  blockInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Mouse1
-    keyboardAxis: 0
-    joystick: LB
-    joystickAxis: 0
-    mobile: LB
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
  lockMeleeInput: 0
-  aimInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Mouse1
-    keyboardAxis: 0
-    joystick: LT
-    joystickAxis: 1
-    mobile: LT
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  shotInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Mouse0
-    keyboardAxis: 0
-    joystick: RT
-    joystickAxis: 1
-    mobile: RT
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  reloadInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: R
-    keyboardAxis: 0
-    joystick: RB
-    joystickAxis: 0
-    mobile: RB
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  switchCameraSideInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Tab
-    keyboardAxis: 0
-    joystick: D-Pad Vertical
-    joystickAxis: 0
-    mobile: D-Pad Vertical
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  scopeViewInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Z
-    keyboardAxis: 0
-    joystick: RightStickClick
-    joystickAxis: 0
-    mobile: RightStickClick
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
  shooterManager: {fileID: 0}
 --- !u!54 &5445852
 Rigidbody:
@@ -4421,86 +4293,6 @@ MonoBehaviour:
  climbSpeed: 1.5
  fastClimbSpeed: 3
  fastClimbStamina: 30
-  verticalInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Vertical
-    keyboardAxis: 0
-    joystick: LeftAnalogVertical
-    joystickAxis: 0
-    mobile: Vertical
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  enterInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: E
-    keyboardAxis: 0
-    joystick: A
-    joystickAxis: 0
-    mobile: A
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  exitInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Space
-    keyboardAxis: 0
-    joystick: B
-    joystickAxis: 0
-    mobile: B
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  fastClimbInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: LeftShift
-    keyboardAxis: 0
-    joystick: LeftStickClick
-    joystickAxis: 0
-    mobile: LeftStickClick
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  slideDownInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Q
-    keyboardAxis: 0
-    joystick: X
-    joystickAxis: 0
-    mobile: X
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
  OnEnterLadder:
    m_PersistentCalls:
      m_Calls:
@@ -4572,54 +4364,7 @@ MonoBehaviour:
  spriteHeight: 0.25
  cameraHeightOffset: 0
  lockSpeed: 0.5
-  lockOnInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Tab
-    keyboardAxis: 0
-    joystick: RightStickClick
-    joystickAxis: 0
-    mobile: RightStickClick
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  nexTargetInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: X
-    keyboardAxis: 0
-    joystick: RightAnalogHorizontal
-    joystickAxis: 1
-    mobile: X
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
-  previousTargetInput:
-    useInput: 1
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: Z
-    keyboardAxis: 0
-    joystick: RightAnalogHorizontal
-    joystickAxis: 1
-    mobile: Z
-    mobileAxis: 0
-    joystickAxisInvert: 1
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
+  debugMode: 0
  onLockOnTarget:
    m_PersistentCalls:
      m_Calls:
@@ -4669,22 +4414,6 @@ MonoBehaviour:
  hideWeaponsTimer: 5
  lockInventoryInputOnLock: 0
  isLocked: 0
-  hideAndDrawWeaponsInput:
-    useInput: 0
-    isAxisInUse: 0
-    isUnityInput: 0
-    keyboard: H
-    keyboardAxis: 0
-    joystick: LB
-    joystickAxis: 0
-    mobile: LB
-    mobileAxis: 0
-    joystickAxisInvert: 0
-    keyboardAxisInvert: 0
-    mobileAxisInvert: 0
-    timeButtonWasPressed: 0
-    lastTimeTheButtonWasPressed: 0
-    inButtomTimer: 0
  meleeWeakAttack: 0
  meleeStrongAttack: 1
  meleeBlock: 1
@@ -5181,7 +4910,7 @@ MonoBehaviour:
    m_ActionName: UI/TrackedDeviceOrientation
  - m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: -3829962440237222997}
        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
        m_MethodName: OnScroll
        m_Mode: 0
@@ -5196,7 +4925,19 @@ MonoBehaviour:
    m_ActionId: 1702ffae-5ad3-4532-9855-bf7e2a8ae749
    m_ActionName: 'Player/Scroll[/Mouse/scroll]'
  - m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnToggleView
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
    m_ActionId: 7e8b9416-0a2d-4652-98d8-e7368560ede9
    m_ActionName: 'Player/ToggleView[/Keyboard/f2]'
  - m_PersistentCalls:
@@ -5207,6 +4948,118 @@ MonoBehaviour:
      m_Calls: []
    m_ActionId: 79227a8d-6fd2-496d-8466-68f007a2c355
    m_ActionName: 'UI/Escape[/Keyboard/escape]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnStrongAttack
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: d1e2f3a4-b5c6-4d7e-8f9a-0b1c2d3e4f5a
+    m_ActionName: 'Player/StrongAttack[/Keyboard/leftAlt]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnBlock
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d
+    m_ActionName: 'Player/Block[/Mouse/rightButton]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnAim
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: f1e2d3c4-b5a6-4978-9012-3456789abcde
+    m_ActionName: 'Player/Aim[/Mouse/rightButton]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnReload
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 98765432-10ab-cdef-0123-456789abcdef
+    m_ActionName: 'Player/Reload[/Keyboard/r]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnDodgeOrThrust
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: e5d4c3b2-a1b2-c3d4-e5f6-a7b8c9d0e1f2
+    m_ActionName: 'Player/Dodge[/Keyboard/q]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnSwitchSide
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 74839201-abcd-ef01-2345-6789abcdef01
+    m_ActionName: 'Player/SwitchSide[/Keyboard/tab]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: -3829962440237222997}
+        m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp
+        m_MethodName: OnScopeView
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 12345678-1234-5678-1234-567812345678
+    m_ActionName: 'Player/ScopeView[/Keyboard/z]'
  m_NeverAutoSwitchControlSchemes: 0
  m_DefaultControlScheme: 
  m_DefaultActionMap: Player