tiboFDG/Ipseity-Demo
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: Revert OctoPlayer

Browse Source
This commit is contained in:
Alexandre Coirier
2026-05-25 22:46:50 +02:00
parent 746c6ce13c
commit a234ba2a7d
4 changed files with 114 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Content/Scenes/Theatre.unity
+25 -1
View File
@@ -448,6 +448,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8725966219179855439, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
m_PrefabInstance: {fileID: 1549040694}
m_PrefabAsset: {fileID: 0}
--- !u!114 &57213877 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
m_PrefabInstance: {fileID: 1549040694}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c85c0434d95406f4da8daa149ba90838, type: 3}
m_Name:
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoPlayer
--- !u!4 &58792973 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 992638687589661580, guid: 8a998c00fc583a54082d05343d747b99, type: 3}
@@ -2923,6 +2934,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.OctoPlayerDrive
_state:
ForcePlayerToFollowTarget: 0
MoveInfluence: 0
LookInfluence: 0
YawRange: 0
@@ -3002,6 +3014,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 654342081}
m_TargetAssemblyTypeName: OctoCore.Components.OctoPlayerDriver, OctoCore.Runtime
m_MethodName: ForcePlayerToFollowTarget
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
OnRelease:
m_PersistentCalls:
m_Calls:
@@ -10902,7 +10926,7 @@ MonoBehaviour:
_onTrigger:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
- m_Target: {fileID: 57213877}
m_TargetAssemblyTypeName: OctoCore.Components.OctoPlayer, OctoCore.Runtime
m_MethodName: Teleport
m_Mode: 5
Assets/_Content/Scripts/Features/Player/Runtime/Camera/CameraEffects.cs
+4 -4
View File
@@ -175,14 +175,14 @@ namespace Unheimlich.Features.Player
float targetYaw = Mathf.Atan2(targetDirection.x, targetDirection.z) * Mathf.Rad2Deg;
float targetPitch = -Mathf.Asin(targetDirection.y) * Mathf.Rad2Deg;
float currentYaw = PlayerController.Instance.Movement.Yaw;
float currentPitch = PlayerController.Instance.Movement.Pitch;
float currentYaw = PlayerController.Instance.Movement.State.Yaw;
float currentPitch = PlayerController.Instance.Movement.State.Pitch;
float newYaw = Mathf.LerpAngle(currentYaw, targetYaw, Settings.aimAssistStrength * Time.deltaTime);
float newPitch = Mathf.Lerp(currentPitch, targetPitch, Settings.aimAssistStrength * Time.deltaTime);
PlayerController.Instance.Movement.Yaw = newYaw;
PlayerController.Instance.Movement.Pitch = newPitch;
PlayerController.Instance.Movement.State.Yaw = newYaw;
PlayerController.Instance.Movement.State.Pitch = newPitch;
}
_hasAimAssistTarget = false;