Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMCL-0000: Improved character controller for jump state #1008

Merged
merged 1 commit into from
Jun 11, 2024
Merged

CMCL-0000: Improved character controller for jump state #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithRoadieRun.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -1092,6 +1091,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
ScanRecursively: 1
SuppressInputWhileBlending: 1
IgnoreTimeScale: 0
m_ControllerManager:
Controllers:
- Name: CursorLock
Expand All @@ -1102,6 +1102,7 @@ MonoBehaviour:
Gain: 1
LegacyInput: Cancel
LegacyGain: 1
CancelDeltaTime: 0
InputValue: 0
Driver:
AccelTime: 0
Expand Down Expand Up @@ -1426,7 +1427,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
BulletPrefab: {fileID: 3056719325741855433, guid: 31d678dfd458ff84d95d644dd3730cca, type: 3}
MaxBulletsPerSec: 6
PlayerRotationTime: 0.2
Fire:
Value: 0
Center: 0
Expand Down Expand Up @@ -2512,14 +2512,26 @@ PrefabInstance:
propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.LegacyInput
value: Fire3
objectReference: {fileID: 0}
- target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.InputAction
value:
objectReference: {fileID: -1608118824973676762, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does it reference InputAction?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because the action mappings are serialized, so they get reloaded when you reopen the scene

- target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.LegacyInput
value: Mouse X
objectReference: {fileID: 0}
- target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[5].Input.InputAction
value:
objectReference: {fileID: -1608118824973676762, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
- target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[5].Input.LegacyInput
value: Mouse Y
objectReference: {fileID: 0}
- target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.InputAction
value:
objectReference: {fileID: -1608118824973676762, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
- target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.LegacyInput
value: Fire1
Expand Down Expand Up @@ -3082,7 +3094,7 @@ Transform:
m_GameObject: {fileID: 2076565716644322336}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.559051, y: 0.77348024, z: -3.1799998}
m_LocalPosition: {x: 1.559051, y: 0.57348025, z: -3.1799998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -3119,7 +3131,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Damping: {x: 0.1, y: 0.5, z: 0.3}
ShoulderOffset: {x: 0.40905112, y: -0.41026962, z: 0}
VerticalArmLength: 0.3
VerticalArmLength: 0.1
CameraSide: 1
CameraDistance: 3.8
AvoidObstacles:
Expand Down Expand Up @@ -3191,19 +3203,17 @@ MonoBehaviour:
Camera: {fileID: 334051334}
ActivateAfter: 0
MinDuration: 0
- FullHash: 1965258778
- FullHash: -827840423
Camera: {fileID: 2076565716644322337}
ActivateAfter: 0.4
ActivateAfter: 0.1
MinDuration: 0
- FullHash: -203094115
- FullHash: 1068812385
Camera: {fileID: 2076565716644322337}
ActivateAfter: 0.4
ActivateAfter: 0.1
MinDuration: 0
HashOfParent:
- Hash: 1432961145
HashOfParent: 756556552
- Hash: -916648961
HashOfParent: 756556552
- Hash: 81563449
HashOfParent: 756556552
- Hash: 1049899859
Expand All @@ -3212,9 +3222,7 @@ MonoBehaviour:
HashOfParent: 81563449
- Hash: -1759641626
HashOfParent: 81563449
- Hash: -1729575745
HashOfParent: 756556552
- Hash: -203094115
- Hash: 788460410
HashOfParent: 756556552
- Hash: -827840423
HashOfParent: 756556552
Expand All @@ -3224,6 +3232,8 @@ MonoBehaviour:
HashOfParent: -827840423
- Hash: -382662320
HashOfParent: -827840423
- Hash: 1068812385
HashOfParent: 756556552
m_LegacyLookAt: {fileID: 0}
m_LegacyFollow: {fileID: 0}
--- !u!4 &2076565717059590787
Expand Down
Loading
Loading