diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index e499990e9..0ee8aa664 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -405,7 +405,12 @@ MonoBehaviour: MasterBanks: - Master Banks: + - Ambience + - Environment - Interactions + - Music + - UI + - VO BanksToLoad: [] LiveUpdatePort: 9264 EnableMemoryTracking: 0 diff --git a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs index e85c9baad..94e2b20a6 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs @@ -10,20 +10,16 @@ using AibisDream.Utility; public class EyeTarget : MonoBehaviour { public Transform targetTransform; // EyeTarget的位置 - [SerializeField] - private float burnRadiusMin = 0f; // 对应_BurnRadius的最小值 + [SerializeField] private float burnRadiusMin = 0f; // 对应_BurnRadius的最小值 - [SerializeField] - private float burnRadiusMax = 1f; // 对应_BurnRadius的最大值 + [SerializeField] private float burnRadiusMax = 1f; // 对应_BurnRadius的最大值 private Material forwardMaterial; - [SerializeField] - private SpriteRenderer backSpriteRenderer; + [SerializeField] private SpriteRenderer backSpriteRenderer; - [SerializeField] - private SpriteRenderer wrongColorSpriteRenderer; - [SerializeField]private SpriteRenderer imageSpriteRender; + [SerializeField] private SpriteRenderer wrongColorSpriteRenderer; + [SerializeField] private SpriteRenderer imageSpriteRender; private Material backMaterial; private Material wrongColorMaterial; @@ -36,37 +32,38 @@ public class EyeTarget : MonoBehaviour forwardMaterial = spriteRenderer.material; forwardMaterial.SetFloat("_SourceGlowDissolveFade", burnRadiusMin); - backMaterial=backSpriteRenderer.material; - wrongColorMaterial=wrongColorSpriteRenderer.material;; - - - + backMaterial = backSpriteRenderer.material; + wrongColorMaterial = wrongColorSpriteRenderer.material; + ; } + public void Init() { SetToMinBurnRadius(); SetToMaxBlur(false); SetToNoWrongColor(); SetNoImage(); - } + private void Start() { - } + public void ImageIn(float duration) { - imageSpriteRender.DOFade(1,duration); + imageSpriteRender.DOFade(1, duration); } + public void ImageOut(float duration) { - imageSpriteRender.DOFade(0,duration); + imageSpriteRender.DOFade(0, duration); } - public void SetNoImage() + + public void SetNoImage() { - imageSpriteRender.SetAlpha(0); + imageSpriteRender.SetAlpha(0); } - + public void SetToMinBurnRadius() { forwardMaterial.SetFloat("_SourceGlowDissolveFade", burnRadiusMin); @@ -76,79 +73,83 @@ public class EyeTarget : MonoBehaviour { forwardMaterial.SetFloat("_SourceGlowDissolveFade", burnRadiusMax); } - public void SetToMaxBlur( bool isForwardMaterial = true) + + public void SetToMaxBlur(bool isForwardMaterial = true) { Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; targetMaterial.SetFloat("_GaussianBlurFade", 1f); } - public void SetToMinBlur( bool isForwardMaterial = true) + + public void SetToMinBlur(bool isForwardMaterial = true) { Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; targetMaterial.SetFloat("_GaussianBlurFade", 0f); } + public void SetToNoWrongColor() { - wrongColorMaterial.SetFloat( "_Alpha", 0f); + wrongColorMaterial.SetFloat("_Alpha", 0f); } - public void SetToWrongColor() + + public void SetToWrongColor() { - wrongColorMaterial.SetFloat( "_Alpha", 1f); + wrongColorMaterial.SetFloat("_Alpha", 1f); } + public void FadeOut(float duration) { // 使用DoTween库来改变_BurnRadius，使目标褪色 forwardMaterial.DOFloat(burnRadiusMin, "_SourceGlowDissolveFade", duration); forwardMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InSine); - forwardMaterial.DOFloat(1f, "_UVDistortFade", duration/2).SetEase(Ease.InSine).SetLoops(2, LoopType.Yoyo);; - - - + forwardMaterial.DOFloat(1f, "_UVDistortFade", duration / 2).SetEase(Ease.InSine).SetLoops(2, LoopType.Yoyo); + ; } public void ColorIn(float duration) { forwardMaterial.DOFloat(burnRadiusMax, "_SourceGlowDissolveFade", duration).SetEase(Ease.InOutSine); forwardMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); - forwardMaterial.DOFloat(1f, "_UVDistortFade", duration/2).SetEase(Ease.InOutSine).SetLoops(2, LoopType.Yoyo);; + forwardMaterial.DOFloat(1f, "_UVDistortFade", duration / 2).SetEase(Ease.InOutSine).SetLoops(2, LoopType.Yoyo); + ; } public void WrongColorIn(float duration) { wrongColorMaterial.DOFloat(1f, "_Alpha", duration).SetEase(Ease.InOutSine); } - public void WrongColorOut(float duration) + + public void WrongColorOut(float duration) { wrongColorMaterial.DOFloat(0f, "_Alpha", duration).SetEase(Ease.InOutSine); } - - public void BlurIn(float duration,bool isForwardMaterial = true) + + public void BlurIn(float duration, bool isForwardMaterial = true) { - AudioManager.PlayLoopAudio("visualturn"); + // AudioManager.PlayLoopAudio("visualturn"); Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; - targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine).OnComplete(() => { - AudioManager.PauseLoopAudio(); - }); + targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); + // .OnComplete(() => { AudioManager.PauseLoopAudio(); }); } - public void BlurOut(float duration,bool isForwardMaterial = true) + public void BlurOut(float duration, bool isForwardMaterial = true) { - AudioManager.PlayLoopAudio("visualturn"); + // AudioManager.PlayLoopAudio("visualturn"); Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; - targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine).OnComplete(() => { - AudioManager.PauseLoopAudio(); - }); + targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); + // .OnComplete(() => { AudioManager.PauseLoopAudio(); }); } + public void ColorBack() { SetToMaxBurnRadius(); SetToNoWrongColor(); SetToMinBlur(); } - public void ColorLost() + + public void ColorLost() { SetToMinBurnRadius(); //SetToNoWrongColor(); SetToMaxBlur(); } - -} +} \ No newline at end of file diff --git a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs index d80396b5f..f3f8ee5d0 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs @@ -231,7 +231,7 @@ public class EyeTransitionManager : MonoBehaviour // 开始视图过渡 private void StartTransition(ViewState targetViewState) { - AudioManager.PauseMemoryAudio(); + // AudioManager.PauseMemoryAudio(); // 如果正在进行视图过渡，或者目标视图是当前视图，或者 MemoryProcess 正在处理，就不进行视图过渡 //if (isTransitioning || currentViewState == targetViewState || (memoryProcess != null && memoryProcess.IsProcessing())) if (isTransitioning || currentViewState == targetViewState) @@ -271,8 +271,6 @@ public class EyeTransitionManager : MonoBehaviour { currentViewState = ViewState.MainView; isTransitioning = false; - AudioManager.PlayAmb1Audio("amb_main"); - AudioManager.PlayAmb2Audio("amb_general"); OnGetMainView.Invoke(); //MouseCursorManager.Instance.isInDeepView=false; DialogController.Instance.StartDialogNode("主维修界面游戏状态检查"); @@ -283,7 +281,7 @@ public class EyeTransitionManager : MonoBehaviour { if (!viewConfigDictionary.TryGetValue(targetViewState, out ViewConfig targetConfig)) return; - AudioManager.RandomPlayInteraction(targetConfig.soundName); + // AudioManager.RandomPlayInteraction(targetConfig.soundName); // Zoom In 的时候，开始 Zoom Sequence zoomInSequence = DOTween.Sequence(); Sequence roateSequence = DOTween.Sequence(); @@ -325,10 +323,6 @@ public class EyeTransitionManager : MonoBehaviour currentViewState = targetViewState; isTransitioning = false; OnGetDeepView.Invoke(); - if (targetConfig.audioName != null) - { - AudioManager.PlayAmb1Audio(targetConfig.audioName); - } if (targetConfig.viewLifecycle != null) { diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 780f4c2ed..6c82ddc50 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -226,7 +226,7 @@ public class MemoryProcess : MonoBehaviour [YarnCommand("MemoryFinished")] public IEnumerator MemoryFinished() { - AudioManager.PauseMemoryAudio(); + // AudioManager.PauseMemoryAudio(); // Fade out alpha from 1 to 0 yield return playBackground.DOFade(0f, 1f).WaitForCompletion(); // Fade to fully transparent over 1 second @@ -244,8 +244,7 @@ public class MemoryProcess : MonoBehaviour [YarnCommand("ColorFadeOut")] public IEnumerator ColorFadeOut() { fadeMaterial.SetFloat("_DirectionalDistortionFade",-15f); - AudioManager.RandomPlayInteraction("colorerase"); - AudioManager.PauseMemoryAudio(); + // AudioManager.PauseMemoryAudio(); Tween tween = fadeMaterial.DOFloat(0, "_DirectionalDistortionFade", 3); yield return tween.WaitForCompletion(); } @@ -266,7 +265,7 @@ public class MemoryProcess : MonoBehaviour Debug.LogError("Memory not found: " + memName); } - AudioManager.PlayMemoryAudio("mem_" + memName); + // AudioManager.PlayMemoryAudio("mem_" + memName); playBackground.gameObject.SetActive(true); //FavoritesManager.Instance.CloseFavorites(); playBackground.alpha=0; @@ -278,7 +277,7 @@ public class MemoryProcess : MonoBehaviour { FavoritesManager.Instance.CloseFavorites(); // Activate playBackground and fade in alpha from 0 to 1 - AudioManager.PlayMemoryAudio("mem_" + clueSlot.punchTape.MemoryIndex); + // AudioManager.PlayMemoryAudio("mem_" + clueSlot.punchTape.MemoryIndex); playBackground.gameObject.SetActive(true); //FavoritesManager.Instance.CloseFavorites(); playBackground.alpha=0; @@ -305,7 +304,7 @@ public class MemoryProcess : MonoBehaviour PunchTape = punchTape; - AudioManager.PauseMemoryAudio(); + // AudioManager.PauseMemoryAudio(); if (isProcessing) { Debug.LogWarning("Already processing a memory. Please wait until the process is finished."); diff --git a/Assets/Prototype/佩佩/Scripts/UFmanager.cs b/Assets/Prototype/佩佩/Scripts/UFmanager.cs index 9753899e2..cd85a80d7 100644 --- a/Assets/Prototype/佩佩/Scripts/UFmanager.cs +++ b/Assets/Prototype/佩佩/Scripts/UFmanager.cs @@ -56,7 +56,7 @@ public class UFmanager : MonoBehaviour { isShowingPhoto = true; // 设置标志，表示照片显示正在进行 - AudioManager.RandomPlayInteraction("uf"); + // AudioManager.RandomPlayInteraction("uf"); // 激活底板 baseImage.gameObject.SetActive(true); diff --git a/Assets/RawResources/ObsoleteYarn.meta b/Assets/RawResources/ObsoleteYarn.meta new file mode 100644 index 000000000..024820960 --- /dev/null +++ b/Assets/RawResources/ObsoleteYarn.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f6e3f324944742f19f02c4352c8ac50b +timeCreated: 1741338372 \ No newline at end of file diff --git a/Assets/Resources/Yarn/BodyModuleTest.meta b/Assets/RawResources/ObsoleteYarn/BodyModuleTest.meta similarity index 100% rename from Assets/Resources/Yarn/BodyModuleTest.meta rename to Assets/RawResources/ObsoleteYarn/BodyModuleTest.meta diff --git a/Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarn b/Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarn similarity index 100% rename from Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarn rename to Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarn diff --git a/Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarn.meta b/Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarn.meta rename to Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarn.meta diff --git a/Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarnproject b/Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarnproject similarity index 100% rename from Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarnproject rename to Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarnproject diff --git a/Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/BodyModuleTest/BodyModuleTest.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/BodyModuleTest/BodyModuleTest.yarnproject.meta diff --git a/Assets/Resources/Yarn/CharacterInOut.meta b/Assets/RawResources/ObsoleteYarn/CharacterInOut.meta similarity index 100% rename from Assets/Resources/Yarn/CharacterInOut.meta rename to Assets/RawResources/ObsoleteYarn/CharacterInOut.meta diff --git a/Assets/Resources/Yarn/CharacterInOut/CharacterInOut.yarnproject b/Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut.yarnproject similarity index 100% rename from Assets/Resources/Yarn/CharacterInOut/CharacterInOut.yarnproject rename to Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut.yarnproject diff --git a/Assets/Resources/Yarn/CharacterInOut/CharacterInOut.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/CharacterInOut/CharacterInOut.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut.yarnproject.meta diff --git a/Assets/Resources/Yarn/CharacterInOut/CharacterInOut1.yarn b/Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut1.yarn similarity index 100% rename from Assets/Resources/Yarn/CharacterInOut/CharacterInOut1.yarn rename to Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut1.yarn diff --git a/Assets/Resources/Yarn/CharacterInOut/CharacterInOut1.yarn.meta b/Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/CharacterInOut/CharacterInOut1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/CharacterInOut/CharacterInOut1.yarn.meta diff --git a/Assets/Resources/Yarn/CharacterTest.meta b/Assets/RawResources/ObsoleteYarn/CharacterTest.meta similarity index 100% rename from Assets/Resources/Yarn/CharacterTest.meta rename to Assets/RawResources/ObsoleteYarn/CharacterTest.meta diff --git a/Assets/Resources/Yarn/CharacterTest/CharacterTest.yarn b/Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarn similarity index 100% rename from Assets/Resources/Yarn/CharacterTest/CharacterTest.yarn rename to Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarn diff --git a/Assets/Resources/Yarn/CharacterTest/CharacterTest.yarn.meta b/Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/CharacterTest/CharacterTest.yarn.meta rename to Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarn.meta diff --git a/Assets/Resources/Yarn/CharacterTest/CharacterTest.yarnproject b/Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarnproject similarity index 100% rename from Assets/Resources/Yarn/CharacterTest/CharacterTest.yarnproject rename to Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarnproject diff --git a/Assets/Resources/Yarn/CharacterTest/CharacterTest.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/CharacterTest/CharacterTest.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/CharacterTest/CharacterTest.yarnproject.meta diff --git a/Assets/Resources/Yarn/ClueBoard.meta b/Assets/RawResources/ObsoleteYarn/ClueBoard.meta similarity index 100% rename from Assets/Resources/Yarn/ClueBoard.meta rename to Assets/RawResources/ObsoleteYarn/ClueBoard.meta diff --git a/Assets/Resources/Yarn/ClueBoard/ClueBoard.yarn b/Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarn similarity index 100% rename from Assets/Resources/Yarn/ClueBoard/ClueBoard.yarn rename to Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarn diff --git a/Assets/Resources/Yarn/ClueBoard/ClueBoard.yarn.meta b/Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ClueBoard/ClueBoard.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarn.meta diff --git a/Assets/Resources/Yarn/ClueBoard/ClueBoard.yarnproject b/Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ClueBoard/ClueBoard.yarnproject rename to Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarnproject diff --git a/Assets/Resources/Yarn/ClueBoard/ClueBoard.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ClueBoard/ClueBoard.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ClueBoard/ClueBoard.yarnproject.meta diff --git a/Assets/Resources/Yarn/CrowBar.meta b/Assets/RawResources/ObsoleteYarn/CrowBar.meta similarity index 100% rename from Assets/Resources/Yarn/CrowBar.meta rename to Assets/RawResources/ObsoleteYarn/CrowBar.meta diff --git a/Assets/Resources/Yarn/CrowBar/CrowBar.yarnproject b/Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar.yarnproject similarity index 100% rename from Assets/Resources/Yarn/CrowBar/CrowBar.yarnproject rename to Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar.yarnproject diff --git a/Assets/Resources/Yarn/CrowBar/CrowBar.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/CrowBar/CrowBar.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar.yarnproject.meta diff --git a/Assets/Resources/Yarn/CrowBar/CrowBar1.yarn b/Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar1.yarn similarity index 100% rename from Assets/Resources/Yarn/CrowBar/CrowBar1.yarn rename to Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar1.yarn diff --git a/Assets/Resources/Yarn/CrowBar/CrowBar1.yarn.meta b/Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/CrowBar/CrowBar1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/CrowBar/CrowBar1.yarn.meta diff --git a/Assets/Resources/Yarn/CutLine.meta b/Assets/RawResources/ObsoleteYarn/CutLine.meta similarity index 100% rename from Assets/Resources/Yarn/CutLine.meta rename to Assets/RawResources/ObsoleteYarn/CutLine.meta diff --git a/Assets/Resources/Yarn/CutLine/CutLine.yarnproject b/Assets/RawResources/ObsoleteYarn/CutLine/CutLine.yarnproject similarity index 100% rename from Assets/Resources/Yarn/CutLine/CutLine.yarnproject rename to Assets/RawResources/ObsoleteYarn/CutLine/CutLine.yarnproject diff --git a/Assets/Resources/Yarn/CutLine/CutLine.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/CutLine/CutLine.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/CutLine/CutLine.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/CutLine/CutLine.yarnproject.meta diff --git a/Assets/Resources/Yarn/CutLine/CutLine1.yarn b/Assets/RawResources/ObsoleteYarn/CutLine/CutLine1.yarn similarity index 100% rename from Assets/Resources/Yarn/CutLine/CutLine1.yarn rename to Assets/RawResources/ObsoleteYarn/CutLine/CutLine1.yarn diff --git a/Assets/Resources/Yarn/CutLine/CutLine1.yarn.meta b/Assets/RawResources/ObsoleteYarn/CutLine/CutLine1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/CutLine/CutLine1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/CutLine/CutLine1.yarn.meta diff --git a/Assets/Resources/Yarn/EmptyTestYarn.meta b/Assets/RawResources/ObsoleteYarn/EmptyTestYarn.meta similarity index 100% rename from Assets/Resources/Yarn/EmptyTestYarn.meta rename to Assets/RawResources/ObsoleteYarn/EmptyTestYarn.meta diff --git a/Assets/Resources/Yarn/EmptyTestYarn/Empty.yarn b/Assets/RawResources/ObsoleteYarn/EmptyTestYarn/Empty.yarn similarity index 100% rename from Assets/Resources/Yarn/EmptyTestYarn/Empty.yarn rename to Assets/RawResources/ObsoleteYarn/EmptyTestYarn/Empty.yarn diff --git a/Assets/Resources/Yarn/EmptyTestYarn/Empty.yarn.meta b/Assets/RawResources/ObsoleteYarn/EmptyTestYarn/Empty.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/EmptyTestYarn/Empty.yarn.meta rename to Assets/RawResources/ObsoleteYarn/EmptyTestYarn/Empty.yarn.meta diff --git a/Assets/Resources/Yarn/EmptyTestYarn/EmptyYarn.yarnproject b/Assets/RawResources/ObsoleteYarn/EmptyTestYarn/EmptyYarn.yarnproject similarity index 100% rename from Assets/Resources/Yarn/EmptyTestYarn/EmptyYarn.yarnproject rename to Assets/RawResources/ObsoleteYarn/EmptyTestYarn/EmptyYarn.yarnproject diff --git a/Assets/Resources/Yarn/EmptyTestYarn/EmptyYarn.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/EmptyTestYarn/EmptyYarn.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/EmptyTestYarn/EmptyYarn.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/EmptyTestYarn/EmptyYarn.yarnproject.meta diff --git a/Assets/Resources/Yarn/EyeGetColor.meta b/Assets/RawResources/ObsoleteYarn/EyeGetColor.meta similarity index 100% rename from Assets/Resources/Yarn/EyeGetColor.meta rename to Assets/RawResources/ObsoleteYarn/EyeGetColor.meta diff --git a/Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject b/Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor.yarnproject similarity index 100% rename from Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject rename to Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor.yarnproject diff --git a/Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor.yarnproject.meta diff --git a/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn b/Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor1.yarn similarity index 100% rename from Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn rename to Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor1.yarn diff --git a/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn.meta b/Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/EyeGetColor/EyeGetColor1.yarn.meta diff --git a/Assets/Resources/Yarn/EyeTarget.meta b/Assets/RawResources/ObsoleteYarn/EyeTarget.meta similarity index 100% rename from Assets/Resources/Yarn/EyeTarget.meta rename to Assets/RawResources/ObsoleteYarn/EyeTarget.meta diff --git a/Assets/Resources/Yarn/EyeTarget/EyeTarget.yarnproject b/Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget.yarnproject similarity index 100% rename from Assets/Resources/Yarn/EyeTarget/EyeTarget.yarnproject rename to Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget.yarnproject diff --git a/Assets/Resources/Yarn/EyeTarget/EyeTarget.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/EyeTarget/EyeTarget.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget.yarnproject.meta diff --git a/Assets/Resources/Yarn/EyeTarget/EyeTarget1.yarn b/Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget1.yarn similarity index 100% rename from Assets/Resources/Yarn/EyeTarget/EyeTarget1.yarn rename to Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget1.yarn diff --git a/Assets/Resources/Yarn/EyeTarget/EyeTarget1.yarn.meta b/Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/EyeTarget/EyeTarget1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/EyeTarget/EyeTarget1.yarn.meta diff --git a/Assets/Resources/Yarn/EyeTest.meta b/Assets/RawResources/ObsoleteYarn/EyeTest.meta similarity index 100% rename from Assets/Resources/Yarn/EyeTest.meta rename to Assets/RawResources/ObsoleteYarn/EyeTest.meta diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarn b/Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarn similarity index 100% rename from Assets/Resources/Yarn/EyeTest/EyeTest.yarn rename to Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarn diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarn.meta b/Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/EyeTest/EyeTest.yarn.meta rename to Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarn.meta diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject b/Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarnproject similarity index 100% rename from Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject rename to Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarnproject diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/EyeTest/EyeTest.yarnproject.meta diff --git a/Assets/Resources/Yarn/Interactive.meta b/Assets/RawResources/ObsoleteYarn/Interactive.meta similarity index 100% rename from Assets/Resources/Yarn/Interactive.meta rename to Assets/RawResources/ObsoleteYarn/Interactive.meta diff --git a/Assets/Resources/Yarn/Interactive/Interactive.yarnproject b/Assets/RawResources/ObsoleteYarn/Interactive/Interactive.yarnproject similarity index 100% rename from Assets/Resources/Yarn/Interactive/Interactive.yarnproject rename to Assets/RawResources/ObsoleteYarn/Interactive/Interactive.yarnproject diff --git a/Assets/Resources/Yarn/Interactive/Interactive.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/Interactive/Interactive.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/Interactive/Interactive.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/Interactive/Interactive.yarnproject.meta diff --git a/Assets/Resources/Yarn/Interactive/Peipei.yarn b/Assets/RawResources/ObsoleteYarn/Interactive/Peipei.yarn similarity index 100% rename from Assets/Resources/Yarn/Interactive/Peipei.yarn rename to Assets/RawResources/ObsoleteYarn/Interactive/Peipei.yarn diff --git a/Assets/Resources/Yarn/Interactive/Peipei.yarn.meta b/Assets/RawResources/ObsoleteYarn/Interactive/Peipei.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Interactive/Peipei.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Interactive/Peipei.yarn.meta diff --git a/Assets/Resources/Yarn/Interactive/Stone.yarn b/Assets/RawResources/ObsoleteYarn/Interactive/Stone.yarn similarity index 100% rename from Assets/Resources/Yarn/Interactive/Stone.yarn rename to Assets/RawResources/ObsoleteYarn/Interactive/Stone.yarn diff --git a/Assets/Resources/Yarn/Interactive/Stone.yarn.meta b/Assets/RawResources/ObsoleteYarn/Interactive/Stone.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Interactive/Stone.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Interactive/Stone.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/ClueBoard.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/ClueBoard.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/ClueBoard.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/ClueBoard.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/ClueBoard.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/ClueBoard.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/ClueBoard.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/ClueBoard.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/LTS_Peipeiday1.yarnproject.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/Test.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/Test.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/Test.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/Test.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/Test.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/Test.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/Test.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/Test.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/tutorial.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/tutorial.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/tutorial.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/tutorial.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/tutorial.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/tutorial.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday1/tutorial.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday1/tutorial.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/ClueBoard.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/ClueBoard.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2/ClueBoard.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/ClueBoard.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/ClueBoard.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/ClueBoard.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2/ClueBoard.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/ClueBoard.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject diff --git a/Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday2/LTS_Peipeiday2.yarnproject.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday3.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday3.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn diff --git a/Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarn.meta diff --git a/Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject diff --git a/Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/LTS_Peipeiday3/LTS_Peipeiday3.yarnproject.meta diff --git a/Assets/Resources/Yarn/MemoryColorFadeOut.meta b/Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut.meta similarity index 100% rename from Assets/Resources/Yarn/MemoryColorFadeOut.meta rename to Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut.meta diff --git a/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject b/Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject similarity index 100% rename from Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject rename to Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject diff --git a/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut.yarnproject.meta diff --git a/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn b/Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn similarity index 100% rename from Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn rename to Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn diff --git a/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn.meta b/Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn.meta diff --git a/Assets/Resources/Yarn/MemoryTest.meta b/Assets/RawResources/ObsoleteYarn/MemoryTest.meta similarity index 100% rename from Assets/Resources/Yarn/MemoryTest.meta rename to Assets/RawResources/ObsoleteYarn/MemoryTest.meta diff --git a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn b/Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarn similarity index 100% rename from Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn rename to Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarn diff --git a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn.meta b/Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn.meta rename to Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarn.meta diff --git a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarnproject b/Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarnproject similarity index 100% rename from Assets/Resources/Yarn/MemoryTest/MemoryTest.yarnproject rename to Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarnproject diff --git a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/MemoryTest/MemoryTest.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/MemoryTest/MemoryTest.yarnproject.meta diff --git a/Assets/Resources/Yarn/MessageBox.meta b/Assets/RawResources/ObsoleteYarn/MessageBox.meta similarity index 100% rename from Assets/Resources/Yarn/MessageBox.meta rename to Assets/RawResources/ObsoleteYarn/MessageBox.meta diff --git a/Assets/Resources/Yarn/MessageBox/MessageBox.yarnproject b/Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox.yarnproject similarity index 100% rename from Assets/Resources/Yarn/MessageBox/MessageBox.yarnproject rename to Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox.yarnproject diff --git a/Assets/Resources/Yarn/MessageBox/MessageBox.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/MessageBox/MessageBox.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox.yarnproject.meta diff --git a/Assets/Resources/Yarn/MessageBox/MessageBox1.yarn b/Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox1.yarn similarity index 100% rename from Assets/Resources/Yarn/MessageBox/MessageBox1.yarn rename to Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox1.yarn diff --git a/Assets/Resources/Yarn/MessageBox/MessageBox1.yarn.meta b/Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/MessageBox/MessageBox1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/MessageBox/MessageBox1.yarn.meta diff --git a/Assets/Resources/Yarn/MessageBox/主界面尝试尝试最新导出.psb b/Assets/RawResources/ObsoleteYarn/MessageBox/主界面尝试尝试最新导出.psb similarity index 100% rename from Assets/Resources/Yarn/MessageBox/主界面尝试尝试最新导出.psb rename to Assets/RawResources/ObsoleteYarn/MessageBox/主界面尝试尝试最新导出.psb diff --git a/Assets/Resources/Yarn/MessageBox/主界面尝试尝试最新导出.psb.meta b/Assets/RawResources/ObsoleteYarn/MessageBox/主界面尝试尝试最新导出.psb.meta similarity index 100% rename from Assets/Resources/Yarn/MessageBox/主界面尝试尝试最新导出.psb.meta rename to Assets/RawResources/ObsoleteYarn/MessageBox/主界面尝试尝试最新导出.psb.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/EventNode.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/EventNode.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/EventNode.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/EventNode.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/PeipeiTalk1.yarnproject similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/PeipeiTalk1.yarnproject diff --git a/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/PeipeiTalk1.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/PeipeiTalk1.yarnproject.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/Start.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/Start.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/Start.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/Start.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/Start.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/Start.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/UF检查.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/UF检查.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/UF检查.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/UF检查.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/UF检查.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/UF检查.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/UF检查.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/UF检查.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/佩佩开场对话.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/佩佩开场对话.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/佩佩开场对话.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/佩佩开场对话.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/分析.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/分析.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/分析.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/分析.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/分析.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/分析.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/复查.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/复查.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/复查.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/复查.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/复查.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/复查.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/手术.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/手术.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/手术.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/手术.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/手术.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/手术.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/术前谈话.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/术前谈话.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/术前谈话.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/术前谈话.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/结束对话.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/结束对话.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/结束对话.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/结束对话.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/视觉检查.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/视觉检查.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/视觉检查.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/视觉检查.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/视觉检查.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/视觉检查.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/视觉检查.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/视觉检查.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk1/记忆检查.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/记忆检查.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/记忆检查.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/记忆检查.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk1/记忆检查.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk1/记忆检查.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk1/记忆检查.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk1/记忆检查.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/EventNode.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/EventNode.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/EventNode.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/EventNode.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/PeipeiTalk2.yarnproject similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/PeipeiTalk2.yarnproject diff --git a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/Start.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/Start.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/Start.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/Start.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/Start.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/Start.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆壳.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆壳.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆壳.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆壳.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆除.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆除.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆除.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF拆除.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF检查.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF检查.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF检查.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/UF检查.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/佩佩开场对话.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/佩佩开场对话.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/佩佩开场对话.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/佩佩开场对话.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/停止想象.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/停止想象.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/停止想象.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/停止想象.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/分析.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/分析.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/分析.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/分析.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/分析.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/分析.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/手术.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/手术.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/手术.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/手术.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/手术.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/手术.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话2.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话2.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话2.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/术前谈话2.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/第一次发热.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/第一次发热.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/第一次发热.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/第一次发热.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/结束对话.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/结束对话.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/结束对话.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/结束对话.yarn.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/身体检查.yarn similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/身体检查.yarn diff --git a/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn.meta b/Assets/RawResources/ObsoleteYarn/PeipeiTalk2/身体检查.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn.meta rename to Assets/RawResources/ObsoleteYarn/PeipeiTalk2/身体检查.yarn.meta diff --git a/Assets/Resources/Yarn/Plug.meta b/Assets/RawResources/ObsoleteYarn/Plug.meta similarity index 100% rename from Assets/Resources/Yarn/Plug.meta rename to Assets/RawResources/ObsoleteYarn/Plug.meta diff --git a/Assets/Resources/Yarn/Plug/Plug.yarnproject b/Assets/RawResources/ObsoleteYarn/Plug/Plug.yarnproject similarity index 100% rename from Assets/Resources/Yarn/Plug/Plug.yarnproject rename to Assets/RawResources/ObsoleteYarn/Plug/Plug.yarnproject diff --git a/Assets/Resources/Yarn/Plug/Plug.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/Plug/Plug.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/Plug/Plug.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/Plug/Plug.yarnproject.meta diff --git a/Assets/Resources/Yarn/Plug/Plug1.yarn b/Assets/RawResources/ObsoleteYarn/Plug/Plug1.yarn similarity index 100% rename from Assets/Resources/Yarn/Plug/Plug1.yarn rename to Assets/RawResources/ObsoleteYarn/Plug/Plug1.yarn diff --git a/Assets/Resources/Yarn/Plug/Plug1.yarn.meta b/Assets/RawResources/ObsoleteYarn/Plug/Plug1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Plug/Plug1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Plug/Plug1.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/ClueBoard.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/ClueBoard.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/ClueBoard.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/ClueBoard.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Eye.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Eye.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Eye.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Eye.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Memory.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Memory.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Memory.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Memory.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Plug.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Plug.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Plug.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Plug.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Test.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Test.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Test.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Test.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Test.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Test.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/Test.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/Test.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/tutorial.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/tutorial.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/tutorial.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday1/tutorial.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/ClueBoard.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/ClueBoard.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/ClueBoard.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/ClueBoard.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Eye.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Eye.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Eye.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Eye.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Eye.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Eye.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Eye.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Eye.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Memory.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Memory.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Memory.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Memory.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Plug.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Plug.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Plug.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Plug.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarnproject.meta diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/UF.yarn similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/UF.yarn diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn.meta b/Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/UF.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Re_LTS_Peipeiday2/UF.yarn.meta diff --git a/Assets/Resources/Yarn/ScreenEffect.meta b/Assets/RawResources/ObsoleteYarn/ScreenEffect.meta similarity index 100% rename from Assets/Resources/Yarn/ScreenEffect.meta rename to Assets/RawResources/ObsoleteYarn/ScreenEffect.meta diff --git a/Assets/Resources/Yarn/ScreenEffect/ScreenEffect.yarnproject b/Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ScreenEffect/ScreenEffect.yarnproject rename to Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect.yarnproject diff --git a/Assets/Resources/Yarn/ScreenEffect/ScreenEffect.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ScreenEffect/ScreenEffect.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect.yarnproject.meta diff --git a/Assets/Resources/Yarn/ScreenEffect/ScreenEffect1.yarn b/Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect1.yarn similarity index 100% rename from Assets/Resources/Yarn/ScreenEffect/ScreenEffect1.yarn rename to Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect1.yarn diff --git a/Assets/Resources/Yarn/ScreenEffect/ScreenEffect1.yarn.meta b/Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ScreenEffect/ScreenEffect1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ScreenEffect/ScreenEffect1.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional1.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1/PlugOptions.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1/PlugOptions.yarn diff --git a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1/PlugOptions.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1/PlugOptions.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1/ShitouFunctional1.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1/ShitouFunctional1.yarn diff --git a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1/ShitouFunctional1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1/ShitouFunctional1.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1/StoneFunctional1.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1/StoneFunctional1.yarnproject diff --git a/Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional1/StoneFunctional1.yarnproject.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional2.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional2/Event.yarn b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2/Event.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2/Event.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2/Event.yarn diff --git a/Assets/Resources/Yarn/ShitouFunctional2/Event.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2/Event.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2/Event.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2/Event.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarn b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarn diff --git a/Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarnproject b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarnproject rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarnproject diff --git a/Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouFunctional2/ShitouFunctional2.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ShitouFunctional2/ShitouFunctional2.yarnproject.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/EventNode.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/EventNode.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/EventNode.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/EventNode.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/EventNode.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/EventNode.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/EventNode.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/EventNode.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarnproject b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/ShitouTalk1.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarnproject rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/ShitouTalk1.yarnproject diff --git a/Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/ShitouTalk1.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/ShitouTalk1.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/ShitouTalk1.yarnproject.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage1.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage1.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage1.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage2.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage2.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage2.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage2.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage3.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage3.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage3.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage3.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage3.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage3.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage3.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage3.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage4.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage4.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage4.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage4.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage4.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage4.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage4.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage4.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage5.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage5.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage5.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Stage5.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Start.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Start.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Start.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Start.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Start.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Start.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk1/Shitou_Start.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk1/Shitou_Start.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk2.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk2.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk2.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk2.meta diff --git a/Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarnproject b/Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarnproject rename to Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarnproject diff --git a/Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk2/ShitouTalk2.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk2/ShitouTalk2.yarnproject.meta diff --git a/Assets/Resources/Yarn/ShitouTalk3.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk3.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk3.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk3.meta diff --git a/Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarn b/Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarn similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarn rename to Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarn diff --git a/Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarn.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarn.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarn.meta diff --git a/Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarnproject b/Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarnproject similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarnproject rename to Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarnproject diff --git a/Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/ShitouTalk3/ShitouTalk3.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/ShitouTalk3/ShitouTalk3.yarnproject.meta diff --git a/Assets/Resources/Yarn/SubWay.meta b/Assets/RawResources/ObsoleteYarn/SubWay.meta similarity index 100% rename from Assets/Resources/Yarn/SubWay.meta rename to Assets/RawResources/ObsoleteYarn/SubWay.meta diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarn b/Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarn similarity index 100% rename from Assets/Resources/Yarn/SubWay/SubWay.yarn rename to Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarn diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarn.meta b/Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/SubWay/SubWay.yarn.meta rename to Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarn.meta diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarnproject b/Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarnproject similarity index 100% rename from Assets/Resources/Yarn/SubWay/SubWay.yarnproject rename to Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarnproject diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/SubWay/SubWay.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/SubWay/SubWay.yarnproject.meta diff --git a/Assets/Resources/Yarn/SubWayTest.meta b/Assets/RawResources/ObsoleteYarn/SubWayTest.meta similarity index 100% rename from Assets/Resources/Yarn/SubWayTest.meta rename to Assets/RawResources/ObsoleteYarn/SubWayTest.meta diff --git a/Assets/Resources/Yarn/SubWayTest/SubWayTest.yarn b/Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarn similarity index 100% rename from Assets/Resources/Yarn/SubWayTest/SubWayTest.yarn rename to Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarn diff --git a/Assets/Resources/Yarn/SubWayTest/SubWayTest.yarn.meta b/Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/SubWayTest/SubWayTest.yarn.meta rename to Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarn.meta diff --git a/Assets/Resources/Yarn/SubWayTest/SubWayTest.yarnproject b/Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarnproject similarity index 100% rename from Assets/Resources/Yarn/SubWayTest/SubWayTest.yarnproject rename to Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarnproject diff --git a/Assets/Resources/Yarn/SubWayTest/SubWayTest.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/SubWayTest/SubWayTest.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/SubWayTest/SubWayTest.yarnproject.meta diff --git a/Assets/Resources/Yarn/Task.meta b/Assets/RawResources/ObsoleteYarn/Task.meta similarity index 100% rename from Assets/Resources/Yarn/Task.meta rename to Assets/RawResources/ObsoleteYarn/Task.meta diff --git a/Assets/Resources/Yarn/Task/Task.yarnproject b/Assets/RawResources/ObsoleteYarn/Task/Task.yarnproject similarity index 100% rename from Assets/Resources/Yarn/Task/Task.yarnproject rename to Assets/RawResources/ObsoleteYarn/Task/Task.yarnproject diff --git a/Assets/Resources/Yarn/Task/Task.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/Task/Task.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/Task/Task.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/Task/Task.yarnproject.meta diff --git a/Assets/Resources/Yarn/Task/Task1.yarn b/Assets/RawResources/ObsoleteYarn/Task/Task1.yarn similarity index 100% rename from Assets/Resources/Yarn/Task/Task1.yarn rename to Assets/RawResources/ObsoleteYarn/Task/Task1.yarn diff --git a/Assets/Resources/Yarn/Task/Task1.yarn.meta b/Assets/RawResources/ObsoleteYarn/Task/Task1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/Task/Task1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/Task/Task1.yarn.meta diff --git a/Assets/Resources/Yarn/UFprocess.meta b/Assets/RawResources/ObsoleteYarn/UFprocess.meta similarity index 100% rename from Assets/Resources/Yarn/UFprocess.meta rename to Assets/RawResources/ObsoleteYarn/UFprocess.meta diff --git a/Assets/Resources/Yarn/UFprocess/UFprocess.yarnproject b/Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess.yarnproject similarity index 100% rename from Assets/Resources/Yarn/UFprocess/UFprocess.yarnproject rename to Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess.yarnproject diff --git a/Assets/Resources/Yarn/UFprocess/UFprocess.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/UFprocess/UFprocess.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess.yarnproject.meta diff --git a/Assets/Resources/Yarn/UFprocess/UFprocess1.yarn b/Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess1.yarn similarity index 100% rename from Assets/Resources/Yarn/UFprocess/UFprocess1.yarn rename to Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess1.yarn diff --git a/Assets/Resources/Yarn/UFprocess/UFprocess1.yarn.meta b/Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/UFprocess/UFprocess1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/UFprocess/UFprocess1.yarn.meta diff --git a/Assets/Resources/Yarn/View.meta b/Assets/RawResources/ObsoleteYarn/View.meta similarity index 100% rename from Assets/Resources/Yarn/View.meta rename to Assets/RawResources/ObsoleteYarn/View.meta diff --git a/Assets/Resources/Yarn/View/View.yarnproject b/Assets/RawResources/ObsoleteYarn/View/View.yarnproject similarity index 100% rename from Assets/Resources/Yarn/View/View.yarnproject rename to Assets/RawResources/ObsoleteYarn/View/View.yarnproject diff --git a/Assets/Resources/Yarn/View/View.yarnproject.meta b/Assets/RawResources/ObsoleteYarn/View/View.yarnproject.meta similarity index 100% rename from Assets/Resources/Yarn/View/View.yarnproject.meta rename to Assets/RawResources/ObsoleteYarn/View/View.yarnproject.meta diff --git a/Assets/Resources/Yarn/View/View1.yarn b/Assets/RawResources/ObsoleteYarn/View/View1.yarn similarity index 100% rename from Assets/Resources/Yarn/View/View1.yarn rename to Assets/RawResources/ObsoleteYarn/View/View1.yarn diff --git a/Assets/Resources/Yarn/View/View1.yarn.meta b/Assets/RawResources/ObsoleteYarn/View/View1.yarn.meta similarity index 100% rename from Assets/Resources/Yarn/View/View1.yarn.meta rename to Assets/RawResources/ObsoleteYarn/View/View1.yarn.meta diff --git a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab b/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab deleted file mode 100644 index 8a26b54e1..000000000 --- a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab +++ /dev/null @@ -1,1208 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2036531279689704464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4517563608897647978} - - component: {fileID: 5469316799991301934} - m_Layer: 0 - m_Name: Interaction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4517563608897647978 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036531279689704464} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &5469316799991301934 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036531279689704464} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -1154322574682727772, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - 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 &2833339172947688528 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9053731432274197797} - - component: {fileID: 8020718999823674538} - m_Layer: 0 - m_Name: Loop2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9053731432274197797 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2833339172947688528} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &8020718999823674538 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2833339172947688528} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.659 - m_Pitch: 1 - Loop: 1 - 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 &4146611325090910048 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 978527555660104375} - - component: {fileID: 8803011080801853210} - m_Layer: 0 - m_Name: Loop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &978527555660104375 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4146611325090910048} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &8803011080801853210 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4146611325090910048} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.659 - m_Pitch: 1 - Loop: 1 - 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 &5867143274518630619 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8704957973411935911} - - component: {fileID: 6813652859075682734} - m_Layer: 0 - m_Name: Voice - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8704957973411935911 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5867143274518630619} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &6813652859075682734 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5867143274518630619} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -2297450186869358485, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - 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 &6415937906163888384 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8958232513318718903} - - component: {fileID: 415694509488218877} - m_Layer: 0 - m_Name: Memery - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8958232513318718903 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6415937906163888384} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &415694509488218877 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6415937906163888384} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -6773993072664640036, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - 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 &6437375885923566570 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6195776254981449253} - - component: {fileID: 683545966647234361} - m_Layer: 0 - m_Name: Amb1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6195776254981449253 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6437375885923566570} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &683545966647234361 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6437375885923566570} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 1773163451604355202, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 8300000, guid: fc69ad6fefb757c43b4d68c6a82363b3, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - 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 &7660119422375597550 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8180040489590280703} - - component: {fileID: 6175183018528746625} - m_Layer: 0 - m_Name: Audio Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8180040489590280703 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7660119422375597550} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 978527555660104375} - - {fileID: 9053731432274197797} - - {fileID: 4268419905980150376} - - {fileID: 2029144652665450398} - - {fileID: 4517563608897647978} - - {fileID: 8704957973411935911} - - {fileID: 8958232513318718903} - - {fileID: 6195776254981449253} - - {fileID: 2351197142428152690} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6175183018528746625 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7660119422375597550} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d02d13e0ef27eb544b62d5a8d296f2ee, type: 3} - m_Name: - m_EditorClassIdentifier: - fadeTime: 1 ---- !u!1 &7662043639505016441 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2351197142428152690} - - component: {fileID: 4980992513314886543} - m_Layer: 0 - m_Name: Amb2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2351197142428152690 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7662043639505016441} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &4980992513314886543 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7662043639505016441} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -4767431408014039957, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - 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 &7726957597452757375 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4268419905980150376} - - component: {fileID: 3385871051024393721} - m_Layer: 0 - m_Name: Loop3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4268419905980150376 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7726957597452757375} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &3385871051024393721 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7726957597452757375} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.659 - m_Pitch: 1 - Loop: 1 - 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 &8879056570523940757 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2029144652665450398} - - component: {fileID: 3634632532610254604} - m_Layer: 0 - m_Name: Loop4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2029144652665450398 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8879056570523940757} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8180040489590280703} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &3634632532610254604 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8879056570523940757} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.659 - m_Pitch: 1 - Loop: 1 - 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 diff --git a/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab index 41b89d9fc..9cd359bbe 100644 --- a/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab +++ b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab @@ -83,7 +83,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7611243318142021168 Transform: m_ObjectHideFlags: 0 @@ -99,7 +99,6 @@ Transform: m_Children: - {fileID: 3641060396765317556} - {fileID: 8556345213791081418} - - {fileID: 2440668723296362102} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8168536426589423301 @@ -112,9 +111,10 @@ GameObject: m_Component: - component: {fileID: 8556345213791081418} - component: {fileID: 7037918505330246345} - - component: {fileID: 1411876041170289596} - component: {fileID: 5795012028576405938} - component: {fileID: 3799972374739294581} + - component: {fileID: 5495044665667537088} + - component: {fileID: 7376866393515326557} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -131,7 +131,7 @@ Transform: m_GameObject: {fileID: 8168536426589423301} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: -0.009999275, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -170,7 +170,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60 + field of view: 34 orthographic: 1 orthographic size: 5 m_Depth: -1 @@ -188,14 +188,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!81 &1411876041170289596 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8168536426589423301} - m_Enabled: 1 --- !u!114 &5795012028576405938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,65 +248,51 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_MaxRayIntersections: 0 ---- !u!1001 &5790406710898921353 -PrefabInstance: +--- !u!114 &5495044665667537088 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7611243318142021168} - m_Modifications: - - target: {fileID: 7660119422375597550, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_Name - value: Audio Manager - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} ---- !u!4 &2440668723296362102 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - m_PrefabInstance: {fileID: 5790406710898921353} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7376866393515326557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index d71c20747..340216d8e 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -4,7 +4,6 @@ colorID: 8 position: 205,-53 --- <> -<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn index 7407ffa95..339870f01 100644 --- a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn +++ b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn @@ -3,8 +3,6 @@ tags: colorID: 8 position: 205,-53 --- - -<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn index 353523dd6..e76616b60 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn @@ -15,15 +15,14 @@ tags: colorID: 8 position: 0,200 --- - <> <> <> <> <> -<> -<> +// <> +<> 播报员: 销售大赛是园区一年一度的盛举，
旨在通过销售，促进幸福罐头公司员工进一步提高生产、销售效率，扩大产业规模。 播报员: 我宣布，
幸福罐头产业园区第1011届销售大赛正式开幕！ diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn index f0fd9e88e..ca52635c8 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn @@ -162,7 +162,7 @@ position: 104,-2498 <> Analysing: #auto_next <> - <> + <> Error: 检查完成！ <> Error: 检测到绘图过程中发生兼容性错误。 @@ -229,7 +229,7 @@ position: 572,-2497 <> Analysing: #auto_next <> - <> + <> Error: 检查到2个错误： <> Error: 未检测到色彩信号！ @@ -363,7 +363,7 @@ ChipModule: 已与附加模块建立连接！ <> <> <> - <> + <> Error: 未检测到色觉晶圆！ <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn index 5d5a76f88..1c20715bd 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn @@ -102,7 +102,7 @@ position: 435,-3043 <> Analysing: #auto_next <> - <> + <> Error: 检查到1个错误： <> Error: 未检测到色彩信号！ diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn index f2327d405..2ef473343 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn @@ -17,7 +17,7 @@ position: 246,-866 me: 先安装色彩晶圆吧。 ->安装色觉晶圆 <> - <> + <> <> <> <> @@ -121,7 +121,7 @@ EyeModule: 已与视觉模块建立连接！ <> Analysing: #auto_next <> - <> + <> Error: 检查完成！检测到一个错误： Error: 检测到未识别的色彩晶圆…请进行校准。 <> @@ -206,8 +206,8 @@ position: 481,-570 ->校准颜色 <> <> -<> -<> +// <> +// <> //<> peipei: 啊…啊啊啊！好多…… me: 佩佩？ #auto_next @@ -215,8 +215,8 @@ peipei: 啊，啊！啊！！ me: 坚持住，佩佩！ peipei: 啊…我看到了！！ <> -<> -<> +// <> +// <> <> peipei: 色彩……#auto_next <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage2_第一次发热.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage2_第一次发热.yarn index 674839748..a06e80bf9 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage2_第一次发热.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage2_第一次发热.yarn @@ -35,7 +35,7 @@ position: -32,-873 <> Linking: 正在建立连接… <> -<> +<> Error: 机体过热！无法建立连接。 Error: 当前温度：83.3℃，请恢复至工作温度…… <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn index b3d94b9e6..48c1b0872 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn @@ -246,7 +246,7 @@ ChipModule: 已与附加模块建立连接！ <> Analysing: 检测到未识别的色彩晶圆…请进行校准。 <> - <> + <> Error: 未检测到色觉晶圆！ <> <> @@ -325,7 +325,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ <> <> <> - <> + <> Error: 检查完成！ <> Error: 自动训练进程发生兼容性错误。 @@ -371,7 +371,7 @@ EyeModule: 已与视觉模块建立连接！ <> <> <> - <> + <> Error: 检查到1个错误： <> Error: 未检测到色彩信号！ @@ -441,7 +441,7 @@ position: 135,-2155 // Linking: 正在建立连接… // <> <> -<> +<> Error: 机体过热！无法建立连接。 Error: 当前温度：89.8℃，请恢复至工作温度…… me: 又过热了！这也太快了… diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn index b1f5c8a5d..41a0d357c 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage5_UF检查.yarn @@ -39,7 +39,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ ->检查 <> Analysing: #auto_next - <> + <> Error: 检查完成！ <> Error: 自动训练进程发生兼容性错误。 diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn index 68d8ed728..050cc7563 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage9_UF拆除.yarn @@ -8,7 +8,7 @@ position: 43,-97 <> <> <> - <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn index 73bc5aa8b..b8dde489b 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn @@ -197,7 +197,7 @@ ChipModule: 已与附加模块建立连接！ <> <> <> - <> + <> Error: 未检测到色觉晶圆！ <> me: 哈哈… @@ -272,7 +272,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ <> <> <> - <> + <> Error: 检查完成！检查到1个错误。 Error: 检查到可能引起兼容性错误的数据传入请求…请处理。 <> @@ -316,7 +316,7 @@ EyeModule: 已与视觉模块建立连接！ <> <> <> - <> + <> Error: 检查到1个错误： <> Error: 未检测到色彩信号！ diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn index 61d52e8ce..d0b044216 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn @@ -119,7 +119,7 @@ EyeModule: 已与视觉模块建立连接！ <> Analysing: #auto_next <> - <> + <> Error: 检查完成！检测到一个错误： me: 啊…别是…… Error: 检测到未识别的色彩晶圆…请进行校准。 diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn index ef4d2d43c..3b363af05 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage7_色觉校准.yarn @@ -25,7 +25,7 @@ EyeModule: 已与视觉模块建立连接！ <> Analysing: #auto_next <> - <> + <> Error: 检查完成！检测到一个错误： me: 啊…别是…… Error: 检测到未识别的色彩晶圆…请进行校准。 @@ -55,7 +55,7 @@ me: 对了！让我们来聊聊关于颜色的回忆…… ->谈论关于红色 me: 红色……你还记得你看到的夕阳吗？有人和你说他想一直坐在那儿…… peipei: 夕阳……我该让你多说些话的…… -<> +<> <> me: 呃啊，我的眼睛…… <> @@ -69,7 +69,7 @@ peipei: 我记得，医生……好凉爽的风…… me: 像海一样的草原，多美啊。草原上的风是什么气味的呢？ me: 等着一切都结束了…等我们休假了，我也要去那里看看。 <> -<> +<> <> me: 又是这种感觉。其实…还挺柔和的。 me: 呼…大概这下就不用开什么护眼模式了。 @@ -80,7 +80,7 @@ me: 佩佩，想想你小时候的那个病房。你一定看了很久的云吧 peipei: 医生……我会听话的，别让我…… me: 就快结束了，佩佩。 <> -<> +<> <> me: 来吧，都来吧！我们就要成功了…… <> @@ -97,6 +97,7 @@ me: 你要替我…好好地去看。 me: …… me: 很好，这才是我熟悉的健康状态，看来我没有什么怪病。哈哈…… me: 我想我会怀念它的。但是…对不起，我想要治好我的病人。 +<> <> <> <> @@ -112,6 +113,7 @@ peipei: 医生…… <> <> === + title: 有晶圆_检查色觉 tags: 待编辑 colorID: 8 @@ -131,7 +133,7 @@ ChipModule: 已与附加模块建立连接！ <> <> <> - <> + <> Analysing:成功连接到色彩晶圆 <> Analysing:色彩晶圆数据待校准 @@ -156,7 +158,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ <> <> <> - <> + <> Error: 检查完成！检查到1个错误。 Error: 检查到可能引起兼容性错误的数据传入请求…请处理。 <> diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage9_继续清除记忆色彩.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage9_继续清除记忆色彩.yarn index 939c7d34d..9ff90d9a6 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage9_继续清除记忆色彩.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage9_继续清除记忆色彩.yarn @@ -63,7 +63,7 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ <> <> <> - <> + <> Error: 检查完成！检查到1个错误。 Error: 检查到可能引起兼容性错误的数据传入请求…请处理。 <> diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn index 9502af4e1..1a2f0cd8e 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn @@ -480,7 +480,7 @@ me: 音乐？ <> <> -<> +<> <> me: 原来如此，这些奇怪的结构原来是… @@ -504,8 +504,8 @@ me: 等等！石头…… shitou: 呜呼！我现在…充满了……力量！ me: 停下，不然的话这些齿轮…#auto_next <> -<> -<> +<> +<> <> <> diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn index 7b432f31b..c08954026 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn @@ -234,7 +234,7 @@ shitou: 给我一些伴奏。 me: 什么？哪来的伴奏…… <> <> -<> +<> 你打起了拍子。 <> <> @@ -246,7 +246,7 @@ shitou: 还有医生—— me: 啊…路斯。 shitou: 为大家献上…不知名…音乐家的歌曲——
《自由的小锡鸟》！ -<> +<> 【~音乐~】#auto_next <> @@ -450,7 +450,7 @@ shitou: 要唱了，医生！ <> 歌曲结束了 -<> +<> <> me: 呼…我从来没有尝试过这个……但总之，能用了。 diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn index fb3ec5942..461ae43a2 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn @@ -227,7 +227,7 @@ MemModule: 未检测到可查看的记忆卡带。 <> <> <> - <> + <> Error: 检查完成！检测到1个错误。 Error: 错误：磁盘损坏！ Error: 磁盘空间不足！已进入覆盖写入模式… diff --git a/Assets/Scenes/Bridge.unity b/Assets/Scenes/Bridge.unity index 396bf9ad3..379b9b941 100644 --- a/Assets/Scenes/Bridge.unity +++ b/Assets/Scenes/Bridge.unity @@ -123,6 +123,132 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &11030335 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1695219948} + m_Modifications: + - target: {fileID: 4266339626480639172, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Name + value: Bubble Left + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: -412 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: -18 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} +--- !u!224 &11030336 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + m_PrefabInstance: {fileID: 11030335} + m_PrefabAsset: {fileID: 0} --- !u!1 &42967868 GameObject: m_ObjectHideFlags: 0 @@ -10310,8 +10436,8 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -10319,14 +10445,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10437,6 +10555,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -15977,6 +16109,132 @@ Transform: m_CorrespondingSourceObject: {fileID: 5296327770213497549, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} m_PrefabInstance: {fileID: 1260729928} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1268806972 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1695219948} + m_Modifications: + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878580226911155808, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Name + value: Bubble Right + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 177 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: -27 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} +--- !u!224 &1268806973 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + m_PrefabInstance: {fileID: 1268806972} + m_PrefabAsset: {fileID: 0} --- !u!21 &1419706337 Material: serializedVersion: 8 @@ -16792,6 +17050,132 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -178.544} +--- !u!1001 &1569380037 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1695219948} + m_Modifications: + - target: {fileID: 636000980267337347, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Name + value: Aside Text + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -412 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} +--- !u!224 &1569380038 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + m_PrefabInstance: {fileID: 1569380037} + m_PrefabAsset: {fileID: 0} --- !u!1 &1587067498 GameObject: m_ObjectHideFlags: 0 @@ -16993,6 +17377,124 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1695219943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695219948} + - component: {fileID: 1695219947} + - component: {fileID: 1695219946} + - component: {fileID: 1695219945} + - component: {fileID: 1695219944} + m_Layer: 5 + m_Name: Bubble Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1695219944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8341b0b94bf446d9b3b3c50a4428ee15, type: 3} + m_Name: + m_EditorClassIdentifier: + delayTime: 300 +--- !u!114 &1695219945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1695219946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1695219947 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1695219948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569380038} + - {fileID: 11030336} + - {fileID: 1268806973} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1707754918 GameObject: m_ObjectHideFlags: 0 @@ -17574,3 +18076,4 @@ SceneRoots: - {fileID: 105721799} - {fileID: 1921397711} - {fileID: 115529396} + - {fileID: 1695219948} diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index 1784d582b..81c304e4f 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -10679,8 +10679,8 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -10688,14 +10688,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10806,6 +10798,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 9fb1f3ce1..e8483eeb3 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -2439,68 +2439,6 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] ---- !u!1001 &1143159656 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1821936329} - m_Modifications: - - target: {fileID: 7660119422375597550, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_Name - value: Audio Manager - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} ---- !u!4 &1143159657 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - m_PrefabInstance: {fileID: 1143159656} - m_PrefabAsset: {fileID: 0} --- !u!1 &1193588877 GameObject: m_ObjectHideFlags: 0 @@ -3445,11 +3383,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!4 &1821936329 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - m_PrefabInstance: {fileID: 9210352354887959608} - m_PrefabAsset: {fileID: 0} --- !u!1 &1858501050 GameObject: m_ObjectHideFlags: 0 @@ -7121,14 +7054,6 @@ PrefabInstance: propertyPath: m_Name value: Editor Mode Func objectReference: {fileID: 0} - - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: field of view - value: 34 - objectReference: {fileID: 0} - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -7169,61 +7094,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: m_LocalPosition.x - value: -0.009999275 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 4185425418237483623, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - insertIndex: 0 - addedObject: {fileID: 1143159657} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - insertIndex: -1 - addedObject: {fileID: 9210352354887959610} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} ---- !u!1 &9210352354887959609 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - m_PrefabInstance: {fileID: 9210352354887959608} - m_PrefabAsset: {fileID: 0} ---- !u!114 &9210352354887959610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9210352354887959609} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] --- !u!212 &9219547770658025207 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/FmodTest.unity b/Assets/Scenes/FmodTest.unity deleted file mode 100644 index 38e920379..000000000 --- a/Assets/Scenes/FmodTest.unity +++ /dev/null @@ -1,325 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &450055138 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 450055141} - - component: {fileID: 450055140} - - component: {fileID: 450055142} - - component: {fileID: 450055143} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &450055140 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450055138} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &450055141 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450055138} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &450055142 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450055138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!114 &450055143 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 450055138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} - m_Name: - m_EditorClassIdentifier: - nonRigidbodyVelocity: 0 - attenuationObject: {fileID: 0} ---- !u!1 &782394916 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 782394918} - - component: {fileID: 782394917} - m_Layer: 0 - m_Name: FMod Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &782394917 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 782394916} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9003b24afc35da54a98df0001480fcee, type: 3} - m_Name: - m_EditorClassIdentifier: - ambEvent: - Guid: - Data1: -322206580 - Data2: 1135064971 - Data3: 832623510 - Data4: 499556537 - Path: event:/plugin ---- !u!4 &782394918 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 782394916} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 450055141} - - {fileID: 782394918} diff --git a/Assets/Scenes/OutSideSceneTemp.unity b/Assets/Scenes/OutSideSceneTemp.unity index dcc18cdc7..032ec92b9 100644 --- a/Assets/Scenes/OutSideSceneTemp.unity +++ b/Assets/Scenes/OutSideSceneTemp.unity @@ -133,8 +133,8 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -142,14 +142,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -260,6 +252,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index b7402c4d8..956e7452e 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -37589,14 +37589,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: field of view - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - propertyPath: orthographic size - value: 5 - objectReference: {fileID: 0} - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -37648,50 +37640,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - insertIndex: -1 - addedObject: {fileID: 9210352354887959610} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} ---- !u!1 &9210352354887959609 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8168536426589423301, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} - m_PrefabInstance: {fileID: 9210352354887959608} - m_PrefabAsset: {fileID: 0} ---- !u!114 &9210352354887959610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9210352354887959609} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index df0d1aa1b..702decc37 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1072,11 +1072,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &40915750 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - m_PrefabInstance: {fileID: 4322113248724993478} - m_PrefabAsset: {fileID: 0} --- !u!1 &45177614 GameObject: m_ObjectHideFlags: 0 @@ -7139,10 +7134,10 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} - component: {fileID: 519420034} + - component: {fileID: 519420035} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -7150,14 +7145,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7319,6 +7306,20 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] +--- !u!114 &519420035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &520475755 GameObject: m_ObjectHideFlags: 0 @@ -12413,7 +12414,6 @@ Transform: m_Children: - {fileID: 72512886} - {fileID: 719228339} - - {fileID: 40915750} - {fileID: 442870838} - {fileID: 1317294298} - {fileID: 1620453322} @@ -40579,63 +40579,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _graphManager: {fileID: 0} ---- !u!1001 &4322113248724993478 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1009826577} - m_Modifications: - - target: {fileID: 7660119422375597550, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_Name - value: Audio Manager - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8180040489590280703, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} --- !u!114 &4322795318065666112 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SkyBridge.unity b/Assets/Scenes/SkyBridge.unity index dfe57b8fd..8f3996bd4 100644 --- a/Assets/Scenes/SkyBridge.unity +++ b/Assets/Scenes/SkyBridge.unity @@ -123,132 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &11030335 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1695219948} - m_Modifications: - - target: {fileID: 4266339626480639172, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_Name - value: Bubble Left - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchoredPosition.x - value: -412 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchoredPosition.y - value: -18 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} ---- !u!224 &11030336 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} - m_PrefabInstance: {fileID: 11030335} - m_PrefabAsset: {fileID: 0} --- !u!1 &42967868 GameObject: m_ObjectHideFlags: 0 @@ -5103,6 +4977,132 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -110, y: -90, z: 90} +--- !u!1001 &170261188 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 393455396} + m_Modifications: + - target: {fileID: 636000980267337347, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Name + value: Aside Text + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -412 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} +--- !u!224 &170261189 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + m_PrefabInstance: {fileID: 170261188} + m_PrefabAsset: {fileID: 0} --- !u!1 &245349310 GameObject: m_ObjectHideFlags: 0 @@ -9957,6 +9957,250 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -70, y: -90, z: 90} +--- !u!1 &393455391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 393455396} + - component: {fileID: 393455395} + - component: {fileID: 393455394} + - component: {fileID: 393455393} + - component: {fileID: 393455392} + m_Layer: 5 + m_Name: Bubble Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &393455392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393455391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8341b0b94bf446d9b3b3c50a4428ee15, type: 3} + m_Name: + m_EditorClassIdentifier: + delayTime: 300 +--- !u!114 &393455393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393455391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &393455394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393455391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &393455395 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393455391} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &393455396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393455391} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 170261189} + - {fileID: 992758215} + - {fileID: 403664131} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1001 &403664130 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 393455396} + m_Modifications: + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878580226911155808, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Name + value: Bubble Right + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 177 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: -27 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} +--- !u!224 &403664131 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + m_PrefabInstance: {fileID: 403664130} + m_PrefabAsset: {fileID: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -9967,8 +10211,8 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -9976,14 +10220,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10094,6 +10330,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -10425,6 +10675,132 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} +--- !u!1001 &992758214 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 393455396} + m_Modifications: + - target: {fileID: 4266339626480639172, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Name + value: Bubble Left + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: -412 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: -18 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} +--- !u!224 &992758215 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + m_PrefabInstance: {fileID: 992758214} + m_PrefabAsset: {fileID: 0} --- !u!1 &1001437908 GameObject: m_ObjectHideFlags: 0 @@ -15624,132 +16000,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} ---- !u!1001 &1268806972 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1695219948} - m_Modifications: - - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3878580226911155808, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_Name - value: Bubble Right - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 177 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -27 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} ---- !u!224 &1268806973 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} - m_PrefabInstance: {fileID: 1268806972} - m_PrefabAsset: {fileID: 0} --- !u!21 &1419706337 Material: serializedVersion: 8 @@ -16476,132 +16726,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -178.544} ---- !u!1001 &1569380037 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1695219948} - m_Modifications: - - target: {fileID: 636000980267337347, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_Name - value: Aside Text - objectReference: {fileID: 0} - - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_AnchoredPosition.y - value: -412 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} ---- !u!224 &1569380038 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} - m_PrefabInstance: {fileID: 1569380037} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1652434544 PrefabInstance: m_ObjectHideFlags: 0 @@ -16933,124 +17057,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1695219943 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1695219948} - - component: {fileID: 1695219947} - - component: {fileID: 1695219946} - - component: {fileID: 1695219945} - - component: {fileID: 1695219944} - m_Layer: 5 - m_Name: Bubble Group - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1695219944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695219943} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8341b0b94bf446d9b3b3c50a4428ee15, type: 3} - m_Name: - m_EditorClassIdentifier: - delayTime: 300 ---- !u!114 &1695219945 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695219943} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1695219946 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695219943} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1695219947 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695219943} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1695219948 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695219943} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1569380038} - - {fileID: 11030336} - - {fileID: 1268806973} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1 &1707754918 GameObject: m_ObjectHideFlags: 0 @@ -17652,5 +17658,5 @@ SceneRoots: - {fileID: 1654892109} - {fileID: 1475389260} - {fileID: 1801092469} + - {fileID: 393455396} - {fileID: 1858506582} - - {fileID: 1695219948} diff --git a/Assets/Scenes/VFXtest.unity b/Assets/Scenes/VFXtest.unity index 577313616..682bd1245 100644 --- a/Assets/Scenes/VFXtest.unity +++ b/Assets/Scenes/VFXtest.unity @@ -426,8 +426,8 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -435,14 +435,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -553,6 +545,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &520270856 stripped GameObject: m_CorrespondingSourceObject: {fileID: -6741419839080540014, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} diff --git a/Assets/Scenes/memorypaint.unity b/Assets/Scenes/memorypaint.unity index bc59074d4..c7cbaff27 100644 --- a/Assets/Scenes/memorypaint.unity +++ b/Assets/Scenes/memorypaint.unity @@ -133,8 +133,8 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -142,14 +142,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -260,6 +252,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &651637267 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Clue/ClueSlotBase.cs b/Assets/Scripts/Clue/ClueSlotBase.cs index 490f04137..7486585f4 100644 --- a/Assets/Scripts/Clue/ClueSlotBase.cs +++ b/Assets/Scripts/Clue/ClueSlotBase.cs @@ -3,6 +3,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using DG.Tweening; using AibisDream; +using AibisDream.Kit; public class ClueSlotBase : MonoBehaviour, IDropHandler { @@ -59,7 +60,7 @@ public class ClueSlotBase : MonoBehaviour, IDropHandler currentClueItem = clueItem; isOccupied = true; punchTapeImage.enabled=true; - AudioManager.RandomPlayInteraction("punchtape"); + // AudioManager.RandomPlayInteraction("punchtape"); StartFilmAnimation(); punchTapeImage.rectTransform.DOAnchorPosY(-473f,4f) .OnComplete(() => diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs b/Assets/Scripts/Dialog System/BaseYarnCommand.cs index e6e077814..f0a6c8ceb 100644 --- a/Assets/Scripts/Dialog System/BaseYarnCommand.cs +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs @@ -44,7 +44,6 @@ namespace AibisDream { HideDialog(); yield return SceneLoader.Instance.LoadSceneAsync(sceneName); - AudioManager.PlayAmb2Audio("amb_general"); } [YarnCommand("unload_scene")] diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 85ebda8e5..c69514f8b 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -147,7 +147,6 @@ namespace AibisDream { if (!DialogCanvasManager.Instance.TrySkipLine()) { - AudioManager.Instance.StopVoice(); DialogCanvasManager.Instance.NextStep(); } } diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs index 99ed97d78..3964def07 100644 --- a/Assets/Scripts/Dialog System/LineView.cs +++ b/Assets/Scripts/Dialog System/LineView.cs @@ -10,10 +10,8 @@ namespace AibisDream public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished) { EnumEventSystem.Global.Send(DialogEventEnum.LineStart, DialogText.GetLine(dialogueLine)); - - Action jumpVoice = SkipVoice; - HandleLineOutput(dialogueLine, jumpVoice, onDialogueLineFinished); - HandleVoiceOutput(dialogueLine); + + HandleLineOutput(dialogueLine, onDialogueLineFinished); if (DialogController.Instance.quickRunMode) { @@ -21,25 +19,10 @@ namespace AibisDream } } - private void HandleLineOutput(LocalizedLine dialogueLine, Action onTextShowed, Action onDialogueLineFinished) + private void HandleLineOutput(LocalizedLine dialogueLine, Action onDialogueLineFinished) { DialogCanvasManager.Instance.ShowLine(dialogueLine.TextWithoutCharacterName.Text, - dialogueLine.GetCharacterVo(), onDialogueLineFinished, onTextShowed, dialogueLine.IsAutoSkipLine()); - } - - private void HandleVoiceOutput(LocalizedLine dialogueLine) - { - // 播放语音 - var voicePath = dialogueLine.GetCharacterVo().voicePath; - if (!string.IsNullOrWhiteSpace(voicePath)) - { - AudioManager.Instance.RandomPlayVoice(voicePath); - } - } - - private void SkipVoice() - { - AudioManager.Instance.StopVoice(); + dialogueLine.GetCharacterVo(), onDialogueLineFinished, dialogueLine.IsAutoSkipLine()); } public override void RunOptions(DialogueOption[] dialogueOptions, Action onOptionSelected) diff --git a/Assets/Scripts/FixSystem/Cable/Socket.cs b/Assets/Scripts/FixSystem/Cable/Socket.cs index 1c3479768..fbb15f67f 100644 --- a/Assets/Scripts/FixSystem/Cable/Socket.cs +++ b/Assets/Scripts/FixSystem/Cable/Socket.cs @@ -1,6 +1,7 @@ using AibisDream; using UnityEngine; using System; +using AibisDream.Kit; public class Socket : MonoBehaviour, ISocket { @@ -45,7 +46,7 @@ public class Socket : MonoBehaviour, ISocket IsAvailable = false; } - AudioManager.RandomPlayInteraction("plug_in"); + FmodManager.Instance.PlaySfx("event:/FollowInput/plugin"); plug = p; plug.CableRef.End = plug.transform; // 可插入就可以触发对话 @@ -54,7 +55,7 @@ public class Socket : MonoBehaviour, ISocket public void RemovePlug(Plug p) { IsAvailable = true; - AudioManager.RandomPlayInteraction("plug_out"); + FmodManager.Instance.PlaySfx("event:/FollowInput/plugout"); if (plug != null) { plug.CableRef.End = plug.transform.GetChild(0).transform; diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs index ec327f8cd..1618aa6fe 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs +++ b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs @@ -1,13 +1,10 @@ -//using System.Drawing; - using UnityEngine; using UnityEngine.UI; -using Yarn.Unity; using DG.Tweening; -using System.Collections.Generic; using System.Collections; using AibisDream; using AibisDream.FixSystem; +using AibisDream.Kit; public class HeatMapController : MonoBehaviour { @@ -83,10 +80,7 @@ public class HeatMapController : MonoBehaviour public void HideHeatMap() { var draggableUI = heatmapGameobject.GetComponent(); - heatmapGameobject.transform.DOLocalMove(outPos, 1f).OnComplete(() => - { - draggableUI.UnlockDrag(); - }); + heatmapGameobject.transform.DOLocalMove(outPos, 1f).OnComplete(() => { draggableUI.UnlockDrag(); }); heatmapGameobject.SetActive(false); } @@ -115,9 +109,9 @@ public class HeatMapController : MonoBehaviour Debug.Log("降温成功"); float duration = 3.5f; SetTemptureSmooth(0, duration); - AudioManager.RandomPlayInteraction("cooler_cooling"); + FmodManager.Instance.PlaySfx("event:/FollowInput/cooler_cooling"); yield return new WaitForSeconds(duration); - rotationTween.Kill(); + rotationTween.Kill(); imageToRotate.localRotation = Quaternion.identity; // 恢复初始状态 imageToMove.DOLocalMove(imageInitialPos, 1f); @@ -139,32 +133,25 @@ public class HeatMapController : MonoBehaviour // 恢复初始状态 imageToMove.DOLocalMove(imageInitialPos, 1f); } + void Start() { - bodyModuleSystem=FindObjectOfType(); + bodyModuleSystem = FindObjectOfType(); // // 初始调用，设置初始位置 //tempture=1; // // 初始化数据，这里是示例，你可以根据实际需求设置 SetDataToMaterial(); } - - // public void SetTemture(float value) - // { - // tempture=value; - - // } - public void SetDataToMaterial() { - - if (tempture >=0&&tempture<=1) + if (tempture >= 0 && tempture <= 1) { - uftempture = Mathf.Lerp(1.5f, 2.8f, tempture ); // 线性插值 + uftempture = Mathf.Lerp(1.5f, 2.8f, tempture); // 线性插值 modulesTempture = Mathf.Lerp(1.5f, 1.8f, tempture); backtemture = Mathf.Lerp(1.5f, 2.25f, tempture); } - else if (tempture >= 1&&tempture<=2) + else if (tempture >= 1 && tempture <= 2) { uftempture = Mathf.Lerp(2.8f, 3.2f, tempture - 1); modulesTempture = Mathf.Lerp(1.8f, 2.3f, tempture - 1); @@ -181,8 +168,7 @@ public class HeatMapController : MonoBehaviour for (int i = 0; i < 7; i++) { //RectTransform transform=Pos[i].GetComponent(); - Transform currentTransform=Pos[i].GetComponent(); - Debug.Log($"Point {i}: {points[i]}"); + Transform currentTransform = Pos[i].GetComponent(); if (i == 0) { @@ -194,22 +180,24 @@ public class HeatMapController : MonoBehaviour } else { - points[i] = new Vector4(Pos[i].position.x, Pos[i].position.y, modulesTempture, 0); // (x, y, z, temperature) + points[i] = new Vector4(Pos[i].position.x, Pos[i].position.y, modulesTempture, + 0); // (x, y, z, temperature) + } - } - Sprite currentSprite=currentTransform.GetComponent().sprite; - properties[i] = new Vector4(currentSprite.bounds.size.x, currentSprite.bounds.size.y, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused) - Debug.Log($"Point {i}: {currentSprite.bounds.size.x}"); + Sprite currentSprite = currentTransform.GetComponent().sprite; + properties[i] = + new Vector4(currentSprite.bounds.size.x, currentSprite.bounds.size.y, 0.0f, + 0.0f); // (boxsize x, boxsize y, unused, unused) //properties[i] = new Vector4(transform.rect.width*1, transform.rect.height*1, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused) //properties[i] = new Vector4(transform.rect.width*1, transform.rect.height*1, 0.0f, 0.0f); // (boxsize x, boxsize y, unused, unused) - } // 将数据传递给 Shader heatMaterial.SetVectorArray("_Points", points); heatMaterial.SetVectorArray("_Properties", properties); } - public void SetTemptureDirect(float value) + + public void SetTemptureDirect(float value) { Tempture = value; } @@ -223,5 +211,4 @@ public class HeatMapController : MonoBehaviour { return minTarget + (value - minSource) * (maxTarget - minTarget) / (maxSource - minSource); } -} - +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystem/Line/LineManager.cs b/Assets/Scripts/FixSystem/Line/LineManager.cs index 6c23edbd5..28b6acf73 100644 --- a/Assets/Scripts/FixSystem/Line/LineManager.cs +++ b/Assets/Scripts/FixSystem/Line/LineManager.cs @@ -7,6 +7,7 @@ using AibisDream; using System.Linq; using DG.Tweening; using AibisDream.FixSystem; +using AibisDream.Kit; [System.Serializable] public class LineSegmentInfo @@ -110,7 +111,7 @@ public class LineManager : MonoBehaviour return; } - AudioManager.RandomPlayInteraction("wire_cut"); + FmodManager.Instance.PlaySfx("event:/Scriptal/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 7fbca90a7..c0dc6895a 100644 --- a/Assets/Scripts/FixSystem/Screen/MessageBox.cs +++ b/Assets/Scripts/FixSystem/Screen/MessageBox.cs @@ -22,26 +22,7 @@ public class MessageBox : MonoBehaviour //DontDestroyOnLoad(gameObject); // 可选：保持在场景加载之间 } } - // Yarn Command处理方法 - // [YarnCommand("messagebox")] - // public void HandleMessageBoxCommand(string type, string message) - // { - // switch (type.ToLower()) - // { - // case "warning": - // SetWarning(message); - // break; - // case "normal": - // SetNormal(message); - // break; - // case "null": - // SetNull(); - // break; - // default: - // Debug.LogError("Invalid message type for messagebox command: " + type); - // break; - // } - // } + private void Start() { SetNull(); @@ -76,21 +57,4 @@ public class MessageBox : MonoBehaviour text.color = Color.white; // 默认文本颜色 //StopCoroutine(FlashWarning()); // 停止闪烁效果（如果正在闪烁） } - - // 闪烁警告效果 - private IEnumerator FlashWarning() - { - AudioManager.SetinteractionSourceVolume(0.35f); - AudioManager.RandomPlayInteraction("beep_warning"); - for (int i = 0; i < 2; i++) - { - state.enabled = false; - yield return new WaitForSeconds(0.3f); // 闪烁间隔 - state.enabled = true; - yield return new WaitForSeconds(0.3f); // 闪烁间隔 - } - AudioManager.SetinteractionSourceVolume(1f); - state.enabled = true; // 确保闪烁后状态仍然可见 - - } } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs index 74164c05c..6294ff131 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/Plug.cs @@ -1,4 +1,5 @@ using AibisDream.Framework; +using AibisDream.Kit; using AibisDream.Utility; using DG.Tweening; using MeadowGames.UINodeConnect4.GraphicRenderer; @@ -73,7 +74,7 @@ namespace AibisDream.FixSystem // 处理插槽插入 targetSocket.PlugIn(); - AudioManager.RandomPlayInteraction("plug_in"); + FmodManager.Instance.PlaySfx("event:/FollowInput/plugin"); _sprite.enabled = false; _cableSystem.curSocket = targetSocket; @@ -94,10 +95,10 @@ namespace AibisDream.FixSystem _cableSystem.CableRef.SetEndPos(_plugRootPos); _cableSystem.curSocket?.PlugOut(); - AudioManager.RandomPlayInteraction("plug_out"); + FmodManager.Instance.PlaySfx("event:/FollowInput/plugout"); _sprite.enabled = true; - if (_cableSystem.curSocket is BodyModule bodyModule) + if (_cableSystem.curSocket is BodyModule) { // 从模块拔出时触发事件 EnumEventSystem.Global.Send(EventEnum.PlugOut); diff --git a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs index c83828495..b6db9bbfd 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs @@ -6,6 +6,7 @@ using AibisDream.FixSystem; using UnityEngine.UI; using Unity.VisualScripting; using AibisDream; +using AibisDream.Kit; public class PunchTapeSystem : MonoBehaviour { @@ -47,7 +48,7 @@ public class PunchTapeSystem : MonoBehaviour { // Move the printer to x = 2 over 1 second yield return punchTapeMachine.DOAnchorPos(new Vector2(-1252f, punchTapeMachine.anchoredPosition.y), 1f).WaitForCompletion(); - AudioManager.RandomPlayInteraction("typing"); + FmodManager.Instance.PlaySfx("event:/Scriptal/typing"); // Gradually move the punch tape to x = -3.8 with rhythmic pattern Vector2 targetPosition = new Vector2(796f, punchTape.anchoredPosition.y); int patternIndex = 0; diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index ea6e868df..5186a28a4 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -11,9 +11,6 @@ namespace AibisDream.FixSystem { SystemDic ??= new IOCContainer(); - // TODO 这个回头要改 - AudioManager.PlayAmb1Audio("amb_room"); - // 初始化状态机 StateMachine = new FixStateMachine(); StartCoroutine(StateMachine.SwitchState(FixState.Clinic)); diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs index e31c92d20..39daf0890 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -168,8 +168,7 @@ namespace AibisDream.FixSystem #region 对话框功能实现 - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, - bool isAutoSkip = false) + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { ShowTitle(character.GetActorName()); StartCoroutine(ShowText(dialogLine)); diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs deleted file mode 100644 index a3c339c95..000000000 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ /dev/null @@ -1,306 +0,0 @@ -using System.Collections; -using AibisDream.Kit; -using UnityEngine; -using Yarn.Unity; - -namespace AibisDream -{ - public class AudioManager : Singleton - { - private const string LoopSource = "Loop"; - private const string LoopSource2 = "Loop2"; - private const string LoopSource3 = "Loop3"; - private const string InteractionSource = "Interaction"; - private const string VoiceSource = "Voice"; - private const string MemorySource = "Memery"; - private const string Amb1Source = "Amb1"; - private const string Amb2Source = "Amb2"; - - private AudioSource _loopSource; - private AudioSource _loopSource2; - private AudioSource _loopSource3; - private AudioSource _interactionSource; - private AudioSource _voiceSource; - private AudioSource _memorySource; - private AudioSource _amb1Source; - private AudioSource _amb2Source; - - public float fadeTime; - - public override void OnSingletonInit() - { - _loopSource = transform.Find(LoopSource).GetComponent(); - _loopSource2 = transform.Find(LoopSource2).GetComponent(); - _loopSource3 = transform.Find(LoopSource3).GetComponent(); - _interactionSource = transform.Find(InteractionSource).GetComponent(); - _voiceSource = transform.Find(VoiceSource).GetComponent(); - _memorySource = transform.Find(MemorySource).GetComponent(); - _amb1Source = transform.Find(Amb1Source).GetComponent(); - _amb2Source = transform.Find(Amb2Source).GetComponent(); - } - - #region 随机播放 - - public void RandomPlayVoice(string voicePath) - { - AudioClip clip = RandomLoadAudioClip(3, $"Audio/{voicePath}"); - _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) - { - AudioClip clip = Instance.RandomLoadAudioClip(3, $"Audio/{interactionName}"); - if (clip == null) - { - clip = Resources.Load($"Audio/{interactionName}"); - } - - Instance._interactionSource.clip = clip; - Instance._interactionSource.Play(); - } - - [YarnCommand("play_interaction")] - public static void PlayInteraction(string name) - { - var clip = Resources.Load($"Audio/{name}"); - Instance._interactionSource.clip = clip; - Instance._interactionSource.Play(); - } - - public void StopVoice() - { - if (_voiceSource.isPlaying) - { - _voiceSource.Stop(); - } - } - - [YarnCommand("stop_interaction")] - public static void StopInteraction() - { - Instance._interactionSource.Stop(); - } - - #endregion - - #region 循环播放 - - [YarnCommand("play_loop_audio")] - public static void PlayLoopAudio(string audioName) - { - AudioClip clip = Resources.Load($"Audio/{audioName}"); - if (clip == null) - { - clip = Instance.RandomLoadAudioClip(3, $"Audio/{audioName}"); - } - - Instance._loopSource.clip = clip; - Instance._loopSource.Play(); - } - - [YarnCommand("pause_loop_audio")] - public static void PauseLoopAudio() - { - Instance._loopSource.Pause(); - } - - [YarnCommand("play_loop2_audio")] - public static void PlayLoop2Audio(string audioName) - { - AudioClip clip = Resources.Load($"Audio/{audioName}"); - if (clip == null) - { - clip = Instance.RandomLoadAudioClip(3, $"Audio/{audioName}"); - } - - Instance._loopSource2.clip = clip; - Instance._loopSource2.Play(); - } - - [YarnCommand("pause_loop2_audio")] - public static void PauseLoop2Audio() - { - Instance._loopSource2.Pause(); - } - - [YarnCommand("play_loop3_audio")] - public static void PlayLoop3Audio(string audioName) - { - AudioClip clip = Resources.Load($"Audio/{audioName}"); - if (clip == null) - { - clip = Instance.RandomLoadAudioClip(3, $"Audio/{audioName}"); - } - - Instance._loopSource3.clip = clip; - Instance._loopSource3.Play(); - } - - [YarnCommand("pause_loop3_audio")] - public static void PauseLoop3Audio() - { - Instance._loopSource3.Pause(); - } - - - public void ContinueLoopAudio() - { - _loopSource.UnPause(); - } - - public bool IsLoopPlaying() - { - return _loopSource.isPlaying; - } - - #endregion - - #region 背景音循环播放 - - [YarnCommand("play_amb1_audio")] - public static void PlayAmb1Audio(string audioName) - { - Instance._amb1Source.Stop(); - AudioClip clip = Resources.Load($"Audio/{audioName}"); - Instance._amb1Source.clip = clip; - Instance._amb1Source.volume = 0f; - Instance._amb1Source.Play(); - Instance.StartCoroutine(Instance.FadeTo(1.0f, Instance.fadeTime, Instance._amb1Source)); - } - - [YarnCommand("pause_amb1_audio")] - public static void PauseAmb1Audio() - { - Instance._amb1Source.Pause(); - } - - [YarnCommand("fade_out_amb1_audio")] - public static void FadeOutAmb1Audio() - { - Instance.StartCoroutine(Instance.FadeTo(0.0f, Instance.fadeTime, Instance._amb1Source)); - } - - public void ContinueAmb1Audio() - { - _amb1Source.volume = 0.0f; - _amb1Source.UnPause(); - StartCoroutine(FadeTo(1.0f, fadeTime, _amb1Source)); - } - - [YarnCommand("play_amb2_audio")] - public static void PlayAmb2Audio(string audioName) - { - Instance._amb2Source.Stop(); - AudioClip clip = Resources.Load($"Audio/{audioName}"); - Instance._amb2Source.clip = clip; - Instance._amb2Source.volume = 0f; - Instance._amb2Source.Play(); - Instance.StartCoroutine(Instance.FadeTo(1.0f, Instance.fadeTime, Instance._amb2Source)); - } - - [YarnCommand("pause_amb2_audio")] - public static void PauseAmb2Audio() - { - Instance._amb2Source.Pause(); - } - - [YarnCommand("fade_out_amb2_audio")] - public static void FadeOutAmb2Audio() - { - Instance.StartCoroutine(Instance.FadeTo(0.0f, Instance.fadeTime, Instance._amb2Source)); - } - - public void ContinueAmb2Audio() - { - _amb2Source.volume = 0.0f; - _amb2Source.UnPause(); - StartCoroutine(FadeTo(1.0f, fadeTime, _amb2Source)); - } - - #endregion - - #region 播放记忆 - - public static void PlayMemoryAudio(string memoryName) - { - // Instance.StartCoroutine(AsyncPlayMemoryAudio(memoryName)); - AudioClip loop = Resources.Load($"Audio/{memoryName}"); - Instance._memorySource.clip = loop; - Instance._memorySource.loop = true; - Instance._memorySource.Play(); - } - - public static void PauseMemoryAudio() - { - Instance._memorySource.Pause(); - } - - public void ContinueMemoryAudio() - { - _memorySource.volume = 0.0f; - _memorySource.Play(); - StartCoroutine(FadeTo(1.0f, fadeTime, _memorySource)); - } - - #endregion - - public void FadeInLoopAudio(string audioName) - { - AudioClip clip = Resources.Load(audioName); - _loopSource.clip = clip; - _loopSource.volume = 0.0f; - _loopSource.Play(); - StartCoroutine(FadeTo(1.0f, 5f, _loopSource)); - } - - private IEnumerator FadeTo(float targetVolume, float duration, AudioSource audioSource) - { - float startVolume = audioSource.volume; - float timeElapsed = 0f; - - while (timeElapsed < duration) - { - timeElapsed += Time.deltaTime; - audioSource.volume = Mathf.Lerp(startVolume, targetVolume, timeElapsed / duration); - yield return null; - } - - audioSource.volume = targetVolume; - } - - private AudioClip RandomLoadAudioClip(int audioSize, string path) - { - int randomIndex = Random.Range(0, audioSize) + 1; - return Resources.Load($"{path}_{randomIndex}"); - } - - private static IEnumerator AsyncPlayMemoryAudio(string memoryName) - { - AudioClip intro = Resources.Load($"Audio/mem_play"); - AudioClip loop = Resources.Load($"Audio/{memoryName}"); - Instance._memorySource.clip = intro; - Instance._memorySource.loop = false; - Instance._memorySource.Play(); - yield return new WaitForSeconds(intro.length); - Instance._memorySource.clip = loop; - Instance._memorySource.loop = true; - Instance._memorySource.Play(); - } - - public static void SetLoopSourceVolume(float num) - { - Instance._loopSource.volume=num; - } - public static void SetinteractionSourceVolume(float num) - { - Instance._interactionSource.volume=num; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs.meta b/Assets/Scripts/Framework/AudioKit/AudioManager.cs.meta deleted file mode 100644 index 43f58d381..000000000 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d02d13e0ef27eb544b62d5a8d296f2ee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Framework/AudioKit/AudioYarnCommand.cs b/Assets/Scripts/Framework/AudioKit/AudioYarnCommand.cs index 829cb86fa..29c5e8bdf 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioYarnCommand.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioYarnCommand.cs @@ -9,9 +9,9 @@ namespace AibisDream.Kit private static IAudioManager AudioManager => FmodManager.Instance; [YarnCommand("play_music")] - public static void PlayMusic(string eventName) + public static void PlayMusic(string eventName, string audioKey = null) { - AudioManager.PlayMusic(eventName); + AudioManager.PlayMusic(eventName, audioKey); } [YarnCommand("stop_music")] @@ -34,9 +34,9 @@ namespace AibisDream.Kit } [YarnCommand("play_sfx")] - public static void PlaySfx(string eventName) + public static void PlaySfx(string eventName, string audioKey = null) { - AudioManager.PlaySfx(eventName); + AudioManager.PlaySfx(eventName, audioKey); } [YarnCommand("stop_sfx")] diff --git a/Assets/Scripts/Framework/AudioKit/FmodManager.cs b/Assets/Scripts/Framework/AudioKit/FmodManager.cs index 88488f5d2..e1c9bdc34 100644 --- a/Assets/Scripts/Framework/AudioKit/FmodManager.cs +++ b/Assets/Scripts/Framework/AudioKit/FmodManager.cs @@ -89,36 +89,36 @@ namespace AibisDream.Kit #region 音乐相关 - public void PlayMusic(string eventName) + public void PlayMusic(string eventName, string audioKey = null) { var eventPath = FormatEventPath(eventName); - if (_musicDict.TryGetValue(eventPath, out var oldMusic)) + + var key = string.IsNullOrEmpty(audioKey) ? eventName : audioKey; + if (_musicDict.TryGetValue(key, out var oldMusic)) { - oldMusic.start(); - } - else - { - var newMusic = RuntimeManager.CreateInstance(eventPath); - _musicDict[eventPath] = newMusic; - newMusic.start(); + oldMusic.stop(STOP_MODE.IMMEDIATE); + oldMusic.release(); + _musicDict.Remove(key); } + + var newMusic = RuntimeManager.CreateInstance(eventPath); + _musicDict[key] = newMusic; + newMusic.start(); } - public void StopMusic(string eventName, STOP_MODE stopMode) + public void StopMusic(string key, STOP_MODE stopMode) { - var eventPath = FormatEventPath(eventName); - if (_musicDict.TryGetValue(eventPath, out var oldMusic)) + if (_musicDict.TryGetValue(key, out var oldMusic)) { oldMusic.stop(stopMode); oldMusic.release(); - _musicDict.Remove(eventPath); + _musicDict.Remove(key); } } - public void SetMusicParam(string eventName, string param, float paramValue) + public void SetMusicParam(string key, string param, float paramValue) { - var eventPath = FormatEventPath(eventName); - if (_musicDict.TryGetValue(eventPath, out var music)) + if (_musicDict.TryGetValue(key, out var music)) { music.setParameterByName(param, paramValue); } @@ -152,40 +152,39 @@ namespace AibisDream.Kit } } - public void PlaySfx(string eventName) + public void PlaySfx(string eventName, string audioKey = null) { var eventPath = FormatEventPath(eventName); - if (_sfxDict.TryGetValue(eventPath, out var oldSfx)) + var key = string.IsNullOrEmpty(audioKey) ? eventName : audioKey; + if (_sfxDict.TryGetValue(key, out var oldSfx)) { - oldSfx.start(); + oldSfx.stop(STOP_MODE.IMMEDIATE); + oldSfx.release(); + _sfxDict.Remove(key); } - else + + var newSfx = RuntimeManager.CreateInstance(eventPath); + if (newSfx.GetDescription().isOneshot(out var isOneshot) != RESULT.OK || !isOneshot) { - var newSfx = RuntimeManager.CreateInstance(eventPath); - if (newSfx.GetDescription().isOneshot(out var isOneshot) != RESULT.OK || !isOneshot) - { - _sfxDict[eventPath] = newSfx; - } + _sfxDict[key] = newSfx; + } - newSfx.start(); - } + newSfx.start(); } - public void StopSfx(string eventName, STOP_MODE stopMode) + public void StopSfx(string key, STOP_MODE stopMode) { - var eventPath = FormatEventPath(eventName); - if (_sfxDict.TryGetValue(eventPath, out var oldSfx)) + if (_sfxDict.TryGetValue(key, out var oldSfx)) { oldSfx.stop(stopMode); oldSfx.release(); - _musicDict.Remove(eventPath); + _musicDict.Remove(key); } } - public void SetSfxParam(string eventName, string paramName, float paramValue) + public void SetSfxParam(string key, string paramName, float paramValue) { - var eventPath = FormatEventPath(eventName); - if (_sfxDict.TryGetValue(eventPath, out var sfx)) + if (_sfxDict.TryGetValue(key, out var sfx)) { sfx.setParameterByName(paramName, paramValue); } @@ -195,7 +194,7 @@ namespace AibisDream.Kit private static string FormatEventPath(string eventName) { - return $"event:/{eventName}"; + return eventName.StartsWith("event:/") ? eventName : $"event:/{eventName}"; } private static AmbState MatchAmbState(string key) @@ -234,7 +233,7 @@ namespace AibisDream.Kit public interface IAudioManager { // Yarn音频接口 - public void PlayMusic(string eventName); + public void PlayMusic(string eventName, string audioKey); public void StopMusic(string eventName, STOP_MODE stopMode); public void SetMusicParam(string eventName, string paramName, float paramValue); @@ -247,7 +246,7 @@ namespace AibisDream.Kit public void OnLineShown(); // 交互相关 - public void PlaySfx(string eventName); + public void PlaySfx(string eventName, string audioKey); public void StopSfx(string eventName, STOP_MODE stopMode); public void SetSfxParam(string eventName, string paramName, float paramValue); } diff --git a/Assets/Scripts/Framework/Config/Character.cs b/Assets/Scripts/Framework/Config/Character.cs index afe9b9cb5..4ad47925c 100644 --- a/Assets/Scripts/Framework/Config/Character.cs +++ b/Assets/Scripts/Framework/Config/Character.cs @@ -51,7 +51,7 @@ namespace AibisDream.Kit { get { - if (!voicePath.StartsWith("event:/")) + if (!string.IsNullOrEmpty(voicePath) && !voicePath.StartsWith("event:/")) { return "event:/" + voicePath; } diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 919f3b553..e123fd32c 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -90,8 +90,6 @@ namespace AibisDream /// 动画序列 public Tween OpenCover() { - AudioManager.PlayLoop2Audio("amb_shitou_engine"); - var sq = DOTween.Sequence(); // 盖板上移 var moveDis = new Vector3(0, coverMoveDistance, 0); @@ -111,7 +109,6 @@ namespace AibisDream /// 动画序列 public Tween CloseCover() { - AudioManager.PauseLoop2Audio(); var sq = DOTween.Sequence(); sq.Join(_cover.DOFade(1, coverMoveDuration)); diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index de6d531a3..dcccc3811 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -143,15 +143,6 @@ namespace AibisDream public void CheckGearSystemState() { - if (_isTargetReached) - { - AudioManager.PlayLoop3Audio("gears_running"); - } - else - { - AudioManager.PauseLoop3Audio(); - } - if (_shaftGraph.AllRunning()) { if (_shaftGraph.AllNewGear()) @@ -184,7 +175,6 @@ namespace AibisDream public IEnumerator OpenCover() { - AudioManager.PlayLoop2Audio("amb_gearbox"); // 旋转拉杆 yield return _coverStick.DORotate(new Vector3(0, 0, -90), 1.5f).WaitForCompletion(); // 开盖 @@ -198,9 +188,6 @@ namespace AibisDream public IEnumerator CloseCover() { isAvailable = false; - AudioManager.PauseLoopAudio(); - AudioManager.PauseLoop2Audio(); - AudioManager.PauseLoop3Audio(); // 关盖 var sq = DOTween.Sequence(); sq.Join(_cover.transform.DOLocalMove(coverDownPos, 1.5f)); diff --git a/Assets/Scripts/MiniGame/Gear/Shaft.cs b/Assets/Scripts/MiniGame/Gear/Shaft.cs index 3fb3bc4df..d4dc5b0c2 100644 --- a/Assets/Scripts/MiniGame/Gear/Shaft.cs +++ b/Assets/Scripts/MiniGame/Gear/Shaft.cs @@ -101,12 +101,6 @@ namespace AibisDream private void OnGearPlugIn() { - // 插入音效 - if (!CommonUtil.IsZero(speed) && IsBroken) - { - AudioManager.PlayLoopAudio("gearbox_bad"); - } - // 破损齿轮插进来就发一次事件，交给yarn处理 if (IsBroken) { @@ -124,11 +118,6 @@ namespace AibisDream public void PlugOutGear() { - if (IsBroken) - { - AudioManager.PauseLoopAudio(); - } - // 拔出时齿轮停转 childGear.UpdateRotation(0, _speedScale); diff --git a/Assets/Scripts/MiniGame/Peipei/CutLine/LineInteraction.cs b/Assets/Scripts/MiniGame/Peipei/CutLine/LineInteraction.cs index 4b65af320..825c97528 100644 --- a/Assets/Scripts/MiniGame/Peipei/CutLine/LineInteraction.cs +++ b/Assets/Scripts/MiniGame/Peipei/CutLine/LineInteraction.cs @@ -5,6 +5,7 @@ using UnityEngine.Playables; using DG.Tweening; // 引入 DoTween 命名空间 using Yarn.Unity; using AibisDream; +using AibisDream.Kit; public class LineInteraction : MonoBehaviour { @@ -115,7 +116,7 @@ public class LineInteraction : MonoBehaviour void ContinueTimeline() { - AudioManager.RandomPlayInteraction("wire_cut"); + FmodManager.Instance.PlaySfx("event:/Scriptal/wire_cut"); timelineDirector.Play(); } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 037341057..6be81cc8b 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -191,7 +191,7 @@ public class EyeSystem : MonoBehaviour { if (currentTarget != null) { - AudioManager.RandomPlayInteraction("colorimagine"); + // AudioManager.RandomPlayInteraction("colorimagine"); eyeStateEffect?.ApplyFocusedEffect(currentTarget); } @@ -203,7 +203,7 @@ public class EyeSystem : MonoBehaviour { if (currentTarget != null) { - AudioManager.RandomPlayInteraction("colorimagine"); + // AudioManager.RandomPlayInteraction("colorimagine"); eyeStateEffect?.ApplyUnfocusedEffect(currentTarget); } @@ -399,7 +399,7 @@ public class EyeSystem : MonoBehaviour memorySequence.Insert(4.5f, memoryMaterial.DOFloat(0f, "_FullDistortionFade", 0.5f).OnComplete(() => { memoryRender.gameObject.SetActive(false); - AudioManager.RandomPlayInteraction("water_drip"); + // AudioManager.RandomPlayInteraction("water_drip"); })); // 等待序列完成 diff --git a/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs b/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs index e8fb024ca..d4b2432c3 100644 --- a/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs @@ -12,6 +12,7 @@ using VolFx; using System.Drawing.Text; // 引入 DoTween 命名空间 using UnityEngine.Rendering.Universal; using System; +using AibisDream.Kit; public class UFSystem : MonoBehaviour { @@ -51,31 +52,37 @@ public class UFSystem : MonoBehaviour CameraKit.Instance.RegisterCamera(CameraEnum.UF, virtualCam); eyeSystem = FindObjectOfType(); } + public void TweenWeight(Volume postProcessingVolume, float targetWeight, float duration) { // 动态调整权重 DOTween.To(() => postProcessingVolume.weight, x => postProcessingVolume.weight = x, targetWeight, duration); } + [YarnCommand("UF_spriteIn")] public IEnumerator UF_spriteIn(float duration = 1.5f) { if (eyeSystem.CurrentTarget != null) { - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); eyeSystem.CurrentTarget.ImageIn(duration); } + yield return new WaitForSeconds(duration); } + [YarnCommand("UF_spriteOut")] public IEnumerator UF_spriteOut(float duration = 1.5f) { if (eyeSystem.CurrentTarget != null) { - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); eyeSystem.CurrentTarget.ImageOut(duration); } + yield return new WaitForSeconds(duration); } + [YarnCommand("UF_AllspriteIn")] public IEnumerator UF_AllspriteIn(float duration = 1.5f) { @@ -83,8 +90,10 @@ public class UFSystem : MonoBehaviour { target.ImageIn(duration); } + yield return new WaitForSeconds(duration); } + [YarnCommand("UF_AllspriteOut")] public IEnumerator UF_AllspriteOut(float duration = 1.5f) { @@ -92,19 +101,22 @@ public class UFSystem : MonoBehaviour { target.ImageOut(duration); } + yield return new WaitForSeconds(duration); } + [YarnCommand("UF_faceIn")] public IEnumerator UF_faceIn(float duration = 1.5f) { face.gameObject.SetActive(true); - face.DOFade(1f,duration); + face.DOFade(1f, duration); yield return new WaitForSeconds(duration); } + [YarnCommand("UF_faceOut")] public IEnumerator UF_faceOut(float duration = 1.5f) { - face.DOFade(0f,duration); + face.DOFade(0f, duration); yield return new WaitForSeconds(duration); face.gameObject.SetActive(false); } @@ -112,52 +124,57 @@ public class UFSystem : MonoBehaviour [YarnCommand("UF_ImaginationEffectIn")] public IEnumerator UF_ImaginationEffectIn(float duration = 1.5f) { - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); TweenWeight(imageVolume, 1, duration); yield return new WaitForSeconds(0); } - [YarnCommand("UF_ImaginationEffectOut")] + + [YarnCommand("UF_ImaginationEffectOut")] public IEnumerator UF_ImaginationEffectOut(float duration = 1.5f) { TweenWeight(imageVolume, 0, duration); - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); yield return new WaitForSeconds(0); } + [YarnCommand("UF_MemoryEffectIn")] public IEnumerator UF_MemoryEffectIn(float duration = 1.5f) { - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); TweenWeight(finalVolume, 1, duration); yield return new WaitForSeconds(0); } - [YarnCommand("UF_MemoryEffectOut")] + + [YarnCommand("UF_MemoryEffectOut")] public IEnumerator UF_MemoryEffectOut(float duration = 1.5f) { TweenWeight(finalVolume, 0, duration); - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); yield return new WaitForSeconds(0); } + [YarnCommand("UF_EyeTargetAscillIn")] public IEnumerator UF_EyeTargetAscillIn(float duration = 1.5f) { - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); TweenWeight(imageAscillVolume, 1, duration); yield return new WaitForSeconds(0); } + [YarnCommand("UF_EyeTargetAscillOut")] public IEnumerator UF_EyeTargetAscillOut(float duration = 1.5f) { TweenWeight(imageAscillVolume, 0, duration); - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); yield return new WaitForSeconds(0); } [YarnCommand("UF_SetBorkenValue")] - public void UF_Borken(int value) - { + public void UF_Borken(int value) + { FullAscillVolume.profile.TryGet(out ascii); - ascii.m_Depth.value=value; - ascii.m_Ascii.value=Color.red; + ascii.m_Depth.value = value; + ascii.m_Ascii.value = Color.red; } @@ -172,23 +189,25 @@ public class UFSystem : MonoBehaviour { isLoopImage = false; } + [YarnCommand("UF_fightEffect")] public void UF_fightEffect() { scaleTween = DOTween.To(() => 0f, t => - { - // 根据 t（0 到 1 的变化）更新多个值 - imageVolume.weight = Mathf.Lerp(0f, 1f, t); // 例如：imageVolume 的 weight - imageAscillVolume.weight = Mathf.Lerp(0f, 1f, t); // 假设 saturation 是另一个值 - finalVolume.weight = Mathf.Lerp(1f, 0f, t); // 假设 contrast 是另一个值 - }, 1f, 1f) - .SetEase(Ease.InOutSine) // 平滑缓动 - .SetLoops(-1, LoopType.Yoyo); // 无限循环 + { + // 根据 t（0 到 1 的变化）更新多个值 + imageVolume.weight = Mathf.Lerp(0f, 1f, t); // 例如：imageVolume 的 weight + imageAscillVolume.weight = Mathf.Lerp(0f, 1f, t); // 假设 saturation 是另一个值 + finalVolume.weight = Mathf.Lerp(1f, 0f, t); // 假设 contrast 是另一个值 + }, 1f, 1f) + .SetEase(Ease.InOutSine) // 平滑缓动 + .SetLoops(-1, LoopType.Yoyo); // 无限循环 } + [YarnCommand("UF_StopfightEffect")] public void UF_StopfightEffect() { - scaleTween.Kill(); + scaleTween.Kill(); } public IEnumerator UFImageLoopProcess() @@ -210,13 +229,14 @@ public class UFSystem : MonoBehaviour StartCoroutine(UF_MemoryEffectOut(0.5f)); index++; // 如果到达列表末尾，则回到开头 - if (index >= eyeSystem.Targets.Count-2) + if (index >= eyeSystem.Targets.Count - 2) { index = 0; } //yield return new WaitForSeconds(1f); // 每隔1秒打印一次 } } + public void OpenUFView() { if (!FullAscillVolume.gameObject.activeInHierarchy) @@ -225,7 +245,6 @@ public class UFSystem : MonoBehaviour imageAscillVolume.weight = 1; imageVolume.weight = 0; finalVolume.weight = 0; - } } @@ -274,21 +293,21 @@ public class UFSystem : MonoBehaviour switch (state) { case UFState.UF: - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); TweenWeight(imageAscillVolume, 1, duration); TweenWeight(imageVolume, 0, duration); TweenWeight(finalVolume, 0, duration); break; case UFState.imagination: - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); TweenWeight(imageAscillVolume, 0, duration); TweenWeight(imageVolume, 1, duration); TweenWeight(finalVolume, 0, duration); break; case UFState.memory: - AudioManager.RandomPlayInteraction("colorimagine"); + FmodManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); TweenWeight(imageAscillVolume, 0, duration); TweenWeight(imageVolume, 0, duration); TweenWeight(finalVolume, 1, duration); diff --git a/Assets/Scripts/SubWay/ParallaxManager.cs b/Assets/Scripts/SubWay/ParallaxManager.cs index 253f31750..fc9f7b3bd 100644 --- a/Assets/Scripts/SubWay/ParallaxManager.cs +++ b/Assets/Scripts/SubWay/ParallaxManager.cs @@ -10,7 +10,7 @@ using AibisDream; public class ParallaxLayerConfig { public GameObject layer; // 背景层的游戏对象 - [SerializeField, Range(0.01f, 1f)]public float scrollSpeed; // 每层的滚动速度 + [SerializeField, Range(0.01f, 1f)] public float scrollSpeed; // 每层的滚动速度 public float scrollOffset; // 每层的滚动偏移量 } @@ -19,7 +19,7 @@ public class ParallaxManager : MonoBehaviour public float speedMultiplier = 1; // 加速系数 public ParallaxLayerConfig[] layerConfigs; // 背景层配置数组 public ParallaxObjectCategoryConfig[] categoryConfigs; // 多种物体配置类别 - + public GameObject tunnelSprite; // 隧道的 Sprite 对象 public SpriteRenderer sisterSpriteRender; // 隧道的 Sprite 对象 @@ -35,40 +35,42 @@ public class ParallaxManager : MonoBehaviour private float previousSpeedMultiplier; // 用于记录上一次的值 [YarnCommand("EnterTunnel")] - public void EnterTunnel() + public void EnterTunnel() { if (tunnelSprite != null && !isInTunnel) { - tunnelSprite.transform.position=tunnelEnterPosition; + tunnelSprite.transform.position = tunnelEnterPosition; isInTunnel = true; // 使用 DOTween 播放隧道进入动画 - sisterSpriteRender.DOFade(0.4f,tunnelDuration); + sisterSpriteRender.DOFade(0.4f, tunnelDuration); tunnelSprite.transform.DOMove(tunnelKeepPosition, tunnelDuration) .SetEase(Ease.Linear) .OnStart(() => Debug.Log("开始进入隧道")) - .OnKill(() => { - Debug.Log("已完成进入隧道"); - ToggleCategoryVisibility("隧洞灯",true); - + .OnKill(() => + { + Debug.Log("已完成进入隧道"); + ToggleCategoryVisibility("隧洞灯", true); }); } } + [YarnCommand("ExitTunnel")] public void ExitTunnel() { if (tunnelSprite != null && isInTunnel) { isInTunnel = false; - ToggleCategoryVisibility("隧洞灯",false); - sisterSpriteRender.DOFade(0,tunnelDuration); + ToggleCategoryVisibility("隧洞灯", false); + sisterSpriteRender.DOFade(0, tunnelDuration); // 使用 DOTween 播放隧道退出动画 tunnelSprite.transform.DOMove(tunnelExitPosition, tunnelDuration) .SetEase(Ease.Linear) .OnStart(() => Debug.Log("开始退出隧道")) - .OnKill(() => { - Debug.Log("已完成退出隧道"); - ToggleCategoryVisibility("隧洞灯",false); - tunnelSprite.transform.position=tunnelEnterPosition; + .OnKill(() => + { + Debug.Log("已完成退出隧道"); + ToggleCategoryVisibility("隧洞灯", false); + tunnelSprite.transform.position = tunnelEnterPosition; }); } } @@ -82,9 +84,10 @@ public class ParallaxManager : MonoBehaviour previousSpeedMultiplier = speedMultiplier; // 记录当前值 Debug.Log($"运行时修改 DOTween.timeScale 为 {speedMultiplier}"); } - if(Input.GetKeyDown(KeyCode.E)) + + if (Input.GetKeyDown(KeyCode.E)) { - if(isInTunnel) + if (isInTunnel) { ExitTunnel(); } @@ -92,15 +95,15 @@ public class ParallaxManager : MonoBehaviour { EnterTunnel(); } - } } + private void OnValidate() { // 当新速度值变化时，实时更新背景层和物体的速度 foreach (var config in layerConfigs) { - StartLayerScroll(config); // 重新启动背景层滚动 + StartLayerScroll(config); // 重新启动背景层滚动 } foreach (var category in categoryConfigs) @@ -117,15 +120,12 @@ public class ParallaxManager : MonoBehaviour // } // } } - } } void Start() { - AudioManager.PlayAmb1Audio("amb_subway"); - AudioManager.PlayAmb1Audio("music_subway"); // 初始化记录的值 Color color = sisterSpriteRender.color; color.a = 0; @@ -152,7 +152,7 @@ public class ParallaxManager : MonoBehaviour { // 按照距离生成 StartCoroutine(ManageObjectGenerationByDistance(category)); - } + } } } @@ -167,6 +167,7 @@ public class ParallaxManager : MonoBehaviour pool.Add(obj); obj.SetActive(false); // 初始时禁用物体 } + objectPools[categoryConfig.categoryName] = pool; Debug.Log($"为分类 {categoryConfig.categoryName} 初始化池子，池中物体数：{pool.Count}"); @@ -176,11 +177,11 @@ public class ParallaxManager : MonoBehaviour private void StartLayerScroll(ParallaxLayerConfig config) { Vector3 startPosition = config.layer.transform.position; - float endPositionX = - config.scrollOffset; - + float endPositionX = -config.scrollOffset; + // 计算需要的时间，基于速度和距离 float distance = Mathf.Abs(endPositionX - startPosition.x); - float duration = distance / config.scrollSpeed; // 使用速度来计算时间 + float duration = distance / config.scrollSpeed; // 使用速度来计算时间 // 背景层滚动时不受 speedMultiplier 影响 config.layer.transform.DOLocalMoveX(endPositionX, duration) @@ -198,87 +199,90 @@ public class ParallaxManager : MonoBehaviour } // 管理物体生成：按时间间隔生成 -public IEnumerator ManageObjectGeneration(ParallaxObjectCategoryConfig categoryConfig) -{ - if (!objectPools.ContainsKey(categoryConfig.categoryName)) + public IEnumerator ManageObjectGeneration(ParallaxObjectCategoryConfig categoryConfig) { - Debug.LogError($"没有为分类 {categoryConfig.categoryName} 初始化对象池！"); - yield break; - } - - var pool = objectPools[categoryConfig.categoryName]; - int batchSize = categoryConfig.batchSize; // 每次生成的物体数量 - float batchInterval = categoryConfig.batchInterval; // 每个物体之间的生成间隔 - float delayAfterBatch = categoryConfig.delayAfterBatch; // 每组生成后的等待时间 - - // 启动首个物体 - GameObject firstObject = pool[0]; - if (!firstObject.activeInHierarchy) - { - - firstObject.transform.position = firstObject.transform.position; // 保持编辑器中的初始位置 - firstObject.SetActive(true); // 启用物体 - StartObjectMoveAnimation(firstObject, categoryConfig); - Debug.Log($"初始化并激活首个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); - ToggleCategoryVisibility(categoryConfig.categoryName,categoryConfig.isEnabled); - - } - - while (true) - { - // 连续生成多个物体 - for (int i = 0; i < batchSize; i++) + if (!objectPools.ContainsKey(categoryConfig.categoryName)) { - GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); - if (obj != null) - { - SpawnObject(obj, categoryConfig); - Debug.Log($"生成物体: {obj.name}, 当前池大小: {pool.Count}"); - } - else - { - Debug.LogWarning($"对象池 {categoryConfig.categoryName} 中没有可用物体！可能需要增加池中物体数量。"); - } - - // 每个物体之间的间隔 - yield return new WaitForSeconds(Random.Range(batchInterval-1f,batchInterval+1f) / speedMultiplier); // 使用 speedMultiplier 来控制生成速率 + Debug.LogError($"没有为分类 {categoryConfig.categoryName} 初始化对象池！"); + yield break; } - // 等待一段时间后再开始下一组生成 - yield return new WaitForSeconds(Random.Range(delayAfterBatch-1f,delayAfterBatch+1.5f) / speedMultiplier); // 使用 speedMultiplier 来控制生成间隔 + var pool = objectPools[categoryConfig.categoryName]; + int batchSize = categoryConfig.batchSize; // 每次生成的物体数量 + float batchInterval = categoryConfig.batchInterval; // 每个物体之间的生成间隔 + float delayAfterBatch = categoryConfig.delayAfterBatch; // 每组生成后的等待时间 + + // 启动首个物体 + GameObject firstObject = pool[0]; + if (!firstObject.activeInHierarchy) + { + firstObject.transform.position = firstObject.transform.position; // 保持编辑器中的初始位置 + firstObject.SetActive(true); // 启用物体 + StartObjectMoveAnimation(firstObject, categoryConfig); + Debug.Log($"初始化并激活首个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); + ToggleCategoryVisibility(categoryConfig.categoryName, categoryConfig.isEnabled); + } + + while (true) + { + // 连续生成多个物体 + for (int i = 0; i < batchSize; i++) + { + GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); + if (obj != null) + { + SpawnObject(obj, categoryConfig); + Debug.Log($"生成物体: {obj.name}, 当前池大小: {pool.Count}"); + } + else + { + Debug.LogWarning($"对象池 {categoryConfig.categoryName} 中没有可用物体！可能需要增加池中物体数量。"); + } + + // 每个物体之间的间隔 + yield return + new WaitForSeconds(Random.Range(batchInterval - 1f, batchInterval + 1f) / + speedMultiplier); // 使用 speedMultiplier 来控制生成速率 + } + + // 等待一段时间后再开始下一组生成 + yield return new WaitForSeconds( + Random.Range(delayAfterBatch - 1f, delayAfterBatch + 1.5f) / + speedMultiplier); // 使用 speedMultiplier 来控制生成间隔 + } } -} // 管理物体生成（基于距离） -public IEnumerator ManageObjectGenerationByDistance(ParallaxObjectCategoryConfig categoryConfig) -{ - var pool = objectPools[categoryConfig.categoryName]; - GameObject firstObject = pool[0]; - if (!firstObject.activeInHierarchy) + public IEnumerator ManageObjectGenerationByDistance(ParallaxObjectCategoryConfig categoryConfig) { - firstObject.transform.position = categoryConfig.objects[0].transform.position; - firstObject.SetActive(true); // 启用物体 - StartObjectMoveAnimation(firstObject, categoryConfig); - ToggleCategoryVisibility(categoryConfig.categoryName,categoryConfig.isEnabled); - Debug.Log($"生成了第一个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); - - } - GameObject lastObject = firstObject; - while (true) - { - // 检查是否需要生成新物体 - if (lastObject == null || lastObject.transform.position.x < -categoryConfig.generationThreshold) + var pool = objectPools[categoryConfig.categoryName]; + GameObject firstObject = pool[0]; + if (!firstObject.activeInHierarchy) { - GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); - if (obj != null) + firstObject.transform.position = categoryConfig.objects[0].transform.position; + firstObject.SetActive(true); // 启用物体 + StartObjectMoveAnimation(firstObject, categoryConfig); + ToggleCategoryVisibility(categoryConfig.categoryName, categoryConfig.isEnabled); + Debug.Log($"生成了第一个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); + } + + GameObject lastObject = firstObject; + while (true) + { + // 检查是否需要生成新物体 + if (lastObject == null || lastObject.transform.position.x < -categoryConfig.generationThreshold) { - SpawnObject(obj, categoryConfig); - lastObject = obj; + GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); + if (obj != null) + { + SpawnObject(obj, categoryConfig); + lastObject = obj; + } } + + yield return null; } - yield return null; } -} // 获取池中未激活的物体 private GameObject GetInactiveObjectFromPool(string categoryName) @@ -294,32 +298,32 @@ public IEnumerator ManageObjectGenerationByDistance(ParallaxObjectCategoryConfig return inactiveObjects[Random.Range(0, inactiveObjects.Count)]; } } + return null; // 如果没有未激活的对象 } // 生成物体逻辑 private void SpawnObject(GameObject obj, ParallaxObjectCategoryConfig categoryConfig) { + float xStart = categoryConfig.xSpawnRange; + obj.transform.localPosition = new Vector3(xStart, obj.transform.localPosition.y, obj.transform.localPosition.z); + obj.SetActive(true); + ToggleCategoryVisibility(categoryConfig.categoryName, categoryConfig.isEnabled); + StartObjectMoveAnimation(obj, categoryConfig); - float xStart = categoryConfig.xSpawnRange; - obj.transform.localPosition = new Vector3(xStart, obj.transform.localPosition.y, obj.transform.localPosition.z); - obj.SetActive(true); - ToggleCategoryVisibility(categoryConfig.categoryName,categoryConfig.isEnabled); - StartObjectMoveAnimation(obj, categoryConfig); - - Debug.Log($"生成物体 {obj.name} 并开始移动, 初始位置: {obj.transform.position}"); - + Debug.Log($"生成物体 {obj.name} 并开始移动, 初始位置: {obj.transform.position}"); } // 启动物体移动动画 private void StartObjectMoveAnimation(GameObject obj, ParallaxObjectCategoryConfig categoryConfig) { // 计算目标位置 - Vector3 targetPosition = new Vector3(-categoryConfig.xSpawnRange, obj.transform.position.y, obj.transform.position.z); - + Vector3 targetPosition = + new Vector3(-categoryConfig.xSpawnRange, obj.transform.position.y, obj.transform.position.z); + // 计算当前位置与目标位置的水平距离 float distance = Mathf.Abs(obj.transform.position.x - targetPosition.x); - + // 计算动画的持续时间：距离 / 速度 float duration = distance / categoryConfig.speed; @@ -331,56 +335,54 @@ public IEnumerator ManageObjectGenerationByDistance(ParallaxObjectCategoryConfig // 物体移动完成后处理 private void HandleObjectCompletion(GameObject obj, ParallaxObjectCategoryConfig categoryConfig) { - obj.SetActive(false); // 隐藏物体 + obj.SetActive(false); // 隐藏物体 Debug.Log($"物体 {obj.name} 移动完成，回收到池中"); } // 控制分类的显示与隐藏 public void ToggleCategoryVisibility(string categoryName, bool isEnabled) -{ - var category = System.Array.Find(categoryConfigs, config => config.categoryName == categoryName); - if (category != null) { - category.isEnabled = isEnabled; - - // 遍历该分类的所有物体，并根据 isEnabled 控制它们的显示状态 - foreach (var obj in objectPools[categoryName]) + var category = System.Array.Find(categoryConfigs, config => config.categoryName == categoryName); + if (category != null) { - // 检查父物体是否有 SpriteRenderer - var renderer = obj.GetComponent(); - - // 如果父物体没有 SpriteRenderer，检查所有子物体 - if (renderer == null) + category.isEnabled = isEnabled; + + // 遍历该分类的所有物体，并根据 isEnabled 控制它们的显示状态 + foreach (var obj in objectPools[categoryName]) { - var childRenderers = obj.GetComponentsInChildren(); - if (childRenderers.Length > 0) + // 检查父物体是否有 SpriteRenderer + var renderer = obj.GetComponent(); + + // 如果父物体没有 SpriteRenderer，检查所有子物体 + if (renderer == null) { - // 如果找到子物体的 SpriteRenderer，修改它们的显示状态 - foreach (var childRenderer in childRenderers) + var childRenderers = obj.GetComponentsInChildren(); + if (childRenderers.Length > 0) { - childRenderer.enabled = isEnabled; + // 如果找到子物体的 SpriteRenderer，修改它们的显示状态 + foreach (var childRenderer in childRenderers) + { + childRenderer.enabled = isEnabled; + } + } + else + { + // 如果父物体和子物体都没有 SpriteRenderer，输出警告 + Debug.LogWarning($"物体 {obj.name} 及其子物体均未找到 SpriteRenderer"); } } else { - // 如果父物体和子物体都没有 SpriteRenderer，输出警告 - Debug.LogWarning($"物体 {obj.name} 及其子物体均未找到 SpriteRenderer"); + // 如果父物体有 SpriteRenderer，直接修改父物体的显示状态 + renderer.enabled = isEnabled; } } - else - { - // 如果父物体有 SpriteRenderer，直接修改父物体的显示状态 - renderer.enabled = isEnabled; - } + + Debug.Log($"分类 {categoryName} 已{(isEnabled ? "启用" : "禁用")}"); + } + else + { + Debug.LogWarning($"未找到名为 {categoryName} 的分类"); } - - Debug.Log($"分类 {categoryName} 已{(isEnabled ? "启用" : "禁用")}"); } - else - { - Debug.LogWarning($"未找到名为 {categoryName} 的分类"); - } -} - - -} +} \ No newline at end of file diff --git a/Assets/Scripts/SystemWindow/WindowManager.cs b/Assets/Scripts/SystemWindow/WindowManager.cs index 6ae903750..d20c0711e 100644 --- a/Assets/Scripts/SystemWindow/WindowManager.cs +++ b/Assets/Scripts/SystemWindow/WindowManager.cs @@ -4,6 +4,7 @@ using Yarn.Unity; using System.Collections; using DG.Tweening; using AibisDream; +using AibisDream.Kit; public class WindowManager : MonoBehaviour { @@ -30,7 +31,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenSingleButtonWindow")] public IEnumerator OpenSingleButtonWindow(string title, string description, bool ispanelActive = true) { - AudioManager.PlayInteraction("ui"); + FmodManager.Instance.PlaySfx("event:/Scriptal/Ui"); bool isConfirmed = false; singleButtonWindowPrefab.transform.GetChild(0).gameObject.SetActive(ispanelActive); @@ -49,7 +50,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenMutiSingleButtonWindow")] public IEnumerator OpenMutiSingleButtonWindow(string title, string description, int number) { - AudioManager.PlayInteraction("ui"); + FmodManager.Instance.PlaySfx("event:/Scriptal/Ui"); bool isConfirmed = false; singleButtonWindowPrefab.transform.GetChild(0).gameObject.SetActive(false); @@ -68,7 +69,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenProgressWindow")] public IEnumerator OpenProgressWindow(string title, string description, float duration) { - AudioManager.PlayInteraction("ui"); + FmodManager.Instance.PlaySfx("event:/Scriptal/Ui"); progressWindowPrefab.TitleValue = title; progressWindowPrefab.DescriptionValue = description; float currentProgress = 0; diff --git a/Assets/Scripts/Task/TaskManager.cs b/Assets/Scripts/Task/TaskManager.cs index 3552d6db6..4c0b59887 100644 --- a/Assets/Scripts/Task/TaskManager.cs +++ b/Assets/Scripts/Task/TaskManager.cs @@ -6,6 +6,7 @@ using Yarn.Unity; using System.Linq; // 添加这个 using 语句 using DG.Tweening; using AibisDream; +using AibisDream.Kit; public class TaskEntry @@ -23,40 +24,41 @@ public class TaskEntry SubTasks = new List(); } } + public class TaskManager : MonoBehaviour { public GameObject taskTextPrefab; // 用于显示任务的文本预制体 - public Transform taskListParent; // 任务列表的父物体 + public Transform taskListParent; // 任务列表的父物体 private List tasks = new List(); private RectTransform pos; public void Awake() { - pos=GetComponent(); + pos = GetComponent(); } [YarnCommand("task_moveIn")] - public void Task_moveIn() - { - AudioManager.PlayInteraction("task_inout"); - pos.DOAnchorPosY(-170f,1f); - } + public void Task_moveIn() + { + FmodManager.Instance.PlaySfx("event:/Scriptal/taskmanager"); + pos.DOAnchorPosY(-170f, 1f); + } [YarnCommand("task_moveOut")] public void Task_moveOut() - { - AudioManager.PlayInteraction("task_inout"); - pos.DOAnchorPosY(175,1f); - } + { + FmodManager.Instance.PlaySfx("event:/Scriptal/taskmanager"); + pos.DOAnchorPosY(175, 1f); + } [YarnCommand("add_task")] public void AddTask(string text, string parentTaskText = null) { TaskEntry newTask = new TaskEntry(text); - + if (!string.IsNullOrEmpty(parentTaskText)) { TaskEntry parentTask = FindTaskByText(tasks, parentTaskText); @@ -70,7 +72,7 @@ public class TaskManager : MonoBehaviour Debug.LogError("Parent task not found"); } } - else if(FindTaskByText(tasks, text)!=null) + else if (FindTaskByText(tasks, text) != null) { Debug.LogWarning("Allreday Added"); } @@ -93,7 +95,7 @@ public class TaskManager : MonoBehaviour } else { - Debug.LogWarning("Task" +taskText +"not found"); + Debug.LogWarning("Task" + taskText + "not found"); } } @@ -150,4 +152,4 @@ public class TaskManager : MonoBehaviour CreateTaskUI(subTask); } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/UI/DialogUI/CenterOption.cs b/Assets/Scripts/UI/DialogUI/CenterOption.cs index ae9305492..62010fb3b 100644 --- a/Assets/Scripts/UI/DialogUI/CenterOption.cs +++ b/Assets/Scripts/UI/DialogUI/CenterOption.cs @@ -21,8 +21,7 @@ namespace AibisDream _ => HideDialog()); } - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, - bool isAutoSkip = false) + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { Debug.Log("CenterOption只显示选项"); } diff --git a/Assets/Scripts/UI/DialogUI/CenterText.cs b/Assets/Scripts/UI/DialogUI/CenterText.cs index 2a4eb18c6..3e98a6cd4 100644 --- a/Assets/Scripts/UI/DialogUI/CenterText.cs +++ b/Assets/Scripts/UI/DialogUI/CenterText.cs @@ -44,8 +44,7 @@ namespace AibisDream }); } - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, - bool isAutoSkip = false) + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { // 把原有对话清掉 ClearBox(); @@ -56,7 +55,6 @@ namespace AibisDream // 自动跳过的回调很难独立Remove，只能全部清空再注册，下策 _dialogText.onTextShowed.RemoveAllListeners(); - _dialogText.onTextShowed.AddListener(() => onTextShowed?.Invoke()); _dialogText.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShown)); _nextStep = nextStep; diff --git a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs index 270e0b169..d114752e9 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs @@ -87,8 +87,7 @@ namespace AibisDream /// 下一步 /// 文字展示结束后触发 /// 是否自动跳过，默认为false - public virtual void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed, - bool isAutoSkip = false) + public virtual void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { gameObject.SetActive(true); @@ -104,7 +103,6 @@ namespace AibisDream // 自动跳过的回调很难独立Remove，只能全部清空再注册，下策 _dialogText.onTextShowed.RemoveAllListeners(); _dialogText.onTextShowed.AddListener(() => _nextArray.gameObject.SetActive(true)); - _dialogText.onTextShowed.AddListener(() => onTextShowed?.Invoke()); _dialogText.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShown)); _nextStep = nextStep; diff --git a/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs b/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs index 62b2f0e2a..326c80dda 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs @@ -38,8 +38,7 @@ namespace AibisDream _dialogViews.ForEach(item => item.HideDialog()); } - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed, - bool isAutoSkip = false) + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { gameObject.SetActive(true); // 根据角色信息气泡 @@ -47,7 +46,7 @@ namespace AibisDream // 处理其他泡泡 ProcessOtherBox(); // 显示对话 - _currentView.ShowLine(dialogLine, character, nextStep, onTextShowed, isAutoSkip); + _currentView.ShowLine(dialogLine, character, nextStep, isAutoSkip); } public void ShowOptions(DialogOption[] options) diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs index 4e3b58fa8..a59bbc517 100644 --- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs +++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs @@ -119,8 +119,7 @@ namespace AibisDream #region 对话框接口 - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, - bool isAutoSkip = false) + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { // 根据DialogViewType确定在哪个对话框显示 if (character.dialogViewType == DialogViewType.Default) @@ -132,7 +131,7 @@ namespace AibisDream _lastShowView = _curView; // 没有指定对话框，就用当前激活的 - _curView.ShowLine(dialogLine, character, nextStep, onTextShowed, isAutoSkip); + _curView.ShowLine(dialogLine, character, nextStep, isAutoSkip); } else if (_dialogViewDict.TryGetValue(character.dialogViewType, out var view)) { @@ -143,7 +142,7 @@ namespace AibisDream _lastShowView = view; // 对于指定了对话框的，就在指定对话框显示 - view.ShowLine(dialogLine, character, nextStep, onTextShowed, isAutoSkip); + view.ShowLine(dialogLine, character, nextStep, isAutoSkip); } else { diff --git a/Assets/Scripts/UI/DialogUI/IDialogView.cs b/Assets/Scripts/UI/DialogUI/IDialogView.cs index b810d772f..dc6d81e6f 100644 --- a/Assets/Scripts/UI/DialogUI/IDialogView.cs +++ b/Assets/Scripts/UI/DialogUI/IDialogView.cs @@ -10,8 +10,7 @@ namespace AibisDream { public interface IDialogView { - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, - bool isAutoSkip = false); + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false); public void ShowOptions(DialogOption[] dialogueOptions); diff --git a/Assets/Scripts/UI/DialogUI/TextBubble.cs b/Assets/Scripts/UI/DialogUI/TextBubble.cs index bfe4427fa..a5c365dac 100644 --- a/Assets/Scripts/UI/DialogUI/TextBubble.cs +++ b/Assets/Scripts/UI/DialogUI/TextBubble.cs @@ -28,7 +28,7 @@ namespace AibisDream.Framework public void ShowLine(string line, Action onTextEnd) { - _typewriter.ShowText(""); + _typewriter.TextAnimator.SetText(""); gameObject.SetActive(true); var formattedLine = CommonUtil.SplitString(line, maxCharNum); _typewriter.ShowText(formattedLine); diff --git a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs index e43416c44..bb5a026fb 100644 --- a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs +++ b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs @@ -15,7 +15,6 @@ namespace AibisDream private bool _skipLineDelay; private Action _nextStep; - private Action _onTextShowed; private bool _isAutoSkip; private ActorRole _curRole; @@ -55,8 +54,7 @@ namespace AibisDream #endregion - public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, - bool isAutoSkip = false) + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, bool isAutoSkip = false) { gameObject.SetActive(true); @@ -80,7 +78,6 @@ namespace AibisDream // 保留信息 _nextStep = nextStep; - _onTextShowed = onTextShowed; _isAutoSkip = isAutoSkip; _curRole = character.role; } @@ -131,8 +128,6 @@ namespace AibisDream { // 触发事件 EnumEventSystem.Global.Send(DialogEventEnum.LineShown); - // 停止语音 - _onTextShowed?.Invoke(); // 执行自动跳过结局 if (_isAutoSkip) diff --git a/Assets/StreamingAssets/Config/character.csv b/Assets/StreamingAssets/Config/character.csv index 4c7dd9bc9..a57985d41 100644 --- a/Assets/StreamingAssets/Config/character.csv +++ b/Assets/StreamingAssets/Config/character.csv @@ -1,17 +1,17 @@ 通过key索引配置,中文名,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径 Key,Cn,DialogViewType,Role,NameColor,HeadPicPath,VoicePath -peipei,佩佩,Default,MainActor,#00FFFF,peipei_head,voice_peipei -me,我,Default,Player,,me_head,voice_me -peipei_novoice,胆怯女声,Default,Aside,#00FFFF,,voice_peipei -yingli_novoice,严厉女声,Default,Aside,#FFCC00,,voice_yingli +peipei,佩佩,Default,MainActor,#00FFFF,peipei_head,VO/voice_peipei +me,我,Default,Player,,me_head,VO/voice_me +peipei_novoice,胆怯女声,Default,Aside,#00FFFF,,VO/voice_peipei +yingli_novoice,严厉女声,Default,Aside,#FFCC00,,VO/voice_yingli tutorial,教学,Default,Aside,,, docter,儿科医生,Default,Aside,#FFCC00,, -peipei_child,童年佩佩,Default,Aside,#00FFFF,,voice_peipei +peipei_child,童年佩佩,Default,Aside,#00FFFF,,VO/voice_peipei unknown,？？？,Default,Aside,#FFCC00,, -shitou,石头,Default,MainActor,,,voice_shitou -Descent,Descent,Default,Aside,#FFCC00,,voice_me -e-assistant,电子助手,Default,Aside,#FFCC00,,voice_me -Gotashi_unknow,戴纯金雕塑头的男人,Default,Aside,#FFCC00,,voice_yingli +shitou,石头,Default,MainActor,,,VO/voice_shitou +Descent,Descent,Default,Aside,#FFCC00,,VO/voice_me +e-assistant,电子助手,Default,Aside,#FFCC00,,VO/voice_me +Gotashi_unknow,戴纯金雕塑头的男人,Default,Aside,#FFCC00,,VO/voice_yingli Linking,连接中……,Screen,Aside,#E6A23C,, Analysing,分析中,Screen,Aside,#E6A23C,, Error,错误警告,Screen,Aside,#E6A23C,, diff --git a/Assets/Scenes/FmodTest.unity.meta b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank.meta similarity index 74% rename from Assets/Scenes/FmodTest.unity.meta rename to Assets/StreamingAssets/FMOD/Desktop/Ambience.bank.meta index be1a46d34..37abfc5ac 100644 --- a/Assets/Scenes/FmodTest.unity.meta +++ b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0330ffb52d63f2e4585f74c290152f15 +guid: 6cc6769eae8670540a7bde405da0800b DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab.meta b/Assets/StreamingAssets/FMOD/Desktop/Environment.bank.meta similarity index 63% rename from Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab.meta rename to Assets/StreamingAssets/FMOD/Desktop/Environment.bank.meta index b916a3cce..8bd944bd4 100644 --- a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab.meta +++ b/Assets/StreamingAssets/FMOD/Desktop/Environment.bank.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b8280919ceaa0a2489020c94c7376cd0 -PrefabImporter: +guid: 4cce39ddddf1b2f4abd17cc5bced84a9 +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/StreamingAssets/FMOD/Desktop/Music.bank.meta b/Assets/StreamingAssets/FMOD/Desktop/Music.bank.meta new file mode 100644 index 000000000..f2f34765a --- /dev/null +++ b/Assets/StreamingAssets/FMOD/Desktop/Music.bank.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 492dd0f98655e2349b993a0d92e4493c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/FMOD/Desktop/UI.bank.meta b/Assets/StreamingAssets/FMOD/Desktop/UI.bank.meta new file mode 100644 index 000000000..3652e5bd5 --- /dev/null +++ b/Assets/StreamingAssets/FMOD/Desktop/UI.bank.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e328d5fa6e623b84abb41c1dc629d185 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/FMOD/Desktop/VO.bank.meta b/Assets/StreamingAssets/FMOD/Desktop/VO.bank.meta new file mode 100644 index 000000000..9dea64a78 --- /dev/null +++ b/Assets/StreamingAssets/FMOD/Desktop/VO.bank.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a55ef9ed3f3ce1c488ca9123d5a2bfef +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: