tiboFDG/Ipseity-Demo
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

Browse Source 
# 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:
Ferlat Thibaud
2026-06-03 13:52:36 +02:00
parent bf9a4e64ca fc362d0e23
commit 3c8e9080f3
64 changed files with 6855 additions and 4698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/TextMesh Pro/Fonts/TMP_Assets/CourierPrime-Regular SDF.asset
+1809 -656
View File
File diff suppressed because one or more lines are too long
Assets/TextMesh Pro/Fonts/TMP_Assets/CutiveMono-Regular SDF.asset
+349 -1118
View File
File diff suppressed because one or more lines are too long
Assets/TextMesh Pro/Fonts/TMP_Assets/Inconsolata-VariableFont_wdth,wght SDF.asset
+649 -308
View File
File diff suppressed because one or more lines are too long
Assets/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset
+318 -702
View File
File diff suppressed because one or more lines are too long
Assets/TextMesh Pro/Fonts/TMP_Assets/ShareTechMono-Regular SDF.asset
+296 -688
View File
File diff suppressed because one or more lines are too long
Assets/TextMesh Pro/Fonts/TMP_Assets/SpecialElite-Regular SDF.asset
+424 -804
View File
File diff suppressed because one or more lines are too long
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkCustomPanner.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: d1d38d88a124d5246a9fd0f0e9e1fe87
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkFlanger.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 1e6017c8ce4747d4dbae4aa39826a07c
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkImpacter.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 0d23c940ee9321f4aa6c196361b94d74
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkMeter.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 350f292ac9d468343ab2a9288c944bb0
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkRecorderADM.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 4cbafe3e1d7c5544abfb3c41ca54e3f3
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkSidechain.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 723222076c07afc4293168e02fbcdf25
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libAkSynthOne.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 8733469f1f01b064a842cbf9bb084802
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libMasteringSuite.bundle.meta
+25
View File
@@ -1,2 +1,27 @@
fileFormatVersion: 2
guid: 28a752fddafa67b46aa481b5bdad34cf
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 0
settings:
DefaultValueInitialized: true
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/API/Runtime/Plugins/Mac/DSP/libResonanceAudio.bundle.meta
+27
View File
@@ -1,2 +1,29 @@
fileFormatVersion: 2
guid: cf56a3a7b5de28a46b9f9981e76e7244
PluginImporter:
externalObjects: {}
serializedVersion: 3
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: OSX
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Wwise/ScriptableObjects/Event/3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15.asset
+18
View File
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: c945e91273b87a045b723cc8ddded56c, type: 3}
m_Name: 3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseEventReference
objectName: Play_FlashHallu
id: 1497902650
guid: 3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15
IsInUserDefinedSoundBank: 0
Assets/Wwise/ScriptableObjects/Event/3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b6053d4e76e193d4f9a7bf1dcddb7e5b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Content/Data/Camera/CamSettings.asset
+5
View File
@@ -22,3 +22,8 @@ MonoBehaviour:
runBobSpeed: 18
runBobAmplitude: 0.03
resetSpeed: 5
bobRollAmplitude: 0.4
strafeTiltAngle: 2.5
strafeTiltSpeed: 6
fovKickAmount: 0
fovKickSpeed: 0
Assets/_Content/Fonts/MerchandePrintCerif/AssetFont/MerchandePrintSerif SDF.asset
+356 -9
View File
File diff suppressed because one or more lines are too long
Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat
+1 -1
View File
@@ -117,7 +117,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Progression: 0.217
- _Progression: 0
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.hlsl
+7 -4
View File
@@ -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);
Assets/Materials.meta → Assets/_Content/Models/VFX/Fog/Materials/Fog.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 403aba0ca33575441a5969ead0eb9120
guid: 9ca1109ad0fc2724691e58979538e579
folderAsset: yes
DefaultImporter:
externalObjects: {}
Assets/_Content/Models/VFX/Fog/Materials/Fog/M_Fog_BodiesInWater.mat
+63
View File
@@ -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
Assets/_Content/Models/VFX/Fog/Materials/Fog/M_Fog_BodiesInWater.mat.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9dc512b94f969f94a812ceda863818db
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Content/Models/VFX/Fog/Materials/M_fog.mat → Assets/_Content/Models/VFX/Fog/Materials/Fog/M_Fog_Omnissiah.mat
+1 -1
View File
@@ -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
Assets/_Content/Models/VFX/Fog/Materials/M_fog.mat.meta → Assets/_Content/Models/VFX/Fog/Materials/Fog/M_Fog_Omnissiah.mat.meta
View File
Assets/_Content/Models/VFX/Fog/Materials/M_FogParticles.mat → Assets/_Content/Models/VFX/Fog/Materials/Fog/M_Fog_Particles.mat
+1 -1
View File
@@ -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
Assets/_Content/Models/VFX/Fog/Materials/M_FogParticles.mat.meta → Assets/_Content/Models/VFX/Fog/Materials/Fog/M_Fog_Particles.mat.meta
View File
Assets/_Content/Models/VFX/Fog/Shaders/Fog.hlsl
+2 -1
View File
@@ -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;
Assets/_Content/Models/VFX/Fog/Shaders/Fog.shadergraph
+408 -17
View File
@@ -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",
Assets/_Content/Prefabs/OctoPlayerFP.prefab
+15 -49
View File
@@ -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:
Assets/_Content/Scenes/BodiesInWater.unity
+1113 -177
View File
File diff suppressed because one or more lines are too long
Assets/_Content/Scenes/HouseOfLeaves.unity
+6 -6
View File
@@ -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
Assets/_Content/Scenes/Omnissiah.unity
+6 -6
View File
@@ -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:
Assets/_Content/Scenes/Samyaza.unity
+5 -1
View File
@@ -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
Assets/_Content/Scenes/Scarecrow.unity
+5 -1
View File
@@ -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
Assets/_Content/Scenes/Theatre.unity
+324 -77
View File
@@ -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:
Assets/_Content/Scripts/Features/Fog.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 96a0cfdaa6cfe3f4b8336bd77daefaba
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Content/Scripts/Features/Fog/FogAutoQueue.cs
+19
View File
@@ -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()
{
}
}
Assets/_Content/Scripts/Features/Fog/FogAutoQueue.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: fab3b088b58554f43bbc16b3f2239f84
Assets/_Content/Scripts/Features/Player/Runtime/Camera/CameraHeadBob.cs
+15 -26
View File
@@ -8,20 +8,16 @@ 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 _currentBobRoll = 0f;
private float _currentTilt = 0f;
private CameraEffects.HeadBobMode _overrideMode = CameraEffects.HeadBobMode.Normal;
@@ -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)
@@ -111,20 +99,18 @@ namespace Unheimlich.Features.Player
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)
Assets/_Content/Scripts/SpiralStaircase.cs
+6 -1
View File
@@ -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()
Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
+16 -20
View File
@@ -82,17 +82,11 @@ namespace OctoCore.Components
[Header("Settings")]
[Tooltip("Horizontal sensitivity (Yaw).")]
public float SensitivityX = 0.1f;
[Tooltip("Mouse sensitivity (Yaw & Pitch).")]
public Vector2 MouseSensitivity = new Vector2(.1f, .1f);
[Tooltip("Vertical sensitivity (Pitch).")]
public float SensitivityY = 0.1f;
[Tooltip("Gamepad horizontal sensitivity.")]
public float GamepadSensitivityX = 150f;
[Tooltip("Gamepad vertical sensitivity.")]
public float GamepadSensitivityY = 150f;
[Tooltip("Controller sensitivity (Yaw & Pitch).")]
public Vector2 ControllerSensitivity = new Vector2(140, 140);
[Tooltip("Minimum pitch (looking down).")]
public float MinPitch = -80f;
@@ -193,6 +187,12 @@ namespace OctoCore.Components
_references.Controller.enabled = true;
}
public void Move(Vector3 offset)
{
transform.position += offset;
Physics.SyncTransforms();
}
public void Pause(bool pause)
{
_state.IsPaused = pause;
@@ -352,26 +352,22 @@ namespace OctoCore.Components
case PlayerModes.FirstPerson:
if (cam && !_state.IsPaused)
{
Vector2 delta = (_state.IsPaused || !_state.IsFocussed || !_settings.AllowLook) ? Vector2.zero : _lookInput;
Vector2 delta = (_state.IsPaused || !_state.IsFocussed) ? Vector2.zero : _lookInput;
if (_settings.AllowLook)
{
bool isGamepad = Gamepad.current != null &&
Gamepad.current.rightStick.ReadValue().magnitude > 0.01f;
bool isController = OctoCore.Instance.Platform.Controller;
Vector2 sensitivity = isController ? _firstPerson.ControllerSensitivity * Time.deltaTime : _firstPerson.MouseSensitivity;
float sensX = isGamepad ? _firstPerson.GamepadSensitivityX : _firstPerson.SensitivityX;
float sensY = isGamepad ? _firstPerson.GamepadSensitivityY : _firstPerson.SensitivityY;
Vector2 look = delta * new Vector2(sensitivity.x, sensitivity.y * -1);
float lookX = isGamepad ? delta.x * sensX * Time.deltaTime : delta.x * sensX;
float lookY = isGamepad ? delta.y * sensY * -1 * Time.deltaTime : delta.y * sensY * -1;
_state.Yaw += lookX;
_state.Yaw += look.x;
float halfRange = _firstPerson.RangeYaw * 0.5f;
float deltaYaw = Mathf.DeltaAngle(_firstPerson.ReferenceYaw, _state.Yaw);
deltaYaw = Mathf.Clamp(deltaYaw, -halfRange, halfRange);
_state.Yaw = _firstPerson.ReferenceYaw + deltaYaw;
_state.Pitch = Mathf.Clamp(_state.Pitch + lookY, _firstPerson.MinPitch, _firstPerson.MaxPitch);
_state.Pitch = Mathf.Clamp(_state.Pitch + look.y, _firstPerson.MinPitch, _firstPerson.MaxPitch);
}
if (_state.Driver)
Packages/OctoCore/Runtime/Scripts/Components/OctoWorldEvent.cs
+7 -1
View File
@@ -147,6 +147,12 @@ namespace OctoCore.Components
EvaluateTrigger(col, false);
}
public void ResetLookAt()
{
_lookAtTimer = 0f;
_lookAtTriggered = false;
}
void TriggerWithCondition()
{
switch (_condition)
@@ -255,7 +261,7 @@ namespace OctoCore.Components
else
{
_lookAtTimer = 0f;
_lookAtTriggered = false;
//_lookAtTriggered = false;
}
}
Packages/OctoCore/Runtime/Scripts/Inputs/OctoInputs.cs
+6 -2
View File
@@ -227,11 +227,16 @@ namespace OctoCore.Inputs
{
var actionInfo = kvp.Value;
if (actionInfo.Reference.action.expectedControlType != "Vector2")
continue;
Vector2 value = actionInfo.Reference.action.ReadValue<Vector2>();
// Only poll enabled actions with callbacks
if (actionInfo.Enabled &&
actionInfo.Reference != null &&
(actionInfo.CallbacksList.Count > 0 || actionInfo.CallbacksVector2List.Count > 0) &&
actionInfo.Reference.action.IsPressed())
value.sqrMagnitude > .0001f)
{
// Call Action callbacks
foreach (var callback in actionInfo.CallbacksList.ToArray())
@@ -242,7 +247,6 @@ namespace OctoCore.Inputs
// Call Vector2 callbacks
foreach (var callback in actionInfo.CallbacksVector2List.ToArray())
{
Vector2 value = actionInfo.Reference.action.ReadValue<Vector2>();
callback?.Invoke(value);
}
}
RESIDENCY_POC_WwiseProject/Containers/Hallucination.wwu
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<WwiseDocument Type="WorkUnit" ID="{2982C361-EC8F-4724-ACCE-29E94AF0FF16}" SchemaVersion="133" RootDocumentID="{CCA82814-9533-4D71-8F0D-C8FAFA465C68}" ParentDocumentID="{CCA82814-9533-4D71-8F0D-C8FAFA465C68}">
<Containers>
<WorkUnit Name="Hallucination" ID="{2982C361-EC8F-4724-ACCE-29E94AF0FF16}" OwnerID="{CCA82814-9533-4D71-8F0D-C8FAFA465C68}" PersistMode="Nested">
<ChildrenList>
<WorkUnit Name="Placeholders" ID="{0F107B40-9A8E-4A68-B4A8-B7CA41EB5068}" PersistMode="Reference"/>
</ChildrenList>
</WorkUnit>
</Containers>
</WwiseDocument>
RESIDENCY_POC_WwiseProject/Containers/Placeholders.wwu
+124
View File
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<WwiseDocument Type="WorkUnit" ID="{0F107B40-9A8E-4A68-B4A8-B7CA41EB5068}" SchemaVersion="133" RootDocumentID="{CCA82814-9533-4D71-8F0D-C8FAFA465C68}" ParentDocumentID="{2982C361-EC8F-4724-ACCE-29E94AF0FF16}">
<Containers>
<WorkUnit Name="Placeholders" ID="{0F107B40-9A8E-4A68-B4A8-B7CA41EB5068}" OwnerID="{2982C361-EC8F-4724-ACCE-29E94AF0FF16}" PersistMode="Nested">
<ChildrenList>
<RandomSequenceContainer Name="FlashHalluPlaceholder" ID="{948A689F-8351-4AED-8439-7A4672EFF9CD}" ShortID="71847943">
<PropertyList>
<Property Name="MakeUpGain" Type="Real64">
<ValueList>
<Value>3</Value>
</ValueList>
</Property>
<Property Name="NormalOrShuffle" Type="int16" Value="0"/>
<Property Name="Pitch" Type="int32">
<ModifierList>
<ModifierInfo>
<Modifier Name="" ID="{44649BFD-7F80-471C-BBB9-E85018CDB3EB}">
<PropertyList>
<Property Name="Enabled" Type="bool" Value="True"/>
<Property Name="Max" Type="Real64" Value="200"/>
<Property Name="Min" Type="Real64" Value="-200"/>
</PropertyList>
</Modifier>
</ModifierInfo>
</ModifierList>
</Property>
</PropertyList>
<ReferenceList>
<Reference Name="Conversion">
<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{16AA8EB9-7498-45FF-B66E-783ABF47004A}"/>
</Reference>
<Reference Name="OutputBus">
<ObjectRef Name="SFX MONO" ID="{A9BA4E6F-7E61-47D7-8F77-23775C1A0FA8}" WorkUnitID="{2098B74C-876E-4F52-B5FB-02CBA1A95394}"/>
</Reference>
</ReferenceList>
<ChildrenList>
<Sound Name="Residency_Glitch-001" ID="{520FFE86-8DB4-43F3-ADDC-87247BD4D40A}" ShortID="956443610">
<ReferenceList>
<Reference Name="Conversion">
<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{16AA8EB9-7498-45FF-B66E-783ABF47004A}"/>
</Reference>
<Reference Name="OutputBus">
<ObjectRef Name="Main Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{2098B74C-876E-4F52-B5FB-02CBA1A95394}"/>
</Reference>
</ReferenceList>
<ChildrenList>
<AudioFileSource Name="Residency_Glitch-001" ID="{76CEB0C6-2986-4962-9EC5-01E0EB911EAC}">
<PropertyList>
<Property Name="FadeOutDuration" Type="Real64" Value="0.05803"/>
<Property Name="LoopBegin" Type="Real64" Value="0"/>
<Property Name="OverrideWavLoop" Type="bool" Value="True"/>
</PropertyList>
<Language>SFX</Language>
<AudioFile>Residency_Glitch-001.wav</AudioFile>
<MediaIDList>
<MediaID ID="838424821"/>
</MediaIDList>
</AudioFileSource>
</ChildrenList>
<ActiveSourceList>
<ActiveSource Name="Residency_Glitch-001" ID="{76CEB0C6-2986-4962-9EC5-01E0EB911EAC}" Platform="Linked"/>
</ActiveSourceList>
</Sound>
<Sound Name="Residency_Glitch-002" ID="{9C98BFD2-9B55-45F2-86A6-91899C0CDD4E}" ShortID="161599684">
<ReferenceList>
<Reference Name="Conversion">
<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{16AA8EB9-7498-45FF-B66E-783ABF47004A}"/>
</Reference>
<Reference Name="OutputBus">
<ObjectRef Name="Main Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{2098B74C-876E-4F52-B5FB-02CBA1A95394}"/>
</Reference>
</ReferenceList>
<ChildrenList>
<AudioFileSource Name="Residency_Glitch-002" ID="{77F80974-101A-480F-921C-DFFCE51791D0}">
<PropertyList>
<Property Name="FadeOutDuration" Type="Real64" Value="0.09627"/>
<Property Name="LoopBegin" Type="Real64" Value="0.0668"/>
<Property Name="OverrideWavLoop" Type="bool" Value="True"/>
<Property Name="TrimBegin" Type="Real64" Value="0.06551"/>
</PropertyList>
<Language>SFX</Language>
<AudioFile>Residency_Glitch-002.wav</AudioFile>
<MediaIDList>
<MediaID ID="843336438"/>
</MediaIDList>
</AudioFileSource>
</ChildrenList>
<ActiveSourceList>
<ActiveSource Name="Residency_Glitch-002" ID="{77F80974-101A-480F-921C-DFFCE51791D0}" Platform="Linked"/>
</ActiveSourceList>
</Sound>
<Sound Name="Residency_Glitch-003" ID="{8E584660-B986-4B23-AED8-0F2CAD95DEF6}" ShortID="156965097">
<ReferenceList>
<Reference Name="Conversion">
<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{16AA8EB9-7498-45FF-B66E-783ABF47004A}"/>
</Reference>
<Reference Name="OutputBus">
<ObjectRef Name="Main Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{2098B74C-876E-4F52-B5FB-02CBA1A95394}"/>
</Reference>
</ReferenceList>
<ChildrenList>
<AudioFileSource Name="Residency_Glitch-003" ID="{A0B82CA0-D628-41BE-9E72-C9ACC34DE143}">
<PropertyList>
<Property Name="FadeOutDuration" Type="Real64" Value="0.18466"/>
<Property Name="LoopBegin" Type="Real64" Value="0"/>
<Property Name="OverrideWavLoop" Type="bool" Value="True"/>
</PropertyList>
<Language>SFX</Language>
<AudioFile>Residency_Glitch-003.wav</AudioFile>
<MediaIDList>
<MediaID ID="41039869"/>
</MediaIDList>
</AudioFileSource>
</ChildrenList>
<ActiveSourceList>
<ActiveSource Name="Residency_Glitch-003" ID="{A0B82CA0-D628-41BE-9E72-C9ACC34DE143}" Platform="Linked"/>
</ActiveSourceList>
</Sound>
</ChildrenList>
</RandomSequenceContainer>
</ChildrenList>
</WorkUnit>
</Containers>
</WwiseDocument>
RESIDENCY_POC_WwiseProject/Containers/SFX.wwu
+2 -1
View File
@@ -7,8 +7,9 @@
<Property Name="OverrideColor" Type="bool" Value="True"/>
</PropertyList>
<ChildrenList>
<WorkUnit Name="PLAYER" ID="{9DCF7355-8BB2-4FFD-BB66-521FBBF09B87}" PersistMode="Reference"/>
<WorkUnit Name="Player" ID="{9DCF7355-8BB2-4FFD-BB66-521FBBF09B87}" PersistMode="Reference"/>
<WorkUnit Name="ENVIRO" ID="{6A94BF93-7FF1-4993-8285-73D5C9CE4309}" PersistMode="Reference"/>
<WorkUnit Name="Hallucination" ID="{2982C361-EC8F-4724-ACCE-29E94AF0FF16}" PersistMode="Reference"/>
</ChildrenList>
</WorkUnit>
</Containers>
RESIDENCY_POC_WwiseProject/Events/SFX.wwu
+12 -1
View File
@@ -7,8 +7,19 @@
<Property Name="OverrideColor" Type="bool" Value="True"/>
</PropertyList>
<ChildrenList>
<WorkUnit Name="PLAYER" ID="{55DA1FC4-39CB-4502-9778-BBF0743DD47B}" PersistMode="Reference"/>
<WorkUnit Name="Player" ID="{55DA1FC4-39CB-4502-9778-BBF0743DD47B}" PersistMode="Reference"/>
<WorkUnit Name="ENVIRO" ID="{A667485F-138A-44DA-A08B-81837CBB7F71}" PersistMode="Reference"/>
<Event Name="Play_FlashHallu" ID="{3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15}">
<ChildrenList>
<Action Name="" ID="{B72B0AAC-18E6-43AA-B146-79951F3AB8EA}" ShortID="109051534">
<ReferenceList>
<Reference Name="Target">
<ObjectRef Name="FlashHalluPlaceholder" ID="{948A689F-8351-4AED-8439-7A4672EFF9CD}" WorkUnitID="{0F107B40-9A8E-4A68-B4A8-B7CA41EB5068}"/>
</Reference>
</ReferenceList>
</Action>
</ChildrenList>
</Event>
</ChildrenList>
</WorkUnit>
</Events>
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Mac/Event/Play_FlashHallu.bnk
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8080313dad96cca6a30a1fca3c46793b55bc3fb8818bc06ed9ec3fcd9e1a86b2
size 403
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Mac/Event/Play_FlashHallu.json
+73
View File
@@ -0,0 +1,73 @@
{
"SoundBanksInfo": {
"Platform": "Mac",
"BasePlatform": "Mac",
"SchemaVersion": "16",
"SoundBankVersion": "172",
"SoundBanks": [
{
"Id": "1497902650",
"Type": "Event",
"GUID": "{3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15}",
"Language": "SFX",
"Hash": "{89576156-972B-203C-5E3D-B90147E7EE3C}",
"ObjectPath": "Play_FlashHallu",
"ShortName": "Play_FlashHallu",
"Path": "Event/Play_FlashHallu.bnk",
"Media": [
{
"Id": "41039869",
"Language": "SFX",
"Streaming": "false",
"Location": "Loose",
"ShortName": "Residency_Glitch-003.wav",
"Path": "Media/41039869.wem",
"CachePath": "99/{996C5E27-3F50-AA40-1BEB-4BEB5356E759}.wem"
},
{
"Id": "838424821",
"Language": "SFX",
"Streaming": "false",
"Location": "Loose",
"ShortName": "Residency_Glitch-001.wav",
"Path": "Media/838424821.wem",
"CachePath": "57/{57CCAE3B-1F73-9C11-12BD-37A0AA05E057}.wem"
},
{
"Id": "843336438",
"Language": "SFX",
"Streaming": "false",
"Location": "Loose",
"ShortName": "Residency_Glitch-002.wav",
"Path": "Media/843336438.wem",
"CachePath": "99/{99045E47-162B-82C5-B2AD-31381162F1CF}.wem"
}
],
"Events": [
{
"Id": "1497902650",
"Name": "Play_FlashHallu",
"ObjectPath": "\\Events\\SFX\\Play_FlashHallu",
"GUID": "{3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15}",
"Color": "23",
"DurationType": "OneShot",
"DurationMin": "0.47617644",
"DurationMax": "0.9100361",
"MediaRefs": [
{
"Id": "41039869"
},
{
"Id": "838424821"
},
{
"Id": "843336438"
}
]
}
]
}
],
"FileHash": "{254BEBB0-0F57-EFCA-622B-535F5AA439ED}"
}
}
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Mac/Event/Play_FlashHallu.txt
+3
View File
@@ -0,0 +1,3 @@
Event ID Name Wwise Object Path Notes
1497902650 Play_FlashHallu \SFX\Play_FlashHallu
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Mac/Media/41039869.wem
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34e6451935cec71cc364ae07a09c44819b6f2c997a4386018372985dea42be26
size 155760
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Mac/Media/838424821.wem
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f5fc7f0cdb572a581050349d8a0bac218a1551ff2e129679fd6c3bd11c5b0ef
size 115296
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Mac/Media/843336438.wem
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c73229eda05b2bfd2845a5d9a7942f2fc3a37030b6302fe797519b650de469a4
size 102768
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Windows/Event/Play_FlashHallu.bnk
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8080313dad96cca6a30a1fca3c46793b55bc3fb8818bc06ed9ec3fcd9e1a86b2
size 403
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Windows/Event/Play_FlashHallu.json
+73
View File
@@ -0,0 +1,73 @@
{
"SoundBanksInfo": {
"Platform": "Windows",
"BasePlatform": "Windows",
"SchemaVersion": "16",
"SoundBankVersion": "172",
"SoundBanks": [
{
"Id": "1497902650",
"Type": "Event",
"GUID": "{3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15}",
"Language": "SFX",
"Hash": "{89576156-972B-203C-5E3D-B90147E7EE3C}",
"ObjectPath": "Play_FlashHallu",
"ShortName": "Play_FlashHallu",
"Path": "Event/Play_FlashHallu.bnk",
"Media": [
{
"Id": "41039869",
"Language": "SFX",
"Streaming": "false",
"Location": "Loose",
"ShortName": "Residency_Glitch-003.wav",
"Path": "Media/41039869.wem",
"CachePath": "99/{996C5E27-3F50-AA40-1BEB-4BEB5356E759}.wem"
},
{
"Id": "838424821",
"Language": "SFX",
"Streaming": "false",
"Location": "Loose",
"ShortName": "Residency_Glitch-001.wav",
"Path": "Media/838424821.wem",
"CachePath": "57/{57CCAE3B-1F73-9C11-12BD-37A0AA05E057}.wem"
},
{
"Id": "843336438",
"Language": "SFX",
"Streaming": "false",
"Location": "Loose",
"ShortName": "Residency_Glitch-002.wav",
"Path": "Media/843336438.wem",
"CachePath": "99/{99045E47-162B-82C5-B2AD-31381162F1CF}.wem"
}
],
"Events": [
{
"Id": "1497902650",
"Name": "Play_FlashHallu",
"ObjectPath": "\\Events\\SFX\\Play_FlashHallu",
"GUID": "{3B7065D1-9A3B-4166-8CD1-0CCC60BE9E15}",
"Color": "23",
"DurationType": "OneShot",
"DurationMin": "0.47617644",
"DurationMax": "0.9100361",
"MediaRefs": [
{
"Id": "41039869"
},
{
"Id": "838424821"
},
{
"Id": "843336438"
}
]
}
]
}
],
"FileHash": "{802103DE-61F3-299D-733C-4E6FDEFAD629}"
}
}
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Windows/Event/Play_FlashHallu.txt
+3
View File
@@ -0,0 +1,3 @@
Event ID Name Wwise Object Path Notes
1497902650 Play_FlashHallu \SFX\Play_FlashHallu
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Windows/Media/41039869.wem
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34e6451935cec71cc364ae07a09c44819b6f2c997a4386018372985dea42be26
size 155760
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Windows/Media/838424821.wem
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f5fc7f0cdb572a581050349d8a0bac218a1551ff2e129679fd6c3bd11c5b0ef
size 115296
RESIDENCY_POC_WwiseProject/GeneratedSoundBanks/Windows/Media/843336438.wem
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c73229eda05b2bfd2845a5d9a7942f2fc3a37030b6302fe797519b650de469a4
size 102768
RESIDENCY_POC_WwiseProject/Originals/SFX/Residency_Glitch-001.wav
LFS
BIN
View File
Binary file not shown.
RESIDENCY_POC_WwiseProject/Originals/SFX/Residency_Glitch-002.wav
LFS
BIN
View File
Binary file not shown.
RESIDENCY_POC_WwiseProject/Originals/SFX/Residency_Glitch-003.wav
LFS
BIN
View File
Binary file not shown.