Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
This commit is contained in:
Ferlat Thibaud
+1
-1
@@ -117,7 +117,7 @@ Material:
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _Progression: 0.84
|
||||
- _Progression: 0.73
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -0,0 +1,110 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 18535463c48e03645a59cf6275b6a1d2
|
||||
ModelImporter:
|
||||
serializedVersion: 24200
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
materialSearch: 1
|
||||
materialLocation: 1
|
||||
animations:
|
||||
legacyGenerateAnimations: 4
|
||||
bakeSimulation: 0
|
||||
resampleCurves: 1
|
||||
optimizeGameObjects: 0
|
||||
removeConstantScaleCurves: 0
|
||||
motionNodeName:
|
||||
animationImportErrors:
|
||||
animationImportWarnings:
|
||||
animationRetargetingWarnings:
|
||||
animationDoRetargetingWarnings: 0
|
||||
importAnimatedCustomProperties: 0
|
||||
importConstraints: 0
|
||||
animationCompression: 1
|
||||
animationRotationError: 0.5
|
||||
animationPositionError: 0.5
|
||||
animationScaleError: 0.5
|
||||
animationWrapMode: 0
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
sortHierarchyByName: 1
|
||||
importPhysicalCameras: 1
|
||||
importVisibility: 1
|
||||
importBlendShapes: 1
|
||||
importCameras: 1
|
||||
importLights: 1
|
||||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 0
|
||||
bakeAxisConversion: 0
|
||||
preserveHierarchy: 0
|
||||
skinWeightsMode: 0
|
||||
maxBonesPerVertex: 4
|
||||
minBoneWeight: 0.001
|
||||
optimizeBones: 1
|
||||
generateMeshLods: 0
|
||||
meshLodGenerationFlags: 0
|
||||
maximumMeshLod: -1
|
||||
meshOptimizationFlags: -1
|
||||
indexFormat: 0
|
||||
secondaryUVAngleDistortion: 8
|
||||
secondaryUVAreaDistortion: 15.000001
|
||||
secondaryUVHardAngle: 88
|
||||
secondaryUVMarginMethod: 1
|
||||
secondaryUVMinLightmapResolution: 40
|
||||
secondaryUVMinObjectScale: 1
|
||||
secondaryUVPackMargin: 4
|
||||
useFileScale: 1
|
||||
strictVertexDataChecks: 0
|
||||
tangentSpace:
|
||||
normalSmoothAngle: 60
|
||||
normalImportMode: 0
|
||||
tangentImportMode: 3
|
||||
normalCalculationMode: 4
|
||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||
blendShapeNormalImportMode: 1
|
||||
normalSmoothingSource: 0
|
||||
referencedClips: []
|
||||
importAnimation: 1
|
||||
humanDescription:
|
||||
serializedVersion: 3
|
||||
human: []
|
||||
skeleton: []
|
||||
armTwist: 0.5
|
||||
foreArmTwist: 0.5
|
||||
upperLegTwist: 0.5
|
||||
legTwist: 0.5
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
skeletonHasParents: 1
|
||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||
autoGenerateAvatarMappingIfUnspecified: 1
|
||||
animationType: 2
|
||||
humanoidOversampling: 1
|
||||
avatarSetup: 0
|
||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||
importBlendShapeDeformPercent: 1
|
||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||
additionalBone: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,99 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5808716582761680893
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2721267321453921552}
|
||||
- component: {fileID: 3976092107026356747}
|
||||
- component: {fileID: 4279205103840629607}
|
||||
- component: {fileID: 9175510880129279672}
|
||||
m_Layer: 0
|
||||
m_Name: WwiseAkReverbZone
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2721267321453921552
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5808716582761680893}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.18337, y: 1, z: 13.99041}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!65 &3976092107026356747
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5808716582761680893}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &4279205103840629607
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5808716582761680893}
|
||||
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!114 &9175510880129279672
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5808716582761680893}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 46c219bf9b866fe4b8065a9d7e6d1f2b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkReverbZone
|
||||
ReverbZone: {fileID: 0}
|
||||
ParentRoom: {fileID: 0}
|
||||
TransitionRegionWidth: 1
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 037c6384bd055e74eabd6d3d182c0367
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1017,6 +1017,87 @@ MonoBehaviour:
|
||||
glitchMinDuration: 0.02
|
||||
glitchMaxDuration: 0.12
|
||||
glitchObject: {fileID: 0}
|
||||
--- !u!1001 &31762403
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4567019715677106522, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseEventTrigger_StairsEvent_KillTheater
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.5977043
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.7632347
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 3.0218527
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 2.9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.596
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 23.252
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.95066565
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.31021753
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 36.145
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6986862178007090695, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7365274582226833486, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: wwiseEvents.Array.data[0].label
|
||||
value: 'Stairs Bed Event '
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7365274582226833486, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: wwiseEvents.Array.data[0].wwiseEvent.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 17a608df6e3800d4bb06a2f6a3701168, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
--- !u!4 &33942115 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -2085358214818735202, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
@@ -3143,27 +3224,27 @@ PrefabInstance:
|
||||
m_Modifications:
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.04722
|
||||
value: 1.3371953
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 3.8757498
|
||||
value: 4.948945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1.5412425
|
||||
value: 1.9680126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8.4335
|
||||
value: 10.808
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 4.97
|
||||
value: 5.0891
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 14.1
|
||||
value: 14.715
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@@ -3236,7 +3317,7 @@ PrefabInstance:
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: reverbAuxBus.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
objectReference: {fileID: 11400000, guid: 2250685977792764f9923476afdf22ec, type: 2}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
@@ -5915,6 +5996,79 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 285654091}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &287693555
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 4.4712415
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 17.34653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -9.64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.59
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 15.616
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5808716582761680893, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseAkRoom_LivingWall_1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: transmissionLoss
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 74d4624db272fc6499fa0bc3973b38f8, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
--- !u!1001 &290048671
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -10974,7 +11128,7 @@ PrefabInstance:
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: reverbAuxBus.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 8edff76a7ebdc724f99e1a185a3b9fca, type: 2}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
@@ -23111,6 +23265,79 @@ MeshCollider:
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -6317805809608689028, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
|
||||
--- !u!1001 &1029398630
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 4.4712415
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 17.34653
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 9.62
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.59
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 16.2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5808716582761680893, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseAkRoom_LivingWall_2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: transmissionLoss
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 74d4624db272fc6499fa0bc3973b38f8, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
--- !u!1 &1032672329
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -23501,7 +23728,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneAuxSend
|
||||
value: 0.728
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: distanceBehavior
|
||||
@@ -23518,7 +23745,7 @@ PrefabInstance:
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: d0c8697228bd6e24186a23fc57f25a90, type: 2}
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 3976092107026356747, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
@@ -63717,3 +63944,6 @@ SceneRoots:
|
||||
- {fileID: 1321486799}
|
||||
- {fileID: 1669380717}
|
||||
- {fileID: 1463114954}
|
||||
- {fileID: 287693555}
|
||||
- {fileID: 1029398630}
|
||||
- {fileID: 31762403}
|
||||
|
||||
@@ -1,12 +1,98 @@
|
||||
using OctoCore.Components;
|
||||
using UnityEngine;
|
||||
|
||||
public class SandController : MonoBehaviour
|
||||
{
|
||||
public Renderer SandRenderer;
|
||||
public float Duration = 15;
|
||||
[System.Serializable]
|
||||
public class References
|
||||
{
|
||||
public Renderer SandRenderer;
|
||||
public Transform[] GlitchBlocksLeft;
|
||||
public Transform[] GlitchBlocksRight;
|
||||
public Transform[] GlitchBlocksTop;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
public class Settings
|
||||
{
|
||||
public float Duration = 25;
|
||||
public float Delay = 2;
|
||||
}
|
||||
|
||||
[SerializeField] private References _references;
|
||||
[SerializeField] private Settings _settings;
|
||||
|
||||
private float _time;
|
||||
private Vector3[] _movesMultiplier = new Vector3[3] { Vector3.left, Vector3.right, Vector3.up };
|
||||
private Vector3[] _movesOffset = new Vector3[3] { new Vector3(-2.02f, 1.5f, 0), new Vector3(2.02f, 1.5f, 0), new Vector3(0, 3.52f, 0) };
|
||||
|
||||
void Start()
|
||||
{
|
||||
_time = -_settings.Delay;
|
||||
|
||||
for (int i = 0; i < _references.GlitchBlocksLeft.Length; i++)
|
||||
SetBlocScale(_references.GlitchBlocksLeft[i], 0);
|
||||
|
||||
for (int i = 0; i < _references.GlitchBlocksRight.Length; i++)
|
||||
SetBlocScale(_references.GlitchBlocksRight[i], 1);
|
||||
|
||||
for (int i = 0; i < _references.GlitchBlocksTop.Length; i++)
|
||||
SetBlocScale(_references.GlitchBlocksTop[i], 2);
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
SandRenderer.material.SetFloat("_Progression", Time.timeSinceLevelLoad / Duration);
|
||||
_time += Time.deltaTime;
|
||||
float progression = Mathf.Clamp01(_time / _settings.Duration);
|
||||
|
||||
_references.SandRenderer.material.SetFloat("_Progression", progression);
|
||||
|
||||
if (!OctoPlayer.Instance)
|
||||
return;
|
||||
|
||||
Vector3 targetPos = _references.SandRenderer.transform.position;
|
||||
targetPos.z = OctoPlayer.Instance.transform.position.z;
|
||||
|
||||
_references.SandRenderer.transform.position = targetPos;
|
||||
//SandRenderer.transform.rotation = OctoPlayer.Instance.transform.rotation;
|
||||
|
||||
for (int i = 0; i < _references.GlitchBlocksLeft.Length; i++)
|
||||
SetBlocPosition(_references.GlitchBlocksLeft[i], 0);
|
||||
|
||||
for (int i = 0; i < _references.GlitchBlocksRight.Length; i++)
|
||||
SetBlocPosition(_references.GlitchBlocksRight[i], 1);
|
||||
|
||||
for (int i = 0; i < _references.GlitchBlocksTop.Length; i++)
|
||||
SetBlocPosition(_references.GlitchBlocksTop[i], 2);
|
||||
}
|
||||
|
||||
void SetBlocScale(Transform tr, int i)
|
||||
{
|
||||
tr.localScale = new Vector3(tr.localScale.x, tr.localScale.y, Mathf.Lerp(2, 4, i * 37.05f % 1));
|
||||
}
|
||||
|
||||
void SetBlocPosition(Transform tr, int i)
|
||||
{
|
||||
Vector3 moveOffset = _movesOffset[i];
|
||||
Vector3 moveMultiplier = _movesMultiplier[i];
|
||||
float id = tr.GetSiblingIndex() + i * 9.12f;
|
||||
|
||||
float offset = _time * Mathf.Lerp(1, 1.3f, _time);
|
||||
offset *= Mathf.Lerp(3, 8, id * 6.23f % 1);
|
||||
offset += id * 17.23f;
|
||||
offset = Mathf.Cos(offset);
|
||||
offset = Mathf.Clamp01(offset * 6 - 2);
|
||||
|
||||
//float amplitude = Time.timeSinceLevelLoad * Mathf.Lerp(.03f, .02f, id * 6.23f % 1);
|
||||
float amplitude = id * 23.18f % 1;
|
||||
amplitude *= Mathf.Clamp01(_time);
|
||||
amplitude *= 1 + _time * .05f;
|
||||
amplitude *= .3f;
|
||||
amplitude = Mathf.Clamp01(amplitude);
|
||||
|
||||
Vector3 targetPos = moveOffset - moveMultiplier * offset * amplitude;
|
||||
targetPos.z = tr.localPosition.z;
|
||||
|
||||
tr.localPosition = targetPos;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,12 +72,18 @@ void Sand_float
|
||||
out float Alpha
|
||||
)
|
||||
{
|
||||
float t = Progression;
|
||||
t -= RidgedNoise3D(PositionWS, .3, 1, 2, .5) * .3;
|
||||
|
||||
float depth = length(PositionWS - _WorldSpaceCameraPos.xyz);
|
||||
float arkMask = 0;
|
||||
|
||||
float t = Progression;
|
||||
t -= RidgedNoise3D(PositionWS, .3, 1, 2, .5) * .3;
|
||||
t -= pow(smoothstep(0, 100, depth), .5) * .6;
|
||||
//t += pow(abs(PositionWS.x), 3) * .02;
|
||||
//t -= pow(saturate(1 - abs(PositionWS.x * .5)), 2) * .3;
|
||||
t += .15;
|
||||
t = saturate(t);
|
||||
|
||||
// Sand
|
||||
|
||||
float sandLayers = 6;
|
||||
@@ -100,14 +106,19 @@ void Sand_float
|
||||
|
||||
// Output
|
||||
|
||||
Color = ColorRemapLinear(saturate(pow(smoothstep(5, 30, depth * sandPatern), .5)), ColorA, ColorB, ColorC, ColorD, ColorE);
|
||||
|
||||
Position = PositionWS;
|
||||
Position.y += sandMask;
|
||||
Position.y *= 1 + saturate(pow(abs(PositionWS.x * .5), 3)) * lerp(-.2, 1.4, sandMask);
|
||||
|
||||
float n = PerlinNoise3D(Position, 50);
|
||||
|
||||
Color = ColorRemapLinear(saturate(pow(smoothstep(5, 30, (Position.z - _WorldSpaceCameraPos.z * .8) * sandPatern), .5)), ColorA, ColorB, ColorC, ColorD, ColorE);
|
||||
Color *= lerp(1, n, smoothstep(30, 0, depth));
|
||||
|
||||
Height = sandMask;
|
||||
|
||||
Alpha = smoothstep(1, .5, abs(smoothstep(-20, 20, PositionWS.x) * 2 - 1));
|
||||
Alpha = 1 - /*smoothstep(1.5, 1.3, abs(PositionWS.x)) **/ smoothstep(0, .3, abs(Position.y));
|
||||
}
|
||||
|
||||
void HouseOfLeaves_float
|
||||
|
||||
@@ -267,10 +267,10 @@ void EnkiBillalFullscreen_float
|
||||
// DISTORTION
|
||||
|
||||
float distortAtten = pow(smoothstep(5, 20, depthMeters), 2);
|
||||
float nDistort0 = FBMNoise3D(positionWS * float3(1, 2.0, 1) - time * .1 - np0 * .5 + np3 * 3, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float nDistort1 = FBMNoise3D(positionWS * float3(1, 1.5, 1) - time * .1 - np0 * .5 + np4 * 3, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float nDistort0 = FBMNoise3D(positionWS * float3(1, 2.0, 1) - time * .2 - np0 * .5, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float nDistort1 = FBMNoise3D(positionWS * float3(1, 1.5, 1) - time * .2 - np0 * .5, 1.5, 1, 2, .5) * 2 - 1;
|
||||
float2 uvDistort0 = uv0 + nDistort0 * .005;
|
||||
float2 uvDistort1 = uv0 + nDistort1 * .015;
|
||||
float2 uvDistort1 = uv0 + nDistort1 * .025;
|
||||
float3 sceneColor2 = SampleSceneColor(uvDistort0);
|
||||
sceneColor2 = lerp(sceneColor2, SampleSceneColor(uvDistort1), .3);
|
||||
float3 cDistort = saturate(sceneColor2 - sceneColor) * distortAtten;
|
||||
@@ -317,7 +317,7 @@ void EnkiBillalFullscreen_float
|
||||
//c = lerp(c, sceneColor2, (greyscale + smoothstep(5, 35, depthMeters) * .8) * .5);
|
||||
//c += sceneColor2 * greyscale * .5;
|
||||
c = lerp(c, outlineColor, outline);
|
||||
c += cDistort * 1;
|
||||
c += cDistort * 1.5;
|
||||
//c = ((c + 1) * (sceneColor2 + 0));
|
||||
//c = smoothstep(-.1, 0, np2);
|
||||
//c = greyscale;
|
||||
|
||||
Reference in New Issue
Block a user