From 60f4f798f7d992a37dadf6b6600593d867e80503 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Mon, 30 Dec 2024 22:40:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=B5=84=E6=BA=90=E5=92=8C?= =?UTF-8?q?=E9=9F=B3=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Art/Memory/戈塔什诱惑.png | 4 ++-- .../Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn | 14 ++++++++------ .../Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn | 1 + Assets/Scripts/Clue/ClueSlotBase.cs | 4 +++- .../Scripts/FixSystem/HeatMap/HeatMapController.cs | 3 ++- Assets/Scripts/SubWay/ParallaxManager.cs | 3 +++ Assets/Scripts/SystemWindow/WindowManager.cs | 4 ++++ Assets/Scripts/Task/TaskManager.cs | 3 +++ 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Assets/Resources/Art/Memory/戈塔什诱惑.png b/Assets/Resources/Art/Memory/戈塔什诱惑.png index 5cef18898..84051d32d 100644 --- a/Assets/Resources/Art/Memory/戈塔什诱惑.png +++ b/Assets/Resources/Art/Memory/戈塔什诱惑.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:412578509e1893bf227af5860ff1392e45d64c4c6cc0c01688bbe63e77b1df66 -size 807708 +oid sha256:2d35d6202bab782782c97421a29803b7931a792deb843515e588e6d4f3885aa1 +size 368744 diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn index 8b567cc65..2e607d053 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn @@ -215,13 +215,15 @@ colorID: 8 position: 942,543 --- peipei:我的画……到底要怎么受欢迎呢？ -戴纯金雕塑的男人: 让我来告诉你吧，你听说过摩尔定律吗？ -戴纯金雕塑的男人: 只要短裙的长度少1厘米，粉丝的数量就会翻倍噢！ -//多加点一本正经的胡说八道！ +戴纯金雕塑头的男人: 孩子，你听说过裙摆摩尔定律吗？ +戴纯金雕塑头的男人: 裙子的长度每减少1机厘，粉丝的数量就会翻倍。 +戴纯金雕塑头的男人: 同理，还有胸臀万有引力定律！胸部和臀部的半径每加大1机厘，对眼球的吸引力就会呈指数增长。 +peipei: 这是……谁说的？ +戴纯金雕塑头的男人: 是著名的机体物理学家沃德·牛孜说的。 peipei:可是…… -戴纯金雕塑头的男人: 这是时代潮流，孩子，加入它吧。 -peipei:可是我画的是半身图。 -戴纯金雕塑头的男人: 呃……那就加大胸部！欧~~派~~~~ +戴纯金雕塑头的男人: 孩子，它和我送给你的UF模块一样，都是一份 供你选择的礼物。 +戴纯金雕塑头的男人: 你可以不用，但这是时代的潮流。 +戴纯金雕塑头的男人: 从今以后，你的同事们都会逐渐接受它的。 <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn index b19c6848c..be5ae037b 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn @@ -216,6 +216,7 @@ position: 238,-441 peipei:医生……我的头……好烫…… me: 该死，得赶快给她降温！ <> + <> <> <> <>//没检查视觉，但是全身都插了 diff --git a/Assets/Scripts/Clue/ClueSlotBase.cs b/Assets/Scripts/Clue/ClueSlotBase.cs index 738655cee..693ffb77e 100644 --- a/Assets/Scripts/Clue/ClueSlotBase.cs +++ b/Assets/Scripts/Clue/ClueSlotBase.cs @@ -4,6 +4,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using DG.Tweening; using System.Numerics; +using AibisDream; public class ClueSlotBase : MonoBehaviour, IDropHandler { @@ -56,7 +57,8 @@ public void OnDrop(PointerEventData eventData) currentClueItem = clueItem; isOccupied = true; punchTapeImage.enabled=true; - punchTapeImage.rectTransform.DOAnchorPosY(-473f,2f) + AudioManager.RandomPlayInteraction("punchtape"); + punchTapeImage.rectTransform.DOAnchorPosY(-473f,4f) .OnComplete(() => { punchTapeImage.enabled=false; diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs index 4f5752538..2edaf5714 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs +++ b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs @@ -84,7 +84,8 @@ public class HeatMapController : MonoBehaviour Debug.Log("降温成功"); heatmapGameobject.GetComponent().isDone = true; float duration = 2f; - SetTemptureSmooth(0,duration); + SetTemptureSmooth(0,duration); + AudioManager.RandomPlayInteraction("cooler_cooling"); yield return new WaitForSeconds(duration); DialogController.Instance.StartDialogNode("降温成功"); bodyModuleSystem.OnCooling(); diff --git a/Assets/Scripts/SubWay/ParallaxManager.cs b/Assets/Scripts/SubWay/ParallaxManager.cs index deddd9791..0f0e24dd2 100644 --- a/Assets/Scripts/SubWay/ParallaxManager.cs +++ b/Assets/Scripts/SubWay/ParallaxManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using DG.Tweening; using Yarn.Unity; +using AibisDream; [System.Serializable] @@ -123,6 +124,8 @@ public class ParallaxManager : MonoBehaviour void Start() { + AudioManager.PlayAmb1Audio("amb_subway"); + AudioManager.PlayAmb1Audio("music_subway"); // 初始化记录的值 Color color = sisterSpriteRender.color; color.a = 0; diff --git a/Assets/Scripts/SystemWindow/WindowManager.cs b/Assets/Scripts/SystemWindow/WindowManager.cs index e51adc9d7..805c219dc 100644 --- a/Assets/Scripts/SystemWindow/WindowManager.cs +++ b/Assets/Scripts/SystemWindow/WindowManager.cs @@ -3,6 +3,7 @@ using RainbowArt.CleanFlatUI; using Yarn.Unity; using System.Collections; using DG.Tweening; +using AibisDream; public class WindowManager : MonoBehaviour { @@ -30,6 +31,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenSingleButtonWindow")] public IEnumerator OpenSingleButtonWindow(string title, string description, bool ispanelActive = true) { + AudioManager.PlayMemoryAudio("ui"); bool isConfirmed = false; singleButtonWindowPrefab.transform.GetChild(0).gameObject.SetActive(ispanelActive); @@ -48,6 +50,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenMutiSingleButtonWindow")] public IEnumerator OpenMutiSingleButtonWindow(string title, string description, int number) { + AudioManager.PlayMemoryAudio("ui"); bool isConfirmed = false; singleButtonWindowPrefab.transform.GetChild(0).gameObject.SetActive(false); @@ -66,6 +69,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenProgressWindow")] public IEnumerator OpenProgressWindow(string title, string description, float duration) { + AudioManager.PlayMemoryAudio("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 6f2247833..7e3d24c2e 100644 --- a/Assets/Scripts/Task/TaskManager.cs +++ b/Assets/Scripts/Task/TaskManager.cs @@ -5,6 +5,7 @@ using TMPro; using Yarn.Unity; using System.Linq; // 添加这个 using 语句 using DG.Tweening; +using AibisDream; public class TaskEntry @@ -39,6 +40,7 @@ public class TaskManager : MonoBehaviour [YarnCommand("task_moveIn")] public void Task_moveIn() { + AudioManager.PlayMemoryAudio("task_inout"); pos.DOAnchorPosY(-170f,1f); } @@ -46,6 +48,7 @@ public class TaskManager : MonoBehaviour [YarnCommand("task_moveOut")] public void Task_moveOut() { + AudioManager.PlayMemoryAudio("task_inout"); pos.DOAnchorPosY(175,1f); }