# 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
64 changed files with 6855 additions and 4698 deletions
+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: