Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/_Content/Fonts/MerchandePrintCerif/AssetFont/MerchandePrintSerif SDF.asset # Assets/_Content/Prefabs/OctoPlayerFP.prefab # Assets/_Content/Scenes/BodiesInWater.unity
This commit is contained in:
@@ -43,6 +43,13 @@ GameObject:
|
||||
- component: {fileID: 3666612565151794712}
|
||||
- component: {fileID: 6053283114444666027}
|
||||
- component: {fileID: 6989128982853398086}
|
||||
- component: {fileID: 522399111239992785}
|
||||
- component: {fileID: 9197788650853038383}
|
||||
- component: {fileID: 7467899538166521570}
|
||||
- component: {fileID: 4479918178055018832}
|
||||
- component: {fileID: 2450754982288114483}
|
||||
- component: {fileID: 1650715703449607419}
|
||||
- component: {fileID: 961202911501545142}
|
||||
m_Layer: 0
|
||||
m_Name: Camera Player
|
||||
m_TagString: MainCamera
|
||||
@@ -168,6 +175,138 @@ MonoBehaviour:
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
m_Version: 2
|
||||
--- !u!114 &522399111239992785
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d96ceb0ee513b1e4197e55e9b926269b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Interactions.Core.InteractionHandler
|
||||
_interactionRange: 5
|
||||
_interactableLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 8
|
||||
_raycastInterval: 0
|
||||
--- !u!114 &9197788650853038383
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
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!114 &7467899538166521570
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a835ee92b0863c9459a0f816c5ff62ac, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkAudioListener
|
||||
isDefaultListener: 1
|
||||
bOverrideScalingFactor: 0
|
||||
scalingFactor: -1
|
||||
listenerId: 0
|
||||
--- !u!114 &4479918178055018832
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ac293711562f7704c9688ef699a612f3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkRoomAwareObject
|
||||
m_Collider: {fileID: 0}
|
||||
--- !u!114 &2450754982288114483
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 976062e6c0f8cb944ad0f941852ec198, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkSpatialAudioListener
|
||||
--- !u!54 &1650715703449607419
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
serializedVersion: 5
|
||||
m_Mass: 1
|
||||
m_LinearDamping: 0
|
||||
m_AngularDamping: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!136 &961202911501545142
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2101508725665932610}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Height: 1
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2277482252851742510
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -328,6 +467,9 @@ GameObject:
|
||||
- component: {fileID: 5295567073180248356}
|
||||
- component: {fileID: 688176918831081180}
|
||||
- component: {fileID: 3522630547589622128}
|
||||
- component: {fileID: 4152409555847978467}
|
||||
- component: {fileID: 4484393045093388587}
|
||||
- component: {fileID: 2442273134423229941}
|
||||
m_Layer: 0
|
||||
m_Name: OctoPlayerFP
|
||||
m_TagString: Player
|
||||
@@ -444,3 +586,61 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Gameplay.Player.CameraEffects
|
||||
Settings: {fileID: 11400000, guid: 28f72f5bbd71f384a86c547567dbb5bf, type: 2}
|
||||
--- !u!114 &4152409555847978467
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8162540767767967414}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 464960797e705e84a9eb87ecce4e9311, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Interactions.Core.PlayerInspectionHandler
|
||||
_inspectionHoldPoint: {fileID: 6579694192787271975}
|
||||
--- !u!114 &4484393045093388587
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8162540767767967414}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b711f35d53cba9d43b8b6f55a40cedbc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Player.StressController
|
||||
_rig: {fileID: 1476756471834662335}
|
||||
_decaySpeed: 0.3
|
||||
_deactivateThreshold: 0.05
|
||||
_debugSustainStress: 1
|
||||
_debugStressValue: 0.2
|
||||
--- !u!114 &2442273134423229941
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8162540767767967414}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5a11b07babb12d446a356745e7a37303, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Audio_FootstepsController
|
||||
footstepEvent:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: 41aa8cbccefacf24b97ee9067316b3dc, type: 2}
|
||||
defaultSwitch:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: cea23ef8af49aa54f9c3833465570bb2, type: 2}
|
||||
_stepInterval: 0.8
|
||||
_minVelocity: 0.3
|
||||
_rayDistance: 0.5
|
||||
_groundLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
|
||||
Reference in New Issue
Block a user