From e7e9156b0e4d180f8f9e291eb5ccfb08847e6269 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 21 Feb 2022 10:43:56 +0800 Subject: *misc --- .../Rigidbody/MoveByVelocity/PhysicsMaterial.meta | 8 ++++++++ .../PhysicsMaterial/player_body.physicMaterial | 14 ++++++++++++++ .../PhysicsMaterial/player_body.physicMaterial.meta | 8 ++++++++ .../Rigidbody/MoveByVelocity/Prefabs/Player.prefab | 4 ++-- .../MoveByVelocity/Scenes/FPSCharacterController.unity | 6 +----- .../JamUtils/PhysicsMaterials/player_body.physicMaterial | 14 -------------- .../PhysicsMaterials/player_body.physicMaterial.meta | 8 -------- 7 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial.meta create mode 100644 JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial create mode 100644 JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial.meta delete mode 100644 JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial delete mode 100644 JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial.meta diff --git a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial.meta b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial.meta new file mode 100644 index 0000000..50697df --- /dev/null +++ b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ee97fec512d8094a9dbcb1d4ac27019 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial new file mode 100644 index 0000000..42d6a2d --- /dev/null +++ b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: player_body + dynamicFriction: 0 + staticFriction: 0 + bounciness: 0 + frictionCombine: 3 + bounceCombine: 1 diff --git a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial.meta b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial.meta new file mode 100644 index 0000000..9abf473 --- /dev/null +++ b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/PhysicsMaterial/player_body.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 88e7227246830b942910801154d623b9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Prefabs/Player.prefab b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Prefabs/Player.prefab index de44de1..02068e2 100644 --- a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Prefabs/Player.prefab +++ b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Prefabs/Player.prefab @@ -473,9 +473,9 @@ MonoBehaviour: m_WallChecker: {fileID: 6401592115772403490} m_Camera: {fileID: 0} m_LookSensitive: 1000 - m_LookSmooth: 0.2 + m_LookSmooth: 0.25 m_MoveSpeed: 500 - m_MoveSmooth: 0.2 + m_MoveSmooth: 0.25 m_HeadBobbing: 0 m_MoveSpeedInAir: 500 m_MoveInAirSmooth: 0.2 diff --git a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Scenes/FPSCharacterController.unity b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Scenes/FPSCharacterController.unity index 2b5dad4..b8fc13c 100644 --- a/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Scenes/FPSCharacterController.unity +++ b/JamHelper/Assets/JamUtils/FirstPersonCharacterController/Rigidbody/MoveByVelocity/Scenes/FPSCharacterController.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.4482453, g: 0.49827272, b: 0.5755822, a: 1} + m_IndirectSpecularColor: {r: 0.44824594, g: 0.4982726, b: 0.5755837, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -9113,10 +9113,6 @@ PrefabInstance: 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: 11 diff --git a/JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial b/JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial deleted file mode 100644 index 5cf1f75..0000000 --- a/JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial +++ /dev/null @@ -1,14 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!134 &13400000 -PhysicMaterial: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: player_body - dynamicFriction: 0 - staticFriction: 0 - bounciness: 0 - frictionCombine: 1 - bounceCombine: 0 diff --git a/JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial.meta b/JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial.meta deleted file mode 100644 index 9abf473..0000000 --- a/JamHelper/Assets/JamUtils/PhysicsMaterials/player_body.physicMaterial.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 88e7227246830b942910801154d623b9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 13400000 - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.1-26-g67d0