diff --git a/Assets/Prefabs/LanguageParticleSystem.prefab b/Assets/Prefabs/LanguageParticleSystem.prefab index 9c3b3b763..4a7ed6b16 100644 --- a/Assets/Prefabs/LanguageParticleSystem.prefab +++ b/Assets/Prefabs/LanguageParticleSystem.prefab @@ -228,11 +228,6 @@ MonoBehaviour: entranceCascadeDuration: 0.8 entranceCascadeStagger: 0.03 entranceSearchRadius: 2 - enableDebugShortcuts: 1 - debugCompleteKey: 286 - debugResetKey: 290 - debugFullTestKey: 291 - autoRunDebugTestOnStart: 0 enableSeparation: 1 minParticleSpacing: 0.6 separationForce: 2.5 diff --git a/Assets/Scenes/HuoShanFixScene.unity b/Assets/Scenes/HuoShanFixScene.unity index 09606ce39..7d1d02684 100644 --- a/Assets/Scenes/HuoShanFixScene.unity +++ b/Assets/Scenes/HuoShanFixScene.unity @@ -17326,11 +17326,6 @@ MonoBehaviour: entranceCascadeStagger: 0.03 entranceSearchRadius: 2 renderLayerName: HuoshanScreen - enableDebugShortcuts: 1 - debugCompleteKey: 286 - debugResetKey: 290 - debugFullTestKey: 291 - autoRunDebugTestOnStart: 0 enableSeparation: 1 minParticleSpacing: 0.6 separationForce: 2.5 diff --git a/Assets/Scripts/MiniGame/HuoShan/Language/LanguageParticleManager.cs b/Assets/Scripts/MiniGame/HuoShan/Language/LanguageParticleManager.cs index 2821a6b6a..3d545afb6 100644 --- a/Assets/Scripts/MiniGame/HuoShan/Language/LanguageParticleManager.cs +++ b/Assets/Scripts/MiniGame/HuoShan/Language/LanguageParticleManager.cs @@ -166,13 +166,6 @@ namespace AibisDream.MiniGame.Language [SerializeField] private string renderLayerName = "HuoshanScreen"; private int renderLayer = 0; - [Header("调试/测试")] - [SerializeField] private bool enableDebugShortcuts = true; - [SerializeField] private KeyCode debugCompleteKey = KeyCode.F5; - [SerializeField] private KeyCode debugResetKey = KeyCode.F9; - [SerializeField] private KeyCode debugFullTestKey = KeyCode.F10; - [SerializeField] private bool autoRunDebugTestOnStart = false; - [Header("布局优化")] [SerializeField] private bool enableSeparation = true; // 是否启用粒子分离力 [SerializeField] private float minParticleSpacing = 0.6f; // 粒子最小间距 @@ -210,7 +203,6 @@ namespace AibisDream.MiniGame.Language private float interferenceTextBaseAlpha = 1f; private Coroutine entranceRoutine; private Coroutine expressionPanelRoutine; - private Coroutine debugTestRoutine; private Coroutine confirmTimelineRoutine; private readonly Dictionary entranceTargets = new Dictionary(); @@ -478,12 +470,6 @@ namespace AibisDream.MiniGame.Language entranceRoutine = null; } - if (debugTestRoutine != null) - { - StopCoroutine(debugTestRoutine); - debugTestRoutine = null; - } - if (confirmTimelineRoutine != null) { StopCoroutine(confirmTimelineRoutine); @@ -814,7 +800,6 @@ namespace AibisDream.MiniGame.Language BuildConnectionMap(); } } - HandleDebugShortcuts(); UpdateConnections(); if (!statusUIHidden) { @@ -1820,100 +1805,6 @@ namespace AibisDream.MiniGame.Language } } - private void HandleDebugShortcuts() - { - if (!enableDebugShortcuts || !Application.isPlaying) - return; - - // 如果未初始化，先初始化 - if (!isInitialized) - return; - - if (Input.GetKeyDown(debugCompleteKey)) - { - DebugCompleteTargets(); - } - - if (Input.GetKeyDown(debugResetKey)) - { - ResetGame(); - } - - if (Input.GetKeyDown(debugFullTestKey)) - { - QueueDebugFullFlow(); - } - } - - [ContextMenu("Debug/一键完成目标")] - public void DebugCompleteTargets() - { - if (!isCompleted) - { - isCompleted = true; - OnTargetsCompleted(); - } - - if (completionPhase == CompletionPhase.Completed) - { - BeginFocusSequence(); - } - } - - [ContextMenu("Debug/重置场景")] - public void DebugResetScene() - { - ResetGame(); - } - - [ContextMenu("Debug/完整流程测试")] - public void DebugPlayFullFlow() - { - QueueDebugFullFlow(); - } - - private void QueueDebugFullFlow() - { - if (!gameObject.activeInHierarchy) - return; - - if (debugTestRoutine != null) - { - StopCoroutine(debugTestRoutine); - } - - debugTestRoutine = StartCoroutine(DebugFullFlowRoutine()); - } - - private IEnumerator DebugFullFlowRoutine() - { - DebugCompleteTargets(); - if (completionPhase == CompletionPhase.Completed) - { - BeginFocusSequence(); - } - - while (completionPhase == CompletionPhase.Focusing) - { - yield return null; - } - - if (completionPhase == CompletionPhase.FocusHolding) - { - yield return new WaitForSeconds(1.5f); - ResolveFocusSequence(); - } - - while (completionPhase != CompletionPhase.Finished) - { - yield return null; - } - - yield return new WaitForSeconds(0.5f); - ResetGame(); - debugTestRoutine = null; - } - private void PlayEntranceSequence() { if (!gameObject.activeInHierarchy || candidateParticles.Count == 0) diff --git a/Assets/Scripts/MiniGame/HuoShan/Language/README_语言系统使用说明.md b/Assets/Scripts/MiniGame/HuoShan/Language/README_语言系统使用说明.md index 947b6cc97..9b3767e59 100644 --- a/Assets/Scripts/MiniGame/HuoShan/Language/README_语言系统使用说明.md +++ b/Assets/Scripts/MiniGame/HuoShan/Language/README_语言系统使用说明.md @@ -261,9 +261,6 @@ A: 检查对话节点名称是否正确，确保该节点在 Yarn 文件中存 **Q: 游戏太难/太简单？** A: 可以在 `LanguageParticleManager` 的 Inspector 中调整参数，如连接距离、粒子数量等。 -**Q: 如何在测试时快速完成？** -A: 编辑模式下可以按 F5 快速完成，F9 重置，F10 完整流程测试（需要先启动系统）。 - --- ## 联系与支持 diff --git a/Assets/StreamingAssets/Config/character.csv b/Assets/StreamingAssets/Config/character.csv index 392225aa7..9f321943f 100644 --- a/Assets/StreamingAssets/Config/character.csv +++ b/Assets/StreamingAssets/Config/character.csv @@ -58,8 +58,8 @@ jb,酒保,Bartender,バーテンダー,Default,MainActor,,,, girl,女孩,Young Girl,少女,Default,Aside,,,, host,主持人,Newscaster,ニュースキャスター,Default,Aside,,,, boy,阿灿,Young Boy,少年,Default,Aside,,,, -Teacher,教师,Teacher,Teacher,Default,Aside,#FFCC00,,, -SellerA,销售员A,Seller A,Seller A,Default,Aside,#FFCC00,,, -SellerB,销售员B,Seller B,Seller B,Default,Aside,#FFCC00,,, -SellerC,销售员C,Seller C,Seller C,Default,Aside,#FFCC00,,, +teacher,教师,Teacher,Teacher,Default,Aside,#FFCC00,,, +sellerA,销售员A,Seller A,Seller A,Default,Aside,#FFCC00,,, +sellerB,销售员B,Seller B,Seller B,Default,Aside,#FFCC00,,, +sellerC,销售员C,Seller C,Seller C,Default,Aside,#FFCC00,,, diff --git a/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn b/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn index 2df6cfd0c..6d1c32248 100644 --- a/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn @@ -160,7 +160,7 @@ position: 0,400 //chunhui：2.原型病的人似乎认为主脑之外还有别的家，也就是海 //czq: 你说的是对的，而且带过就够了，现在已经写了，混在日常对话中间了 -<> +<> <> <> <> @@ -192,7 +192,7 @@ hs: 没事儿，都过去了。 #line:015a2ab <> <> hs: 年审结束之后我带你去个好地方吧。 #line:040432c -<> +<> me: 你不是还差很多分么？ #line:0834523 hs: 嗨，怕啥！我可是我们全组前三…呃，应该是前三百…我是说，三千…呃…… #line:081508a <>