diff --git a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs index f039539d6..a93fa69d3 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs @@ -101,7 +101,7 @@ public class EyeTransitionManager : MonoBehaviour private void Awake() { - LoadState(); + //LoadState(); //DontDestroyOnLoad(this.gameObject); SceneManager.sceneUnloaded += OnSceneUnloaded; @@ -118,7 +118,7 @@ public class EyeTransitionManager : MonoBehaviour { if (currentScene.name == "佩佩视觉模块") { - SaveState(); + //SaveState(); } } @@ -184,7 +184,7 @@ public class EyeTransitionManager : MonoBehaviour SetVisualState(config.viewState.ToString(),config.currentVisualIndex); } } - LoadState(); + //LoadState(); } public void ActivateSocketChoice(YarnOption[] options) @@ -274,7 +274,7 @@ public class EyeTransitionManager : MonoBehaviour { yield return null; } - SaveState(); + //SaveState(); } // Yarn 命令,设置视图的可用性 [YarnCommand("set_view_availability")] diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index aad369832..4784e6c51 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -104,7 +104,7 @@ public IEnumerator ColorFadeOut() // }); - memorySequence.AppendInterval(3.35f); + memorySequence.AppendInterval(3.4f); // 记忆处理结束,激活memoryFinishedImage memorySequence.AppendCallback(() => diff --git a/Assets/Resources/Audio/BooomAudio/mem_yingli_1.ogg b/Assets/Resources/Audio/mem_yingli_1.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_yingli_1.ogg rename to Assets/Resources/Audio/mem_yingli_1.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_yingli_1.ogg.meta b/Assets/Resources/Audio/mem_yingli_1.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_yingli_1.ogg.meta rename to Assets/Resources/Audio/mem_yingli_1.ogg.meta diff --git a/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn b/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn index 66c6515b7..589f68fa0 100644 --- a/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn @@ -12,14 +12,14 @@ position: 55,-1208 title: TV position: 66,-976 --- +<> <> <> <> <> <> -本demo为早期验证版本,其中文本,交互,画面均为过程版 -如果遇到bug或困扰,请随时联系发给您demo的朋友 -如果您不知道在何处反馈,欢迎微信联系:15209116298 QQ:781230111 +本demo为早期验证版本,其中文本,交互,画面,声音均为过程版 +如果遇到bug或困扰,请随在玩家群325268983中反馈 如果您能够在游玩过程中记录反馈,我们将不胜感激 好了!游戏开始~ <> @@ -33,6 +33,7 @@ position: 66,-976 <> <> <> +<> <> 播报员: 欢迎收看今天的幸福快讯! 播报员: 今天天气晴,午后可能会有小雨。 @@ -121,12 +122,14 @@ position: 64,-262 <> <> me: 我在拆卸你的头部背板,这可能会让你感觉有些痒。 +<> <> ///拆除color模块 <> ///任务插入 <> <> +<> ///让佩佩的眼睛处于可以想象颜色的状态 <> ///确认当前的试图状态为头部的概览视图 @@ -860,11 +863,11 @@ peipei_child: 医生快看,它现在更像一个飞机啦! peipei: 停下,医生……快停下…… me: 感觉反胃是吗?记忆引起的情绪波动导致的,我这就退出来。 <> -<> +position: -155,407ility ViewManager "MemoryView" false>> <> === title: conclusion -position: -212,372 +position: -201,426 --- <> @@ -919,7 +922,7 @@ peipei: …… === title: BeforeSurgery -position: 345,412 +position: 359,428 --- me: 那么,视觉-记忆桥阻断术 ,如果你确认接受手术,就在这里签下你的名字吧。 peipei: ……(签字) @@ -930,14 +933,16 @@ me: 好的,那么我们开始吧。 <> <> <> +<> <> <> <> <> +<> <> <> -<> +position: 85,821 <> <> diff --git a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn index dd02833ad..49d4bcc5d 100644 --- a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn @@ -305,7 +305,7 @@ position: 77,22 <> === title: EyeView -position: 554,12 +position: 469,33 --- ///进入视觉模块 <> @@ -384,7 +384,7 @@ me: 总之……这不是你的工作结果异常的原因。 === title: UFtest -position: -324,10 +position: -324,9 --- ///确保是在主视角下进行UF模块的操作 <> @@ -518,10 +518,11 @@ me: 怎么办?手册也没有给出解决办法…… === title: conclusion -position: -209,312 +position: 87,267 --- ///<> ///<<任务提示更新: 进行诊断已完成>> +<> peipei: 医生…现在该怎么办?我感觉我的左眼几乎要烧坏了…… me: 好吧,现在的问题比较棘手。 me: 手册上的信息似乎不足以解决你的问题了。我现在所能看到的是…… @@ -531,6 +532,7 @@ peipei: 什么意思? me: 形象地说,有一种我看不见的东西,在使你的记忆和视觉互相寻找。 me: 这实在是有点诡异。就像是你的视觉和记忆不适应失去连接的状态,正在尝试寻找对方。 me: 这是为什么呢?我是严格按照手册的方式去做的…… +me: 可能不是一下子能搞清楚的,我们出去聊吧 <> <> <> @@ -649,7 +651,7 @@ me: 那我们试试吧。 === title: Treatment -position: 124,513 +position: 93,516 --- <> <> diff --git a/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn b/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn index 7439ad10b..f7d168f2e 100644 --- a/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk3/PeipeiTalk3.yarn @@ -574,11 +574,11 @@ me: 总算,结束了。 me: 她再也不记得任何颜色了,她再也不记得任何颜色了…… me: 我…我在做对的事情吗? <> -感谢您游玩 艾比斯之梦 的demo-佩佩切片,流程到此终止 -本demo为早期验证版本,其中文本,交互,画面均为过程版 -您的反馈和建议对我们至关重要 -如果您不知道在何处反馈,欢迎微信联系:15209116298 QQ:781230111 -谢谢!(退出游戏Alt F4) +感谢您游玩 艾比斯之梦 的demo-佩佩流程,游戏到此暂时中止 +欢迎在玩家群325268983中讨论和反馈,以及通过问卷告诉我们您的意见 +这对我们非常重要!谢谢! +如果您希望在再次尝试游戏,可以使用P+Q键调出快进指令(位于右上角),可以随时开启关闭 +(退出游戏Alt F4) === @@ -779,11 +779,11 @@ me: 总算,结束了。 me: 我看不到颜色了,我看不到颜色了。 me: 我…我在做对的事情吗? <> -感谢您游玩 艾比斯之梦 的demo-佩佩切片,流程到此终止 -本demo为早期验证版本,其中文本,交互,画面均为过程版 -您的反馈和建议对我们至关重要 -如果您不知道在何处反馈,欢迎微信联系:15209116298 QQ:781230111 -谢谢!(退出游戏Alt F4) +感谢您游玩 艾比斯之梦 的demo-佩佩流程,游戏到此暂时中止 +欢迎在玩家群325268983中讨论和反馈,以及通过问卷告诉我们您的意见 +这对我们非常重要!谢谢! +如果您希望在再次尝试游戏,可以使用P+Q键调出快进指令(位于右上角),可以随时开启关闭 +(退出游戏Alt F4) // peipei: 医生?!难道你…… // peipei: 不…不不不……我不…… // ->你看到色彩,我治好我的病人,比什么都重要。 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index e64958636..82873f091 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -2045,7 +2045,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 1773163451604355202, guid: b14347481450a234a852407119bfecb4, type: 2} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: fc69ad6fefb757c43b4d68c6a82363b3, type: 3} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -3713,7 +3713,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1596715191 RectTransform: m_ObjectHideFlags: 0 @@ -3728,9 +3728,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1696845842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -163.79704} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1596715192 diff --git a/Assets/Scripts/FixSystem/Book/BookManager.cs b/Assets/Scripts/FixSystem/Book/BookManager.cs index 860395134..89fe564b3 100644 --- a/Assets/Scripts/FixSystem/Book/BookManager.cs +++ b/Assets/Scripts/FixSystem/Book/BookManager.cs @@ -42,7 +42,11 @@ public class BookManager : MonoBehaviour flipmanager = book.gameObject.GetComponent(); bookPos = book.gameObject.GetComponent(); // Initially, the book is closed - CloseBook(); + if(book.gameObject.activeInHierarchy) + { + CloseBook(); + } + } // Open the book and flip to a specific page diff --git a/Assets/Scripts/Game Loop/StartMenu.cs b/Assets/Scripts/Game Loop/StartMenu.cs index e7a2f5d49..19c974b77 100644 --- a/Assets/Scripts/Game Loop/StartMenu.cs +++ b/Assets/Scripts/Game Loop/StartMenu.cs @@ -13,14 +13,14 @@ namespace AibisDream { private void OnEnable() { startButton.onClick.AddListener(StartGame); - continueButton.onClick.AddListener(ContinueGame); + //continueButton.onClick.AddListener(ContinueGame); quitButton.onClick.AddListener(QuitGame); } private void OnDisable() { startButton?.onClick.RemoveListener(StartGame); - continueButton?.onClick.RemoveListener(ContinueGame); + //continueButton?.onClick.RemoveListener(ContinueGame); quitButton?.onClick.RemoveListener(QuitGame); }