diff --git a/Assets/Resources/SceneSO/PeipeiDay3.asset b/Assets/Resources/SceneSO/PeipeiDay3.asset index 1ea82385b..2a48570d8 100644 --- a/Assets/Resources/SceneSO/PeipeiDay3.asset +++ b/Assets/Resources/SceneSO/PeipeiDay3.asset @@ -16,4 +16,4 @@ MonoBehaviour: yarnProject: {fileID: 7545569452688597077, guid: 05ccf66391562af43835d718ca36f508, type: 3} firstSceneName: PeipeiFixScene isEndOfDay: 1 - nameToPlayer: "\u7B2C\u4E09\u5929\u4E0A\u5348\u4F69\u4F69" + nameToPlayer: "\u7B2C\u56DB\u5929\u4E0A\u5348\u4F69\u4F69" diff --git a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn index 9086ebd33..2e908f608 100644 --- a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn @@ -132,6 +132,8 @@ me: 你会有的… <> 感谢游玩艾比斯之梦,本次demo的体验流程已结束。 +->返回主菜单 + <> //<> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn index dd1d7980c..236759a70 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn @@ -284,6 +284,8 @@ peipei: 这是我们的职责。 制作组: 感谢游玩艾比斯之梦,本次demo的体验流程已结束。 制作组:(提示:尚有分支可以探索…) +->返回主菜单 + <> === diff --git a/Assets/Resources/Yarn/FP_Peipei3/BE结束谈话.yarn b/Assets/Resources/Yarn/FP_Peipei3/BE结束谈话.yarn index abe3d8bc8..174bff871 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/BE结束谈话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/BE结束谈话.yarn @@ -196,6 +196,8 @@ me: ……再见。 <> 感谢游玩艾比斯之梦,本次demo的体验流程已结束。 +->返回主菜单 + <> //<> === diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 10cb4a5f6..9d68afbde 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9283,9 +9283,10 @@ MonoBehaviour: - {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} + - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} runMode: 0 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} + testTalkSo: {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} saveFileName: StoneDay2_2_3 --- !u!4 &719228339 Transform: diff --git a/Assets/Scripts/Dialog System/BaseYarnCommand.cs b/Assets/Scripts/Dialog System/BaseYarnCommand.cs index 0c63765d5..4830dc89c 100644 --- a/Assets/Scripts/Dialog System/BaseYarnCommand.cs +++ b/Assets/Scripts/Dialog System/BaseYarnCommand.cs @@ -16,6 +16,11 @@ namespace AibisDream DialogController.Instance.ClearVariables(); DialogController.Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo()); } + [YarnCommand("BackToMenu")] + public static void BackToMenu() + { + StartMenu.Instance.BackToMenu(); + } [YarnCommand("switch_tv")] public static void SwitchTV(string picName) diff --git a/Assets/Scripts/Game Loop/GameLoopManager.cs b/Assets/Scripts/Game Loop/GameLoopManager.cs index 9b7b32cc0..b78c51e1c 100644 --- a/Assets/Scripts/Game Loop/GameLoopManager.cs +++ b/Assets/Scripts/Game Loop/GameLoopManager.cs @@ -79,7 +79,8 @@ namespace AibisDream yield return SceneLoader.Instance.LoadSceneAsync(_currentTalkSceneSo.firstSceneName); StartMenu.Instance.HideStartMenu(); DialogController.Instance.StartDialog(_currentTalkSceneSo.yarnProject); - MainUIController.Instance.HideMainUI(); + MainUIController.Instance.TVFadeOut(1); + //MainUIController.Instance.HideMainUI(); } public IEnumerator NextSceneSo()