From 8e53bf0d16d4d541e3adb520bfe66693cfb08897 Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 12 Jun 2025 19:30:41 +0200 Subject: [PATCH] Everything works --- blueberryPeak/Assets/Prefabs/Fox.prefab | 219 ++- blueberryPeak/Assets/Scenes/Beach.unity | 1236 ++++++++++------- .../ProjectData/AkWwiseProjectData.asset | 2 +- blueberryPeak/Assets/WwiseSettings.xml | 8 - .../ProjectSettings/GraphicsSettings.asset | 8 +- .../Mac/DefaultSoundBank.bnk | Bin 33637112 -> 33637112 bytes .../Mac/DefaultSoundBank.json | 16 +- .../Mac/DefaultSoundBank.txt | 12 +- .../Windows/DefaultSoundBank.bnk | Bin 33637112 -> 33637112 bytes .../Windows/DefaultSoundBank.json | 16 +- .../Windows/DefaultSoundBank.txt | 12 +- 11 files changed, 952 insertions(+), 577 deletions(-) diff --git a/blueberryPeak/Assets/Prefabs/Fox.prefab b/blueberryPeak/Assets/Prefabs/Fox.prefab index 512310d..6158a80 100644 --- a/blueberryPeak/Assets/Prefabs/Fox.prefab +++ b/blueberryPeak/Assets/Prefabs/Fox.prefab @@ -144,7 +144,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: resolutionWidth: 1000 - renderImage: {fileID: 0} + renderImage: {fileID: 6815680019830847891} --- !u!114 &6584294768226900608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -185,6 +185,180 @@ MonoBehaviour: bOverrideScalingFactor: 0 scalingFactor: -1 listenerId: 0 +--- !u!1 &5475925037101346994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1128901999844610101} + - component: {fileID: 475018923759597873} + - component: {fileID: 2189921947567433577} + - component: {fileID: 2369712649137259205} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1128901999844610101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5475925037101346994} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8648064102012430356} + m_Father: {fileID: 235347041090592828} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &475018923759597873 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5475925037101346994} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2189921947567433577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5475925037101346994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &2369712649137259205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5475925037101346994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &6961390974456666784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8648064102012430356} + - component: {fileID: 416135692042186679} + - component: {fileID: 6815680019830847891} + m_Layer: 5 + m_Name: GameView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8648064102012430356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6961390974456666784} + 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: 1128901999844610101} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &416135692042186679 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6961390974456666784} + m_CullTransparentMesh: 1 +--- !u!114 &6815680019830847891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6961390974456666784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &7563270112099016041 GameObject: m_ObjectHideFlags: 0 @@ -200,6 +374,8 @@ GameObject: - component: {fileID: 6316633489399381400} - component: {fileID: 7486215183385803752} - component: {fileID: 3740866600301396226} + - component: {fileID: 693370075499580097} + - component: {fileID: 3519636746957563812} m_Layer: 0 m_Name: Fox m_TagString: Untagged @@ -220,6 +396,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1128901999844610101} - {fileID: 1228212197469905358} - {fileID: 7690322300433945} m_Father: {fileID: 0} @@ -3114,6 +3291,46 @@ MonoBehaviour: movement: {fileID: -8149295062786237634, guid: be9004d90ff609fe6a33a9a4fbcfb30a, type: 3} cameraTransform: {fileID: 1228212197469905358} cameraOffset: {x: 0, y: 10, z: -10} +--- !u!114 &693370075499580097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7563270112099016041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c937869b929adf9479ee3544d8886f7f, type: 3} + m_Name: + m_EditorClassIdentifier: + 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 &3519636746957563812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7563270112099016041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e279c79f46ba866438afc957062b00ed, type: 3} + m_Name: + m_EditorClassIdentifier: + isDefaultListener: 1 + bOverrideScalingFactor: 0 + scalingFactor: -1 + listenerId: 0 --- !u!1001 &545475637625852402 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/blueberryPeak/Assets/Scenes/Beach.unity b/blueberryPeak/Assets/Scenes/Beach.unity index 1b8a2f2..6ffc7b3 100644 --- a/blueberryPeak/Assets/Scenes/Beach.unity +++ b/blueberryPeak/Assets/Scenes/Beach.unity @@ -431,50 +431,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 37231181} m_PrefabAsset: {fileID: 0} ---- !u!1 &54395739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 54395740} - - component: {fileID: 54395741} - m_Layer: 0 - m_Name: AkAmbientPoint2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &54395740 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54395739} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.49, y: 0, z: -1.23} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &54395741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54395739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &55427476 PrefabInstance: m_ObjectHideFlags: 0 @@ -787,50 +743,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 83345288} m_PrefabAsset: {fileID: 0} ---- !u!1 &85120683 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 85120684} - - component: {fileID: 85120685} - m_Layer: 0 - m_Name: AkAmbientPoint4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &85120684 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 85120683} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.36, y: 0, z: -0.46} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &85120685 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 85120683} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &86383560 PrefabInstance: m_ObjectHideFlags: 0 @@ -2321,6 +2233,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 167165841649341647, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: renderImage + value: + objectReference: {fileID: 401388688} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.x value: -0.068 @@ -2367,7 +2283,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + insertIndex: 0 + addedObject: {fileID: 1646702144} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} insertIndex: -1 @@ -2619,7 +2538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 382261870} - - component: {fileID: 382261869} + - component: {fileID: 382261871} m_Layer: 0 m_Name: Soundbank m_TagString: Untagged @@ -2627,31 +2546,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &382261869 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 382261868} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f49dc0281719c25428f2818a2ccd1618, type: 3} - m_Name: - m_EditorClassIdentifier: - triggerList: ae8d9d44 - useOtherObject: 0 - data: - idInternal: 0 - valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: ad28f4072e0d93948931c12db9431d1a, type: 2} - decodeBank: 0 - overrideLoadSetting: 0 - loadAsynchronous: 0 - saveDecodedBank: 0 - unloadTriggerList: 958ca0ea - bankNameInternal: - valueGuidInternal: --- !u!4 &382261870 Transform: m_ObjectHideFlags: 0 @@ -2667,6 +2561,103 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &382261871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382261868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f49dc0281719c25428f2818a2ccd1618, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerList: f7e1664c + useOtherObject: 0 + data: + idInternal: 0 + valueGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: ad28f4072e0d93948931c12db9431d1a, type: 2} + decodeBank: 0 + overrideLoadSetting: 0 + loadAsynchronous: 0 + saveDecodedBank: 0 + unloadTriggerList: 958ca0ea + bankNameInternal: + valueGuidInternal: +--- !u!1 &401388687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 401388690} + - component: {fileID: 401388689} + - component: {fileID: 401388688} + m_Layer: 5 + m_Name: GameView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &401388688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 401388687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &401388689 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 401388687} + m_CullTransparentMesh: 1 +--- !u!224 &401388690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 401388687} + 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: 1646702144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &412381567 PrefabInstance: m_ObjectHideFlags: 0 @@ -2979,6 +2970,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 464447489} m_PrefabAsset: {fileID: 0} +--- !u!1 &484915515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 484915517} + - component: {fileID: 484915516} + m_Layer: 0 + m_Name: AkAmbientPoint4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &484915516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484915515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &484915517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484915515} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.31, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &497483697 PrefabInstance: m_ObjectHideFlags: 0 @@ -3135,6 +3170,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 505699114} m_PrefabAsset: {fileID: 0} +--- !u!1 &532025660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532025662} + - component: {fileID: 532025661} + m_Layer: 0 + m_Name: AkAmbientPoint0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &532025661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532025660} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &532025662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532025660} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &536486186 GameObject: m_ObjectHideFlags: 0 @@ -3160,7 +3239,7 @@ Transform: m_GameObject: {fileID: 536486186} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 31.502398, y: -76.99967, z: -31.671715} + m_LocalPosition: {x: 31.502398, y: 0, z: -31.671715} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4034,6 +4113,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 689541243} m_PrefabAsset: {fileID: 0} +--- !u!1 &714941962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 714941964} + - component: {fileID: 714941963} + m_Layer: 0 + m_Name: AkAmbientPoint2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &714941963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714941962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &714941964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714941962} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &717145944 PrefabInstance: m_ObjectHideFlags: 0 @@ -4995,12 +5118,69 @@ Transform: m_GameObject: {fileID: 825585976} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -62.48, y: 4.7, z: 34.7} + m_LocalPosition: {x: -62.48, y: 0, z: 34.7} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1771154901} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &829142793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 829142795} + - component: {fileID: 829142794} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &829142794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829142793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c9d5ddca75153324c9685094dbef0fc9, type: 3} + m_Name: + m_EditorClassIdentifier: + InitializationSettings: {fileID: 11400000, guid: 69d39931291d213498bf7bbd3d60e88f, type: 2} + basePath: + language: + defaultPoolSize: 0 + lowerPoolSize: 0 + streamingPoolSize: 0 + memoryCutoffThreshold: 0 + monitorPoolSize: 0 + monitorQueuePoolSize: 0 + callbackManagerBufferSize: 0 + spatialAudioPoolSize: 0 + maxSoundPropagationDepth: 0 + engineLogging: 0 +--- !u!4 &829142795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829142793} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &830460315 PrefabInstance: m_ObjectHideFlags: 0 @@ -5079,50 +5259,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 830460315} m_PrefabAsset: {fileID: 0} ---- !u!1 &831564643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 831564644} - - component: {fileID: 831564645} - m_Layer: 0 - m_Name: AkAmbientPoint3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &831564644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 831564643} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.35, y: 0, z: -0.34} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &831564645 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 831564643} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &839212090 GameObject: m_ObjectHideFlags: 0 @@ -5687,6 +5823,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 968439180} m_PrefabAsset: {fileID: 0} +--- !u!1 &985516465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 985516467} + - component: {fileID: 985516466} + m_Layer: 0 + m_Name: AkAmbientPoint1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &985516466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985516465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &985516467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985516465} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.42, y: 0, z: -1.13} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &988189068 PrefabInstance: m_ObjectHideFlags: 0 @@ -6004,6 +6184,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 8044303137933371746, guid: d35cab8b21f7e447c94954e58c9c3528, type: 3} m_PrefabInstance: {fileID: 916341880} m_PrefabAsset: {fileID: 0} +--- !u!1 &1055247026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1055247028} + - component: {fileID: 1055247027} + m_Layer: 0 + m_Name: AkAmbientPoint5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1055247027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055247026} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1055247028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1055247026} + 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: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1082384625 PrefabInstance: m_ObjectHideFlags: 0 @@ -6596,6 +6820,8 @@ GameObject: - component: {fileID: 1272620835} - component: {fileID: 1272620834} - component: {fileID: 1272620833} + - component: {fileID: 1272620838} + - component: {fileID: 1272620837} m_Layer: 0 m_Name: Plane m_TagString: Untagged @@ -6692,8 +6918,82 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1570084567} + - {fileID: 532025662} + - {fileID: 985516467} + - {fileID: 714941964} + - {fileID: 1808721333} + - {fileID: 484915517} + - {fileID: 1055247028} + - {fileID: 1358052382} + - {fileID: 1712466327} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1272620837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272620832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf352f0fcebd8b045865385354a10883, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerList: f7e1664c + useOtherObject: 0 + actionOnEventType: 0 + curveInterpolation: 4 + enableActionOnEvent: 0 + data: + idInternal: 0 + valueGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: d8cc182f7f596134d8ed0abed949b450, type: 2} + useCallbacks: 0 + stopSoundOnDestroy: 1 + Callbacks: [] + soundEmitterObject: {fileID: 0} + transitionDuration: 0 + eventIdInternal: 0 + valueGuidInternal: + m_callbackDataInternal: {fileID: 0} + MultiPositionType: 1 + multiPositionTypeLabel: 1 + attenuationSphereColor: {r: 1, g: 0, b: 0, a: 0.1} + LargeModePositions: + - {fileID: 532025661} + - {fileID: 985516466} + - {fileID: 714941963} + - {fileID: 1808721332} + - {fileID: 484915516} + - {fileID: 1055247027} + - {fileID: 1358052381} + - {fileID: 1712466326} + multiPositionArray: [] +--- !u!114 &1272620838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272620832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c937869b929adf9479ee3544d8886f7f, type: 3} + m_Name: + m_EditorClassIdentifier: + 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!1001 &1276827042 PrefabInstance: m_ObjectHideFlags: 0 @@ -7006,6 +7306,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1349535048} m_PrefabAsset: {fileID: 0} +--- !u!1 &1358052380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1358052382} + - component: {fileID: 1358052381} + m_Layer: 0 + m_Name: AkAmbientPoint6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1358052381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1358052380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1358052382 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1358052380} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.86, y: 0, z: -1.14} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1360742290 PrefabInstance: m_ObjectHideFlags: 0 @@ -7318,63 +7662,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1443729183} m_PrefabAsset: {fileID: 0} ---- !u!1 &1452067108 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1452067110} - - component: {fileID: 1452067109} - m_Layer: 0 - m_Name: WwiseGlobal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1452067109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1452067108} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c9d5ddca75153324c9685094dbef0fc9, type: 3} - m_Name: - m_EditorClassIdentifier: - InitializationSettings: {fileID: 11400000, guid: 69d39931291d213498bf7bbd3d60e88f, type: 2} - basePath: - language: - defaultPoolSize: 0 - lowerPoolSize: 0 - streamingPoolSize: 0 - memoryCutoffThreshold: 0 - monitorPoolSize: 0 - monitorQueuePoolSize: 0 - callbackManagerBufferSize: 0 - spatialAudioPoolSize: 0 - maxSoundPropagationDepth: 0 - engineLogging: 0 ---- !u!4 &1452067110 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1452067108} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1462361756 PrefabInstance: m_ObjectHideFlags: 0 @@ -8004,50 +8291,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1559307788} m_PrefabAsset: {fileID: 0} ---- !u!1 &1561195064 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1561195065} - - component: {fileID: 1561195066} - m_Layer: 0 - m_Name: AkAmbientPoint8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1561195065 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561195064} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.54, y: 0, z: 0.36} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1561195066 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561195064} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1570084566 GameObject: m_ObjectHideFlags: 0 @@ -8057,8 +8300,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1570084567} - - component: {fileID: 1570084570} - - component: {fileID: 1570084569} - component: {fileID: 1570084568} m_Layer: 0 m_Name: OceanSound @@ -8079,14 +8320,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1777005372} - - {fileID: 2061423942} - - {fileID: 54395740} - - {fileID: 831564644} - - {fileID: 85120684} - - {fileID: 2120286007} - - {fileID: 1561195065} + m_Children: [] m_Father: {fileID: 1272620836} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1570084568 @@ -8116,75 +8350,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &1570084569 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1570084566} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf352f0fcebd8b045865385354a10883, type: 3} - m_Name: - m_EditorClassIdentifier: - triggerList: f7e1664c - useOtherObject: 0 - actionOnEventType: 0 - curveInterpolation: 4 - enableActionOnEvent: 0 - data: - idInternal: 0 - valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: d8cc182f7f596134d8ed0abed949b450, type: 2} - useCallbacks: 0 - stopSoundOnDestroy: 1 - Callbacks: [] - soundEmitterObject: {fileID: 0} - transitionDuration: 0 - eventIdInternal: 0 - valueGuidInternal: - m_callbackDataInternal: {fileID: 0} - MultiPositionType: 1 - multiPositionTypeLabel: 1 - attenuationSphereColor: {r: 1, g: 0, b: 0, a: 0.1} - LargeModePositions: - - {fileID: 1777005373} - - {fileID: 2061423943} - - {fileID: 54395741} - - {fileID: 831564645} - - {fileID: 85120685} - - {fileID: 2120286008} - - {fileID: 0} - - {fileID: 0} - - {fileID: 1561195066} - - {fileID: 0} - - {fileID: 0} - multiPositionArray: [] ---- !u!114 &1570084570 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1570084566} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c937869b929adf9479ee3544d8886f7f, type: 3} - m_Name: - m_EditorClassIdentifier: - 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!1001 &1571544823 PrefabInstance: m_ObjectHideFlags: 0 @@ -8888,6 +9053,108 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1646554137} m_PrefabAsset: {fileID: 0} +--- !u!1 &1646702143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1646702144} + - component: {fileID: 1646702147} + - component: {fileID: 1646702146} + - component: {fileID: 1646702145} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1646702144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646702143} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 401388690} + m_Father: {fileID: 1656399210} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1646702145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646702143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1646702146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646702143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1646702147 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646702143} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1656399201 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} @@ -8933,6 +9200,11 @@ MonoBehaviour: scalingFactor: 1 m_posOffsetData: {fileID: 0} listenerMask: 1 +--- !u!4 &1656399210 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + m_PrefabInstance: {fileID: 355138358} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1685684246 PrefabInstance: m_ObjectHideFlags: 0 @@ -9167,6 +9439,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1711196369} m_PrefabAsset: {fileID: 0} +--- !u!1 &1712466325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1712466327} + - component: {fileID: 1712466326} + m_Layer: 0 + m_Name: AkAmbientPoint7 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1712466326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712466325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1712466327 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712466325} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.59, y: 0, z: -1.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1714858950 GameObject: m_ObjectHideFlags: 0 @@ -9817,51 +10133,7 @@ MonoBehaviour: m_EditorClassIdentifier: pointA: {fileID: 839212091} pointB: {fileID: 825585977} - speed: 1 ---- !u!1 &1777005371 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1777005372} - - component: {fileID: 1777005373} - m_Layer: 0 - m_Name: AkAmbientPoint0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1777005372 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777005371} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.05, y: 0, z: -1.23} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1777005373 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1777005371} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: + speed: 7 --- !u!1001 &1783132636 PrefabInstance: m_ObjectHideFlags: 0 @@ -10095,6 +10367,50 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 1795851264} m_PrefabAsset: {fileID: 0} +--- !u!1 &1808721331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1808721333} + - component: {fileID: 1808721332} + m_Layer: 0 + m_Name: AkAmbientPoint3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1808721332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808721331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1808721333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808721331} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.68, y: 0, z: -1.06} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272620836} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1811603887 PrefabInstance: m_ObjectHideFlags: 0 @@ -11725,50 +12041,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 2049992241} m_PrefabAsset: {fileID: 0} ---- !u!1 &2061423941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2061423942} - - component: {fileID: 2061423943} - m_Layer: 0 - m_Name: AkAmbientPoint1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2061423942 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2061423941} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.44, y: 0, z: -1.229} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2061423943 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2061423941} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2068884966 PrefabInstance: m_ObjectHideFlags: 0 @@ -12081,50 +12353,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 2096933144} m_PrefabAsset: {fileID: 0} ---- !u!1 &2120286006 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2120286007} - - component: {fileID: 2120286008} - m_Layer: 0 - m_Name: AkAmbientPoint5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2120286007 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120286006} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.91, y: 0, z: 0.36} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1570084567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2120286008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120286006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d69859443f158fb4987dfed8b84548ae, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2123101934 PrefabInstance: m_ObjectHideFlags: 0 @@ -12498,68 +12726,10 @@ Transform: m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3} m_PrefabInstance: {fileID: 2146104686} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3687053795700960224 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalPosition.x - value: 603.75 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalPosition.y - value: 365 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1553430327168647196, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5140940003472417979, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} - propertyPath: m_Name - value: Camera - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 3687053795700960224} - {fileID: 1272620836} - {fileID: 1745342965} - {fileID: 355138358} @@ -12567,6 +12737,6 @@ SceneRoots: - {fileID: 1183713119} - {fileID: 1714858951} - {fileID: 1783132636} - - {fileID: 1452067110} - {fileID: 382261870} - {fileID: 536486187} + - {fileID: 829142795} diff --git a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index e987004..4c99670 100644 --- a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -658,7 +658,7 @@ MonoBehaviour: m_lastTime: -8584520486832050207 List: [] ExpandedFileSystemItemIds: - ExpandedWaapiItemIds: 0500000006000000070000000e0000000f000000 + ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f00000020000000 AutoSyncSelection: 0 autoPopulateEnabled: 1 currentDataSource: 0 diff --git a/blueberryPeak/Assets/WwiseSettings.xml b/blueberryPeak/Assets/WwiseSettings.xml index 5a62fc2..1da3f16 100644 --- a/blueberryPeak/Assets/WwiseSettings.xml +++ b/blueberryPeak/Assets/WwiseSettings.xml @@ -5,11 +5,7 @@ Audio/GeneratedSoundBanks true true -<<<<<<< Updated upstream false -======= - true ->>>>>>> Stashed changes true true true @@ -21,11 +17,7 @@ 8080 127.0.0.1 true -<<<<<<< Updated upstream https://github.com/audiokinetic/WwiseUnityAddressables.git#v24.1.5 -======= - ->>>>>>> Stashed changes WwiseData/Bank false Assets/AddressableAssetsData/DataBuilders/BuildScriptWwisePacked.asset diff --git a/blueberryPeak/ProjectSettings/GraphicsSettings.asset b/blueberryPeak/ProjectSettings/GraphicsSettings.asset index 7a9a4c2..f96c812 100644 --- a/blueberryPeak/ProjectSettings/GraphicsSettings.asset +++ b/blueberryPeak/ProjectSettings/GraphicsSettings.asset @@ -37,7 +37,7 @@ GraphicsSettings: m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} + m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -58,15 +58,11 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_RenderPipelineGlobalSettingsMap: -<<<<<<< Updated upstream UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: 30ed48d810a9c624c937c9e56b29ac1d, type: 2} -======= - UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: 2cda96fd671631342a9117a464d42aef, type: 2} ->>>>>>> Stashed changes UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_LogWhenShaderIsCompiled: 0 - m_LightProbeOutsideHullStrategy: 0 + m_LightProbeOutsideHullStrategy: 1 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0 diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.bnk index 0f3640f7bea7d775f69cc0e21f4bd826ff463d01..00a3ee7f6c2f6e34cef1a1816edb26ea417fe7e8 100644 GIT binary patch delta 2563 zcmXBWcT|sG0LO7pl3BhaGkYc@N}*&Wdt`6fBs+U1$u8M5d#{jDDIsrj{+!& zLMV(Put!l8LvfTqNt8lqltEdPLwQty11iE1l~5T~P!&$7hU##J3u?d>Zm5Y`s10{` zpbk7y7xhpd4bTu?XasLGMiVqeGc-pFv_vbkK9XQ=Goqg9MP!b2H;YL&F3#>(y^jYS z4)L<{L0hy#dvriYbV6rzL05D`cl1C{^nx#XqYwI`ANpee24WBf!w*B?kD(Zb;TVCD z7=_UYz!;3hIE=>xOvEHi#uQA&G)zYzW*`VN5sX;~!EDUIT+G9KEWkp9A`FWVj>TAl zrC5gLSb>#Th1FPtwOEG;tj7jy#3pRU7Hq{fY{w4l#4hZ{9_+_;RH;2;hm3VJU` za1_T7jTpq@IN}hG6F7-eIE@6H!C9Qcd0fCnT*75s!Bt#CB9d?&H(E_F zpfpsxltzlT(pYJtG*y}@&6O5POJiS3S}Ws>sn@EpK@7aB}Iw_r%E=pIWo6=qBq4ZRGDZWZ?rH|5A>8JEp1}FoSLCRpoPZ^^4 zD?^oG%5Y_bGEy0(j8+1aG0IqFoHAaSpiERIDU+2c%2Z{VGF=H&W+*|*OeI*ErGzN6 zl{v~>Wu7u$S)eRbLX|LOkrJ*fR+cDBjrjDaWk#5l>EmW6za7WUm7U$eA*)BUZ&Lh{ z*kwjypvfHVZMtvc;qz*|{{Y{#oYg}EJeM0}g|bpvrL0!gC~K8`55uC0)qhxQN09&k delta 2563 zcmXBWcT|sG0LO7pB{RN8WRsbZ63G_XdluO%TgaXvQ7B}FY}rCGA|op+L?}Bes|eY@ z_s8##*ZbUapL5Ui&%O8DOg}$UCW1?wLX$jPtjxnk-pV_&cIvRS3lR?U5=`!uY|XM* zCx<77|IBb*mFYD%Ho-qO!GIaeVS%i$L^fnc4&+2Gp)p+11WnS+QgSO+N**PzVp8%c`IQ1nLFM0%3TaeWu~CXB zMU`SoaixS(QYodBR>~;0N?E0xQeLT`R8%S{c1mTXic(dnrr0ahjTkp;2O~Ji6zjV# zD&6_7<;k7XJUkt*IR~YrIT*xIsi8P2HI-V5vr=1eQR*mlm3m5jrGe5=X{0n(T$LtD zQ^iebrZiVtC@qy%N^7N!(pG6_>`zH+Z=5%I=NVly;?vE<%1v^23G`kO5R?(w!5|%# zPD*E`i_%r;rgT@_6%VC{(o^wNdMUk?K1yGupVD6$pbS(7DT9?EikC7}8Kw+ZMkphd zQOam#jN+|~RmLgf6(41SGEteNOjf2SQ6R2C_Vl_g4$609s$mMP1X5M_lClM%Vn2(~m0@0?n`R?Bhbc3rD@Os(m7DJCR( zr4jFI3QqU1dlwRH5#SkjrmUCi)gYgSs|>PQS);5~LX~yOdS!zWrfgI;DVvoo%2s8Y zvR&DsgeyChUCM4{kFrp+qYul~YQLa#}f~ zoK?;#vC4Vnf^t#0q+C|wlqHZ*)XdZ_P&;3W@VvUC+rVHXG@)Fn+g9u7Osrj{+!& zLMV(Put!l8LvfTqNt8lqltEdPLwQty11iE1l~5T~P!&$7hU##J3u?d>Zm5Y`s10{` zpbk7y7xhpd4bTu?XasLGMiVqeGc-pFv_vbkK9XQ=Goqg9MP!b2H;YL&F3#>(y^jYS z4)L<{L0hy#dvriYbV6rzL05D`cl1C{^nx#XqYwI`ANpee24WBf!w*B?kD(Zb;TVCD z7=_UYz!;3hIE=>xOvEHi#uQA&G)zYzW*`VN5sX;~!EDUIT+G9KEWkp9A`FWVj>TAl zrC5gLSb>#Th1FPtwOEG;tj7jy#3pRU7Hq{fY{w4l#4hZ{9_+_;RH;2;hm3VJU` za1_T7jTpq@IN}hG6F7-eIE@6H!C9Qcd0fCnT*75s!Bt#CB9d?&H(E_F zpfpsxltzlT(pYJtG*y}@&6O5POJiS3S}Ws>sn@EpK@7aB}Iw_r%E=pIWo6=qBq4ZRGDZWZ?rH|5A>8JEp1}FoSLCRpoPZ^^4 zD?^oG%5Y_bGEy0(j8+1aG0IqFoHAaSpiERIDU+2c%2Z{VGF=H&W+*|*OeI*ErGzN6 zl{v~>Wu7u$S)eRbLX|LOkrJ*fR+cDBjrjDaWk#5l>EmW6za7WUm7U$eA*)BUZ&Lh{ z*kwjypvfHVZMtvc;qz*|{{Y{#oYg}EJeM0}g|bpvrL0!gC~K8`55uC0)qhxQN09&k delta 2563 zcmXBWcT|sG0LO7pB{RN8WRsbZ63G_XdluO%TgaXvQ7B}FY}rCGA|op+L?}Bes|eY@ z_s8##*ZbUapL5Ui&%O8DOg}$UCW1?wLX$jPtjxnk-pV_&cIvRS3lR?U5=`!uY|XM* zCx<77|IBb*mFYD%Ho-qO!GIaeVS%i$L^fnc4&+2Gp)p+11WnS+QgSO+N**PzVp8%c`IQ1nLFM0%3TaeWu~CXB zMU`SoaixS(QYodBR>~;0N?E0xQeLT`R8%S{c1mTXic(dnrr0ahjTkp;2O~Ji6zjV# zD&6_7<;k7XJUkt*IR~YrIT*xIsi8P2HI-V5vr=1eQR*mlm3m5jrGe5=X{0n(T$LtD zQ^iebrZiVtC@qy%N^7N!(pG6_>`zH+Z=5%I=NVly;?vE<%1v^23G`kO5R?(w!5|%# zPD*E`i_%r;rgT@_6%VC{(o^wNdMUk?K1yGupVD6$pbS(7DT9?EikC7}8Kw+ZMkphd zQOam#jN+|~RmLgf6(41SGEteNOjf2SQ6R2C_Vl_g4$609s$mMP1X5M_lClM%Vn2(~m0@0?n`R?Bhbc3rD@Os(m7DJCR( zr4jFI3QqU1dlwRH5#SkjrmUCi)gYgSs|>PQS);5~LX~yOdS!zWrfgI;DVvoo%2s8Y zvR&DsgeyChUCM4{kFrp+qYul~YQLa#}f~ zoK?;#vC4Vnf^t#0q+C|wlqHZ*)XdZ_P&;3W@VvUC+rVHXG@)Fn+g9u7O