diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity index d26ba66..ad1dc64 100644 --- a/blueberryPeak/Assets/Scenes/Market.unity +++ b/blueberryPeak/Assets/Scenes/Market.unity @@ -3478,7 +3478,7 @@ MonoBehaviour: data: idInternal: 0 valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: ad28f4072e0d93948931c12db9431d1a, type: 2} + WwiseObjectReference: {fileID: 11400000, guid: e4f155f408831c9409ce8788e58db611, type: 2} decodeBank: 0 overrideLoadSetting: 0 loadAsynchronous: 0 @@ -5134,11 +5134,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3243503616957313541, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: initWindSpeed - value: 55 + value: 40 objectReference: {fileID: 0} - target: {fileID: 3243503616957313541, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: windSpeedStep - value: 5 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: cameraTransform diff --git a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index 487cb47..1da8375 100644 --- a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -390,7 +390,7 @@ MonoBehaviour: ObjectType: 3 guid: 3ad7a428add8d743a9d0f63bff02a38f Path: Events\Default Work Unit\Play_ForrestBird1 - maxAttenuation: 15 + maxAttenuation: 20 maxDuration: 0 minDuration: 0 - name: Play_ForrestBird2 @@ -407,7 +407,7 @@ MonoBehaviour: ObjectType: 3 guid: 5ea5a0b00a4bff4e98744eda45a54d54 Path: Events\Default Work Unit\Play_ForrestBird2 - maxAttenuation: 15 + maxAttenuation: 20 maxDuration: 0 minDuration: 0 - name: Play_ForrestBird3 @@ -424,7 +424,7 @@ MonoBehaviour: ObjectType: 3 guid: 58af185e600b0045b734c72d87696c78 Path: Events\Default Work Unit\Play_ForrestBird3 - maxAttenuation: 15 + maxAttenuation: 20 maxDuration: 0 minDuration: 0 - name: Play_ForrestBird4 @@ -441,7 +441,7 @@ MonoBehaviour: ObjectType: 3 guid: d4891b251f04dc4cb88f8d6e7380f555 Path: Events\Default Work Unit\Play_ForrestBird4 - maxAttenuation: 15 + maxAttenuation: 20 maxDuration: 0 minDuration: 0 - name: Play_ForrestBird5 @@ -458,7 +458,7 @@ MonoBehaviour: ObjectType: 3 guid: 0aca489bba73354686e30306b0cd5b6b Path: Events\Default Work Unit\Play_ForrestBird5 - maxAttenuation: 15 + maxAttenuation: 20 maxDuration: 0 minDuration: 0 - name: Play_ForrestMusic @@ -932,7 +932,7 @@ MonoBehaviour: m_lastTime: -8584520486832050207 List: [] ExpandedFileSystemItemIds: - ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f00000020000000230000002400000025000000260000002700000028000000290000002a0000002e0000002f0000003000000037000000380000006400000065000000 + ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f00000020000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f0000003000000037000000380000006400000065000000 AutoSyncSelection: 0 autoPopulateEnabled: 1 currentDataSource: 0 diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/75B60BFF-FC5A-43F0-84A1-9FBB18B80082.asset b/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/75B60BFF-FC5A-43F0-84A1-9FBB18B80082.asset new file mode 100644 index 0000000..22a98f9 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/75B60BFF-FC5A-43F0-84A1-9FBB18B80082.asset @@ -0,0 +1,17 @@ +%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: 1949b7a5925897b4da7aa5006694b26d, type: 3} + m_Name: 75B60BFF-FC5A-43F0-84A1-9FBB18B80082 + m_EditorClassIdentifier: + objectName: MarketSoundBank + id: 3041575924 + guid: 75B60BFF-FC5A-43F0-84A1-9FBB18B80082 diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/75B60BFF-FC5A-43F0-84A1-9FBB18B80082.asset.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/75B60BFF-FC5A-43F0-84A1-9FBB18B80082.asset.meta new file mode 100644 index 0000000..b306ec2 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/75B60BFF-FC5A-43F0-84A1-9FBB18B80082.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4f155f408831c9409ce8788e58db611 +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 7fd3acd..6899fd3 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -1241,7 +1241,7 @@ - + @@ -1258,7 +1258,7 @@ InvertedSCurve - 15 + 20 -200 37 @@ -1359,7 +1359,7 @@ - + @@ -1376,7 +1376,7 @@ SCurve - 15 + 20 -200 37 @@ -1477,7 +1477,7 @@ - + @@ -1494,7 +1494,7 @@ Exp1 - 15 + 20 -200 37 @@ -1595,7 +1595,7 @@ - + @@ -1612,7 +1612,7 @@ Exp1 - 15 + 20 -200 37 @@ -1713,7 +1713,7 @@ - + @@ -1730,7 +1730,7 @@ Exp3 - 15 + 20 -200 37 @@ -1864,6 +1864,11 @@ + + + -3 + + @@ -1896,7 +1901,7 @@ - -6 + -9 diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.bnk index 280c9a2..9df894f 100644 Binary files a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.bnk and b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.bnk differ diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.json b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.json index 96c025a..40849d8 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.json +++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/ForrestSoundBank.json @@ -10,7 +10,7 @@ "Type": "User", "GUID": "{13AF1B90-A0F5-446A-BCFA-C41A2D03D5CD}", "Language": "SFX", - "Hash": "{404B7F97-1AE1-EDC1-AC90-0D2E961F60B7}", + "Hash": "{2D624D02-B265-51E2-4CCB-117DED715C3B}", "ObjectPath": "\\SoundBanks\\Default Work Unit\\ForrestSoundBank", "ShortName": "ForrestSoundBank", "Path": "ForrestSoundBank.bnk", @@ -575,7 +575,7 @@ "Name": "Play_ForrestBird1", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird1", "GUID": "{28A4D73A-D8AD-43D7-A9D0-F63BFF02A38F}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -588,7 +588,7 @@ "Name": "Play_ForrestBird2", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird2", "GUID": "{B0A0A55E-4B0A-4EFF-9874-4EDA45A54D54}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -601,7 +601,7 @@ "Name": "Play_ForrestBird3", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird3", "GUID": "{5E18AF58-0B60-4500-B734-C72D87696C78}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -614,7 +614,7 @@ "Name": "Play_ForrestBird4", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird4", "GUID": "{251B89D4-041F-4CDC-B88F-8D6E7380F555}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -627,7 +627,7 @@ "Name": "Play_ForrestBird5", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird5", "GUID": "{9B48CA0A-73BA-4635-86E3-0306B0CD5B6B}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -799,6 +799,6 @@ ] } ], - "FileHash": "{339E68DC-6FC9-9E31-1186-CA4844D6E4D0}" + "FileHash": "{FC9EECA9-1C32-ADCF-7CB8-DC63DEA49378}" } } \ No newline at end of file diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.bnk index 8d722b7..048885d 100644 Binary files a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.bnk and b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.bnk differ diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.json b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.json index 3a50453..d00f086 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.json +++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/MarketSoundBank.json @@ -10,7 +10,7 @@ "Type": "User", "GUID": "{75B60BFF-FC5A-43F0-84A1-9FBB18B80082}", "Language": "SFX", - "Hash": "{E5A9B61A-D916-B1CD-E3C2-8E81571CFCF4}", + "Hash": "{FCE3EED2-A0C1-318E-5DD9-FEB1CD68BDC4}", "ObjectPath": "\\SoundBanks\\Default Work Unit\\MarketSoundBank", "ShortName": "MarketSoundBank", "Path": "MarketSoundBank.bnk", @@ -716,6 +716,6 @@ ] } ], - "FileHash": "{A37FFC7B-9CFE-0075-CCAE-E2A634BE82F7}" + "FileHash": "{C0923393-04D4-2CE6-281B-CDADD6DB1F95}" } } \ No newline at end of file diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.bnk index 280c9a2..9df894f 100644 Binary files a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.bnk and b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.bnk differ diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.json b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.json index e56292d..7498390 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.json +++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/ForrestSoundBank.json @@ -10,7 +10,7 @@ "Type": "User", "GUID": "{13AF1B90-A0F5-446A-BCFA-C41A2D03D5CD}", "Language": "SFX", - "Hash": "{404B7F97-1AE1-EDC1-AC90-0D2E961F60B7}", + "Hash": "{2D624D02-B265-51E2-4CCB-117DED715C3B}", "ObjectPath": "\\SoundBanks\\Default Work Unit\\ForrestSoundBank", "ShortName": "ForrestSoundBank", "Path": "ForrestSoundBank.bnk", @@ -575,7 +575,7 @@ "Name": "Play_ForrestBird1", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird1", "GUID": "{28A4D73A-D8AD-43D7-A9D0-F63BFF02A38F}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -588,7 +588,7 @@ "Name": "Play_ForrestBird2", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird2", "GUID": "{B0A0A55E-4B0A-4EFF-9874-4EDA45A54D54}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -601,7 +601,7 @@ "Name": "Play_ForrestBird3", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird3", "GUID": "{5E18AF58-0B60-4500-B734-C72D87696C78}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -614,7 +614,7 @@ "Name": "Play_ForrestBird4", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird4", "GUID": "{251B89D4-041F-4CDC-B88F-8D6E7380F555}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -627,7 +627,7 @@ "Name": "Play_ForrestBird5", "ObjectPath": "\\Events\\Default Work Unit\\Play_ForrestBird5", "GUID": "{9B48CA0A-73BA-4635-86E3-0306B0CD5B6B}", - "MaxAttenuation": "15", + "MaxAttenuation": "20", "DurationType": "Infinite", "MediaRefs": [ { @@ -799,6 +799,6 @@ ] } ], - "FileHash": "{ACC910C3-04D9-CB6E-1BF7-138D85759C7A}" + "FileHash": "{80BDF8A5-38C6-EA3A-F4D1-030F3E3302FA}" } } \ No newline at end of file diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.bnk index 8d722b7..048885d 100644 Binary files a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.bnk and b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.bnk differ diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.json b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.json index 8d2e577..be885ba 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.json +++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/MarketSoundBank.json @@ -10,7 +10,7 @@ "Type": "User", "GUID": "{75B60BFF-FC5A-43F0-84A1-9FBB18B80082}", "Language": "SFX", - "Hash": "{E5A9B61A-D916-B1CD-E3C2-8E81571CFCF4}", + "Hash": "{FCE3EED2-A0C1-318E-5DD9-FEB1CD68BDC4}", "ObjectPath": "\\SoundBanks\\Default Work Unit\\MarketSoundBank", "ShortName": "MarketSoundBank", "Path": "MarketSoundBank.bnk", @@ -716,6 +716,6 @@ ] } ], - "FileHash": "{5673FD5B-F835-CBFD-2861-6BF93E803B41}" + "FileHash": "{78F16D5E-FCA0-F245-ED16-19383B15E924}" } } \ No newline at end of file