From a23e37dbfdc6fc6c3574b70cc854d8088138a7a3 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Fri, 15 Nov 2024 04:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E8=B7=91=E9=80=9A=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AddressableAssetsData/link.xml | 338 ++++++++++++++++++ Assets/AddressableAssetsData/link.xml.meta | 7 + .../Prototype/佩佩/Scripts/MemoryProcess.cs | 2 - .../Resources/Yarn/PeipeiNew/ClueBoard.yarn | 10 +- .../Yarn/PeipeiNew2/ClueBoardDay2.yarn | 17 +- Assets/Scenes/Persistence.unity | 6 +- Assets/Scripts/Clue/ClueBaordNew.cs | 1 - Assets/Scripts/FixSystem/DraggableUI.cs | 1 - .../FixSystem/Effect/MouseFollowEffect.cs | 1 - .../FixSystem/Scope/OscilloscopeController.cs | 1 - 10 files changed, 366 insertions(+), 18 deletions(-) create mode 100644 Assets/AddressableAssetsData/link.xml create mode 100644 Assets/AddressableAssetsData/link.xml.meta diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..325df3f09 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 000000000..c855d2e95 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd966470c04680c4a97c0568dc56e6eb +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index f75574dc1..4f5f206fd 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -5,8 +5,6 @@ using UnityEngine.UI; using DG.Tweening; using Yarn.Unity; using AibisDream; -using Unity.VisualScripting; -using UnityEditor.Timeline; public class MemoryProcess : MonoBehaviour,IViewLifecycle { diff --git a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn index a42b6fa89..2d5a3b425 100644 --- a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn @@ -35,15 +35,23 @@ me: 我们对这种症状的产生原因知之甚少… me: 直观地说…这像是一种代偿,“因为她看不见颜色,所以通过某种方式补偿了回来”。 me: 不过…机体医学更关心机体如何正常工作,对于它们能不能看见颜色这种小问题…探索得很少。 <> -me: 总之,针对“记忆反流” ,机体医学已知的应对方案是…… <> +<> <> +<> <> +<> <> +<> <> +<> +me: 总之,针对“记忆反流” ,机体医学已知的应对方案是…… <> +<> <> +<> <> +<> <> === title: 执行手术 diff --git a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn index bf6a55f98..582d21958 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn @@ -30,17 +30,7 @@ position: -204,-329 --- me: 佩佩的视觉中出现了怪异的颜色…这和昨天看到的记忆反流情况类似,却也不同。 me: 最直接的不同之处在于,昨天的记忆反流生成了记忆打孔带,而这一次生成的是,用于UF的打孔带…… -<> <> -<> -<> -<> -<> -<> -<> -<> -<> -<> === @@ -171,15 +161,22 @@ me: 发热也好,眼睛痛也好,其实是一种…… me: 幻痛。 me: 因为失去了颜色而渴望颜色的幻痛…… <> +<> <> +<> <> +<> me: 想要停止幻痛,就要让佩佩的视觉和记忆中的色彩对齐。要么让记忆失去颜色,要么让视觉出现颜色。 me: 一种思路是,让佩佩能够看到颜色。 me: 如果能看到颜色,当然也就不存在幻痛了。 me: 可是如果要让视觉出现颜色,就必须要一个色觉晶圆…但是这个晶圆已经被UF占用了。 +<> <> +<> <> +<> <> +<> me: 晶圆是严格管制品,外部不可能找得到,晶圆从何而来呢…… <> <> diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 9ed984cda..053337ee9 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1506,6 +1506,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 87648344802685914, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 263 + objectReference: {fileID: 0} - target: {fileID: 148738931902546867, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: _sID value: 9c75badd-0e76-4a17-8930-49e89707a1b8 @@ -1664,7 +1668,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2041500036292700548, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: m_AnchoredPosition.x - value: -628 + value: -609 objectReference: {fileID: 0} - target: {fileID: 2041500036292700548, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/Scripts/Clue/ClueBaordNew.cs b/Assets/Scripts/Clue/ClueBaordNew.cs index d0d6495b3..7fb0e1909 100644 --- a/Assets/Scripts/Clue/ClueBaordNew.cs +++ b/Assets/Scripts/Clue/ClueBaordNew.cs @@ -6,7 +6,6 @@ using MeadowGames.UINodeConnect4; using UnityEngine; using Yarn.Unity; using RainbowArt.CleanFlatUI; -using UnityEditor.Localization.Plugins.XLIFF.V20; public class ClueBaordNew : MonoBehaviour { diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs b/Assets/Scripts/FixSystem/DraggableUI.cs index 98691689e..c69003109 100644 --- a/Assets/Scripts/FixSystem/DraggableUI.cs +++ b/Assets/Scripts/FixSystem/DraggableUI.cs @@ -1,4 +1,3 @@ -using UnityEditor.Localization.Plugins.XLIFF.V12; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs index f62b49a0f..dcd0db5f3 100644 --- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs +++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs @@ -2,7 +2,6 @@ using UnityEngine; using UnityEngine.UI; using DG.Tweening; using TMPro; -using UnityEditor.Localization.Plugins.XLIFF.V12; using AibisDream; public class MouseFollowAndZoom : MonoBehaviour diff --git a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs index c7aca742d..eb3da9277 100644 --- a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs +++ b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs @@ -6,7 +6,6 @@ using UnityEngine.UI; using System.Text.RegularExpressions; using DG.Tweening; using TMPro; -using UnityEditor.Localization.Plugins.XLIFF.V20; using AibisDream; using Yarn.Unity; using Unity.VisualScripting;