Complete movement update

This commit is contained in:
2026-06-04 13:10:09 +07:00
parent f70082a350
commit 6c8c372f9d
6 changed files with 145053 additions and 285 deletions

View File

@@ -6,17 +6,6 @@
<component name="ChangeListManager">
<list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Input/InputReader.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Input/InputReader.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Interaction/Item Manager/vDrawHideMeleeWeapons.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Interaction/Item Manager/vDrawHideMeleeWeapons.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/Actions/vLadderAction.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/Actions/vLadderAction.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vBlockUnarmedAttack.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vBlockUnarmedAttack.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vMeleeCombatInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vMeleeCombatInput.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vThirdPersonInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vThirdPersonInput.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/Generic/Triggers/vSimpleTriggerWithInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/Generic/Triggers/vSimpleTriggerWithInput.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/LockOn/vLockOn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/LockOn/vLockOn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/Shooter/vLockOnShooter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/Shooter/vLockOnShooter.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/Shooter/vShooterMeleeInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/Shooter/vShooterMeleeInput.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/Weapon/vDrawHideShooterWeapons.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/Weapon/vDrawHideShooterWeapons.cs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -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

144787
Assets/_Recovery/0 (13).unity Normal file

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 24da8ac242cf3f54aa516d7481103c4e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,125 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 10
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 2
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 1
m_PVRFilteringGaussRadiusAO: 1
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots: []

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d6b841e08a4e187419259d4e8e586ced
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: