aboutsummaryrefslogtreecommitdiff
path: root/JamHelper/Assets/JamUtils/FPSControllerVelocity
diff options
context:
space:
mode:
Diffstat (limited to 'JamHelper/Assets/JamUtils/FPSControllerVelocity')
-rw-r--r--JamHelper/Assets/JamUtils/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity450
-rw-r--r--JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player.prefab (renamed from JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player_Velocity.prefab)56
-rw-r--r--JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player.prefab.meta (renamed from JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player_Velocity.prefab.meta)0
-rw-r--r--JamHelper/Assets/JamUtils/FPSControllerVelocity/Scripts/FPSCharacterController.cs50
4 files changed, 390 insertions, 166 deletions
diff --git a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
index 4bcf0e9..86d3da1 100644
--- a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
+++ b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
- m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+ m_IndirectSpecularColor: {r: 0.4482453, g: 0.49827272, b: 0.5755822, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -184,7 +184,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 609bd1cd8d9c9004bbc7d85853029e55, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -749,7 +749,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32706
+ m_Name: pb_Mesh17984
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -907,36 +907,6 @@ Mesh:
offset: 0
size: 0
path:
---- !u!1 &148244777 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 7739210602112578987, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- m_PrefabInstance: {fileID: 6879717249385526193}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &148244782
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 148244777}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 60e373202cc879c4a8e781f92dbdcb48, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- type: 5
---- !u!114 &148244783
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 148244777}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 63b841e9c9589044db9f0b7edfca90bd, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &153808474
GameObject:
m_ObjectHideFlags: 0
@@ -988,7 +958,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 121b024a4658cf4409af8632d7088c2e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1030,7 +1000,7 @@ Transform:
m_LocalScale: {x: 5, y: 1, z: 5}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &190189551
GameObject:
@@ -1660,7 +1630,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 121b024a4658cf4409af8632d7088c2e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1726,7 +1696,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32718
+ m_Name: pb_Mesh17996
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -2134,13 +2104,203 @@ HingeJoint:
m_EnablePreprocessing: 1
m_MassScale: 1
m_ConnectedMassScale: 1
+--- !u!1 &531215973
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 531215974}
+ - component: {fileID: 531215977}
+ - component: {fileID: 531215976}
+ - component: {fileID: 531215975}
+ m_Layer: 0
+ m_Name: Cube (5)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &531215974
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 531215973}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 19.084, y: -1.112, z: 32.52}
+ m_LocalScale: {x: 2, y: 1, z: 2}
+ m_Children: []
+ m_Father: {fileID: 1833817345}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &531215975
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 531215973}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &531215976
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 531215973}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 7d2c2a8df6d8c9243a9b2118f42a5041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &531215977
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 531215973}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &594374152
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 594374153}
+ - component: {fileID: 594374156}
+ - component: {fileID: 594374155}
+ - component: {fileID: 594374154}
+ m_Layer: 0
+ m_Name: Cube (4)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &594374153
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 594374152}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 17.06, y: -1.3, z: 32.52}
+ m_LocalScale: {x: 2, y: 1, z: 2}
+ m_Children: []
+ m_Father: {fileID: 1833817345}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &594374154
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 594374152}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &594374155
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 594374152}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 7d2c2a8df6d8c9243a9b2118f42a5041, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &594374156
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 594374152}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!43 &629032605
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32626
+ m_Name: pb_Mesh17914
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -2359,7 +2519,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 609bd1cd8d9c9004bbc7d85853029e55, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -3043,7 +3203,7 @@ Light:
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
- m_Intensity: 0.45
+ m_Intensity: 0.7
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
@@ -3100,13 +3260,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
- m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+ m_LocalRotation: {x: 0.37427223, y: -0.19263731, z: 0.079792984, w: 0.9035731}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+ m_LocalEulerAnglesHint: {x: 45, y: -24.07, z: 0}
--- !u!1 &729325353
GameObject:
m_ObjectHideFlags: 0
@@ -3168,7 +3328,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 7d2c2a8df6d8c9243a9b2118f42a5041, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -6342,12 +6502,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 729325353}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 10.79, y: -1.77, z: 26.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_Father: {fileID: 1833817345}
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &830429033
GameObject:
@@ -6410,7 +6570,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 609bd1cd8d9c9004bbc7d85853029e55, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -7034,7 +7194,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 7d2c2a8df6d8c9243a9b2118f42a5041, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -7070,7 +7230,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32358
+ m_Name: pb_Mesh17676
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7234,7 +7394,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32822
+ m_Name: pb_Mesh18080
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7423,7 +7583,7 @@ Transform:
- {fileID: 961102767}
- {fileID: 1213064841}
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &961102761
GameObject:
@@ -7580,7 +7740,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32500
+ m_Name: pb_Mesh17816
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7775,7 +7935,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32788
+ m_Name: pb_Mesh18046
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -7939,7 +8099,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32536
+ m_Name: pb_Mesh17828
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -8431,7 +8591,7 @@ Transform:
m_LocalScale: {x: 10, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &1124696510
Rigidbody:
@@ -8483,7 +8643,7 @@ Rigidbody:
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
- m_Interpolate: 0
+ m_Interpolate: 1
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &1156133198
@@ -8526,7 +8686,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 121b024a4658cf4409af8632d7088c2e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -8784,7 +8944,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32674
+ m_Name: pb_Mesh17960
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -8942,6 +9102,71 @@ Mesh:
offset: 0
size: 0
path:
+--- !u!1001 &1198588178
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_Camera
+ value:
+ objectReference: {fileID: 685442961}
+ - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_StepSmooth
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_RootOrder
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 7.2635603
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.26
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739210602112578987, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+ propertyPath: m_Name
+ value: Player
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
--- !u!1 &1213064840
GameObject:
m_ObjectHideFlags: 0
@@ -9330,7 +9555,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 609bd1cd8d9c9004bbc7d85853029e55, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -9950,7 +10175,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 7d2c2a8df6d8c9243a9b2118f42a5041, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -13124,12 +13349,12 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1372386534}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 14.63, y: -1.69, z: 26.91}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_Father: {fileID: 1833817345}
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1537433337
GameObject:
@@ -13192,7 +13417,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 609bd1cd8d9c9004bbc7d85853029e55, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -13785,7 +14010,7 @@ Rigidbody:
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
- m_Interpolate: 0
+ m_Interpolate: 1
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &1621878135
@@ -13828,7 +14053,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 121b024a4658cf4409af8632d7088c2e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -14086,7 +14311,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32472
+ m_Name: pb_Mesh17788
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -14362,7 +14587,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32412
+ m_Name: pb_Mesh17708
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -14526,7 +14751,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh32686
+ m_Name: pb_Mesh17972
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -14718,6 +14943,10 @@ Transform:
- {fileID: 279687863}
- {fileID: 1719779269}
- {fileID: 1002245355}
+ - {fileID: 594374153}
+ - {fileID: 531215974}
+ - {fileID: 729325358}
+ - {fileID: 1372386539}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14814,7 +15043,7 @@ Transform:
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1861258020
GameObject:
@@ -14913,7 +15142,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 609bd1cd8d9c9004bbc7d85853029e55, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -15645,7 +15874,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 121b024a4658cf4409af8632d7088c2e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -15739,7 +15968,7 @@ Rigidbody:
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
- m_Interpolate: 0
+ m_Interpolate: 1
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &2137460921
@@ -15782,7 +16011,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
+ - {fileID: 2100000, guid: 121b024a4658cf4409af8632d7088c2e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -16091,76 +16320,3 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b338d16f2565167408259c170d8f52b3, type: 3}
---- !u!1001 &6879717249385526193
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_Camera
- value:
- objectReference: {fileID: 685442961}
- - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_MoveSmooth
- value: 0.2
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LookSensitive
- value: 1200
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_RootOrder
- value: 13
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalPosition.x
- value: 7.2635603
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.26
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalPosition.z
- value: -0.6
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578985, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_Interpolate
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7739210602112578987, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
- propertyPath: m_Name
- value: Player_Velocity
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
diff --git a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player_Velocity.prefab b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player.prefab
index 71094c0..de44de1 100644
--- a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player_Velocity.prefab
+++ b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player.prefab
@@ -54,7 +54,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6879717249098648186}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.108, z: 0}
+ m_LocalPosition: {x: 0, y: 0.6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6879717249617651342}
@@ -131,7 +131,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6879717249872257471}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: -0.3, z: 0}
+ m_LocalPosition: {x: 0, y: -0.257, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6879717249617651342}
@@ -205,7 +205,7 @@ GameObject:
m_Component:
- component: {fileID: 7739210600721244145}
- component: {fileID: 7739210600721244159}
- - component: {fileID: 7421056502815140734}
+ - component: {fileID: 8404252012299775654}
m_Layer: 6
m_Name: GroundChecker
m_TagString: Untagged
@@ -221,8 +221,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7739210600721244144}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: -0.966, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: 0, y: -0.824, z: 0}
+ m_LocalScale: {x: 0.9, y: 0.2, z: 0.9}
m_Children:
- {fileID: 6879717248958439976}
m_Father: {fileID: 7739210602112578984}
@@ -241,8 +241,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Foot: {fileID: 6879717248958439976}
---- !u!135 &7421056502815140734
-SphereCollider:
+--- !u!64 &8404252012299775654
+MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -251,9 +251,10 @@ SphereCollider:
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
- serializedVersion: 2
- m_Radius: 0.47066826
- m_Center: {x: 0, y: 0.36, z: -0.0060388446}
+ serializedVersion: 4
+ m_Convex: 1
+ m_CookingOptions: 26
+ m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &7739210601246302678
GameObject:
m_ObjectHideFlags: 0
@@ -409,8 +410,10 @@ GameObject:
- component: {fileID: 7739210602112578985}
- component: {fileID: 7739210602112578966}
- component: {fileID: 6879717248498036401}
+ - component: {fileID: 1198588180}
+ - component: {fileID: 1198588181}
m_Layer: 6
- m_Name: Player_Velocity
+ m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -473,7 +476,9 @@ MonoBehaviour:
m_LookSmooth: 0.2
m_MoveSpeed: 500
m_MoveSmooth: 0.2
+ m_HeadBobbing: 0
m_MoveSpeedInAir: 500
+ m_MoveInAirSmooth: 0.2
m_JumpPower: 300
m_Muzzle: {fileID: 7739210601246302679}
m_HittableLayers:
@@ -482,7 +487,11 @@ MonoBehaviour:
m_ShotInfiniteDistance: 100
m_WallJumpForce: 1
m_WallJumpPower: 10000
+ m_WallRunSpeed: 1
m_ExtraGravity: {x: 0, y: 0, z: 0}
+ m_Lower: {fileID: 6879717249872257464}
+ m_Upper: {fileID: 6879717249098648187}
+ m_StepSmooth: 100
--- !u!114 &6879717248498036401
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -496,6 +505,31 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Bullet: {fileID: 4396925871583976770, guid: 7f51e5dfe22a2f045b0b8b5c468152de, type: 3}
+--- !u!114 &1198588180
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7739210602112578987}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 60e373202cc879c4a8e781f92dbdcb48, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ type: 5
+--- !u!114 &1198588181
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7739210602112578987}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 63b841e9c9589044db9f0b7edfca90bd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &7739210602622086241
GameObject:
m_ObjectHideFlags: 0
diff --git a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player_Velocity.prefab.meta b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player.prefab.meta
index 689e2b6..689e2b6 100644
--- a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player_Velocity.prefab.meta
+++ b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Prefabs/Player.prefab.meta
diff --git a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Scripts/FPSCharacterController.cs b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Scripts/FPSCharacterController.cs
index cf8928d..db0cb20 100644
--- a/JamHelper/Assets/JamUtils/FPSControllerVelocity/Scripts/FPSCharacterController.cs
+++ b/JamHelper/Assets/JamUtils/FPSControllerVelocity/Scripts/FPSCharacterController.cs
@@ -83,9 +83,14 @@ namespace JamUtils
[Header("ExtraGravity")]
[SerializeField] private Vector3 m_ExtraGravity;
- #endregion
+ [Header("WalkOnStairs")]
+ [SerializeField] private Transform m_Lower;
+ [SerializeField] private Transform m_Upper;
+ [SerializeField] private float m_StepSmooth;
- public Func<RaycastHit, bool> checkHit;
+ #endregion
+
+ public Func<RaycastHit, bool> checkHit;
public Action<Vector3, Transform> shootTarget;
private Rigidbody m_Rigidbody;
@@ -176,8 +181,8 @@ namespace JamUtils
dir = dir.normalized;
- m_MoveDirection = Vector3.Slerp(m_MoveDirection, dir, 1f);
- }
+ m_MoveDirection = Vector3.Slerp(m_MoveDirection, dir, 1f);
+ }
void MoveAroundFixedUpdate()
{
@@ -190,10 +195,22 @@ namespace JamUtils
float vy = m_Rigidbody.velocity.y;
Vector3 velocity = new Vector3(m_MoveDirection.x * Time.deltaTime * m_MoveSpeed, vy, m_MoveDirection.z * Time.deltaTime * m_MoveSpeed);
- m_Rigidbody.velocity = Vector3.Slerp(m_Rigidbody.velocity, velocity, m_MoveSmooth);
+ Vector3 rigidVel = m_Rigidbody.velocity;
+
+ // 对速度Slerp比较危险
+ //if (Vector3.Angle(rigidVel, velocity) > 90)
+ //{
+ // m_Rigidbody.velocity = Vector3.Lerp(rigidVel, velocity, m_MoveSmooth);
+ //}
+ //else
+ //{
+ // m_Rigidbody.velocity = Vector3.Slerp(rigidVel, velocity, m_MoveSmooth);
+ //}
+
+ m_Rigidbody.velocity = Vector3.Lerp(rigidVel, velocity, m_MoveSmooth);
}
- void MoveInAirUpdate()
+ void MoveInAirUpdate()
{
if (!IsModuleActive(CharacterModule.MoveInAir))
return;
@@ -352,7 +369,23 @@ namespace JamUtils
m_Rigidbody.AddForce(m_ExtraGravity, ForceMode.Acceleration);
}
- void SetCamera ()
+ void WalkOnStairs()
+ {
+ //int layermask = ~(1 << LayerMask.NameToLayer("Player"));
+
+ //RaycastHit hitLower;
+ //if (Physics.Raycast(m_Lower.position, transform.TransformDirection(Vector3.forward), out hitLower, 0.6f, layermask))
+ //{
+ // RaycastHit hitUpper;
+ // if (!Physics.Raycast(m_Upper.position, transform.TransformDirection(Vector3.forward), out hitUpper, 0.7f, layermask))
+ // {
+ // m_Rigidbody.position += new Vector3(0f, m_StepSmooth * Time.deltaTime, 0f);
+ // }
+ //}
+ }
+
+
+ void SetCamera ()
{
m_Camera.SetCameraPositionAndRotation(m_Eye);
}
@@ -385,7 +418,8 @@ namespace JamUtils
private void FixedUpdate()
{
- MoveAroundFixedUpdate();
+ WalkOnStairs();
+ MoveAroundFixedUpdate();
MoveInAirFixedUpdate();
DodgeFixed();
ExtraGravity();
generated by cgit v1.1-26-g67d0 at 2025-05-22 02:16:56 +0000