diff --git a/Assets/Prototype/佩佩/Scripts/EyeManager.cs b/Assets/Prototype/佩佩/Scripts/EyeManager.cs index 1dde6966e..2fd287e52 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeManager.cs @@ -164,6 +164,7 @@ public class EyeManager : MonoBehaviour { if(currentTarget!=null) { + AudioManager.RandomPlayInteraction("colorimagine"); eyeStateEffect?.ApplyFocusedEffect(currentTarget); } @@ -176,6 +177,7 @@ public class EyeManager : MonoBehaviour { if(currentTarget!=null) { + AudioManager.RandomPlayInteraction("colorimagine"); eyeStateEffect?.ApplyUnfocusedEffect(currentTarget); } @@ -292,6 +294,7 @@ private Sequence glitchin; [YarnCommand("EyeGlitch_in")] public IEnumerator EyeGlitch_in() { + glitchin = DOTween.Sequence(); Material material = eyeImage.material; if(eyeImage==null) @@ -299,6 +302,8 @@ public IEnumerator EyeGlitch_in() Debug.LogError("No eyeImage"); yield break; } + // AudioManager.RandomPlayInteraction("colorcorrect_in"); + // AudioManager.PlayLoopAudio("colorcorrect_loop"); // _HsvShift 从 0 ~ 360 来回变化 hsvShiftTween = DOTween.To(() => material.GetFloat("_HsvShift"), x => material.SetFloat("_HsvShift", x), 360, 1f) .SetLoops(-1, LoopType.Yoyo); diff --git a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs index 1fd062041..54fb2a981 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs @@ -2,6 +2,7 @@ using System.Collections; using UnityEngine; using DG.Tweening; using Unity.Mathematics; +using AibisDream; public class EyeTarget : MonoBehaviour { @@ -102,14 +103,20 @@ public class EyeTarget : MonoBehaviour public void BlurIn(float duration,bool isForwardMaterial = true) { + AudioManager.PlayLoopAudio("visualturn"); Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; - targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); + targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine).OnComplete(() => { + AudioManager.PauseLoopAudio(); + }); } public void BlurOut(float duration,bool isForwardMaterial = true) { + AudioManager.PlayLoopAudio("visualturn"); Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; - targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); + targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine).OnComplete(() => { + AudioManager.PauseLoopAudio(); + }); } public void ColorBack() { diff --git a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs index 7e272d265..f039539d6 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs @@ -57,6 +57,8 @@ public class EyeTransitionManager : MonoBehaviour // } } } + public string audioName="amb_remove"; + public string soundName="remove_in_1"; } // 在 Unity 编辑器中配置视图(不包括MainView) @@ -301,7 +303,7 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) // 开始视图过渡 private void StartTransition(ViewState targetViewState) { - AudioManager.Instance.PauseMemoryAudio(); + AudioManager.PauseMemoryAudio(); // 如果正在进行视图过渡,或者目标视图是当前视图,或者 MemoryProcess 正在处理,就不进行视图过渡 if (isTransitioning || currentViewState == targetViewState || (memoryProcess != null && memoryProcess.IsProcessing())) { @@ -348,6 +350,8 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) { currentViewState = ViewState.MainView; isTransitioning = false; + AudioManager.PlayAmb1Audio("amb_main"); + AudioManager.PlayAmb2Audio("amb_general"); }); } @@ -355,6 +359,8 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) { if (!viewConfigDictionary.TryGetValue(targetViewState, out ViewConfig targetConfig)) return; + + AudioManager.RandomPlayInteraction(targetConfig.soundName); // Zoom In 的时候,开始 Zoom Sequence zoomInSequence = DOTween.Sequence(); Sequence roateSequence = DOTween.Sequence(); @@ -397,6 +403,10 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) currentViewState = targetViewState; isTransitioning = false; + if(targetConfig.audioName!=null) + { + AudioManager.PlayAmb1Audio(targetConfig.audioName); + } }); }); } diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index fd35ffc4a..aad369832 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -46,6 +46,8 @@ public class MemoryProcess : MonoBehaviour [YarnCommand("ColorFadeOut")] public IEnumerator ColorFadeOut() { + AudioManager.RandomPlayInteraction("colorerase"); + AudioManager.PauseMemoryAudio(); // 在3秒内把 _DirectionalDistortionFade 从 -2 变成 -14 Tween tween = memoryFinishedImage.material.DOFloat(-14, "_DirectionalDistortionFade", 3); yield return tween.WaitForCompletion(); @@ -53,7 +55,7 @@ public IEnumerator ColorFadeOut() [YarnCommand("search_memory")] public IEnumerator SearchMemory(string memoryName,bool isColorful = true) { - AudioManager.Instance.PauseMemoryAudio(); + AudioManager.PauseMemoryAudio(); if (isColorful) { memoryFinishedImage.material.SetFloat("_DirectionalDistortionFade", -2); @@ -82,26 +84,27 @@ public IEnumerator ColorFadeOut() } Sequence memorySequence = DOTween.Sequence(); - AudioManager.SetLoopSourceVolume(0.3f); - AudioManager.PlayLoopAudio("tv_noise"); + // AudioManager.SetLoopSourceVolume(0.3f); + // AudioManager.PlayLoopAudio("tv_noise"); + AudioManager.PlayMemoryAudio("mem_"+memoryName); // 修改memoryprocess的参数 memorySequence.Append(memoryProcessImage.material.DOFloat(0, "_StrongTintFade", 0.2f)); memorySequence.Join(memoryProcessImage.material.DOFloat(1, "_GlitchFade", 0.2f)); - memorySequence.AppendInterval(3f); // 添加1.5秒的延时 + //memorySequence.AppendInterval(2.8f); // 添加1.5秒的延时 // 在1.5秒延时后,暂停循环音频并播放记忆音频 - memorySequence.AppendCallback(() => - { + // memorySequence.AppendCallback(() => + // { - AudioManager.PauseLoopAudio(); - AudioManager.SetLoopSourceVolume(1.0f); - AudioManager.PlayMemoryAudio("mem_"+memoryName); + // AudioManager.PauseLoopAudio(); + // AudioManager.SetLoopSourceVolume(1.0f); + // AudioManager.PlayMemoryAudio("mem_"+memoryName); - }); + // }); - memorySequence.AppendInterval(2.1f); + memorySequence.AppendInterval(3.35f); // 记忆处理结束,激活memoryFinishedImage memorySequence.AppendCallback(() => diff --git a/Assets/Prototype/佩佩/Scripts/UFProcess.cs b/Assets/Prototype/佩佩/Scripts/UFProcess.cs index 093b4d9c3..0df2b8d46 100644 --- a/Assets/Prototype/佩佩/Scripts/UFProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/UFProcess.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using DG.Tweening; -using Yarn.Unity; +using Yarn.Unity; +using AibisDream; public class UFProcess : MonoBehaviour { @@ -34,7 +35,7 @@ public class UFProcess : MonoBehaviour [YarnCommand("UFprocess")] public IEnumerator ProcessMemory(string memoryFinishedImageName, string UFImageName,bool isColorWrong=false) { - + AudioManager.PlayLoopAudio("UFlearning"); if (isProcessing) { Debug.LogWarning("Already processing a memory. Please wait until the process is finished."); @@ -122,6 +123,7 @@ public class UFProcess : MonoBehaviour { UFImage.gameObject.SetActive(false); isProcessing = false; // 处理完成,设置为false + AudioManager.PauseLoopAudio(); }); yield return memorySequence.WaitForCompletion(); } diff --git a/Assets/Prototype/佩佩/Scripts/UFmanager.cs b/Assets/Prototype/佩佩/Scripts/UFmanager.cs index 41f37ed62..8e299ffb1 100644 --- a/Assets/Prototype/佩佩/Scripts/UFmanager.cs +++ b/Assets/Prototype/佩佩/Scripts/UFmanager.cs @@ -5,6 +5,7 @@ using UnityEngine.UI; using DG.Tweening; using Yarn.Unity; using System.Collections; +using AibisDream; public class UFmanager : MonoBehaviour { @@ -55,6 +56,8 @@ public class UFmanager : MonoBehaviour { isShowingPhoto = true; // 设置标志,表示照片显示正在进行 + AudioManager.RandomPlayInteraction("uf"); + // 激活底板 baseImage.gameObject.SetActive(true); // 设置照片并使其可见 diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index 1d0257f96..bcafd092a 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -14835,6 +14835,8 @@ MonoBehaviour: crowBarSocket: {fileID: 0} cameraSize: 2 cameraPos: {x: 0, y: 0.5} + audioName: amb_remove + soundName: remove_in_1 - viewPanel: {fileID: 1294333830} socket: {fileID: 7986262} viewState: 2 @@ -14847,6 +14849,8 @@ MonoBehaviour: crowBarSocket: {fileID: 587433360} cameraSize: 2 cameraPos: {x: -4.5, y: 0.5} + audioName: + soundName: - viewPanel: {fileID: 1882925196} socket: {fileID: 1451543708} viewState: 3 @@ -14856,6 +14860,8 @@ MonoBehaviour: crowBarSocket: {fileID: 0} cameraSize: 2.5 cameraPos: {x: -2.5, y: 5.3} + audioName: amb_deep + soundName: deep_in_1 - viewPanel: {fileID: 0} socket: {fileID: 1261765723} viewState: 4 @@ -14864,6 +14870,8 @@ MonoBehaviour: crowBarSocket: {fileID: 0} cameraSize: 0 cameraPos: {x: 0, y: 0} + audioName: + soundName: - viewPanel: {fileID: 0} socket: {fileID: 697311004} viewState: 7 @@ -14872,6 +14880,8 @@ MonoBehaviour: crowBarSocket: {fileID: 0} cameraSize: 0 cameraPos: {x: 0, y: 0} + audioName: + soundName: - viewPanel: {fileID: 0} socket: {fileID: 144553463} viewState: 5 @@ -14880,6 +14890,8 @@ MonoBehaviour: crowBarSocket: {fileID: 0} cameraSize: 0 cameraPos: {x: 0, y: 0} + audioName: + soundName: - viewPanel: {fileID: 0} socket: {fileID: 585617291} viewState: 6 @@ -14890,6 +14902,8 @@ MonoBehaviour: crowBarSocket: {fileID: 0} cameraSize: 0 cameraPos: {x: 0, y: 0} + audioName: + soundName: faceTransform: {fileID: 1082705360} projector: {fileID: 490060563} --- !u!4 &1102365682 diff --git a/Assets/Resources/Audio/UFlearning.ogg b/Assets/Resources/Audio/UFlearning.ogg new file mode 100644 index 000000000..e2a72b188 --- /dev/null +++ b/Assets/Resources/Audio/UFlearning.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c333dd0b743f61afdc2587c72d14ceca301715bfcf43888a4de4badfb6fe3341 +size 1212205 diff --git a/Assets/Resources/Audio/beep_warning_3.ogg.meta b/Assets/Resources/Audio/UFlearning.ogg.meta similarity index 91% rename from Assets/Resources/Audio/beep_warning_3.ogg.meta rename to Assets/Resources/Audio/UFlearning.ogg.meta index c45ad8f28..278bdccdd 100644 --- a/Assets/Resources/Audio/beep_warning_3.ogg.meta +++ b/Assets/Resources/Audio/UFlearning.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d97ac3302c4aa2d48bfced3bd59c92ad +guid: 6eb33d0a0f91b884cbc9d7ba12a7ac1f AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Resources/Audio/amb_deep.ogg b/Assets/Resources/Audio/amb_deep.ogg new file mode 100644 index 000000000..03b447ede --- /dev/null +++ b/Assets/Resources/Audio/amb_deep.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4001035fa6744e17ebbd7eefe9e4880a250b4c5d8a38ade7752cc173c5301e0 +size 739933 diff --git a/Assets/Resources/Audio/beep_warning_1.ogg.meta b/Assets/Resources/Audio/amb_deep.ogg.meta similarity index 91% rename from Assets/Resources/Audio/beep_warning_1.ogg.meta rename to Assets/Resources/Audio/amb_deep.ogg.meta index 594da02ef..adda6084b 100644 --- a/Assets/Resources/Audio/beep_warning_1.ogg.meta +++ b/Assets/Resources/Audio/amb_deep.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73f8c4530bd45db45bcacc06c5f73ca2 +guid: 63b6a0704529c12409783f5b2cbf4d22 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Resources/Audio/amb_general.ogg b/Assets/Resources/Audio/amb_general.ogg new file mode 100644 index 000000000..f710b75c9 --- /dev/null +++ b/Assets/Resources/Audio/amb_general.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20c4e3f4e5c8993c2a340f90a6cd0cb18b94b71057cc64c821662719a7f7d90f +size 469314 diff --git a/Assets/Resources/Audio/beep_warning_2.ogg.meta b/Assets/Resources/Audio/amb_general.ogg.meta similarity index 91% rename from Assets/Resources/Audio/beep_warning_2.ogg.meta rename to Assets/Resources/Audio/amb_general.ogg.meta index ecc2eda7d..01f2a4cc9 100644 --- a/Assets/Resources/Audio/beep_warning_2.ogg.meta +++ b/Assets/Resources/Audio/amb_general.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c8a46dfdb911dea44b63e9c7228def69 +guid: 529b891c87292d44eba1d013b6c470fb AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Resources/Audio/amb_main 1.ogg b/Assets/Resources/Audio/amb_main 1.ogg new file mode 100644 index 000000000..89fab4246 --- /dev/null +++ b/Assets/Resources/Audio/amb_main 1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da4b11e854bf03db9b989681594eaed3122439dc4d1d62f394a70758c22770cb +size 813453 diff --git a/Assets/Resources/Audio/amb_main 1.ogg.meta b/Assets/Resources/Audio/amb_main 1.ogg.meta new file mode 100644 index 000000000..d6561485d --- /dev/null +++ b/Assets/Resources/Audio/amb_main 1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7ad1a1455220fb74290f9d47f013d3b2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/amb_main_yingli_1.ogg b/Assets/Resources/Audio/amb_main_yingli_1.ogg new file mode 100644 index 000000000..a13a9a4e1 --- /dev/null +++ b/Assets/Resources/Audio/amb_main_yingli_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea422d718ebda2324d50dc634988e14a4db028d86be9fced7ed2f08896ba160a +size 771329 diff --git a/Assets/Resources/Audio/amb_main_yingli_1.ogg.meta b/Assets/Resources/Audio/amb_main_yingli_1.ogg.meta new file mode 100644 index 000000000..c2cc64c85 --- /dev/null +++ b/Assets/Resources/Audio/amb_main_yingli_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: aa9cbbbdf3d436445b3da79ce2826317 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/amb_main_yingli_4.ogg b/Assets/Resources/Audio/amb_main_yingli_4.ogg new file mode 100644 index 000000000..479f0ad42 --- /dev/null +++ b/Assets/Resources/Audio/amb_main_yingli_4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9979fd83a64c1f68bab0b9d64b68f22a9e1275860a7b3babc2670bdc32fe649 +size 765621 diff --git a/Assets/Resources/Audio/amb_main_yingli_4.ogg.meta b/Assets/Resources/Audio/amb_main_yingli_4.ogg.meta new file mode 100644 index 000000000..bdfdbacf4 --- /dev/null +++ b/Assets/Resources/Audio/amb_main_yingli_4.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cc6e07fb02ba45e4084b880db0c54f70 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/amb_remove.ogg b/Assets/Resources/Audio/amb_remove.ogg new file mode 100644 index 000000000..16edc6221 --- /dev/null +++ b/Assets/Resources/Audio/amb_remove.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd2a130903c5442a5abc7b89f908b9981fad8d6306a157e0c14c3d0ae936053e +size 845875 diff --git a/Assets/Resources/Audio/amb_remove.ogg.meta b/Assets/Resources/Audio/amb_remove.ogg.meta new file mode 100644 index 000000000..0e883abf9 --- /dev/null +++ b/Assets/Resources/Audio/amb_remove.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5c79d5a0bf2431443912a764d396da20 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/amb_room.ogg b/Assets/Resources/Audio/amb_room.ogg new file mode 100644 index 000000000..0f9f7ab28 --- /dev/null +++ b/Assets/Resources/Audio/amb_room.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cfe7dff39c539b889ad3e0c3600e6fa8f76efcd35ad5f3b4e8e84203fffe21e +size 720773 diff --git a/Assets/Resources/Audio/amb_room.ogg.meta b/Assets/Resources/Audio/amb_room.ogg.meta new file mode 100644 index 000000000..d052925c9 --- /dev/null +++ b/Assets/Resources/Audio/amb_room.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b849a4be6ee6d7d46a4b818eac2296cc +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/beep_warning.ogg b/Assets/Resources/Audio/beep_warning.ogg index 4cfa0073f..a37b66004 100644 --- a/Assets/Resources/Audio/beep_warning.ogg +++ b/Assets/Resources/Audio/beep_warning.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1c914ff1f2481afc5806588911c3ab10ce4a9bd1d06195311e53b97d79fa76c -size 55686 +oid sha256:99b28d3374e79c2a976e16e8088e934eaf8855914ccd858a1a154d8c804bea81 +size 72034 diff --git a/Assets/Resources/Audio/beep_warning_1.ogg b/Assets/Resources/Audio/beep_warning_1.ogg deleted file mode 100644 index 81345fa21..000000000 --- a/Assets/Resources/Audio/beep_warning_1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bba3401ca0de7a8abf9f405a5d23f88a989ba960dc42226eef6388b65e12bceb -size 27688 diff --git a/Assets/Resources/Audio/beep_warning_2.ogg b/Assets/Resources/Audio/beep_warning_2.ogg deleted file mode 100644 index 81345fa21..000000000 --- a/Assets/Resources/Audio/beep_warning_2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bba3401ca0de7a8abf9f405a5d23f88a989ba960dc42226eef6388b65e12bceb -size 27688 diff --git a/Assets/Resources/Audio/beep_warning_3.ogg b/Assets/Resources/Audio/beep_warning_3.ogg deleted file mode 100644 index 81345fa21..000000000 --- a/Assets/Resources/Audio/beep_warning_3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bba3401ca0de7a8abf9f405a5d23f88a989ba960dc42226eef6388b65e12bceb -size 27688 diff --git a/Assets/Resources/Audio/book_1.ogg b/Assets/Resources/Audio/book_1.ogg new file mode 100644 index 000000000..3b11b0df2 --- /dev/null +++ b/Assets/Resources/Audio/book_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:196c5204756bb6c5d314a8be7182993e169717ac9d5675bbdad8e905c5b21342 +size 41866 diff --git a/Assets/Resources/Audio/book_1.ogg.meta b/Assets/Resources/Audio/book_1.ogg.meta new file mode 100644 index 000000000..2514ac0a8 --- /dev/null +++ b/Assets/Resources/Audio/book_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a4a83501bbf535b4e950cbe8f25761b0 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/book_2.ogg b/Assets/Resources/Audio/book_2.ogg new file mode 100644 index 000000000..269da4072 --- /dev/null +++ b/Assets/Resources/Audio/book_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c96cb5c85a00885759569ca036f1f4a76a08ce609ed1d0b71f876682edf7936 +size 47725 diff --git a/Assets/Resources/Audio/book_2.ogg.meta b/Assets/Resources/Audio/book_2.ogg.meta new file mode 100644 index 000000000..37166c3db --- /dev/null +++ b/Assets/Resources/Audio/book_2.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3dfa7c1257e96c144b4f642bd4766885 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/book_3.ogg b/Assets/Resources/Audio/book_3.ogg new file mode 100644 index 000000000..2e402546b --- /dev/null +++ b/Assets/Resources/Audio/book_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76ded158dc6cf2cf3b4ef623057f0b2095b4247f96e1f07613808601449259ed +size 44783 diff --git a/Assets/Resources/Audio/book_3.ogg.meta b/Assets/Resources/Audio/book_3.ogg.meta new file mode 100644 index 000000000..9a6151ffc --- /dev/null +++ b/Assets/Resources/Audio/book_3.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0c7deedff475a1d4c8008fb8e46360a1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorcorrect_in.ogg b/Assets/Resources/Audio/colorcorrect_in.ogg new file mode 100644 index 000000000..62c5e5fd6 --- /dev/null +++ b/Assets/Resources/Audio/colorcorrect_in.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:deb08eefa47054ba111a9b8d6f2b896bbf1de8edb795c1c53fb22a4fbd2410a3 +size 87441 diff --git a/Assets/Resources/Audio/colorcorrect_in.ogg.meta b/Assets/Resources/Audio/colorcorrect_in.ogg.meta new file mode 100644 index 000000000..ee8637452 --- /dev/null +++ b/Assets/Resources/Audio/colorcorrect_in.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 74769e7100a53b64dabc32a397518ef7 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorcorrect_loop.ogg b/Assets/Resources/Audio/colorcorrect_loop.ogg new file mode 100644 index 000000000..1a7af88cc --- /dev/null +++ b/Assets/Resources/Audio/colorcorrect_loop.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b99d24263b89ed1c71ae06e820a225ded1b8413ca9d0f7105e9aed62433eb4fb +size 106927 diff --git a/Assets/Resources/Audio/colorcorrect_loop.ogg.meta b/Assets/Resources/Audio/colorcorrect_loop.ogg.meta new file mode 100644 index 000000000..cfdcca2a0 --- /dev/null +++ b/Assets/Resources/Audio/colorcorrect_loop.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 28f9d42b1e04217419ec8a4d338c4339 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorcorrect_out.ogg b/Assets/Resources/Audio/colorcorrect_out.ogg new file mode 100644 index 000000000..aeeb2be6c --- /dev/null +++ b/Assets/Resources/Audio/colorcorrect_out.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dc93414dd391f76d87f70ed5d9bdd7c0536b2ae3a243b2aeed23690c6c93592 +size 118030 diff --git a/Assets/Resources/Audio/colorcorrect_out.ogg.meta b/Assets/Resources/Audio/colorcorrect_out.ogg.meta new file mode 100644 index 000000000..b11ad7534 --- /dev/null +++ b/Assets/Resources/Audio/colorcorrect_out.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b4105af33707a4344970be7a306ee2bd +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorerase.ogg b/Assets/Resources/Audio/colorerase.ogg new file mode 100644 index 000000000..af86353b5 --- /dev/null +++ b/Assets/Resources/Audio/colorerase.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a4965650faf266beeeefbe83593167c857fb402cc08fa190c820e4f6daf6ed4 +size 104777 diff --git a/Assets/Resources/Audio/colorerase.ogg.meta b/Assets/Resources/Audio/colorerase.ogg.meta new file mode 100644 index 000000000..b0c9f4d1d --- /dev/null +++ b/Assets/Resources/Audio/colorerase.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b7f14b63be111e64d8039f08ba1a0b78 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorimagine_1.ogg b/Assets/Resources/Audio/colorimagine_1.ogg new file mode 100644 index 000000000..d91f207d3 --- /dev/null +++ b/Assets/Resources/Audio/colorimagine_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3071766ee0021e370b0a4887e1104ad39d4ee3ea90223b63b664910b0d0d166d +size 58896 diff --git a/Assets/Resources/Audio/colorimagine_1.ogg.meta b/Assets/Resources/Audio/colorimagine_1.ogg.meta new file mode 100644 index 000000000..d2d259732 --- /dev/null +++ b/Assets/Resources/Audio/colorimagine_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a84fc0d98960b934eaa1fdd2b994bee8 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorimagine_2.ogg b/Assets/Resources/Audio/colorimagine_2.ogg new file mode 100644 index 000000000..77a9fa6c2 --- /dev/null +++ b/Assets/Resources/Audio/colorimagine_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5baf394336bd5b225c3b9cdc78bfd9d8adcd0b5e8d1d108dadc57f294b5792e5 +size 54960 diff --git a/Assets/Resources/Audio/colorimagine_2.ogg.meta b/Assets/Resources/Audio/colorimagine_2.ogg.meta new file mode 100644 index 000000000..094d57c8b --- /dev/null +++ b/Assets/Resources/Audio/colorimagine_2.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 90d9377e23887f84eae751eb79adee8e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/colorimagine_3.ogg b/Assets/Resources/Audio/colorimagine_3.ogg new file mode 100644 index 000000000..ceeccf25b --- /dev/null +++ b/Assets/Resources/Audio/colorimagine_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00892eff00d8378a0e77435e80d0862b6773e27270d1be915d4bf1946f652b9a +size 50336 diff --git a/Assets/Resources/Audio/colorimagine_3.ogg.meta b/Assets/Resources/Audio/colorimagine_3.ogg.meta new file mode 100644 index 000000000..800550edd --- /dev/null +++ b/Assets/Resources/Audio/colorimagine_3.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ed4aa977255ed954492d0344f7168eb2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/crowbar.ogg b/Assets/Resources/Audio/crowbar.ogg new file mode 100644 index 000000000..620f29317 --- /dev/null +++ b/Assets/Resources/Audio/crowbar.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05f10237ab27336e4aee4608070981b780a8a3e4665c02a4126d83f5f6363dd8 +size 62945 diff --git a/Assets/Resources/Audio/crowbar.ogg.meta b/Assets/Resources/Audio/crowbar.ogg.meta new file mode 100644 index 000000000..d7f0c769d --- /dev/null +++ b/Assets/Resources/Audio/crowbar.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2059db41d0445f644a384d76472da8fd +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/deep_in_1.ogg b/Assets/Resources/Audio/deep_in_1.ogg new file mode 100644 index 000000000..bbeed9032 --- /dev/null +++ b/Assets/Resources/Audio/deep_in_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9aa769b29fc1b43ee272be23d084362eb91451c0541f18f0d9e4117a0e252664 +size 127539 diff --git a/Assets/Resources/Audio/deep_in_1.ogg.meta b/Assets/Resources/Audio/deep_in_1.ogg.meta new file mode 100644 index 000000000..07ffcccd9 --- /dev/null +++ b/Assets/Resources/Audio/deep_in_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7f1f46c5e2626d048ac9fb37e43a54ed +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/end_0920.ogg b/Assets/Resources/Audio/end_0920.ogg new file mode 100644 index 000000000..3c937ae03 --- /dev/null +++ b/Assets/Resources/Audio/end_0920.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85c5f55212dc887fc28a6c27f610b7320c4e855ce66f352beb97e6b9b1a2f129 +size 6923933 diff --git a/Assets/Resources/Audio/end_0920.ogg.meta b/Assets/Resources/Audio/end_0920.ogg.meta new file mode 100644 index 000000000..8bc07e293 --- /dev/null +++ b/Assets/Resources/Audio/end_0920.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 15e5b46e1b916874ca0bbd5f0e6393ad +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_liuying_1.ogg b/Assets/Resources/Audio/mem_liuying_1.ogg new file mode 100644 index 000000000..0f07b7426 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7ed83fbeb9f50ca1194dc526f0a7097c7b908c29f0f1050706dc04ced0635a0 +size 2986004 diff --git a/Assets/Resources/Audio/mem_liuying_1.ogg.meta b/Assets/Resources/Audio/mem_liuying_1.ogg.meta new file mode 100644 index 000000000..3e3da9cd4 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 23fa58a208a75ae4a94cf483f0224097 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_liuying_1_dye.ogg b/Assets/Resources/Audio/mem_liuying_1_dye.ogg new file mode 100644 index 000000000..aaa150a02 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_1_dye.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca15c9aa26aa94332e4a612bc9c7bf9f076fafbbff18bcc9a3977780dce25cfc +size 397037 diff --git a/Assets/Resources/Audio/mem_liuying_1_dye.ogg.meta b/Assets/Resources/Audio/mem_liuying_1_dye.ogg.meta new file mode 100644 index 000000000..065a77c26 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_1_dye.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 03fe751fc65c2464694725408e98a6a4 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_liuying_2.ogg b/Assets/Resources/Audio/mem_liuying_2.ogg new file mode 100644 index 000000000..c4b146ae3 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d9297a250f0166b795e0fba0ce2d74aa4707b3e80d5e5bc0a7d77ee5a66134f +size 3010386 diff --git a/Assets/Resources/Audio/mem_liuying_2.ogg.meta b/Assets/Resources/Audio/mem_liuying_2.ogg.meta new file mode 100644 index 000000000..5671f9b9e --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_2.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9878ed81e47fc3e41a0874b601310648 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_liuying_2_dye.ogg b/Assets/Resources/Audio/mem_liuying_2_dye.ogg new file mode 100644 index 000000000..87a3b97e7 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_2_dye.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d0e616fd4a74a4a0c1f075bf6af39c1190454a5be6b52f4e9913b6a897375bd +size 449979 diff --git a/Assets/Resources/Audio/mem_liuying_2_dye.ogg.meta b/Assets/Resources/Audio/mem_liuying_2_dye.ogg.meta new file mode 100644 index 000000000..2a3de8fb6 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_2_dye.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0240583d087269b419cbbba2ec37f5ef +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_liuying_3.ogg b/Assets/Resources/Audio/mem_liuying_3.ogg new file mode 100644 index 000000000..4f159c5af --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56f51b07527f0db98ad8390b986a5d0cc6569dab096af81e45df60e81414ec5b +size 3001255 diff --git a/Assets/Resources/Audio/mem_liuying_3.ogg.meta b/Assets/Resources/Audio/mem_liuying_3.ogg.meta new file mode 100644 index 000000000..760c79f5c --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_3.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c94212d5dde487c43b1bf0736d932e4d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_liuying_3_dye.ogg b/Assets/Resources/Audio/mem_liuying_3_dye.ogg new file mode 100644 index 000000000..10890e38d --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_3_dye.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89d5b87cc52ca584589684eec6fb8407fe4aeb8cf7b05d625a6f65ad27358cb9 +size 426640 diff --git a/Assets/Resources/Audio/mem_liuying_3_dye.ogg.meta b/Assets/Resources/Audio/mem_liuying_3_dye.ogg.meta new file mode 100644 index 000000000..281a24662 --- /dev/null +++ b/Assets/Resources/Audio/mem_liuying_3_dye.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4460e5b99ccd0cb448858866ec2fe57d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/mem_play.ogg b/Assets/Resources/Audio/mem_play.ogg index badc8357f..815a0f3f5 100644 --- a/Assets/Resources/Audio/mem_play.ogg +++ b/Assets/Resources/Audio/mem_play.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a423885d83eeafac262b40d2184a4d0edc83fe9262430649049efbae8386f73a -size 80152 +oid sha256:4c9c980fd77a917ed4e420666f65729905dbea12fa5931404625b33ad05a5e81 +size 137427 diff --git a/Assets/Resources/Audio/mem_play.ogg.meta b/Assets/Resources/Audio/mem_play.ogg.meta index d5f8ad3dc..10c8d2674 100644 --- a/Assets/Resources/Audio/mem_play.ogg.meta +++ b/Assets/Resources/Audio/mem_play.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 61b76fd076206a14a9798ebc3a148889 +guid: 9ff2c775fa6d55b4196bb3e6fee17376 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Resources/Audio/peel.ogg b/Assets/Resources/Audio/peel.ogg new file mode 100644 index 000000000..a52aef406 --- /dev/null +++ b/Assets/Resources/Audio/peel.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a850a09511d8ec6c4dfef79b12735dd20a555843a13bcef57407e2137c67ef2b +size 49947 diff --git a/Assets/Resources/Audio/peel.ogg.meta b/Assets/Resources/Audio/peel.ogg.meta new file mode 100644 index 000000000..9d5c719b9 --- /dev/null +++ b/Assets/Resources/Audio/peel.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ec36e8038e6462347af32472bcfcceab +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/remove_in_1.ogg b/Assets/Resources/Audio/remove_in_1.ogg new file mode 100644 index 000000000..7bf458575 --- /dev/null +++ b/Assets/Resources/Audio/remove_in_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dafebef12fd24e80355d708dbf16366689c98428adf5238f2408598431e4016b +size 76951 diff --git a/Assets/Resources/Audio/remove_in_1.ogg.meta b/Assets/Resources/Audio/remove_in_1.ogg.meta new file mode 100644 index 000000000..cc87f06a3 --- /dev/null +++ b/Assets/Resources/Audio/remove_in_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 90ad2e14d4685844c878138d2ddec24c +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/BooomAudio/tv_in_1.ogg b/Assets/Resources/Audio/tv_in_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_in_1.ogg rename to Assets/Resources/Audio/tv_in_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/tv_in_1.ogg.meta b/Assets/Resources/Audio/tv_in_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_in_1.ogg.meta rename to Assets/Resources/Audio/tv_in_1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/tv_in_2.ogg b/Assets/Resources/Audio/tv_in_2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_in_2.ogg rename to Assets/Resources/Audio/tv_in_2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/tv_in_2.ogg.meta b/Assets/Resources/Audio/tv_in_2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_in_2.ogg.meta rename to Assets/Resources/Audio/tv_in_2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/tv_in_3.ogg b/Assets/Resources/Audio/tv_in_3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_in_3.ogg rename to Assets/Resources/Audio/tv_in_3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/tv_in_3.ogg.meta b/Assets/Resources/Audio/tv_in_3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_in_3.ogg.meta rename to Assets/Resources/Audio/tv_in_3.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/tv_turn_1.ogg b/Assets/Resources/Audio/tv_turn_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_turn_1.ogg rename to Assets/Resources/Audio/tv_turn_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/tv_turn_1.ogg.meta b/Assets/Resources/Audio/tv_turn_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_turn_1.ogg.meta rename to Assets/Resources/Audio/tv_turn_1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/tv_turn_2.ogg b/Assets/Resources/Audio/tv_turn_2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_turn_2.ogg rename to Assets/Resources/Audio/tv_turn_2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/tv_turn_2.ogg.meta b/Assets/Resources/Audio/tv_turn_2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_turn_2.ogg.meta rename to Assets/Resources/Audio/tv_turn_2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/tv_turn_3.ogg b/Assets/Resources/Audio/tv_turn_3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_turn_3.ogg rename to Assets/Resources/Audio/tv_turn_3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/tv_turn_3.ogg.meta b/Assets/Resources/Audio/tv_turn_3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/tv_turn_3.ogg.meta rename to Assets/Resources/Audio/tv_turn_3.ogg.meta diff --git a/Assets/Resources/Audio/uf.mp3 b/Assets/Resources/Audio/uf.mp3 new file mode 100644 index 000000000..50734c55c Binary files /dev/null and b/Assets/Resources/Audio/uf.mp3 differ diff --git a/Assets/Resources/Audio/uf.mp3.meta b/Assets/Resources/Audio/uf.mp3.meta new file mode 100644 index 000000000..fe676364a --- /dev/null +++ b/Assets/Resources/Audio/uf.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4c5cb1b3846a9f44190794f7f0d0ca6b +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/visualturn.ogg b/Assets/Resources/Audio/visualturn.ogg new file mode 100644 index 000000000..0e7442cc8 --- /dev/null +++ b/Assets/Resources/Audio/visualturn.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f41162fd57835da6aa5e98f1e1a1ff0130fd1b407a4149bfe566def6c859622f +size 106336 diff --git a/Assets/Resources/Audio/visualturn.ogg.meta b/Assets/Resources/Audio/visualturn.ogg.meta new file mode 100644 index 000000000..74ff9e735 --- /dev/null +++ b/Assets/Resources/Audio/visualturn.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5cbadd776c16dac42a018ceb8fc0d802 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/wire_cut.ogg b/Assets/Resources/Audio/wire_cut.ogg new file mode 100644 index 000000000..02a256be3 --- /dev/null +++ b/Assets/Resources/Audio/wire_cut.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80fdec429a66131aed15e491240623408ff4b9c98fcaa5996b75129742fe73e9 +size 79867 diff --git a/Assets/Resources/Audio/wire_cut.ogg.meta b/Assets/Resources/Audio/wire_cut.ogg.meta new file mode 100644 index 000000000..a26d645bc --- /dev/null +++ b/Assets/Resources/Audio/wire_cut.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 05c8d174b8fa25f489f794db4045f32f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/MemoryColor.mat b/Assets/Resources/Materials/MemoryColor.mat index ea0531edd..db0f8bc2c 100644 --- a/Assets/Resources/Materials/MemoryColor.mat +++ b/Assets/Resources/Materials/MemoryColor.mat @@ -164,7 +164,7 @@ Material: - _DirectionalAlphaFadeNoiseFactor: 0.2 - _DirectionalAlphaFadeRotation: 0 - _DirectionalAlphaFadeWidth: 0.2 - - _DirectionalDistortionFade: -2 + - _DirectionalDistortionFade: -14 - _DirectionalDistortionInvert: 0 - _DirectionalDistortionNoiseFactor: 0.2 - _DirectionalDistortionRandomDirection: 0.1 diff --git a/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn b/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn index 456052fdf..66c6515b7 100644 --- a/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn @@ -12,6 +12,8 @@ position: 55,-1208 title: TV position: 66,-976 --- +<> +<> <> <> <> @@ -31,12 +33,14 @@ position: 66,-976 <> <> <> +<> 播报员: 欢迎收看今天的幸福快讯! 播报员: 今天天气晴,午后可能会有小雨。 播报员: 随着人类机器化技术的发展,幸福罐头园区已经正式迈进了全机器人时代! 播报员: 昨天下午,在下一季度的生产启动会上,专家组对幸福罐头园区的机器人化进展做了全面汇报…… me: 这下就有更多机器人要修了……但好歹我也更不用担心失业了。 <> +<> 播报员: 第七届罐头销售大赛即将开始,幸福园区的机器人们已经投入到了紧张的筹备工作当中! 播报员: 在销售部工作的火山,正在为新一季度的销售工作而紧张地忙碌着…… me: 给机器人推销罐头…为什么呢? @@ -54,6 +58,8 @@ title: OutDoorTalk position: 69,-716 --- <> +<> +<> ///<<窗外出现两个人影>> //////都是问号,除了音频怎么区分两个陌生人?——我记得之前聊过更改冒泡框的方案 //////这里可以不可以强调你以前不是这样的,因为工作量上来之前佩佩是可以完成的,慢慢的越来越难,后来质量也出了问题 @@ -1076,6 +1082,7 @@ me: 再见,佩佩。 peipei: 再见…… <> me: 希望这代价是值得的…… +<> //////这段对话形式还需要探索下——我需要玩玩coffeetalk等 === title: PlugMemory diff --git a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn index 426f0bda1..dd02833ad 100644 --- a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn @@ -16,6 +16,7 @@ position: 58,-1212 title: TV position: 63,-958 --- +<> <> <> 送走佩佩之后,佩佩第二天没有出现。 @@ -119,12 +120,15 @@ position: 69,-275 ///表示进入头部维修界面 <> <> +<> <> <> ///让佩佩的眼睛处于可以想象颜色的状态 <> ///确认当前的试图状态为头部的概览视图 <> +<> +<> ///发放初始任务 <> <> @@ -149,6 +153,7 @@ position: 69,-275 <> <> <> +<> <> me: 温度过高?看起来又有新的问题了…… me: 进行插线检查吧。 @@ -158,6 +163,8 @@ title: Choice position: 77,22 --- <> +<> +<> <> [command name=activate_socket_choice /] -> UFView @@ -626,13 +633,16 @@ me: 那我们试试吧。 <> <> <> +<> <> +<> <> ///表示此时线是断的状态 <> <> <> <> +<> //<> //<> <> @@ -741,7 +751,9 @@ position: 85,821 --- <> <> +<> <> +<> <> ///表示此时线是断的状态 <> @@ -752,8 +764,10 @@ position: 85,821 <> <> <> +<> <> <> +<> 封条: 警告:UnstableFusion属于公司财产,严禁个人拆卸、调试! me: 好吧…我想现在你没有任何意义了。 ->揭除UF封条 @@ -762,6 +776,7 @@ position: 85,821 //[command name=activate_socket_choice /] //->UFViewCrowBar//要拆除哪个veiw就加后缀 <> + <> <> <> //////撬开来之后佩佩应该就开始痛,直到你说这不会停下,佩佩吼着让你把它拆掉 @@ -787,6 +802,7 @@ me: UF模块中这个绘图过程……无法被停止。 me: 它会一直学习,只要你还活着,它还在你的身体里,就不会停下 peipei: 呕…真的不行了,医生……停下。 <> +<> <> peipei: 让它从我的身体里出去吧。我不要带着它被回收…… me: 这意味着你会无法完成工作,最终导致你进PIP 。这真的没问题吗? @@ -805,7 +821,10 @@ me: 时间紧急,只能用撬棍把它撬下来了。 <> [command name=activate_socket_choice /] ->UFViewCrowBar + <> <> +<> +<> peipei: 啊! <> peipei: 呼…… @@ -893,6 +912,8 @@ peipei: 当然,来吧。 ->校准颜色 <> <> +<> +<> //<> peipei: 啊…啊啊啊!好多…… me: 佩佩? #auto_next @@ -900,6 +921,8 @@ peipei: 啊,啊!啊!! me: 坚持住,佩佩! peipei: 啊…美丽的…… <> +<> +<> peipei: 色彩…… <> <> @@ -955,6 +978,7 @@ peipei: 再次谢谢你…医生。我们…… peipei: 我们再见啦。 <> me: 再见……佩佩。 +<> //////整个过程让佩佩“痛”,这个感受还没加 //////或许不需要了?体验下现在版本。 === \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn b/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn index fbfa2167a..7439ad10b 100644 --- a/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn @@ -1,6 +1,7 @@ title: Start position: 0,0 --- +<> <> <> 佩佩离开后的很长一段时间,我都没有再看到她。 @@ -30,13 +31,16 @@ me: 坚持住,佩佩。 ///进入维修界面 <> <> +<> <> +<> <> ///设置成UF模块缺失的状态 <> <> <> <> +<> <> <> <> @@ -99,7 +103,8 @@ me: 佩佩,醒来吧。 ///佩佩的pulse恢复正常,UF模块亮起红灯 <> <> -<> +<> +<> peipei: 好美…… me: 佩佩? peipei: 医生…… @@ -109,6 +114,7 @@ peipei: 我在…… me: 佩佩,你#auto_next peipei: 好美……医生…… //////怎么实现打断 +<> me: 啊……她没有被完全唤醒。当然。 me: 她还没有被完全修好,UF模块有一个报错灯。我明白了。 me: 公司要保证UF恢复正常才会让她的意识被完全唤醒。 @@ -547,6 +553,7 @@ me: 一切应该都结束了……都结束了。 <> <> <> +<> peipei: ……(她一脸迷茫地坐起,看着我,眼神空洞) me: 你醒了。 <> @@ -567,7 +574,7 @@ me: 总算,结束了。 me: 她再也不记得任何颜色了,她再也不记得任何颜色了…… me: 我…我在做对的事情吗? <> -感谢您游玩《艾比斯之梦》的demo-佩佩切片,流程到此终止 +感谢您游玩 艾比斯之梦 的demo-佩佩切片,流程到此终止 本demo为早期验证版本,其中文本,交互,画面均为过程版 您的反馈和建议对我们至关重要 如果您不知道在何处反馈,欢迎微信联系:15209116298 QQ:781230111 @@ -663,6 +670,7 @@ me: 好的……红色,我来了。 //////需要夕阳真的是红色?和美术确认——我感觉是OK的?可能是看起来很特别的夕阳 ->渲染红色通道 <> +<> <> me: 呃啊,我的眼睛…… <> @@ -678,6 +686,7 @@ me: 像海一样的草原,多美啊。草原上的风是什么气味的呢? me: 等着一切都结束了…等我们休假了,我也要去那里看看。 ->渲染绿色通道 <> +<> <> me: 又是这种感觉。其实…还挺柔和的。 me: 呼…大概这下就不用开什么护眼模式了。 @@ -690,6 +699,7 @@ peipei: 医生……我会听话的,别让我…… me: 就快结束了,佩佩。 ->渲染蓝色通道 <> +<> <> me: 来吧,都来吧!我们就要成功了…… <> @@ -710,12 +720,14 @@ me: 我想我会怀念它的。但是…对不起,我想要治好我的病人 <> <>哈哈…… 屏幕: 重新启动中 +<> peipei: 我这是在哪?医生……医生? <> <> me: 别动,我要先把你的背板装好。 <> <> +<> <> <> <> @@ -767,7 +779,7 @@ me: 总算,结束了。 me: 我看不到颜色了,我看不到颜色了。 me: 我…我在做对的事情吗? <> -感谢您游玩《艾比斯之梦》的demo-佩佩切片,流程到此终止 +感谢您游玩 艾比斯之梦 的demo-佩佩切片,流程到此终止 本demo为早期验证版本,其中文本,交互,画面均为过程版 您的反馈和建议对我们至关重要 如果您不知道在何处反馈,欢迎微信联系:15209116298 QQ:781230111 diff --git a/Assets/Resources/Yarn/UFprocess/UFprocess1.yarn b/Assets/Resources/Yarn/UFprocess/UFprocess1.yarn index f1013eb7d..a7bc049d7 100644 --- a/Assets/Resources/Yarn/UFprocess/UFprocess1.yarn +++ b/Assets/Resources/Yarn/UFprocess/UFprocess1.yarn @@ -2,7 +2,7 @@ tags: --- <> -//<> +<> ->进入UF视图 <> <> diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 05e0aed54..008aa1ddd 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -223,6 +223,16 @@ namespace AibisDream DialogCanvasManager.Instance.SwitchDialogView(sceneName == "ClinicScene" ? DialogViewType.Bubble : DialogViewType.OldBox); + if(sceneName=="ClinicScene") + { + AudioManager.PlayAmb1Audio("amb_room"); + } + else + { + AudioManager.PlayAmb1Audio("amb_main"); + } + AudioManager.PlayAmb2Audio("amb_general"); + } [YarnCommand("unload_scene")] diff --git a/Assets/Scripts/FixSystem/Book/BookManager.cs b/Assets/Scripts/FixSystem/Book/BookManager.cs index 0b8676228..860395134 100644 --- a/Assets/Scripts/FixSystem/Book/BookManager.cs +++ b/Assets/Scripts/FixSystem/Book/BookManager.cs @@ -77,6 +77,7 @@ public class BookManager : MonoBehaviour { yield break; } + AudioManager.RandomPlayInteraction("book"); OnBookOpen?.Invoke(); // 如果书还没有激活,先激活它 if (!book.gameObject.activeInHierarchy) @@ -112,6 +113,7 @@ public class BookManager : MonoBehaviour // Close the book public void CloseBook(Action onCloseCallback = null) { + AudioManager.RandomPlayInteraction("book"); StartCoroutine(CloseBookCoroutine(onCloseCallback)); } diff --git a/Assets/Scripts/FixSystem/Line/LineManager.cs b/Assets/Scripts/FixSystem/Line/LineManager.cs index 6a43da479..cd4ddf1b8 100644 --- a/Assets/Scripts/FixSystem/Line/LineManager.cs +++ b/Assets/Scripts/FixSystem/Line/LineManager.cs @@ -77,6 +77,7 @@ public void CutLine(InteractiveLineSegment originalLineSegment, Vector3 splitPoi { return; } + AudioManager.RandomPlayInteraction("wire_cut"); // Create the first new line segment GameObject firstLineSegmentObject = Instantiate(physicLineSegmentPrefab, transform); diff --git a/Assets/Scripts/FixSystem/Screen/MessageBox.cs b/Assets/Scripts/FixSystem/Screen/MessageBox.cs index 5783ad465..8f452fd2c 100644 --- a/Assets/Scripts/FixSystem/Screen/MessageBox.cs +++ b/Assets/Scripts/FixSystem/Screen/MessageBox.cs @@ -81,7 +81,7 @@ public class MessageBox : MonoBehaviour private IEnumerator FlashWarning() { AudioManager.SetinteractionSourceVolume(0.35f); - AudioManager.RandomPlayInteraction("messagebox_warning"); + AudioManager.RandomPlayInteraction("beep_warning"); for (int i = 0; i < 2; i++) { state.enabled = false; diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs index 9707e665d..b7b9456f5 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs @@ -41,6 +41,11 @@ namespace AibisDream _voiceSource.clip = clip; _voiceSource.Play(); } + [YarnCommand("mute")] + public static void MuteInteract(bool isMute) + { + Instance._interactionSource.mute=isMute; + } [YarnCommand("random_play_interaction")] public static void RandomPlayInteraction(string interactionName) @@ -186,9 +191,9 @@ namespace AibisDream Instance.StartCoroutine(AsyncPlayMemoryAudio(memoryName)); } - public void PauseMemoryAudio() + public static void PauseMemoryAudio() { - _memorySource.Pause(); + Instance._memorySource.Pause(); } public void ContinueMemoryAudio() diff --git a/Assets/StreamingAssets/Config/character.csv b/Assets/StreamingAssets/Config/character.csv index a932745eb..d927c8177 100644 --- a/Assets/StreamingAssets/Config/character.csv +++ b/Assets/StreamingAssets/Config/character.csv @@ -1,7 +1,7 @@ 通过key索引配置,中文名,人物角色(Player/MainActor/Aside),名称显示时的颜色,头像Pic路径,语音资源路径 Key,Cn,Role,NameColor,HeadPicPath,VoicePath -peipei,佩佩,MainActor,#00FFFF,peipei_head,voice_peipei -me,我,Player,,me_head,voice_me +peipei,佩佩,Aside,#00FFFF,peipei_head,voice_peipei +me,我,Aside,,me_head,voice_me peipei_novoice,胆怯女声,Aside,#00FFFF,,voice_peipei yingli_novoice,严厉女声,Aside,#FFCC00,,voice_yingli tutorial,教学,Aside,,,