diff --git a/Assets/Resources/Audio/BooomAudio/fixing_general.ogg b/Assets/Resources/Audio/fixing_general.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/fixing_general.ogg rename to Assets/Resources/Audio/fixing_general.ogg diff --git a/Assets/Resources/Audio/BooomAudio/fixing_general.ogg.meta b/Assets/Resources/Audio/fixing_general.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/fixing_general.ogg.meta rename to Assets/Resources/Audio/fixing_general.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg b/Assets/Resources/Audio/mem_戈塔什诱惑.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg rename to Assets/Resources/Audio/mem_戈塔什诱惑.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg.meta b/Assets/Resources/Audio/mem_戈塔什诱惑.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg.meta rename to Assets/Resources/Audio/mem_戈塔什诱惑.ogg.meta diff --git a/Assets/Resources/Audio/mem_liuying3-1.ogg b/Assets/Resources/Audio/mem_海边.ogg similarity index 100% rename from Assets/Resources/Audio/mem_liuying3-1.ogg rename to Assets/Resources/Audio/mem_海边.ogg diff --git a/Assets/Resources/Audio/mem_liuying3-1.ogg.meta b/Assets/Resources/Audio/mem_海边.ogg.meta similarity index 100% rename from Assets/Resources/Audio/mem_liuying3-1.ogg.meta rename to Assets/Resources/Audio/mem_海边.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg b/Assets/Resources/Audio/mem_英里生气.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg rename to Assets/Resources/Audio/mem_英里生气.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg.meta b/Assets/Resources/Audio/mem_英里生气.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg.meta rename to Assets/Resources/Audio/mem_英里生气.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/typing.ogg b/Assets/Resources/Audio/typing.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/typing.ogg rename to Assets/Resources/Audio/typing.ogg diff --git a/Assets/Resources/Audio/BooomAudio/typing.ogg.meta b/Assets/Resources/Audio/typing.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/typing.ogg.meta rename to Assets/Resources/Audio/typing.ogg.meta diff --git a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn b/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn index 458e0536e..fcaae654d 100644 --- a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn +++ b/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn @@ -1,4 +1,4 @@ -title: Start +title: Start tags: colorID: 8 position: 253,-2041 @@ -13,19 +13,24 @@ tags: <> <> <> -<> +<> <> -<> +<> <> <> <> +<> +<> +<> +<> + === title: End_memoryPaly tags: colorID: 3 position: -1,976 --- -<> +<> === title: UF绘图1 diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn index 9024d89af..429dc61bc 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn @@ -149,6 +149,7 @@ position: 480,-2840 <> <> <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn index 2473f42ad..7d00e0a99 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn @@ -114,6 +114,7 @@ me: 佩佩,该放手了。 <> <> <> +<> <> <> <> @@ -140,6 +141,7 @@ position: 0,-2840 <> <> <> +<> <> <> <> @@ -164,6 +166,7 @@ position: 480,-2840 <> <> <> + <> <> <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index c7c8bc828..0bfdabe66 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -12864,7 +12864,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &659675442 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32075,8 +32075,8 @@ MonoBehaviour: punchTapeMachine: {fileID: 35416255} punchTape: {fileID: 2028795587} blackPanel: {fileID: 964820569} - stepInterval: 0.05 - stepDistance: 50 + stepInterval: 0.08 + stepDistance: 24 stepPatterns: - 0.1 - 0.2 @@ -39770,7 +39770,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.x - value: -0.269 + value: -0.2 objectReference: {fileID: 0} - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs index feeca945c..a4ba60aa6 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs @@ -209,13 +209,13 @@ namespace AibisDream.FixSystem public IEnumerator EnableDeepInButton() { - yield return _deepinButton.GetTransform().DOLocalMoveX(0.5f, 0.5f).WaitForCompletion(); + yield return _deepinButton.GetTransform().DOLocalMoveX(0.35f, 0.5f).WaitForCompletion(); _deepinButton.SetActive(true); } public IEnumerator DisableDeepInButton() { - yield return _deepinButton.GetTransform().DOLocalMoveX(-0.1f, 0.5f).WaitForCompletion(); + yield return _deepinButton.GetTransform().DOLocalMoveX(-0.2f, 0.5f).WaitForCompletion(); _deepinButton.SetActive(false); } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs index e0885a40c..c83828495 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs @@ -5,6 +5,7 @@ using UnityEngine; using AibisDream.FixSystem; using UnityEngine.UI; using Unity.VisualScripting; +using AibisDream; public class PunchTapeSystem : MonoBehaviour { @@ -46,7 +47,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"); // Gradually move the punch tape to x = -3.8 with rhythmic pattern Vector2 targetPosition = new Vector2(796f, punchTape.anchoredPosition.y); int patternIndex = 0;