Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/TextMesh Pro/Fonts/TMP_Assets/CourierPrime-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/CutiveMono-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/Inconsolata-VariableFont_wdth,wght SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/ShareTechMono-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/SpecialElite-Regular SDF.asset # Assets/_Content/Prefabs/OctoPlayerFP.prefab # Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
This commit is contained in:
@@ -145,7 +145,7 @@ MonoBehaviour:
|
||||
m_VolumeTrigger: {fileID: 0}
|
||||
m_VolumeFrameworkUpdateModeOption: 2
|
||||
m_RenderPostProcessing: 1
|
||||
m_Antialiasing: 0
|
||||
m_Antialiasing: 2
|
||||
m_AntialiasingQuality: 2
|
||||
m_StopNaN: 0
|
||||
m_Dithering: 0
|
||||
@@ -311,7 +311,6 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1836339402272228918}
|
||||
- {fileID: 1175390396199967368}
|
||||
m_Father: {fileID: 4440040250278121308}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1476756471834662335
|
||||
@@ -326,15 +325,15 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 320cde26f18d40b40a31c85e85ee4e59, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.World.CameraSystem.LostFootageRig
|
||||
_isActive: 1
|
||||
_masterIntensityInspector: 1
|
||||
_stressLevel: 0
|
||||
_isActive: 0
|
||||
_masterIntensityInspector: 1.5
|
||||
_stressLevel: 0.3
|
||||
_stressAmplitudeMul: 2.5
|
||||
_stressSpeedMul: 1.8
|
||||
_idleAmplitude: 0.25
|
||||
_idleNoiseSpeed: 0.6
|
||||
_walkAmplitude: 0.8
|
||||
_walkNoiseSpeed: 1.4
|
||||
_idleAmplitude: 0.5
|
||||
_idleNoiseSpeed: 1.6
|
||||
_walkAmplitude: 0.7
|
||||
_walkNoiseSpeed: 2
|
||||
_runAmplitude: 1.8
|
||||
_runNoiseSpeed: 2.5
|
||||
_moveTSmoothSpeed: 4
|
||||
@@ -355,40 +354,9 @@ MonoBehaviour:
|
||||
_spinMaxZAngle: 2.5
|
||||
_spinNoiseSpeed: 0.08
|
||||
_spinDamping: 2
|
||||
_fadeDuration: 0.6
|
||||
_fadeDuration: 2
|
||||
_debugOverrideStress: 0
|
||||
_debugStressOverride: 0
|
||||
--- !u!1 &4625798697874999476
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1175390396199967368}
|
||||
m_Layer: 0
|
||||
m_Name: InspectionHoldPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1175390396199967368
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4625798697874999476}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.43299997, z: 2}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5410551608337962707}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &5575782855984327677
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -446,7 +414,7 @@ GameObject:
|
||||
- component: {fileID: 1735456339091181674}
|
||||
- component: {fileID: 5295567073180248356}
|
||||
- component: {fileID: 688176918831081180}
|
||||
- component: {fileID: 3522630547589622128}
|
||||
- component: {fileID: 4455649155230787949}
|
||||
- component: {fileID: 2442273134423229941}
|
||||
- component: {fileID: 8933622434396077949}
|
||||
m_Layer: 0
|
||||
@@ -539,10 +507,8 @@ MonoBehaviour:
|
||||
JumpAction: -1877919292
|
||||
_firstPerson:
|
||||
Camera: {fileID: 3666612565151794712}
|
||||
SensitivityX: 0.1
|
||||
SensitivityY: 0.1
|
||||
GamepadSensitivityX: 5
|
||||
GamepadSensitivityY: 5
|
||||
MouseSensitivity: {x: 0.1, y: 0.1}
|
||||
ControllerSensitivity: {x: 140, y: 140}
|
||||
MinPitch: -80
|
||||
MaxPitch: 80
|
||||
ReferenceYaw: 0
|
||||
@@ -559,18 +525,18 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 2d192ca4042c25c4ea16f024d0e262c1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Gameplay.Player.PlayerController
|
||||
--- !u!114 &3522630547589622128
|
||||
--- !u!114 &4455649155230787949
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8162540767767967414}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e05e5ee4f09d55d4a93324fe0eb85d6e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Gameplay.Player.CameraEffects
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Player.CameraEffects
|
||||
Settings: {fileID: 11400000, guid: 28f72f5bbd71f384a86c547567dbb5bf, type: 2}
|
||||
--- !u!114 &2442273134423229941
|
||||
MonoBehaviour:
|
||||
|
||||
Reference in New Issue
Block a user