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:
@@ -22,3 +22,8 @@ MonoBehaviour:
|
||||
runBobSpeed: 18
|
||||
runBobAmplitude: 0.03
|
||||
resetSpeed: 5
|
||||
bobRollAmplitude: 0.4
|
||||
strafeTiltAngle: 2.5
|
||||
strafeTiltSpeed: 6
|
||||
fovKickAmount: 0
|
||||
fovKickSpeed: 0
|
||||
|
||||
File diff suppressed because one or more lines are too long
+1
-1
@@ -117,7 +117,7 @@ Material:
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _Progression: 0.217
|
||||
- _Progression: 0
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
|
||||
@@ -28,10 +28,11 @@ void Sand_float
|
||||
|
||||
// Arks
|
||||
|
||||
float arkMask = abs(frac(PositionWS.z * .5) * 2 - 1);
|
||||
/*float arkMask = abs(frac(PositionWS.z * .5) * 2 - 1);
|
||||
arkMask = pow(smoothstep(.7, 0, arkMask), 2);
|
||||
arkMask += smoothstep(2.8, 3.2, abs(PositionWS.x));
|
||||
arkMask = saturate(arkMask);
|
||||
arkMask = saturate(arkMask);*/
|
||||
float arkMask = 0;
|
||||
|
||||
// Sand
|
||||
|
||||
@@ -39,12 +40,14 @@ void Sand_float
|
||||
|
||||
float sandDirection = cos(t * sandLayers * 3.14);
|
||||
|
||||
float sandDensity = smoothstep(1.5, 0, abs(PositionWS.x));
|
||||
sandDensity = saturate(sandDensity + arkMask);
|
||||
//float sandDensity = smoothstep(1.5, 0, abs(PositionWS.x));
|
||||
//sandDensity = saturate(sandDensity + arkMask);
|
||||
|
||||
float sandPatern = RidgedNoise3D(PositionWS + float3(sandDirection, 0, 0), .6, 1, 2, .5) * .8;
|
||||
sandPatern += 1 - RidgedNoise3D(PositionWS + float3(0, 0, t * sandLayers * 2), .8, 2, 2, .5) * .2;
|
||||
|
||||
float sandDensity = sqrt(smoothstep(0, 2, abs(PositionWS.x) + sandPatern));
|
||||
|
||||
float sandGradientSign = (floor(t * sandLayers) % 2 == 0) ? 1 : -1;
|
||||
float sandGradient = smoothstep(2 * -sandGradientSign, 2 * sandGradientSign, PositionWS.x);
|
||||
float sandPhase = frac(t * sandLayers);
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9ca1109ad0fc2724691e58979538e579
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,63 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &-5747633948245401730
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: M_Fog_BodiesInWater
|
||||
m_Shader: {fileID: -6465566751694194690, guid: 0f1522c6af8cc4d47a4bbc5401f58523, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3001
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- unity_Lightmaps:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_LightmapsInd:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_ShadowMasks:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _DepthAtten: 1
|
||||
- _IntersectionAtten: 10
|
||||
- _MaskID: 2
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 1
|
||||
m_Colors:
|
||||
- _ColorA: {r: 0.0244749, g: 0.05798854, b: 0.09433961, a: 1}
|
||||
- _ColorB: {r: 0.4528302, g: 0.34919697, b: 0.22855109, a: 0.59607846}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9dc512b94f969f94a812ceda863818db
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+1
-1
@@ -20,7 +20,7 @@ Material:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: M_fog
|
||||
m_Name: M_Fog_Omnissiah
|
||||
m_Shader: {fileID: -6465566751694194690, guid: 0f1522c6af8cc4d47a4bbc5401f58523, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
+1
-1
@@ -7,7 +7,7 @@ Material:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: M_FogParticles
|
||||
m_Name: M_Fog_Particles
|
||||
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
@@ -7,6 +7,7 @@ void Fog_float
|
||||
(
|
||||
float4 ColorA,
|
||||
float4 ColorB,
|
||||
float DepthAtten,
|
||||
float3 PositionWS,
|
||||
float3 PositionOS,
|
||||
float3 PivotWS,
|
||||
@@ -28,7 +29,7 @@ void Fog_float
|
||||
//float test = RidgedNoise3D(PositionWS, 10, 2, 2, .5);
|
||||
float3 camPos = _WorldSpaceCameraPos.xyz;
|
||||
float depth = distance(camPos, PositionWS);
|
||||
float depthAtten = smoothstep(5, 30, depth);
|
||||
float depthAtten = lerp(1, smoothstep(5, 30, depth), DepthAtten);
|
||||
|
||||
|
||||
float t = _Time.y * .7;
|
||||
|
||||
@@ -20,6 +20,12 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "4da948d3c5594d2581cd893dc42c5853"
|
||||
},
|
||||
{
|
||||
"m_Id": "6b00dfa68b5a4919a3d199ce0d83b7b0"
|
||||
},
|
||||
{
|
||||
"m_Id": "683448ff408243589dbc6d52ad471b22"
|
||||
}
|
||||
],
|
||||
"m_Keywords": [],
|
||||
@@ -116,6 +122,15 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "798cfd16490043f186f0329a0eb6edd2"
|
||||
},
|
||||
{
|
||||
"m_Id": "701f398c9cba4c41acd604f8d47f6030"
|
||||
},
|
||||
{
|
||||
"m_Id": "15e1690e2d6f4303a4ff4da114bc32f1"
|
||||
},
|
||||
{
|
||||
"m_Id": "7d4fdac03ace4a198e5135d42a49dcc5"
|
||||
}
|
||||
],
|
||||
"m_GroupDatas": [],
|
||||
@@ -135,6 +150,20 @@
|
||||
"m_SlotId": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "15e1690e2d6f4303a4ff4da114bc32f1"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "7d4fdac03ace4a198e5135d42a49dcc5"
|
||||
},
|
||||
"m_SlotId": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -289,6 +318,20 @@
|
||||
"m_SlotId": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "701f398c9cba4c41acd604f8d47f6030"
|
||||
},
|
||||
"m_SlotId": 0
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "cd9b6500316e4beabbb4e8a42c14ce9d"
|
||||
},
|
||||
"m_SlotId": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -317,6 +360,20 @@
|
||||
"m_SlotId": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "7d4fdac03ace4a198e5135d42a49dcc5"
|
||||
},
|
||||
"m_SlotId": 2
|
||||
},
|
||||
"m_InputSlot": {
|
||||
"m_Node": {
|
||||
"m_Id": "1bbd96557fec42adb96949d2b0ffdd5d"
|
||||
},
|
||||
"m_SlotId": 1
|
||||
}
|
||||
},
|
||||
{
|
||||
"m_OutputSlot": {
|
||||
"m_Node": {
|
||||
@@ -971,6 +1028,42 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
"m_ObjectId": "15e1690e2d6f4303a4ff4da114bc32f1",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Property",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": -1338.0001220703125,
|
||||
"y": 1059.0,
|
||||
"width": 165.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "28da90f803e04668bab2ea38a1350cc4"
|
||||
}
|
||||
],
|
||||
"synonyms": [],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": true,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
},
|
||||
"m_Property": {
|
||||
"m_Id": "683448ff408243589dbc6d52ad471b22"
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
|
||||
@@ -1320,6 +1413,22 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "28da90f803e04668bab2ea38a1350cc4",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "IntersectionAtten",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
|
||||
@@ -1366,10 +1475,10 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": -1017.0,
|
||||
"y": 190.0,
|
||||
"width": 0.0,
|
||||
"height": 0.0
|
||||
"x": -990.0,
|
||||
"y": 207.0,
|
||||
"width": 112.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
@@ -1518,6 +1627,31 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
|
||||
"m_ObjectId": "4217587d1b9a454f974f328acf876083",
|
||||
"m_Id": 2,
|
||||
"m_DisplayName": "Out",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": {
|
||||
"x": 0.0,
|
||||
"y": 0.0,
|
||||
"z": 0.0,
|
||||
"w": 0.0
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"x": 0.0,
|
||||
"y": 0.0,
|
||||
"z": 0.0,
|
||||
"w": 0.0
|
||||
},
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -1990,6 +2124,50 @@
|
||||
"m_SerializedDescriptor": "VertexDescription.Position"
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
|
||||
"m_ObjectId": "683448ff408243589dbc6d52ad471b22",
|
||||
"m_Guid": {
|
||||
"m_GuidSerialized": "8712a244-2722-4c04-bbfd-5ec3bfa4516c"
|
||||
},
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "IntersectionAtten",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "IntersectionAtten",
|
||||
"m_DefaultReferenceName": "_IntersectionAtten",
|
||||
"m_OverrideReferenceName": "",
|
||||
"m_GeneratePropertyBlock": false,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
"m_DismissedVersion": 0,
|
||||
"m_Precision": 0,
|
||||
"overrideHLSLDeclaration": true,
|
||||
"hlslDeclarationOverride": 2,
|
||||
"m_Hidden": false,
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": 10.0,
|
||||
"m_FloatType": 0,
|
||||
"m_LiteralFloatMode": false,
|
||||
"m_RangeValues": {
|
||||
"x": 0.0,
|
||||
"y": 1.0
|
||||
},
|
||||
"m_SliderType": 0,
|
||||
"m_SliderPower": 3.0,
|
||||
"m_EnumType": 0,
|
||||
"m_CSharpEnumString": "",
|
||||
"m_EnumNames": [
|
||||
"Default"
|
||||
],
|
||||
"m_EnumValues": [
|
||||
0
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
|
||||
@@ -2058,6 +2236,50 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
|
||||
"m_ObjectId": "6b00dfa68b5a4919a3d199ce0d83b7b0",
|
||||
"m_Guid": {
|
||||
"m_GuidSerialized": "595dc70a-a699-4950-92ff-ad02c28fafa7"
|
||||
},
|
||||
"promotedFromAssetID": "",
|
||||
"promotedFromCategoryName": "",
|
||||
"promotedOrdering": -1,
|
||||
"m_Name": "DepthAtten",
|
||||
"m_DefaultRefNameVersion": 1,
|
||||
"m_RefNameGeneratedByDisplayName": "DepthAtten",
|
||||
"m_DefaultReferenceName": "_DepthAtten",
|
||||
"m_OverrideReferenceName": "",
|
||||
"m_GeneratePropertyBlock": false,
|
||||
"m_UseCustomSlotLabel": false,
|
||||
"m_CustomSlotLabel": "",
|
||||
"m_DismissedVersion": 0,
|
||||
"m_Precision": 0,
|
||||
"overrideHLSLDeclaration": true,
|
||||
"hlslDeclarationOverride": 2,
|
||||
"m_Hidden": false,
|
||||
"m_PerRendererData": false,
|
||||
"m_customAttributes": [],
|
||||
"m_Value": 1.0,
|
||||
"m_FloatType": 1,
|
||||
"m_LiteralFloatMode": false,
|
||||
"m_RangeValues": {
|
||||
"x": 0.0,
|
||||
"y": 1.0
|
||||
},
|
||||
"m_SliderType": 0,
|
||||
"m_SliderPower": 3.0,
|
||||
"m_EnumType": 0,
|
||||
"m_CSharpEnumString": "",
|
||||
"m_EnumNames": [
|
||||
"Default"
|
||||
],
|
||||
"m_EnumValues": [
|
||||
0
|
||||
]
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
|
||||
@@ -2117,10 +2339,10 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": -1020.0,
|
||||
"y": 254.0,
|
||||
"width": 0.0,
|
||||
"height": 0.0
|
||||
"x": -990.0,
|
||||
"y": 241.0,
|
||||
"width": 113.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
@@ -2191,6 +2413,42 @@
|
||||
"m_ScreenSpaceType": 1
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
"m_ObjectId": "701f398c9cba4c41acd604f8d47f6030",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Property",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": -1012.0,
|
||||
"y": 274.0,
|
||||
"width": 135.0,
|
||||
"height": 34.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "d8111b71b3344dcea3490eb6238f1c1e"
|
||||
}
|
||||
],
|
||||
"synonyms": [],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": true,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
},
|
||||
"m_Property": {
|
||||
"m_Id": "6b00dfa68b5a4919a3d199ce0d83b7b0"
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.SplitNode",
|
||||
@@ -2320,6 +2578,48 @@
|
||||
"m_Labels": []
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DivideNode",
|
||||
"m_ObjectId": "7d4fdac03ace4a198e5135d42a49dcc5",
|
||||
"m_Group": {
|
||||
"m_Id": ""
|
||||
},
|
||||
"m_Name": "Divide",
|
||||
"m_DrawState": {
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": -1148.0001220703125,
|
||||
"y": 975.0000610351563,
|
||||
"width": 126.00006103515625,
|
||||
"height": 117.99993896484375
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "c0f54d625fa045e79128819246a3ef1a"
|
||||
},
|
||||
{
|
||||
"m_Id": "b7ebe9d130f548e3abbb54399d2785e6"
|
||||
},
|
||||
{
|
||||
"m_Id": "4217587d1b9a454f974f328acf876083"
|
||||
}
|
||||
],
|
||||
"synonyms": [
|
||||
"division",
|
||||
"divided by"
|
||||
],
|
||||
"m_Precision": 0,
|
||||
"m_PreviewExpanded": false,
|
||||
"m_DismissedVersion": 0,
|
||||
"m_PreviewMode": 0,
|
||||
"m_CustomColors": {
|
||||
"m_SerializableColors": []
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
|
||||
@@ -2355,6 +2655,12 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "c8e6ac05572749048406347a00e68816"
|
||||
},
|
||||
{
|
||||
"m_Id": "6b00dfa68b5a4919a3d199ce0d83b7b0"
|
||||
},
|
||||
{
|
||||
"m_Id": "683448ff408243589dbc6d52ad471b22"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -2372,7 +2678,7 @@
|
||||
"m_ZTestMode": 4,
|
||||
"m_ZWriteControl": 0,
|
||||
"m_AlphaMode": 0,
|
||||
"m_RenderFace": 2,
|
||||
"m_RenderFace": 0,
|
||||
"m_AlphaClip": false,
|
||||
"m_CastShadows": false,
|
||||
"m_ReceiveShadows": true,
|
||||
@@ -2667,6 +2973,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "9e8b71ed4db4436d8813bff786ae37b7",
|
||||
"m_Id": 8,
|
||||
"m_DisplayName": "DepthAtten",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "DepthAtten",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
@@ -2993,6 +3315,31 @@
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
|
||||
"m_ObjectId": "b7ebe9d130f548e3abbb54399d2785e6",
|
||||
"m_Id": 1,
|
||||
"m_DisplayName": "B",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "B",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": {
|
||||
"x": 2.0,
|
||||
"y": 2.0,
|
||||
"z": 2.0,
|
||||
"w": 2.0
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"x": 0.0,
|
||||
"y": 0.0,
|
||||
"z": 0.0,
|
||||
"w": 0.0
|
||||
},
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
|
||||
@@ -3125,6 +3472,31 @@
|
||||
"m_Labels": []
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
|
||||
"m_ObjectId": "c0f54d625fa045e79128819246a3ef1a",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "A",
|
||||
"m_SlotType": 0,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "A",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": {
|
||||
"x": 1.0,
|
||||
"y": 0.0,
|
||||
"z": 0.0,
|
||||
"w": 0.0
|
||||
},
|
||||
"m_DefaultValue": {
|
||||
"x": 0.0,
|
||||
"y": 0.0,
|
||||
"z": 0.0,
|
||||
"w": 0.0
|
||||
},
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
|
||||
@@ -3517,19 +3889,28 @@
|
||||
"m_Expanded": true,
|
||||
"m_Position": {
|
||||
"serializedVersion": "2",
|
||||
"x": -652.0,
|
||||
"x": -646.0,
|
||||
"y": 308.0,
|
||||
"width": 198.0,
|
||||
"height": 166.0
|
||||
"height": 214.0
|
||||
}
|
||||
},
|
||||
"m_Slots": [
|
||||
{
|
||||
"m_Id": "5ba5e0c48f2945efbada98663c457b7b"
|
||||
},
|
||||
{
|
||||
"m_Id": "85bd1f19680a4262b37dd8e85f368376"
|
||||
},
|
||||
{
|
||||
"m_Id": "ab1e5d725fe7419a94bbeb8f68a2a2ca"
|
||||
},
|
||||
{
|
||||
"m_Id": "9517e00d3ea64186a6874be224598766"
|
||||
},
|
||||
{
|
||||
"m_Id": "9e8b71ed4db4436d8813bff786ae37b7"
|
||||
},
|
||||
{
|
||||
"m_Id": "bc721469373a42e7ab14d6640037b417"
|
||||
},
|
||||
@@ -3541,12 +3922,6 @@
|
||||
},
|
||||
{
|
||||
"m_Id": "c1e2c96af1fe41c99db7eb015f6be865"
|
||||
},
|
||||
{
|
||||
"m_Id": "5ba5e0c48f2945efbada98663c457b7b"
|
||||
},
|
||||
{
|
||||
"m_Id": "85bd1f19680a4262b37dd8e85f368376"
|
||||
}
|
||||
],
|
||||
"synonyms": [
|
||||
@@ -3617,6 +3992,22 @@
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 0,
|
||||
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
|
||||
"m_ObjectId": "d8111b71b3344dcea3490eb6238f1c1e",
|
||||
"m_Id": 0,
|
||||
"m_DisplayName": "DepthAtten",
|
||||
"m_SlotType": 1,
|
||||
"m_Hidden": false,
|
||||
"m_ShaderOutputName": "Out",
|
||||
"m_StageCapability": 3,
|
||||
"m_Value": 0.0,
|
||||
"m_DefaultValue": 0.0,
|
||||
"m_Labels": [],
|
||||
"m_LiteralMode": false
|
||||
}
|
||||
|
||||
{
|
||||
"m_SGVersion": 1,
|
||||
"m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
|
||||
|
||||
@@ -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:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -201,7 +201,7 @@ MeshRenderer:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 300277218}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
@@ -261,7 +261,7 @@ Transform:
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 40, y: 40, z: 40}
|
||||
m_LocalScale: {x: 0.5251041, y: 40, z: 13.3708}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1920554116}
|
||||
@@ -324,9 +324,9 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 412733324}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 6.9868, y: -0, z: 19.0302}
|
||||
m_LocalScale: {x: 0.8365, y: 1, z: 1.526204}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0.1, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 917697129}
|
||||
@@ -951,7 +951,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7907523562308333758, guid: bc77fc4360cf7554d882153c57d02f91, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 10.5671
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7605571332984283666, guid: bc77fc4360cf7554d882153c57d02f91, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
||||
@@ -186,7 +186,6 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1288571885}
|
||||
- {fileID: 735183341}
|
||||
- {fileID: 1820726847}
|
||||
m_Father: {fileID: 0}
|
||||
@@ -220,6 +219,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1288571885}
|
||||
- {fileID: 57213872}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -703,7 +703,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1288571885
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -718,7 +718,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1857350192}
|
||||
m_Father: {fileID: 581223803}
|
||||
m_Father: {fileID: 622343290}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1549040694
|
||||
PrefabInstance:
|
||||
@@ -797,8 +797,8 @@ PrefabInstance:
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 4152409555847978467, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
- {fileID: 4484393045093388587, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 4625798697874999476, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
@@ -1022,7 +1022,7 @@ MonoBehaviour:
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
m_CallState: 0
|
||||
_onTriggerDelayed:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
|
||||
@@ -290,7 +290,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.OctoPlayerSpeedArea
|
||||
_settings:
|
||||
MinRadius: 1
|
||||
MaxRadius: 4
|
||||
MaxRadius: 5
|
||||
MinSpeedMultiplier: 0
|
||||
MaxSpeedMultiplier: 1
|
||||
SpeedCurve:
|
||||
@@ -480,6 +480,10 @@ PrefabInstance:
|
||||
propertyPath: _settings.AllowMove
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3}
|
||||
propertyPath: _settings.WalkSpeed
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3}
|
||||
propertyPath: _firstPerson.MaxPitch
|
||||
value: 0
|
||||
|
||||
@@ -842,7 +842,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _settings.RunSpeed
|
||||
value: 20
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _settings.AllowLook
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _settings.WalkSpeed
|
||||
|
||||
@@ -3020,6 +3020,92 @@ Light:
|
||||
m_LightUnit: 1
|
||||
m_LuxAtDistance: 1
|
||||
m_EnableSpotReflector: 1
|
||||
--- !u!1 &337666369
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 337666370}
|
||||
- component: {fileID: 337666372}
|
||||
- component: {fileID: 337666371}
|
||||
m_Layer: 0
|
||||
m_Name: Wwise_FlashHalluB
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &337666370
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 337666369}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1321486799}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &337666371
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 337666369}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: eec618f338d13bf43b8519814d335311, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkEvent
|
||||
triggerList: f7e1664c
|
||||
useOtherObject: 0
|
||||
actionOnEventType: 0
|
||||
curveInterpolation: 4
|
||||
enableActionOnEvent: 0
|
||||
data:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: b6053d4e76e193d4f9a7bf1dcddb7e5b, type: 2}
|
||||
useCallbacks: 0
|
||||
stopSoundOnDestroy: 1
|
||||
Callbacks: []
|
||||
soundEmitterObject: {fileID: 0}
|
||||
transitionDuration: 0
|
||||
eventIdInternal: 0
|
||||
valueGuidInternal:
|
||||
m_callbackDataInternal: {fileID: 0}
|
||||
--- !u!114 &337666372
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 337666369}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj
|
||||
m_listeners:
|
||||
initialListenerList: []
|
||||
useDefaultListeners: 1
|
||||
isEnvironmentAware: 1
|
||||
isStaticObject: 0
|
||||
usePositionOffsetData: 0
|
||||
m_positionOffsetData:
|
||||
KeepMe: 0
|
||||
positionOffset: {x: 0, y: 0, z: 0}
|
||||
scalingFactor: 1
|
||||
m_posOffsetData: {fileID: 0}
|
||||
listenerMask: 1
|
||||
--- !u!1 &350873397
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3644,6 +3730,92 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -8697944735082660400, guid: 471d04e939c6be84780b978dadd025c7, type: 3}
|
||||
--- !u!1 &436063987
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 436063988}
|
||||
- component: {fileID: 436063990}
|
||||
- component: {fileID: 436063989}
|
||||
m_Layer: 0
|
||||
m_Name: Wwise_FlashHalluA
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &436063988
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 436063987}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1321486799}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &436063989
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 436063987}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: eec618f338d13bf43b8519814d335311, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkEvent
|
||||
triggerList: f7e1664c
|
||||
useOtherObject: 0
|
||||
actionOnEventType: 0
|
||||
curveInterpolation: 4
|
||||
enableActionOnEvent: 0
|
||||
data:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: b6053d4e76e193d4f9a7bf1dcddb7e5b, type: 2}
|
||||
useCallbacks: 0
|
||||
stopSoundOnDestroy: 1
|
||||
Callbacks: []
|
||||
soundEmitterObject: {fileID: 0}
|
||||
transitionDuration: 0
|
||||
eventIdInternal: 0
|
||||
valueGuidInternal:
|
||||
m_callbackDataInternal: {fileID: 0}
|
||||
--- !u!114 &436063990
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 436063987}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj
|
||||
m_listeners:
|
||||
initialListenerList: []
|
||||
useDefaultListeners: 1
|
||||
isEnvironmentAware: 1
|
||||
isStaticObject: 0
|
||||
usePositionOffsetData: 0
|
||||
m_positionOffsetData:
|
||||
KeepMe: 0
|
||||
positionOffset: {x: 0, y: 0, z: 0}
|
||||
scalingFactor: 1
|
||||
m_posOffsetData: {fileID: 0}
|
||||
listenerMask: 1
|
||||
--- !u!1 &445037221
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -11603,6 +11775,92 @@ Transform:
|
||||
- {fileID: 1182842639}
|
||||
m_Father: {fileID: 1005038677}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1206823297
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1206823300}
|
||||
- component: {fileID: 1206823299}
|
||||
- component: {fileID: 1206823298}
|
||||
m_Layer: 0
|
||||
m_Name: Wwise_FlashHalluC
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!114 &1206823298
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206823297}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: eec618f338d13bf43b8519814d335311, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkEvent
|
||||
triggerList: f7e1664c
|
||||
useOtherObject: 0
|
||||
actionOnEventType: 0
|
||||
curveInterpolation: 4
|
||||
enableActionOnEvent: 0
|
||||
data:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: b6053d4e76e193d4f9a7bf1dcddb7e5b, type: 2}
|
||||
useCallbacks: 0
|
||||
stopSoundOnDestroy: 1
|
||||
Callbacks: []
|
||||
soundEmitterObject: {fileID: 0}
|
||||
transitionDuration: 0
|
||||
eventIdInternal: 0
|
||||
valueGuidInternal:
|
||||
m_callbackDataInternal: {fileID: 0}
|
||||
--- !u!114 &1206823299
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206823297}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj
|
||||
m_listeners:
|
||||
initialListenerList: []
|
||||
useDefaultListeners: 1
|
||||
isEnvironmentAware: 1
|
||||
isStaticObject: 0
|
||||
usePositionOffsetData: 0
|
||||
m_positionOffsetData:
|
||||
KeepMe: 0
|
||||
positionOffset: {x: 0, y: 0, z: 0}
|
||||
scalingFactor: 1
|
||||
m_posOffsetData: {fileID: 0}
|
||||
listenerMask: 1
|
||||
--- !u!4 &1206823300
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206823297}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1321486799}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1216115092
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -12872,6 +13130,9 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1182344410}
|
||||
- {fileID: 436063988}
|
||||
- {fileID: 337666370}
|
||||
- {fileID: 1206823300}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1323932845
|
||||
@@ -14452,7 +14713,7 @@ MeshCollider:
|
||||
serializedVersion: 5
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -2854399153807799721, guid: 471d04e939c6be84780b978dadd025c7, type: 3}
|
||||
m_Mesh: {fileID: -2909226912472205776, guid: 471d04e939c6be84780b978dadd025c7, type: 3}
|
||||
--- !u!1 &1490947752
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -14869,78 +15130,6 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 622343290}
|
||||
m_Modifications:
|
||||
- target: {fileID: 986184075687059205, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _isActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _stressLevel
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _fadeDuration
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _idleAmplitude
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _walkAmplitude
|
||||
value: 0.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _idleNoiseSpeed
|
||||
value: 1.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _walkNoiseSpeed
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _masterIntensity
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _debugStressValue
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _debugSustainStress
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1476756471834662335, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _masterIntensityInspector
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _settings.CanRun
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _settings.CanJump
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _firstPerson.GamepadSensitivityX
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: _firstPerson.GamepadSensitivityY
|
||||
value: 150
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6989128982853398086, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: m_Antialiasing
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8162540767767967414, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: OctoPlayerFP
|
||||
@@ -14985,10 +15174,8 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 0}
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 4625798697874999476, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
|
||||
@@ -16407,6 +16594,18 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 436063987}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument: Play_FlashHallu
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
Triggered: 0
|
||||
- Progression: 0.7
|
||||
OnReached:
|
||||
@@ -16462,6 +16661,30 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 337666369}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
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
|
||||
- m_Target: {fileID: 436063987}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
Triggered: 0
|
||||
- Progression: 1
|
||||
OnReached:
|
||||
@@ -16517,6 +16740,30 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 1206823297}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
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
|
||||
- m_Target: {fileID: 337666369}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
Triggered: 0
|
||||
--- !u!1 &1708782433
|
||||
GameObject:
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 96a0cfdaa6cfe3f4b8336bd77daefaba
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,19 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class FogAutoQueue : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Renderer[] _renderers;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
for(int i = 1; i < _renderers.Length; i++)
|
||||
{
|
||||
_renderers[i].material.renderQueue = _renderers[0].material.renderQueue + i;
|
||||
}
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fab3b088b58554f43bbc16b3f2239f84
|
||||
@@ -8,25 +8,21 @@ namespace Unheimlich.Features.Player
|
||||
/// Simulates camera head bobbing motion during player movement and idle states.
|
||||
/// Smoothly transitions between idle, walk and run bob parameters.
|
||||
/// Adds a subtle Z-axis roll to the bob and a strafe tilt applied in LateUpdate.
|
||||
///
|
||||
/// Sprint bob is automatically disabled when OctoPlayer.CanRun is false,
|
||||
/// since IsRunning already returns false in that case.
|
||||
/// Both rolls are combined additively to avoid asymmetric drift.
|
||||
/// </summary>
|
||||
public class CameraHeadBob : MonoBehaviour
|
||||
{
|
||||
private float _timer = 0f;
|
||||
private Vector3 _startLocalPos;
|
||||
|
||||
// Smoothly interpolated bob parameters to avoid brutal state switches.
|
||||
private float _currentBobSpeed = 0f;
|
||||
private float _currentBobAmplitude = 0f;
|
||||
|
||||
// Strafe tilt (Z roll applied in LateUpdate, after OctoPlayer sets camera pitch).
|
||||
private float _currentTilt = 0f;
|
||||
private float _currentBobRoll = 0f;
|
||||
private float _currentTilt = 0f;
|
||||
|
||||
private CameraEffects.HeadBobMode _overrideMode = CameraEffects.HeadBobMode.Normal;
|
||||
private bool _hasOverride = false;
|
||||
private Coroutine _resetCoroutine;
|
||||
private bool _hasOverride = false;
|
||||
private Coroutine _resetCoroutine;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
@@ -46,16 +42,14 @@ namespace Unheimlich.Features.Player
|
||||
if (currentMode == CameraEffects.HeadBobMode.Disabled)
|
||||
{
|
||||
SetBobDirect(settings.idleBobSpeed, 0f);
|
||||
ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
_currentBobRoll = ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
return;
|
||||
}
|
||||
|
||||
bool forceIdle = currentMode == CameraEffects.HeadBobMode.Idle;
|
||||
|
||||
if (forceIdle)
|
||||
if (currentMode == CameraEffects.HeadBobMode.Idle)
|
||||
{
|
||||
SetBobDirect(settings.idleBobSpeed, settings.idleBobAmplitude);
|
||||
ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
_currentBobRoll = ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -63,19 +57,16 @@ namespace Unheimlich.Features.Player
|
||||
if (!isGrounded)
|
||||
{
|
||||
SetBobDirect(settings.idleBobSpeed, 0f);
|
||||
ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
_currentBobRoll = ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
return;
|
||||
}
|
||||
|
||||
// Drive bob parameters directly from the actual physics velocity.
|
||||
float horizontalSpeed = new Vector3(
|
||||
PlayerController.Instance.CharController.velocity.x,
|
||||
0f,
|
||||
PlayerController.Instance.CharController.velocity.z
|
||||
).magnitude;
|
||||
|
||||
// IsRunning already returns false when OctoPlayer.CanRun is off —
|
||||
// so the bob falls back to walk params automatically.
|
||||
bool isRunning = OctoCore.Components.OctoPlayer.Instance.State.IsRunning;
|
||||
|
||||
const float WalkSpeedMs = 10f / 3.6f;
|
||||
@@ -88,12 +79,9 @@ namespace Unheimlich.Features.Player
|
||||
float targetAmplitude = Mathf.Lerp(settings.idleBobAmplitude, isRunning ? settings.runBobAmplitude : settings.walkBobAmplitude, t);
|
||||
|
||||
SetBobDirect(targetSpeed, targetAmplitude);
|
||||
ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
_currentBobRoll = ApplySmoothedBob(settings.bobRollAmplitude);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Applies strafe tilt in LateUpdate so it composites correctly over OctoPlayer's pitch rotation.
|
||||
/// </summary>
|
||||
private void LateUpdate()
|
||||
{
|
||||
if (PlayerController.Instance == null || PlayerController.Instance.CharController == null)
|
||||
@@ -102,29 +90,27 @@ namespace Unheimlich.Features.Player
|
||||
var settings = PlayerController.Instance.CameraEffects?.Settings;
|
||||
if (settings == null) return;
|
||||
|
||||
Vector3 velocity = PlayerController.Instance.CharController.velocity;
|
||||
float strafeAmount = Vector3.Dot(velocity, PlayerController.Instance.transform.right);
|
||||
Vector3 velocity = PlayerController.Instance.CharController.velocity;
|
||||
float strafeAmount = Vector3.Dot(velocity, PlayerController.Instance.transform.right);
|
||||
|
||||
float runSpeedMs = PlayerController.Instance.Movement != null ? 20f / 3.6f : 5.5f;
|
||||
float strafeFactor = Mathf.Clamp(strafeAmount / runSpeedMs, -1f, 1f);
|
||||
float runSpeedMs = PlayerController.Instance.Movement != null ? 20f / 3.6f : 5.5f;
|
||||
float strafeFactor = Mathf.Clamp(strafeAmount / runSpeedMs, -1f, 1f);
|
||||
|
||||
float targetTilt = -strafeFactor * settings.strafeTiltAngle;
|
||||
_currentTilt = Mathf.Lerp(_currentTilt, targetTilt, Time.deltaTime * settings.strafeTiltSpeed);
|
||||
float targetTilt = -strafeFactor * settings.strafeTiltAngle;
|
||||
_currentTilt = Mathf.Lerp(_currentTilt, targetTilt, Time.deltaTime * settings.strafeTiltSpeed);
|
||||
|
||||
Quaternion baseRot = transform.localRotation;
|
||||
transform.localRotation = baseRot * Quaternion.Euler(0f, 0f, _currentTilt);
|
||||
// Combine bob roll + strafe tilt additively
|
||||
transform.localRotation = Quaternion.Euler(0f, 0f, _currentBobRoll + _currentTilt);
|
||||
}
|
||||
|
||||
// ── Public API ────────────────────────────────────────────────────────────
|
||||
|
||||
/// <summary>Overrides the head bob mode (Idle, Normal, Disabled).</summary>
|
||||
public void SetMode(CameraEffects.HeadBobMode mode)
|
||||
{
|
||||
_overrideMode = mode;
|
||||
_hasOverride = true;
|
||||
}
|
||||
|
||||
/// <summary>Clears any active mode override and returns to Normal.</summary>
|
||||
public void ClearOverride()
|
||||
{
|
||||
_hasOverride = false;
|
||||
@@ -136,7 +122,6 @@ namespace Unheimlich.Features.Player
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Lerps the camera local position back to origin over <paramref name="duration"/> seconds.</summary>
|
||||
public void LerpToZero(float duration)
|
||||
{
|
||||
if (_resetCoroutine != null)
|
||||
@@ -153,7 +138,11 @@ namespace Unheimlich.Features.Player
|
||||
_currentBobAmplitude = amplitude;
|
||||
}
|
||||
|
||||
private void ApplySmoothedBob(float rollAmplitude)
|
||||
/// <summary>
|
||||
/// Applies bob position and returns the Z roll value (degrees).
|
||||
/// Rotation is NOT set here — LateUpdate combines it with strafe tilt.
|
||||
/// </summary>
|
||||
private float ApplySmoothedBob(float rollAmplitude)
|
||||
{
|
||||
_timer += Time.deltaTime * _currentBobSpeed;
|
||||
|
||||
@@ -166,7 +155,7 @@ namespace Unheimlich.Features.Player
|
||||
newPos.y += y;
|
||||
transform.localPosition = newPos;
|
||||
|
||||
transform.localRotation = Quaternion.Euler(0f, 0f, roll);
|
||||
return roll;
|
||||
}
|
||||
|
||||
private System.Collections.IEnumerator LerpToZeroCoroutine(float duration)
|
||||
|
||||
@@ -257,8 +257,13 @@ public class SpiralStaircase : MonoBehaviour
|
||||
trigger.Triggered = false;
|
||||
}
|
||||
}
|
||||
Vector3 targetPosition = new Vector3(0, _state.Progression * _settings.HalfTurns * -_stairHeight, 0);
|
||||
Vector3 offset = targetPosition - _references.Stairs.transform.localPosition;
|
||||
|
||||
_references.Stairs.transform.localPosition = new Vector3(0, _state.Progression * _settings.HalfTurns * -_stairHeight, 0);
|
||||
_references.Stairs.transform.localPosition = targetPosition;
|
||||
|
||||
if (OctoPlayer.Instance)
|
||||
OctoPlayer.Instance.Move(offset);
|
||||
}
|
||||
|
||||
private void ManageInside()
|
||||
|
||||
Reference in New Issue
Block a user