diff --git a/blueberryPeak/Assets/Materials/Material.mat.meta b/blueberryPeak/Assets/Materials/Material.mat.meta
new file mode 100644
index 0000000..0865856
--- /dev/null
+++ b/blueberryPeak/Assets/Materials/Material.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b9693fccb53d8841b745724a5c60381
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity
index 98d20f6..d5a10cc 100644
--- a/blueberryPeak/Assets/Scenes/Market.unity
+++ b/blueberryPeak/Assets/Scenes/Market.unity
@@ -334,6 +334,35 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &259279071 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+ m_PrefabInstance: {fileID: 2071877021}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &259279079
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 259279071}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eb406d5b56f128c459c8013143f26241, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ triggerList: f7e1664c
+ useOtherObject: 0
+ data:
+ idInternal: 0
+ valueGuidInternal:
+ groupIdInternal: 0
+ groupGuidInternal:
+ WwiseObjectReference: {fileID: 11400000, guid: 6db10d635a886864fab77277a370b163, type: 2}
+ valueIdInternal: 0
+ groupIdInternal: 0
+ valueGuidInternal:
+ groupGuidInternal:
--- !u!1001 &269692911
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4623,6 +4652,14 @@ PrefabInstance:
propertyPath: cameraTransform
value:
objectReference: {fileID: 1755022767}
+ - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+ propertyPath: footstepInterval
+ value: 0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+ propertyPath: footstepEvent.WwiseObjectReference
+ value:
+ objectReference: {fileID: 11400000, guid: 0a40e999cf3ad3349893f6e7878d1798, type: 2}
- target: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
propertyPath: m_Name
value: Fox
@@ -4630,7 +4667,10 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 259279079}
m_SourcePrefab: {fileID: 100100000, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
--- !u!1001 &2120212726
PrefabInstance:
diff --git a/blueberryPeak/Assets/Textures/FoxHouse.meta b/blueberryPeak/Assets/Textures/FoxHouse.meta
new file mode 100644
index 0000000..fcc9e0a
--- /dev/null
+++ b/blueberryPeak/Assets/Textures/FoxHouse.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9c619a0d720def44bb7a46fb7eb62848
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
index 58ffccc..4ca23f3 100644
--- a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
+++ b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
@@ -66,7 +66,7 @@ MonoBehaviour:
ParentPath: SoundBanks\Default Work Unit
guid: 6dbe1735fe9da64689dc0e3d33d7b30f
GuidInternal:
- m_lastTime: -8584517974135632867
+ m_lastTime: -8584515452736820231
List:
- name: DefaultSoundBank
guid: 478b900634195a4da87a85e27e5ad6f8
@@ -94,7 +94,7 @@ MonoBehaviour:
ParentPath: Events\Default Work Unit
guid: d503ca4bc28c0b4384cf91e122dea841
GuidInternal:
- m_lastTime: -8584517974136036978
+ m_lastTime: -8584515452737275721
List:
- name: Play_BackgroundMusic
guid: e73cae149756cc4ca4877c502decb508
@@ -232,6 +232,23 @@ MonoBehaviour:
maxAttenuation: 0
maxDuration: 0.6429932
minDuration: 0.6429932
+ - name: Play_Bushes
+ guid: 8ca5211f24c6264bbd431cb4f03beb3a
+ id: 1487213420
+ PathAndIcons:
+ - ElementName: Events
+ ObjectType: 5
+ guid: 00000000000000000000000000000000
+ - ElementName: Default Work Unit
+ ObjectType: 12
+ guid: d503ca4bc28c0b4384cf91e122dea841
+ - ElementName: Play_Bushes
+ ObjectType: 3
+ guid: 8ca5211f24c6264bbd431cb4f03beb3a
+ Path: Events\Default Work Unit\Play_Bushes
+ maxAttenuation: 0
+ maxDuration: 0.6429932
+ minDuration: 0.5993424
- name: Play_click1
guid: 602a369d2628574d9d0a9602a2539d8e
id: 2790046327
@@ -368,6 +385,23 @@ MonoBehaviour:
maxAttenuation: 0
maxDuration: 0.5201354
minDuration: 0.5201354
+ - name: Play_MarketMusic
+ guid: ae3394ce0be9794bbda1870ea432b2f9
+ id: 3892216159
+ PathAndIcons:
+ - ElementName: Events
+ ObjectType: 5
+ guid: 00000000000000000000000000000000
+ - ElementName: Default Work Unit
+ ObjectType: 12
+ guid: d503ca4bc28c0b4384cf91e122dea841
+ - ElementName: Play_MarketMusic
+ ObjectType: 3
+ guid: ae3394ce0be9794bbda1870ea432b2f9
+ Path: Events\Default Work Unit\Play_MarketMusic
+ maxAttenuation: 0
+ maxDuration: 0
+ minDuration: 0
- name: Play_Ocean
guid: 71a8eb3c14d2db4ca3b54b43832fee29
id: 1724638476
@@ -726,7 +760,7 @@ MonoBehaviour:
m_lastTime: -8584520486832050207
List: []
ExpandedFileSystemItemIds:
- ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f0000002000000023000000240000002500000026000000
+ ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f000000200000002300000024000000250000002600000028000000290000002a000000
AutoSyncSelection: 0
autoPopulateEnabled: 1
currentDataSource: 0
diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset
new file mode 100644
index 0000000..728fd09
--- /dev/null
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset
@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e1c76fa0d0141864aa84b4e58218517c, type: 3}
+ m_Name: B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872
+ m_EditorClassIdentifier:
+ objectName: grass
+ id: 4248645337
+ guid: B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872
+ WwiseSwitchGroupReference: {fileID: 11400000, guid: fa917db249567fd429723f330d02ea79, type: 2}
diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset.meta
new file mode 100644
index 0000000..da0e2fa
--- /dev/null
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6db10d635a886864fab77277a370b163
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
index a880fa4..30f0cba 100644
--- a/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
+++ b/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
@@ -1699,7 +1699,7 @@
-
+
@@ -1709,40 +1709,52 @@
-
- SFX
- Bush.wav
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Bush.wav
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Bush2.wav
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SFX
- Bush2.wav
-
-
-
-
-
-
-
-
-
+
@@ -1812,6 +1824,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SFX
+ Market.wav
+
+
+
+
+
+
+
+
+
diff --git a/blueberryPeak/blueberryPeak_WwiseProject/Events/Default Work Unit.wwu b/blueberryPeak/blueberryPeak_WwiseProject/Events/Default Work Unit.wwu
index 58e1e3e..7ed18b9 100644
--- a/blueberryPeak/blueberryPeak_WwiseProject/Events/Default Work Unit.wwu
+++ b/blueberryPeak/blueberryPeak_WwiseProject/Events/Default Work Unit.wwu
@@ -278,6 +278,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu b/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu
index 7dac750..a4013e1 100644
--- a/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu
+++ b/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu
@@ -21,6 +21,8 @@
+
+