diff --git a/Assets/Prefabs/Tasktext.prefab b/Assets/Prefabs/Tasktext.prefab index 3a8c8de0c..d07a8bb3b 100644 --- a/Assets/Prefabs/Tasktext.prefab +++ b/Assets/Prefabs/Tasktext.prefab @@ -65,10 +65,12 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: ' + +' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -4877161827586246797, guid: 4cfecb1365a6162428292ebdfcaa2e47, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -92,8 +94,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -131,6 +133,6 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prototype/佩佩/Scripts/EyeManager.cs b/Assets/Prototype/佩佩/Scripts/EyeManager.cs index 91a069628..1dde6966e 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeManager.cs @@ -6,6 +6,7 @@ using DG.Tweening; using Yarn.Unity; using System.Linq; using UnityEngine.UI; +using AibisDream; public class EyeManager : MonoBehaviour { @@ -370,6 +371,7 @@ public IEnumerator SetEyeColor(string color,string memoryName=null) memorySequence.Insert(4.5f, memoryMaterial.DOFloat(0f, "_FullDistortionFade", 0.5f).OnComplete(() => { memoryRender.gameObject.SetActive(false); + AudioManager.RandomPlayInteraction("water_drip"); })); // 等待序列完成 diff --git a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs index 0ec453e38..7e272d265 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs @@ -9,7 +9,6 @@ using DG.Tweening; using Yarn.Unity; using UnityEngine.SceneManagement; using System.Numerics; - public class EyeTransitionManager : MonoBehaviour { @@ -302,6 +301,7 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) // 开始视图过渡 private void StartTransition(ViewState targetViewState) { + AudioManager.Instance.PauseMemoryAudio(); // 如果正在进行视图过渡,或者目标视图是当前视图,或者 MemoryProcess 正在处理,就不进行视图过渡 if (isTransitioning || currentViewState == targetViewState || (memoryProcess != null && memoryProcess.IsProcessing())) { @@ -311,7 +311,6 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) // 开始视图过渡 isTransitioning = true; - Tween rotateTween = null; if (targetViewState == ViewState.MainView) { Debug.Log("into mainview"); @@ -338,11 +337,9 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) zoomOutSequence.Insert(zoomDuration / 2,Camera.main.DOOrthoSize(5f, zoomDuration).SetEase(Ease.OutCubic)); zoomOutSequence.Insert(zoomDuration / 2, Camera.main.transform.DOMove(new UnityEngine.Vector3(0,0,-10) , zoomDuration).SetEase(Ease.OutCubic)); - if(projector.localPosition.y<=0) + if(projector.localPosition.y<=3) { - zoomOutSequence.Append(faceTransform.DOLocalMove(new UnityEngine.Vector2(0,0f), zoomDuration).SetEase(Ease.OutCubic)); - zoomOutSequence.Join(projector.DOLocalMove(new UnityEngine.Vector2(0,0f), zoomDuration).SetEase(Ease.OutCubic)); - zoomOutSequence.Append(projector.DOLocalMove(new UnityEngine.Vector2(0,3.5f), zoomDuration).SetEase(Ease.OutCubic)); + zoomOutSequence.Append(projector.DOLocalMove(new UnityEngine.Vector2(0,3.5f), zoomDuration).SetEase(Ease.OutCubic)); } @@ -356,26 +353,29 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) else { + if (!viewConfigDictionary.TryGetValue(targetViewState, out ViewConfig targetConfig)) return; // Zoom In 的时候,开始 Zoom Sequence zoomInSequence = DOTween.Sequence(); + Sequence roateSequence = DOTween.Sequence(); // zoomInSequence.Append(faceTransform.DOLocalMove(targetConfig.viewPosition, zoomDuration).SetEase(Ease.OutCubic)); // zoomInSequence.Join(faceTransform.DOScale(UnityEngine.Vector2.one*1.5f, zoomDuration).SetEase(Ease.OutCubic)); - float FadeTiming=zoomDuration/2; + float FadeTiming=zoomDuration/4; if (targetViewState == ViewState.MemoryView) { - FadeTiming*=4f; + FadeTiming*=8f; - zoomInSequence.Append(projector.DOLocalMove(new UnityEngine.Vector2(0,0f), zoomDuration).SetEase(Ease.OutCubic)); - //zoomInSequence.Insert(zoomDuration, rotateTween); - // rotateTween = projector.GetChild(0).transform.DOLocalRotate(new UnityEngine.Vector3(0, 0, 360), 2f, RotateMode.FastBeyond360) - // .SetEase(Ease.Linear) - // .SetLoops(-1, LoopType.Restart); // 无限循环旋转 - - // 添加其他动画到序列中,并在旋转2秒后开始 - //zoomInSequence.AppendInterval(zoomDuration/4); // 等待2秒 - zoomInSequence.Append(projector.DOLocalMove(new UnityEngine.Vector2(0,-3f), zoomDuration).SetEase(Ease.OutCubic)); - zoomInSequence.Join(faceTransform.DOLocalMove(new UnityEngine.Vector2(0,-3f), zoomDuration).SetEase(Ease.OutCubic)); + zoomInSequence.Append(projector.DOLocalMove(new UnityEngine.Vector2(0,0f), zoomDuration).SetEase(Ease.OutElastic,0.5f)); + zoomInSequence.AppendCallback(() => + { + + // 创建并启动循环旋转动画 + roateSequence.Append(projector.GetChild(0).transform.DOLocalRotate(new UnityEngine.Vector3(0, 0, -360), 1f, RotateMode.FastBeyond360).SetEase(Ease.Linear) + .SetLoops(3, LoopType.Incremental)); + roateSequence.Play(); + }); + zoomInSequence.AppendInterval(0.5f); + } zoomInSequence.Append(Camera.main.DOOrthoSize(targetConfig.cameraSize, zoomDuration).SetEase(Ease.OutCubic)); zoomInSequence.Join( Camera.main.transform.DOMove(new UnityEngine.Vector3(targetConfig.cameraPos.x,targetConfig.cameraPos.y,-10), zoomDuration).SetEase(Ease.OutCubic)); @@ -387,14 +387,14 @@ public void SetViewAvailability(string viewStateName, bool isAvailable) // 在整个 Zoom 完成后激活 Eye View zoomInSequence.OnComplete(() => { - if (rotateTween != null) + if(zoomInSequence!=null) { - rotateTween.Kill(); - //Debug.Log("Rotate tween killed"); + zoomInSequence.Kill(); } SetView(targetViewState); FadeFromBlack(() => { + currentViewState = targetViewState; isTransitioning = false; }); diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 28b2024e5..fd35ffc4a 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using DG.Tweening; -using Yarn.Unity; +using Yarn.Unity; +using AibisDream; public class MemoryProcess : MonoBehaviour { @@ -52,6 +53,7 @@ public IEnumerator ColorFadeOut() [YarnCommand("search_memory")] public IEnumerator SearchMemory(string memoryName,bool isColorful = true) { + AudioManager.Instance.PauseMemoryAudio(); if (isColorful) { memoryFinishedImage.material.SetFloat("_DirectionalDistortionFade", -2); @@ -65,7 +67,7 @@ public IEnumerator ColorFadeOut() Debug.LogWarning("Already processing a memory. Please wait until the process is finished."); yield break; } - + //AudioManager.PlayLoopAudio("tv_noise"); memoryProcessImage.gameObject.SetActive(true); // 重新激活 memoryProcessImage memoryFinishedImage.gameObject.SetActive(false); // 禁用 memoryFinishedImage memoryFinishedImageNoColor.gameObject.SetActive(false); @@ -80,12 +82,26 @@ public IEnumerator ColorFadeOut() } Sequence memorySequence = DOTween.Sequence(); + AudioManager.SetLoopSourceVolume(0.3f); + AudioManager.PlayLoopAudio("tv_noise"); // 修改memoryprocess的参数 - memorySequence.Append(memoryProcessImage.material.DOFloat(0, "_StrongTintFade", 1)); - memorySequence.Join(memoryProcessImage.material.DOFloat(1, "_GlitchFade", 1)); + memorySequence.Append(memoryProcessImage.material.DOFloat(0, "_StrongTintFade", 0.2f)); + memorySequence.Join(memoryProcessImage.material.DOFloat(1, "_GlitchFade", 0.2f)); - memorySequence.AppendInterval(2.5f); // 添加4秒的延时 + memorySequence.AppendInterval(3f); // 添加1.5秒的延时 + + // 在1.5秒延时后,暂停循环音频并播放记忆音频 + memorySequence.AppendCallback(() => + { + + AudioManager.PauseLoopAudio(); + AudioManager.SetLoopSourceVolume(1.0f); + AudioManager.PlayMemoryAudio("mem_"+memoryName); + + }); + + memorySequence.AppendInterval(2.1f); // 记忆处理结束,激活memoryFinishedImage memorySequence.AppendCallback(() => diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index 0ed447311..1d0257f96 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -2706,8 +2706,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 3, y: 90.2} - m_SizeDelta: {x: 270, y: 2} + m_AnchoredPosition: {x: 6, y: 103} + m_SizeDelta: {x: 300, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &196715436 MonoBehaviour: @@ -5390,8 +5390,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -1.1} - m_SizeDelta: {x: 300, y: 300} + m_AnchoredPosition: {x: 7, y: 0} + m_SizeDelta: {x: 350, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &298503008 MonoBehaviour: @@ -5562,6 +5562,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &336153716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 336153717} + - component: {fileID: 336153718} + m_Layer: 0 + m_Name: "\u80CC\u666F (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &336153717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336153716} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.08500099, y: 16.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1677463565} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &336153718 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336153716} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -3514371587045790464, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.03, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &342631405 GameObject: m_ObjectHideFlags: 0 @@ -7252,6 +7336,90 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 526895855} m_CullTransparentMesh: 1 +--- !u!1 &528414264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 528414265} + - component: {fileID: 528414266} + m_Layer: 0 + m_Name: "\u5DE6\u4FA7\u754C\u9762 (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &528414265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528414264} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0.0000029504295} + m_LocalPosition: {x: 0.00001042309, y: 15.76, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1677463565} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} +--- !u!212 &528414266 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528414264} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 461186577} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 959782197 + m_SortingLayer: 7 + m_SortingOrder: 0 + m_Sprite: {fileID: -1850603012235433780, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 19.2, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &550049038 GameObject: m_ObjectHideFlags: 0 @@ -7409,7 +7577,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 151, y: 160} + m_AnchoredPosition: {x: 168, y: 175} m_SizeDelta: {x: 500, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &555910942 @@ -7584,6 +7752,120 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 558082846} m_CullTransparentMesh: 1 +--- !u!1001 &576044008 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1093487541} + m_Modifications: + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_SizeDelta.x + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3556313705934389985, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 3556313705934389985, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_fontSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 3556313705934389985, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_fontSizeBase + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5295477770541402281, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_Name + value: Tasktext + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} +--- !u!224 &576044009 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + m_PrefabInstance: {fileID: 576044008} + m_PrefabAsset: {fileID: 0} --- !u!1 &578644883 GameObject: m_ObjectHideFlags: 0 @@ -10704,7 +10986,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -36} + m_AnchoredPosition: {x: 2, y: -36} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &719154562 @@ -10754,8 +11036,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -11368,7 +11650,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.029999971, y: -1.47} + m_AnchoredPosition: {x: -0.029999971, y: -1.24} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &770829337 @@ -14300,12 +14582,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 576044009} m_Father: {fileID: 555910940} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -47.3} + m_AnchoredPosition: {x: -16, y: -43} m_SizeDelta: {x: 300, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1093487542 @@ -14326,7 +14609,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: -17.59 + m_Spacing: -10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -14571,8 +14854,8 @@ MonoBehaviour: - {fileID: 951186776} currentVisualIndex: 0 crowBarSocket: {fileID: 0} - cameraSize: 2 - cameraPos: {x: -2.5, y: 3} + cameraSize: 2.5 + cameraPos: {x: -2.5, y: 5.3} - viewPanel: {fileID: 0} socket: {fileID: 1261765723} viewState: 4 @@ -17906,6 +18189,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} insertIndex: 1 addedObject: {fileID: 1082705360} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + insertIndex: 12 + addedObject: {fileID: 528414265} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + insertIndex: 13 + addedObject: {fileID: 336153717} - targetCorrespondingSourceObject: {fileID: 5906748915288829771, guid: fd04c28739017964789d58d573f9fabb, type: 3} insertIndex: -1 addedObject: {fileID: 1558284819} @@ -18714,6 +19003,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2137618659} - {fileID: 770829336} - {fileID: 1383513209} m_Father: {fileID: 1141076862} @@ -19887,7 +20177,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.02, y: -0.2} + m_AnchoredPosition: {x: 0.01999998, y: 0.029999971} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1383513210 @@ -31215,6 +31505,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2126911509} m_CullTransparentMesh: 1 +--- !u!1 &2137618658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2137618659} + - component: {fileID: 2137618661} + - component: {fileID: 2137618660} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2137618659 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137618658} + 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: 1329182368} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.06, y: 0.053} + m_SizeDelta: {x: 3.3, y: 2.25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2137618660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137618658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2137618661 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137618658} + m_CullTransparentMesh: 1 --- !u!1 &2147346625 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Audio/BooomAudio/beep_error.ogg b/Assets/Resources/Audio/beep_error.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error.ogg rename to Assets/Resources/Audio/beep_error.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_error.ogg.meta b/Assets/Resources/Audio/beep_error.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error.ogg.meta rename to Assets/Resources/Audio/beep_error.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_error_1.ogg b/Assets/Resources/Audio/beep_error_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error_1.ogg rename to Assets/Resources/Audio/beep_error_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_error_1.ogg.meta b/Assets/Resources/Audio/beep_error_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error_1.ogg.meta rename to Assets/Resources/Audio/beep_error_1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_error_2.ogg b/Assets/Resources/Audio/beep_error_2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error_2.ogg rename to Assets/Resources/Audio/beep_error_2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_error_2.ogg.meta b/Assets/Resources/Audio/beep_error_2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error_2.ogg.meta rename to Assets/Resources/Audio/beep_error_2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_error_3.ogg b/Assets/Resources/Audio/beep_error_3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error_3.ogg rename to Assets/Resources/Audio/beep_error_3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_error_3.ogg.meta b/Assets/Resources/Audio/beep_error_3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_error_3.ogg.meta rename to Assets/Resources/Audio/beep_error_3.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning.ogg b/Assets/Resources/Audio/beep_warning.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning.ogg rename to Assets/Resources/Audio/beep_warning.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning.ogg.meta b/Assets/Resources/Audio/beep_warning.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning.ogg.meta rename to Assets/Resources/Audio/beep_warning.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning_1.ogg b/Assets/Resources/Audio/beep_warning_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning_1.ogg rename to Assets/Resources/Audio/beep_warning_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning_1.ogg.meta b/Assets/Resources/Audio/beep_warning_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning_1.ogg.meta rename to Assets/Resources/Audio/beep_warning_1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning_2.ogg b/Assets/Resources/Audio/beep_warning_2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning_2.ogg rename to Assets/Resources/Audio/beep_warning_2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning_2.ogg.meta b/Assets/Resources/Audio/beep_warning_2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning_2.ogg.meta rename to Assets/Resources/Audio/beep_warning_2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning_3.ogg b/Assets/Resources/Audio/beep_warning_3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning_3.ogg rename to Assets/Resources/Audio/beep_warning_3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/beep_warning_3.ogg.meta b/Assets/Resources/Audio/beep_warning_3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/beep_warning_3.ogg.meta rename to Assets/Resources/Audio/beep_warning_3.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_1.ogg b/Assets/Resources/Audio/mem_liuying1-1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_1.ogg rename to Assets/Resources/Audio/mem_liuying1-1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_1.ogg.meta b/Assets/Resources/Audio/mem_liuying1-1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_1.ogg.meta rename to Assets/Resources/Audio/mem_liuying1-1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_2.ogg b/Assets/Resources/Audio/mem_liuying1-2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_2.ogg rename to Assets/Resources/Audio/mem_liuying1-2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_2.ogg.meta b/Assets/Resources/Audio/mem_liuying1-2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_2.ogg.meta rename to Assets/Resources/Audio/mem_liuying1-2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_3.ogg b/Assets/Resources/Audio/mem_liuying1-3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_3.ogg rename to Assets/Resources/Audio/mem_liuying1-3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_3.ogg.meta b/Assets/Resources/Audio/mem_liuying1-3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_3.ogg.meta rename to Assets/Resources/Audio/mem_liuying1-3.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_5.ogg b/Assets/Resources/Audio/mem_liuying3-1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_5.ogg rename to Assets/Resources/Audio/mem_liuying3-1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_liuying_5.ogg.meta b/Assets/Resources/Audio/mem_liuying3-1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_liuying_5.ogg.meta rename to Assets/Resources/Audio/mem_liuying3-1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_play.ogg b/Assets/Resources/Audio/mem_play.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_play.ogg rename to Assets/Resources/Audio/mem_play.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_play.ogg.meta b/Assets/Resources/Audio/mem_play.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_play.ogg.meta rename to Assets/Resources/Audio/mem_play.ogg.meta diff --git a/Assets/Resources/Audio/messagebox_warning.mp3 b/Assets/Resources/Audio/messagebox_warning.mp3 new file mode 100644 index 000000000..a629c4401 Binary files /dev/null and b/Assets/Resources/Audio/messagebox_warning.mp3 differ diff --git a/Assets/Resources/Audio/messagebox_warning.mp3.meta b/Assets/Resources/Audio/messagebox_warning.mp3.meta new file mode 100644 index 000000000..801534624 --- /dev/null +++ b/Assets/Resources/Audio/messagebox_warning.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a50452fe0a9c3bd4fa264b343fae798d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/BooomAudio/plug_in_1.ogg b/Assets/Resources/Audio/plug_in_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_in_1.ogg rename to Assets/Resources/Audio/plug_in_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/plug_in_1.ogg.meta b/Assets/Resources/Audio/plug_in_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_in_1.ogg.meta rename to Assets/Resources/Audio/plug_in_1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/plug_in_2.ogg b/Assets/Resources/Audio/plug_in_2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_in_2.ogg rename to Assets/Resources/Audio/plug_in_2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/plug_in_2.ogg.meta b/Assets/Resources/Audio/plug_in_2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_in_2.ogg.meta rename to Assets/Resources/Audio/plug_in_2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/plug_in_3.ogg b/Assets/Resources/Audio/plug_in_3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_in_3.ogg rename to Assets/Resources/Audio/plug_in_3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/plug_in_3.ogg.meta b/Assets/Resources/Audio/plug_in_3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_in_3.ogg.meta rename to Assets/Resources/Audio/plug_in_3.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/plug_out_1.ogg b/Assets/Resources/Audio/plug_out_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_out_1.ogg rename to Assets/Resources/Audio/plug_out_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/plug_out_1.ogg.meta b/Assets/Resources/Audio/plug_out_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_out_1.ogg.meta rename to Assets/Resources/Audio/plug_out_1.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/plug_out_2.ogg b/Assets/Resources/Audio/plug_out_2.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_out_2.ogg rename to Assets/Resources/Audio/plug_out_2.ogg diff --git a/Assets/Resources/Audio/BooomAudio/plug_out_2.ogg.meta b/Assets/Resources/Audio/plug_out_2.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_out_2.ogg.meta rename to Assets/Resources/Audio/plug_out_2.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/plug_out_3.ogg b/Assets/Resources/Audio/plug_out_3.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_out_3.ogg rename to Assets/Resources/Audio/plug_out_3.ogg diff --git a/Assets/Resources/Audio/BooomAudio/plug_out_3.ogg.meta b/Assets/Resources/Audio/plug_out_3.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/plug_out_3.ogg.meta rename to Assets/Resources/Audio/plug_out_3.ogg.meta diff --git a/Assets/Resources/Audio/tv_noise.mp3 b/Assets/Resources/Audio/tv_noise.mp3 new file mode 100644 index 000000000..4c6b4ddc0 Binary files /dev/null and b/Assets/Resources/Audio/tv_noise.mp3 differ diff --git a/Assets/Resources/Audio/tv_noise.mp3.meta b/Assets/Resources/Audio/tv_noise.mp3.meta new file mode 100644 index 000000000..06b0e7eae --- /dev/null +++ b/Assets/Resources/Audio/tv_noise.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b3110dbc67cdffe4aaa6297b866d0e6f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/water_drip.mp3 b/Assets/Resources/Audio/water_drip.mp3 new file mode 100644 index 000000000..baa0eb5e9 Binary files /dev/null and b/Assets/Resources/Audio/water_drip.mp3 differ diff --git a/Assets/Resources/Audio/water_drip.mp3.meta b/Assets/Resources/Audio/water_drip.mp3.meta new file mode 100644 index 000000000..a4cdadd85 --- /dev/null +++ b/Assets/Resources/Audio/water_drip.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 97ea0d9c3f1c3124ab41b4fd1fc66db9 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn b/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn index a07114038..a435b37d0 100644 --- a/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn +++ b/Assets/Resources/Yarn/MemoryColorFadeOut/MemoryColorFadeOut1.yarn @@ -2,7 +2,7 @@ tags: --- <> -//<> +<> ->进入记忆 <> ->搜寻记忆 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index f1fcc5530..26a45dd82 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1534,10 +1534,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18a3ec3914131d44199ae33902edf159, type: 3} m_Name: m_EditorClassIdentifier: - runMode: 0 + runMode: 1 firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene - testYarnProject: CharacterTest + testYarnProject: Task --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -3518,7 +3518,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} m_audioClip: {fileID: 0} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.659 m_Pitch: 1 Loop: 1 Mute: 0 diff --git a/Assets/Scripts/FixSystem/Cable/Plug.cs b/Assets/Scripts/FixSystem/Cable/Plug.cs index f9c0e7b1e..9be2eaa18 100644 --- a/Assets/Scripts/FixSystem/Cable/Plug.cs +++ b/Assets/Scripts/FixSystem/Cable/Plug.cs @@ -44,6 +44,7 @@ public class Plug : MonoBehaviour, IDragHandler, IPointerDownHandler, IPointerUp transform.position = startPosition; initialSocket.InsertPlug(this); plugSprite.enabled = false; + currentSocket=initialSocket; DialogController.OnDialogueStart += HandleDialogueStart; DialogController.OnDialogueComplete += HandleDialogueComplete; } diff --git a/Assets/Scripts/FixSystem/Cable/Socket.cs b/Assets/Scripts/FixSystem/Cable/Socket.cs index dff864232..a310b77d1 100644 --- a/Assets/Scripts/FixSystem/Cable/Socket.cs +++ b/Assets/Scripts/FixSystem/Cable/Socket.cs @@ -27,6 +27,7 @@ public class Socket : MonoBehaviour, ISocket { IsAvailable = false; } + AudioManager.RandomPlayInteraction("plug_in"); plug=p; plug.CableRef.End=plug.transform; // 可插入就可以触发对话 @@ -36,10 +37,12 @@ public class Socket : MonoBehaviour, ISocket public void RemovePlug(Plug p) { IsAvailable = true; + AudioManager.RandomPlayInteraction("plug_out"); MessageBox.Instance.HandleMessageBoxCommand("null",""); plug.CableRef.End=plug.transform.GetChild(0).transform; plug=null; + } public Vector2 GetPosition() diff --git a/Assets/Scripts/FixSystem/Screen/MessageBox.cs b/Assets/Scripts/FixSystem/Screen/MessageBox.cs index 9307a7a06..5783ad465 100644 --- a/Assets/Scripts/FixSystem/Screen/MessageBox.cs +++ b/Assets/Scripts/FixSystem/Screen/MessageBox.cs @@ -2,6 +2,7 @@ using UnityEngine; using TMPro; using System.Collections; using Yarn.Unity; +using AibisDream; public class MessageBox : MonoBehaviour { @@ -79,13 +80,17 @@ public class MessageBox : MonoBehaviour // 闪烁警告效果 private IEnumerator FlashWarning() { - for (int i = 0; i < 3; i++) + AudioManager.SetinteractionSourceVolume(0.35f); + AudioManager.RandomPlayInteraction("messagebox_warning"); + for (int i = 0; i < 2; i++) { state.enabled = false; - yield return new WaitForSeconds(0.5f); // 闪烁间隔 + yield return new WaitForSeconds(0.3f); // 闪烁间隔 state.enabled = true; - yield return new WaitForSeconds(0.5f); // 闪烁间隔 + yield return new WaitForSeconds(0.3f); // 闪烁间隔 } + AudioManager.SetinteractionSourceVolume(1f); state.enabled = true; // 确保闪烁后状态仍然可见 + } } diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs index 0d68877af..9707e665d 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs @@ -51,8 +51,8 @@ namespace AibisDream clip = Resources.Load($"Audio/{interactionName}"); } - Instance._voiceSource.clip = clip; - Instance._voiceSource.Play(); + Instance._interactionSource.clip = clip; + Instance._interactionSource.Play(); } public void StopVoice() @@ -181,9 +181,9 @@ namespace AibisDream #region 播放记忆 - public void PlayMemoryAudio(string memoryName) + public static void PlayMemoryAudio(string memoryName) { - StartCoroutine(AsyncPlayMemoryAudio(memoryName)); + Instance.StartCoroutine(AsyncPlayMemoryAudio(memoryName)); } public void PauseMemoryAudio() @@ -230,17 +230,26 @@ namespace AibisDream return Resources.Load($"{path}_{randomIndex}"); } - private IEnumerator AsyncPlayMemoryAudio(string memoryName) + private static IEnumerator AsyncPlayMemoryAudio(string memoryName) { AudioClip intro = Resources.Load($"Audio/mem_play"); AudioClip loop = Resources.Load($"Audio/{memoryName}"); - _memorySource.clip = intro; - _memorySource.loop = false; - _memorySource.Play(); + Instance._memorySource.clip = intro; + Instance._memorySource.loop = false; + Instance._memorySource.Play(); yield return new WaitForSeconds(intro.length); - _memorySource.clip = loop; - _memorySource.loop = true; - _memorySource.Play(); + 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/Task/TaskManager.cs b/Assets/Scripts/Task/TaskManager.cs index 4e37027c7..2922a3904 100644 --- a/Assets/Scripts/Task/TaskManager.cs +++ b/Assets/Scripts/Task/TaskManager.cs @@ -39,14 +39,14 @@ public class TaskManager : MonoBehaviour [YarnCommand("task_moveIn")] public void Task_moveIn() { - pos.DOAnchorPosY(-pos.sizeDelta.y/4,1f); + pos.DOAnchorPosY(-170f,1f); } [YarnCommand("task_moveOut")] public void Task_moveOut() { - pos.DOAnchorPosY(pos.sizeDelta.y/3.5f,1f); + pos.DOAnchorPosY(175,1f); } [YarnCommand("add_task")]