diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 4f5f206fd..68a52f0b4 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -310,6 +310,7 @@ public IEnumerator PlayMemory(bool useYarn=false,string memName="") [YarnCommand("search_memory")] public IEnumerator SearchMemory(PunchTape punchTape, bool isSkipDialogue=false) { + //FavoritesManager.Instance.CloseFavorites(); if(punchTape==null) { Debug.Log("no punchTape"); diff --git a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn index 2d5a3b425..4abc3f1e6 100644 --- a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn @@ -8,6 +8,8 @@ position: 43,-97 <> <> <> +<> +me: 好像不太对,我再想想 <> === diff --git a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn index 363287a22..117160e94 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn @@ -18,6 +18,8 @@ position: -95,-631 <> <> <> +<> +me: 好像不太对,我再想想 <> === diff --git a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn index d33bd8d0f..9cda1a9fc 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn @@ -312,7 +312,7 @@ position: -995,-1507 title: 主维修界面 tags: colorID: 3 -position: 238,-429 +position: 238,-432 --- <1>> <> @@ -352,14 +352,14 @@ position: 238,-429 // <> // me: UF到底把信息传递给了谁? // me: 最好再检查一下各个模块。 - <> + <> me: 发热得越来越快了…… me: 再次执行降温 - <> <> + <> //<> - <> - <> + <> + <> me: 时间不多了,我必须赶紧分析得出结论…然后迅速执行手术。 me: 希望还来得及…… me: 佩佩,可以休息一下了。我现在需要对已有的症状进行分析。 @@ -559,7 +559,7 @@ me: 那我们试试吧…在视觉模块验证一下吧。 //<> //<> <> -<> +<> <> <> <> @@ -1116,7 +1116,7 @@ tags: colorID: 8 position: 1379,-1199 --- -//<> +<> <> <> <> @@ -1141,9 +1141,9 @@ me: 只好在全身收集一下其他症状了。 title: 第二次降温 tags: colorID: 8 -position: 1383,-931 +position: 1364,-718 --- -//<> +<> <> <> me: 呼,总算…… @@ -1212,7 +1212,7 @@ position: 1769,-1106 title: 第三次降温 tags: colorID: 8 -position: 1376,-718 +position: 1377,-972 --- //暂时废弃,降温减少一次,现在第四次改为第三次 //TODO-玩家有可能会跳过第二次发热,如果那样,第二次和第三次降温结束的对话需要做一些融合 @@ -1220,6 +1220,7 @@ position: 1376,-718 <> <> <> +<> me: 我想下一次发热,不会这么简单了... <> <> @@ -1847,7 +1848,7 @@ me: 这里有插孔了,可以去检查看看了 title: UF进程播放完毕 tags: colorID: 8 -position: -153,-845 +position: -166,-851 --- //【表现学习过程】 me: …… @@ -1915,14 +1916,14 @@ me: 只有这样了…先把热源给移除了。 title: 检查UF固定螺丝移除 tags: colorID: 8 -position: -145,-47 +position: -160,-39 --- //【移除了所有UF的螺丝,取下UF,发热停止了】 <> <> <> <> -<> +<> me: 好…现在热源被移除了。 me: 看起来系统似乎正在恢复正常…… me: 佩佩? @@ -2144,7 +2145,7 @@ peipei: 我们去维修室吧 <> <> <> -<> +<> <> <> <> diff --git a/Assets/Scripts/Clue/ClueSlotBase.cs b/Assets/Scripts/Clue/ClueSlotBase.cs index f24153629..a02817ead 100644 --- a/Assets/Scripts/Clue/ClueSlotBase.cs +++ b/Assets/Scripts/Clue/ClueSlotBase.cs @@ -15,8 +15,8 @@ public class ClueSlotBase : MonoBehaviour, IDropHandler [HideInInspector] public bool isOccupied = false; // 插槽是否已占用 - [HideInInspector] - public bool isLocked = false; // 插槽是否已占用 + // [HideInInspector] + //public bool isLocked = false; // 插槽是否已占用 private Image slotFrame; @@ -32,14 +32,13 @@ public class ClueSlotBase : MonoBehaviour, IDropHandler SetSlotLockState(true); } - public void OnDrop(PointerEventData eventData) +public void OnDrop(PointerEventData eventData) { - if (isLocked) - { - Debug.Log("ClueSlot locked"); - return; - } - + // if (isOccupied) + // { + // Debug.Log("ClueSlot locked"); + // return; + // } ClueItem clueItem = eventData.pointerDrag.GetComponent(); if (clueItem != null) { @@ -48,17 +47,15 @@ public class ClueSlotBase : MonoBehaviour, IDropHandler if (clue != null && interaction != null) { - // 如果插槽已被占用,先将当前 ClueItem 返回到集合 - if (currentClueItem != null) + // // 如果插槽已被占用,先将当前 ClueItem 返回到集合 + if (isOccupied) { ReturnClueToCollection(currentClueItem); currentClueItem = null; // 清除旧的 currentClueItem } - // 更新当前的 ClueItem currentClueItem = clueItem; isOccupied = true; - // 调整位置和父对象 RectTransform slotRectTransform = GetComponent(); interaction.SetClueParentAndPosition(slotRectTransform); diff --git a/Assets/Scripts/Clue/MemoryClueSlot.cs b/Assets/Scripts/Clue/MemoryClueSlot.cs index ea09b21fa..e07107846 100644 --- a/Assets/Scripts/Clue/MemoryClueSlot.cs +++ b/Assets/Scripts/Clue/MemoryClueSlot.cs @@ -28,15 +28,8 @@ public class MemoryClueSlot : ClueSlotBase } public override void ReleaseSlot() { - if (currentClueItem != null) - { - currentClueItem.used=true; - ReturnClueToCollection(currentClueItem); - currentClueItem = null; // 清除 currentClueItem 的引用 - } - isOccupied = false; - interaction = null; base.ReleaseSlot(); // 保证基类的清理逻辑被执行 + currentClueItem.used=true; } private void PlayMemory(PunchTape punchTape) { diff --git a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs index eb3da9277..9d42f1e66 100644 --- a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs +++ b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs @@ -339,10 +339,15 @@ private IEnumerator ScanForError(string trimmedString) waveformVisualizer.clarity = 1; return; } + else if(>=0) + { + screenText.text=""; + } if(targetData.HasExternalError()) { screenText.text="记忆模块,允许直接进入"; + screenText.text.color=Color.green; //waveformVisualizer.gameObject.SetActive(false); return; } @@ -351,6 +356,7 @@ private IEnumerator ScanForError(string trimmedString) string originalString = currentSocket.name; string trimmedString = originalString.Replace("Socket", ""); screenText.text=trimmedString+ ":未检测到错误"; + screenText.text.color=Color.green; return; } else if(!currentSocket.targetData.isCorrect) @@ -358,6 +364,7 @@ private IEnumerator ScanForError(string trimmedString) string originalString = currentSocket.name; string trimmedString = originalString.Replace("Socket", ""); screenText.text=trimmedString+ ":检测到异常,请寻找错误深入"; + screenText.text.color=Color.red; //DialogController.Instance.StartDialogNode("发现异常模块"); } @@ -403,7 +410,7 @@ private IEnumerator ScanForError(string trimmedString) void ResetVisualizer() { - + screenText.text.color=Color.white; waveformVisualizer.waveformType = WaveformType.Noise; waveformVisualizer.clarity = 0; waveformVisualizer.ResetWaveform(); diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6747da215..decd5ed21 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -11,7 +11,7 @@ "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { "version": "1.0.0", @@ -23,7 +23,7 @@ "com.unity.mathematics": "1.2.6", "com.unity.modules.animation": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.2d.common": { "version": "8.0.1", @@ -36,14 +36,14 @@ "com.unity.modules.animation": "1.0.0", "com.unity.burst": "1.7.3" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { "version": "5.0.3", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { "version": "8.0.2", @@ -54,7 +54,7 @@ "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.2d.sprite": { "version": "1.0.0", @@ -71,7 +71,7 @@ "com.unity.2d.common": "8.0.1", "com.unity.modules.physics2d": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.2d.tilemap": { "version": "1.0.0", @@ -92,21 +92,21 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.addressables": { "version": "1.21.21", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.23", "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.scriptablebuildpipeline": "1.21.23", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.burst": { "version": "1.8.7", @@ -115,7 +115,7 @@ "dependencies": { "com.unity.mathematics": "1.2.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.cinemachine": { "version": "2.9.7", @@ -124,14 +124,14 @@ "dependencies": { "com.unity.test-framework": "1.1.31" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.collections": { "version": "1.2.4", @@ -141,14 +141,14 @@ "com.unity.burst": "1.6.6", "com.unity.test-framework": "1.1.31" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.feature.2d": { "version": "2.0.0", @@ -172,7 +172,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -181,7 +181,7 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.localization": { "version": "1.4.5", @@ -191,21 +191,21 @@ "com.unity.addressables": "1.21.8", "com.unity.nuget.newtonsoft-json": "3.0.2" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { "version": "14.0.8", @@ -234,14 +234,14 @@ "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.searcher": { "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.shadergraph": { "version": "14.0.8", @@ -261,7 +261,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -270,7 +270,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.7.5", @@ -282,7 +282,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "1.0.0", @@ -301,7 +301,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "dev.yarnspinner.unity": { "version": "2.4.2",