Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
4c1a1e3b84
BIN
audio/Environment/Wind.mp3
(Stored with Git LFS)
BIN
audio/Environment/Wind.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
audio/Music/GardenMusic.wav
(Stored with Git LFS)
Normal file
BIN
audio/Music/GardenMusic.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -60827,7 +60827,7 @@ BoxCollider:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
@ -67835,6 +67835,97 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4362319458209513468, guid: 348e52e7a39fa49abafa3271436475d8, type: 3}
|
||||
m_PrefabInstance: {fileID: 1238406712}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1240273040
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1240273041}
|
||||
- component: {fileID: 1240273043}
|
||||
- component: {fileID: 1240273042}
|
||||
m_Layer: 0
|
||||
m_Name: BackgroundMusic
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1240273041
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1240273040}
|
||||
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: 2049723525}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1240273042
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1240273040}
|
||||
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: 4fea9b3e68cd4a346b6573944913bbfe, type: 2}
|
||||
useCallbacks: 0
|
||||
stopSoundOnDestroy: 1
|
||||
Callbacks: []
|
||||
soundEmitterObject: {fileID: 0}
|
||||
transitionDuration: 0
|
||||
eventIdInternal: 0
|
||||
valueGuidInternal:
|
||||
m_callbackDataInternal: {fileID: 0}
|
||||
MultiPositionType: 1
|
||||
multiPositionTypeLabel: 0
|
||||
attenuationSphereColor: {r: 1, g: 0, b: 0, a: 0.1}
|
||||
LargeModePositions: []
|
||||
multiPositionArray: []
|
||||
--- !u!114 &1240273043
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1240273040}
|
||||
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 &1245102914
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -115601,6 +115692,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 199034236}
|
||||
- {fileID: 1572911751}
|
||||
- {fileID: 1240273041}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &2050377737
|
||||
|
@ -32,6 +32,7 @@ namespace AK
|
||||
static const AkUniqueID PLAY_FORRESTBIRD4 = 4226542672U;
|
||||
static const AkUniqueID PLAY_FORRESTBIRD5 = 4226542673U;
|
||||
static const AkUniqueID PLAY_FORRESTMUSIC = 3105457078U;
|
||||
static const AkUniqueID PLAY_GARDENMUSIC = 1664562946U;
|
||||
static const AkUniqueID PLAY_GRASSFOOTSTEPS = 2348137961U;
|
||||
static const AkUniqueID PLAY_GRAVELFOOTSTEPS = 2892919588U;
|
||||
static const AkUniqueID PLAY_ITEMPICKUP = 4241593335U;
|
||||
|
@ -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: 641a4bfe018bd0e40a983621326b538c, type: 3}
|
||||
m_Name: C94DDF57-A3AD-4F2D-A8BC-5A65C789856D
|
||||
m_EditorClassIdentifier:
|
||||
objectName: Play_GardenMusic
|
||||
id: 1664562946
|
||||
guid: C94DDF57-A3AD-4F2D-A8BC-5A65C789856D
|
||||
IsInUserDefinedSoundBank: 1
|
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4fea9b3e68cd4a346b6573944913bbfe
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
@ -10,7 +10,7 @@
|
||||
"Type": "User",
|
||||
"GUID": "{CA06D51B-2067-4D44-9D56-6EF115FEAC5C}",
|
||||
"Language": "SFX",
|
||||
"Hash": "{411FA089-7C22-18CB-FC26-2FCF544F9F59}",
|
||||
"Hash": "{FD99012B-8690-C75F-CCF1-939A16A95EFD}",
|
||||
"ObjectPath": "\\SoundBanks\\Default Work Unit\\GardenSoundBank",
|
||||
"ShortName": "GardenSoundBank",
|
||||
"Path": "GardenSoundBank.bnk",
|
||||
@ -71,6 +71,14 @@
|
||||
"ShortName": "midWind.wav",
|
||||
"CachePath": "1E/{1E622216-ADC3-782E-2C15-9E4D80A76C33}.wem"
|
||||
},
|
||||
{
|
||||
"Id": "296134674",
|
||||
"Language": "SFX",
|
||||
"Streaming": "false",
|
||||
"Location": "Memory",
|
||||
"ShortName": "GardenMusic.wav",
|
||||
"CachePath": "59/{596E474E-1334-9533-2001-B760CA3394E0}.wem"
|
||||
},
|
||||
{
|
||||
"Id": "349722559",
|
||||
"Language": "SFX",
|
||||
@ -476,6 +484,18 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": "1664562946",
|
||||
"Name": "Play_GardenMusic",
|
||||
"ObjectPath": "\\Events\\Default Work Unit\\Play_GardenMusic",
|
||||
"GUID": "{C94DDF57-A3AD-4F2D-A8BC-5A65C789856D}",
|
||||
"DurationType": "Infinite",
|
||||
"MediaRefs": [
|
||||
{
|
||||
"Id": "296134674"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": "4241593335",
|
||||
"Name": "Play_ItemPickUp",
|
||||
@ -604,6 +624,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{42742742-00FF-9FEE-C2B9-997A855FF197}"
|
||||
"FileHash": "{D9854527-23E8-1B3B-B415-DB605E757D3E}"
|
||||
}
|
||||
}
|
@ -3,6 +3,7 @@ Event ID Name Wwise Object Path Notes
|
||||
581346396 Play_BerryWithBush \Default Work Unit\Play_BerryWithBush
|
||||
1020223172 Play_Wind \Default Work Unit\Play_Wind
|
||||
1487213420 Play_Bushes \Default Work Unit\Play_Bushes
|
||||
1664562946 Play_GardenMusic \Default Work Unit\Play_GardenMusic
|
||||
1691497952 Play_Bush \Default Work Unit\Play_Bush
|
||||
2060005325 Play_QuestComplete \Default Work Unit\Play_QuestComplete
|
||||
2149395099 Play_Resume \Default Work Unit\Play_Resume
|
||||
@ -35,6 +36,7 @@ In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size
|
||||
113179799 SnowStep2 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\17\{178A927F-1B33-8E45-1C63-091C21DA062B}.wem \Actor-Mixer Hierarchy\Default Work Unit\Footsteps\SnowFootsteps\SnowStep2 29652
|
||||
193742926 ForrestBird2 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\A0\{A06D69DC-1516-620B-E445-BA1621D881F0}.wem \Actor-Mixer Hierarchy\Default Work Unit\Environment\Birds\ForrestBird2 4110432
|
||||
228784554 midWind C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\1E\{1E622216-ADC3-782E-2C15-9E4D80A76C33}.wem \Actor-Mixer Hierarchy\Default Work Unit\Environment\Wind\midWind 39381736
|
||||
296134674 GardenMusic C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\59\{596E474E-1334-9533-2001-B760CA3394E0}.wem \Actor-Mixer Hierarchy\Default Work Unit\Music\GardenMusic 45964852
|
||||
349722559 SandStep5 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\2F\{2FB1FCA9-B154-98C7-E813-B012DEA951A3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Footsteps\SandFootsteps\SandStep5 27174
|
||||
411979747 Bush C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\2C\{2C78D74F-CB90-6718-629C-5BEC755C5FF3}.wem \Actor-Mixer Hierarchy\Default Work Unit\PlayerActions\Bushes\Bush 105820
|
||||
428379771 GrassStep5 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\B1\{B19BA577-DB5E-6460-97C4-03037605D9D5}.wem \Actor-Mixer Hierarchy\Default Work Unit\Footsteps\GrassFootsteps\GrassStep5 20230
|
||||
|
Binary file not shown.
@ -10,7 +10,7 @@
|
||||
"Type": "User",
|
||||
"GUID": "{CA06D51B-2067-4D44-9D56-6EF115FEAC5C}",
|
||||
"Language": "SFX",
|
||||
"Hash": "{411FA089-7C22-18CB-FC26-2FCF544F9F59}",
|
||||
"Hash": "{FD99012B-8690-C75F-CCF1-939A16A95EFD}",
|
||||
"ObjectPath": "\\SoundBanks\\Default Work Unit\\GardenSoundBank",
|
||||
"ShortName": "GardenSoundBank",
|
||||
"Path": "GardenSoundBank.bnk",
|
||||
@ -71,6 +71,14 @@
|
||||
"ShortName": "midWind.wav",
|
||||
"CachePath": "1E/{1E622216-ADC3-782E-2C15-9E4D80A76C33}.wem"
|
||||
},
|
||||
{
|
||||
"Id": "296134674",
|
||||
"Language": "SFX",
|
||||
"Streaming": "false",
|
||||
"Location": "Memory",
|
||||
"ShortName": "GardenMusic.wav",
|
||||
"CachePath": "59/{596E474E-1334-9533-2001-B760CA3394E0}.wem"
|
||||
},
|
||||
{
|
||||
"Id": "349722559",
|
||||
"Language": "SFX",
|
||||
@ -476,6 +484,18 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": "1664562946",
|
||||
"Name": "Play_GardenMusic",
|
||||
"ObjectPath": "\\Events\\Default Work Unit\\Play_GardenMusic",
|
||||
"GUID": "{C94DDF57-A3AD-4F2D-A8BC-5A65C789856D}",
|
||||
"DurationType": "Infinite",
|
||||
"MediaRefs": [
|
||||
{
|
||||
"Id": "296134674"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": "4241593335",
|
||||
"Name": "Play_ItemPickUp",
|
||||
@ -604,6 +624,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{733F0078-5058-E19E-5633-2CB01F2FBF1B}"
|
||||
"FileHash": "{221C1309-73F2-A65B-023E-EE40A82596F2}"
|
||||
}
|
||||
}
|
@ -3,6 +3,7 @@ Event ID Name Wwise Object Path Notes
|
||||
581346396 Play_BerryWithBush \Default Work Unit\Play_BerryWithBush
|
||||
1020223172 Play_Wind \Default Work Unit\Play_Wind
|
||||
1487213420 Play_Bushes \Default Work Unit\Play_Bushes
|
||||
1664562946 Play_GardenMusic \Default Work Unit\Play_GardenMusic
|
||||
1691497952 Play_Bush \Default Work Unit\Play_Bush
|
||||
2060005325 Play_QuestComplete \Default Work Unit\Play_QuestComplete
|
||||
2149395099 Play_Resume \Default Work Unit\Play_Resume
|
||||
@ -35,6 +36,7 @@ In Memory Audio ID Name Audio source file Wwise Object Path Notes Data Size
|
||||
113179799 SnowStep2 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\17\{178A927F-1B33-8E45-1C63-091C21DA062B}.wem \Actor-Mixer Hierarchy\Default Work Unit\Footsteps\SnowFootsteps\SnowStep2 29652
|
||||
193742926 ForrestBird2 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\A0\{A06D69DC-1516-620B-E445-BA1621D881F0}.wem \Actor-Mixer Hierarchy\Default Work Unit\Environment\Birds\ForrestBird2 4110432
|
||||
228784554 midWind C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\1E\{1E622216-ADC3-782E-2C15-9E4D80A76C33}.wem \Actor-Mixer Hierarchy\Default Work Unit\Environment\Wind\midWind 39381736
|
||||
296134674 GardenMusic C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\59\{596E474E-1334-9533-2001-B760CA3394E0}.wem \Actor-Mixer Hierarchy\Default Work Unit\Music\GardenMusic 45964852
|
||||
349722559 SandStep5 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\2F\{2FB1FCA9-B154-98C7-E813-B012DEA951A3}.wem \Actor-Mixer Hierarchy\Default Work Unit\Footsteps\SandFootsteps\SandStep5 27174
|
||||
411979747 Bush C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\2C\{2C78D74F-CB90-6718-629C-5BEC755C5FF3}.wem \Actor-Mixer Hierarchy\Default Work Unit\PlayerActions\Bushes\Bush 105820
|
||||
428379771 GrassStep5 C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\B1\{B19BA577-DB5E-6460-97C4-03037605D9D5}.wem \Actor-Mixer Hierarchy\Default Work Unit\Footsteps\GrassFootsteps\GrassStep5 20230
|
||||
|
BIN
blueberryPeak/blueberryPeak_WwiseProject/Originals/SFX/GardenMusic.wav
(Stored with Git LFS)
Normal file
BIN
blueberryPeak/blueberryPeak_WwiseProject/Originals/SFX/GardenMusic.wav
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user