diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 38d1b41b..ce4c51d8 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -2068,6 +2068,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 111903055} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 111903060} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &111903053 stripped Transform: @@ -2264,9 +2267,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 111903055} + audioSource: {fileID: 111903060} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &111903060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111903054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!4 &116821030 stripped Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} @@ -2837,6 +2856,7 @@ GameObject: - component: {fileID: 143210810} - component: {fileID: 143210814} - component: {fileID: 143210815} + - component: {fileID: 143210816} m_Layer: 0 m_Name: Picnic m_TagString: Untagged @@ -2961,7 +2981,7 @@ AudioSource: m_GameObject: {fileID: 143210809} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} + OutputAudioMixerGroup: {fileID: -6354048548703642832, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} m_audioClip: {fileID: 0} m_Resource: {fileID: 0} m_PlayOnAwake: 0 @@ -2974,7 +2994,7 @@ AudioSource: Priority: 128 DopplerLevel: 1 MinDistance: 13.117783 - MaxDistance: 25 + MaxDistance: 45 Pan2D: 0 rolloffMode: 2 BypassEffects: 0 @@ -2993,13 +3013,22 @@ AudioSource: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.9898071 - value: 0 - inSlope: -0.5249217 - outSlope: -0.5249217 + time: 0.69302607 + value: 0.003539428 + inSlope: -0.008300927 + outSlope: -0.008300927 tangentMode: 0 weightedMode: 0 - inWeight: 0 + inWeight: 0.5333304 + outWeight: 0.60747784 + - serializedVersion: 3 + time: 0.9898071 + value: 0.006011963 + inSlope: 0.026068304 + outSlope: 0.026068304 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.77708286 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -3049,6 +3078,22 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &143210816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143210809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 1 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &146130588 GameObject: m_ObjectHideFlags: 0 @@ -431393,6 +431438,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 244965519} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 244965524} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &244965517 stripped Transform: @@ -431589,9 +431637,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 244965519} + audioSource: {fileID: 244965524} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &244965524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244965518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &245063347 GameObject: m_ObjectHideFlags: 0 @@ -431943,6 +432007,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 268725212} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 268725217} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &268725210 stripped Transform: @@ -432139,9 +432206,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 268725212} + audioSource: {fileID: 268725217} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &268725217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268725211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!4 &270418878 stripped Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} @@ -432243,6 +432326,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 272306124} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 272306129} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &272306122 stripped Transform: @@ -432439,9 +432525,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 1d09d0bd473edd744a5c98fb45f159ec, type: 3} - audioSource: {fileID: 272306124} + audioSource: {fileID: 272306129} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &272306129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 272306123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &272973495 PrefabInstance: m_ObjectHideFlags: 0 @@ -433150,6 +433252,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 289703778} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 289703785} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &289703777 stripped GameObject: @@ -433341,7 +433446,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 289703778} + audioSource: {fileID: 289703785} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &289703783 stripped @@ -433349,6 +433454,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 289703776} m_PrefabAsset: {fileID: 0} +--- !u!114 &289703785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 289703777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &291207987 GameObject: m_ObjectHideFlags: 0 @@ -433782,6 +433903,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 302630987} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 302630994} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &302630986 stripped GameObject: @@ -433973,7 +434097,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 302630987} + audioSource: {fileID: 302630994} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &302630992 stripped @@ -433981,6 +434105,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 302630985} m_PrefabAsset: {fileID: 0} +--- !u!114 &302630994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 302630986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &304536401 PrefabInstance: m_ObjectHideFlags: 0 @@ -434539,6 +434679,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 325464628} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 325464635} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &325464627 stripped GameObject: @@ -434730,7 +434873,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 325464628} + audioSource: {fileID: 325464635} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &325464633 stripped @@ -434738,6 +434881,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 325464626} m_PrefabAsset: {fileID: 0} +--- !u!114 &325464635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 325464627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!4 &332724605 stripped Transform: m_CorrespondingSourceObject: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} @@ -435034,6 +435193,7 @@ GameObject: - component: {fileID: 368957769} - component: {fileID: 368957771} - component: {fileID: 368957772} + - component: {fileID: 368957773} m_Layer: 0 m_Name: SoundBirdStateMachine m_TagString: Untagged @@ -435227,6 +435387,22 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &368957773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 368957766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 0 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &369578433 GameObject: m_ObjectHideFlags: 0 @@ -439611,6 +439787,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 570413065} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 570413072} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &570413064 stripped GameObject: @@ -439802,7 +439981,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 570413065} + audioSource: {fileID: 570413072} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &570413070 stripped @@ -439810,6 +439989,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 570413063} m_PrefabAsset: {fileID: 0} +--- !u!114 &570413072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570413064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &578131735 GameObject: m_ObjectHideFlags: 0 @@ -441930,6 +442125,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 696969630} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 696969637} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &696969629 stripped GameObject: @@ -442121,7 +442319,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 696969630} + audioSource: {fileID: 696969637} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &696969635 stripped @@ -442129,6 +442327,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 696969628} m_PrefabAsset: {fileID: 0} +--- !u!114 &696969637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696969629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &697303079 PrefabInstance: m_ObjectHideFlags: 0 @@ -442405,6 +442619,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 702911164} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 702911171} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &702911163 stripped GameObject: @@ -442596,7 +442813,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 702911164} + audioSource: {fileID: 702911171} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &702911169 stripped @@ -442604,6 +442821,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 702911162} m_PrefabAsset: {fileID: 0} +--- !u!114 &702911171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 702911163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &703561436 GameObject: m_ObjectHideFlags: 0 @@ -443165,6 +443398,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 719693374} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 719693379} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &719693372 stripped Transform: @@ -443361,9 +443597,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 6104d2de1cbe86846b0e152caace38c1, type: 3} - audioSource: {fileID: 719693374} + audioSource: {fileID: 719693379} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &719693379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719693373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!4 &733706664 stripped Transform: m_CorrespondingSourceObject: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3} @@ -443973,6 +444225,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 779867980} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 779867987} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &779867979 stripped GameObject: @@ -444164,7 +444419,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 779867980} + audioSource: {fileID: 779867987} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &779867985 stripped @@ -444172,6 +444427,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 779867978} m_PrefabAsset: {fileID: 0} +--- !u!114 &779867987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779867979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &801067978 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3} @@ -444329,7 +444600,7 @@ MonoBehaviour: audioSourceType: 0 audioSource: {fileID: 0} clipPriority: 0 - sourcePriority: 0 + sourcePriority: 1 --- !u!1 &812734406 GameObject: m_ObjectHideFlags: 0 @@ -445286,9 +445557,6 @@ PrefabInstance: insertIndex: 1 addedObject: {fileID: 534194578} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3} - insertIndex: -1 - addedObject: {fileID: 1249289166} - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3} insertIndex: -1 addedObject: {fileID: 801067984} @@ -446943,6 +447211,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 914558066} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 914558071} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &914558064 stripped Transform: @@ -447139,9 +447410,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 914558066} + audioSource: {fileID: 914558071} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &914558071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914558065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &916198445 GameObject: m_ObjectHideFlags: 0 @@ -447779,11 +448066,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1153004718} m_PrefabAsset: {fileID: 0} ---- !u!1 &965429168 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3} - m_PrefabInstance: {fileID: 841182293} - m_PrefabAsset: {fileID: 0} --- !u!1001 &965496300 PrefabInstance: m_ObjectHideFlags: 0 @@ -448198,6 +448480,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 982160407} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 982160414} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &982160406 stripped GameObject: @@ -448389,7 +448674,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 982160407} + audioSource: {fileID: 982160414} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &982160412 stripped @@ -448397,6 +448682,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 982160405} m_PrefabAsset: {fileID: 0} +--- !u!114 &982160414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 982160406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &991134208 PrefabInstance: m_ObjectHideFlags: 0 @@ -450026,6 +450327,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1057088615} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1057088622} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1057088614 stripped GameObject: @@ -450217,7 +450521,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1057088615} + audioSource: {fileID: 1057088622} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1057088620 stripped @@ -450225,6 +450529,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1057088613} m_PrefabAsset: {fileID: 0} +--- !u!114 &1057088622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057088614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &1059330637 PrefabInstance: m_ObjectHideFlags: 0 @@ -450808,6 +451128,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1073825565} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1073825572} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1073825564 stripped GameObject: @@ -450999,7 +451322,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1073825565} + audioSource: {fileID: 1073825572} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1073825570 stripped @@ -451007,6 +451330,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1073825563} m_PrefabAsset: {fileID: 0} +--- !u!114 &1073825572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073825564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &1082413465 PrefabInstance: m_ObjectHideFlags: 0 @@ -454631,109 +454970,12 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3} m_PrefabInstance: {fileID: 841182293} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965429168} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3} m_Name: m_EditorClassIdentifier: '::' ---- !u!82 &1249289166 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965429168} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &1252594308 GameObject: m_ObjectHideFlags: 0 @@ -454820,7 +455062,7 @@ MonoBehaviour: SoundBirdObject: {fileID: 277331775} flightDuration: 3 flightDelay: 0.46 - audioSource: {fileID: 368957772} + audioSource: {fileID: 368957773} --- !u!1001 &1256486233 PrefabInstance: m_ObjectHideFlags: 0 @@ -457465,6 +457707,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1378408881} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1378408888} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1378408880 stripped GameObject: @@ -457656,7 +457901,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1378408881} + audioSource: {fileID: 1378408888} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1378408886 stripped @@ -457664,6 +457909,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1378408879} m_PrefabAsset: {fileID: 0} +--- !u!114 &1378408888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378408880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &1386095854 GameObject: m_ObjectHideFlags: 0 @@ -458087,6 +458348,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1421238376} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1421238381} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &1421238374 stripped Transform: @@ -458283,9 +458547,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1421238376} + audioSource: {fileID: 1421238381} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &1421238381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1421238375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &1428802629 PrefabInstance: m_ObjectHideFlags: 0 @@ -459865,6 +460145,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1498457915} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1498457922} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1498457914 stripped GameObject: @@ -460056,7 +460339,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1498457915} + audioSource: {fileID: 1498457922} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1498457920 stripped @@ -460064,6 +460347,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1498457913} m_PrefabAsset: {fileID: 0} +--- !u!114 &1498457922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498457914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &1506143248 GameObject: m_ObjectHideFlags: 0 @@ -461098,6 +461397,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1539536028} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1539536035} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1539536027 stripped GameObject: @@ -461289,7 +461591,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1539536028} + audioSource: {fileID: 1539536035} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1539536033 stripped @@ -461297,6 +461599,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1539536026} m_PrefabAsset: {fileID: 0} +--- !u!114 &1539536035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539536027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &1541015566 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3} @@ -465919,6 +466237,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1754168037} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1754168044} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1754168036 stripped GameObject: @@ -466110,7 +466431,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1754168037} + audioSource: {fileID: 1754168044} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1754168042 stripped @@ -466118,6 +466439,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1754168035} m_PrefabAsset: {fileID: 0} +--- !u!114 &1754168044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754168036} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!4 &1756247657 stripped Transform: m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} @@ -469889,6 +470226,7 @@ GameObject: - component: {fileID: 1943192894} - component: {fileID: 1943192895} - component: {fileID: 1943192896} + - component: {fileID: 1943192897} m_Layer: 0 m_Name: Picnic PPL Distracted m_TagString: Untagged @@ -469949,7 +470287,7 @@ AudioSource: Priority: 128 DopplerLevel: 1 MinDistance: 13 - MaxDistance: 19 + MaxDistance: 45 Pan2D: 0 rolloffMode: 2 BypassEffects: 0 @@ -469968,13 +470306,22 @@ AudioSource: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.9932251 + time: 0.8191924 value: 0 - inSlope: -0.68448335 - outSlope: -0.68448335 + inSlope: 0.018307725 + outSlope: 0.018307725 tangentMode: 0 weightedMode: 0 - inWeight: 0 + inWeight: 0.33333334 + outWeight: 0.8066968 + - serializedVersion: 3 + time: 0.9932251 + value: 0 + inSlope: -0.030011429 + outSlope: -0.030011429 + tangentMode: 0 + weightedMode: 0 + inWeight: 1 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 @@ -470024,6 +470371,22 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &1943192897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943192893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 1 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &1944202997 PrefabInstance: m_ObjectHideFlags: 0 @@ -470781,6 +471144,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 1967124847} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1967124854} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &1967124846 stripped GameObject: @@ -470972,7 +471338,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 1967124847} + audioSource: {fileID: 702911171} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &1967124852 stripped @@ -470980,6 +471346,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 1967124845} m_PrefabAsset: {fileID: 0} +--- !u!114 &1967124854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967124846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &1969906095 GameObject: m_ObjectHideFlags: 0 @@ -472613,6 +472995,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 2054236274} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 2054236281} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!1 &2054236273 stripped GameObject: @@ -472804,7 +473189,7 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 2054236274} + audioSource: {fileID: 2054236281} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} --- !u!4 &2054236279 stripped @@ -472812,6 +473197,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 2054236272} m_PrefabAsset: {fileID: 0} +--- !u!114 &2054236281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054236273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &2054797209 PrefabInstance: m_ObjectHideFlags: 0 @@ -473636,6 +474037,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 2086965018} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 2086965023} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &2086965016 stripped Transform: @@ -473832,9 +474236,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 2086965018} + audioSource: {fileID: 2086965023} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &2086965023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086965017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &2090785348 GameObject: m_ObjectHideFlags: 0 @@ -475153,6 +475573,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} insertIndex: -1 addedObject: {fileID: 2145742832} + - targetCorrespondingSourceObject: {fileID: 5308891672325920944, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} + insertIndex: -1 + addedObject: {fileID: 2145742837} m_SourcePrefab: {fileID: 100100000, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} --- !u!4 &2145742830 stripped Transform: @@ -475349,9 +475772,25 @@ MonoBehaviour: enterSprite: {fileID: 832746360605889420, guid: 4b4d8e5150c141640a2e6b4bbfc4bab2, type: 3} exitSprite: {fileID: 8814730014571327863, guid: 3383f09233685984885d44cafa54f515, type: 3} enterSound: {fileID: 8300000, guid: 975d8d57c80dbbd478eff9545f015f8f, type: 3} - audioSource: {fileID: 2145742832} + audioSource: {fileID: 2145742837} soundBirdSMRef: {fileID: 368957769} soundbirdHearingCheck: {fileID: 2022162752} +--- !u!114 &2145742837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145742831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1001 &1548124686061025687 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs b/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs index 424a4ee6..327b4966 100644 --- a/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs +++ b/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs @@ -18,7 +18,7 @@ public class PicnicBehaviour : MonoBehaviour [Header("The FakeChocolate to destroy!")] [SerializeField] private GameObject fakeChocolate; // Assign in Inspector - private AudioSource _audioSource; + private AppleAudioSource _audioSource; public AudioResource distractedAudioClips; public AudioResource angryAudioClips; public AudioResource feederClips; @@ -34,7 +34,7 @@ public class PicnicBehaviour : MonoBehaviour { stateMachine = GetComponent(); animator = GetComponent(); - _audioSource = GetComponent(); + _audioSource = GetComponent(); } private IEnumerator StateCycleRoutine() @@ -68,8 +68,8 @@ public class PicnicBehaviour : MonoBehaviour animator.SetTrigger("theyAngry"); //stateMachine.ChangeState("Picnic PPL Angry"); Logging.Debug("Hey! Don't steal my chocolate!"); - _audioSource.resource = angryAudioClips; - _audioSource.Play(); + _audioSource.audioSource.resource = angryAudioClips; + _audioSource.Play(0); } public void destroyFakeChocolate() @@ -83,20 +83,20 @@ public class PicnicBehaviour : MonoBehaviour public void PlayFeederAudio() { - _audioSource.resource = feederClips; - _audioSource.Play(); + _audioSource.audioSource.resource = feederClips; + _audioSource.Play(0); } public void PlayMoanerAudio() { - _audioSource.resource = moanerClips; - _audioSource.Play(); + _audioSource.audioSource.resource = moanerClips; + _audioSource.Play(0); } public void PlayDistractedAudio() { - _audioSource.resource = distractedAudioClips; - _audioSource.Play(); + _audioSource.audioSource.resource = distractedAudioClips; + _audioSource.Play(0); } diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs index 4d2d188b..820f9c18 100644 --- a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs +++ b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs @@ -7,7 +7,7 @@ public class SoundGenerator : MonoBehaviour [SerializeField] private Sprite enterSprite; [SerializeField] private Sprite exitSprite; [SerializeField] private AudioClip enterSound; - [SerializeField] private AudioSource audioSource; + [SerializeField] private AppleAudioSource audioSource; [SerializeField] private StateMachine soundBirdSMRef; [SerializeField] private soundBird_CanFly soundbirdHearingCheck; @@ -35,7 +35,7 @@ public class SoundGenerator : MonoBehaviour } if (audioSource != null && enterSound != null) { - audioSource.PlayOneShot(enterSound); + audioSource.audioSource.PlayOneShot(enterSound); } if (soundBirdSMRef != null && soundBirdSMRef.currentState.name == "SoundBird" && soundbirdHearingCheck.canFly == true) { diff --git a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs index 0fe2eb10..6eea8f2c 100644 --- a/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs +++ b/Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs @@ -13,7 +13,7 @@ public class soundBird_TakeOffBehaviour : MonoBehaviour private Animator animator; private TweenBase objectTween; - public AudioSource audioSource; + public AppleAudioSource audioSource; void Awake() { @@ -29,7 +29,7 @@ public class soundBird_TakeOffBehaviour : MonoBehaviour { animator.SetBool("isScared", true); objectTween = Tween.Spline(FlightSpline, SoundBirdObject, 0, 1, false, flightDuration, flightDelay, Tween.EaseIn, Tween.LoopType.None, HandleTweenStarted, HandleTweenFinished); - audioSource.Play(); + audioSource.Play(0); } void HandleTweenStarted() { diff --git a/Assets/Scripts/Sound/AudioManager.cs b/Assets/Scripts/Sound/AudioManager.cs index a47326e4..efa9a224 100644 --- a/Assets/Scripts/Sound/AudioManager.cs +++ b/Assets/Scripts/Sound/AudioManager.cs @@ -150,6 +150,12 @@ public class AudioManager : MonoBehaviour, IPausable Debug.Log($"[AUDIOMANAGER] Playing {currentlyPlayingVO.name} as nothing is currently playing."); return true; } + + // If the requested audio is not critical, and the currently playing audio is, tell the request to get bent + if (requestedAudioSource.audioSourceType == AppleAudioSource.AudioSourceType.VO && currentlyPlayingVO.audioSourceType == AppleAudioSource.AudioSourceType.CriticalVO) + { + return false; + } // If the requested audio source is the same, interrupt and trigger it again if (currentlyPlayingVO == requestedAudioSource) { diff --git a/Assets/Scripts/Sound/BushAudioController.cs b/Assets/Scripts/Sound/BushAudioController.cs index 71163db1..bfdb5db7 100644 --- a/Assets/Scripts/Sound/BushAudioController.cs +++ b/Assets/Scripts/Sound/BushAudioController.cs @@ -30,7 +30,7 @@ public class BushAudioController : MonoBehaviour public void PlayPhotoSoundBite() { VOPlayer.audioSource.resource = reactionClipToPlay; - VOPlayer.Play(0); + VOPlayer.Play(1); } public void PlayFlashSound()