diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn index ad7d0f5a6..964f9a650 100644 --- a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn +++ b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage1.yarn @@ -1,5 +1,6 @@ title: 开场对话 tags: +group: 入口 position: 250,-26 --- <> @@ -123,6 +124,7 @@ me: 放心,检查不收钱。
我们直接开始吧。 === title: 进入阶段2 +group: 出口 position: 248,443 --- <> diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn index b50961802..f26212c0a 100644 --- a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn +++ b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage2.yarn @@ -1,4 +1,5 @@ title: 全身检查 +group: 入口 tags: position: 378,-540 --- @@ -51,6 +52,7 @@ position: 384,81 === title: 进入阶段3 +group: 出口 position: 385,382 --- <> @@ -61,8 +63,9 @@ position: 385,382 title: 检查_肺 tags: +group: 插入触发 colorID: 8 -position: -464,-179 +position: -161,-190 --- <> <> @@ -111,8 +114,9 @@ position: -464,-179 title: 检查_心 tags: +group: 插入触发 colorID: 8 -position: -461,8 +position: -158,-3 --- <> <> @@ -187,7 +191,8 @@ position: -461,8 title: 检查_胃 tags: colorID: 8 -position: -463,202 +group: 插入触发 +position: -160,191 --- <> <> @@ -230,7 +235,8 @@ position: -463,202 title: 检查_肝 tags: colorID: 8 -position: -461,381 +group: 插入触发 +position: -158,370 --- <> <> diff --git a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs index 1233381a3..483cad6d0 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs @@ -7,22 +7,14 @@ namespace AibisDream.FixSystem { public class OscilloscopeSystem : MonoBehaviour { - #region 组件索引 + #region 旧的组件索引 - private TMP_Text _state; // 显示状态的TextMeshPro组件 - private TMP_Text _screenText;// 显示消息的TextMeshPro组件 + private TMP_Text _state; // 显示状态的TextMeshPro组件 + private TMP_Text _screenText; // 显示消息的TextMeshPro组件 private SpriteButton _deepinButton; #endregion - #region 状态 - - public bool isScanning; - public bool isPlaying; - public bool canScan; - - #endregion - private void Awake() { FixSystemCenter.SystemDic.Register(this); @@ -41,41 +33,39 @@ namespace AibisDream.FixSystem { _deepinButton.CheckButtonClick(); } - + + #region 旧显示屏接口 + public void MessageBoxSetError() { _state.text = "错误"; _state.color = Color.red; // 红色 - // _screenText.text = message; - // _screenText.color = Color.white; // 默认文本颜色 } public void MessageBoxSetWarning() { _state.text = "警告"; _state.color = new Color(1.0f, 0.55f, 0.0f); // 琥珀色 - // _screenText.text = message; - // _screenText.color = Color.white; // 默认文本颜色 } + public void MessageBoxSetNormal() { _state.text = "正常"; _state.color = Color.blue; // 琥珀色 - // _screenText.text = message; - // _screenText.color = Color.white; // 默认文本颜色 } + public void MessageBoxSetChecking() { _state.text = "检查中"; _state.color = Color.white; // 琥珀色 - // _screenText.text = string.Empty; - // _screenText.color = Color.white; // 默认文本颜色 } + public void MessageBoxSetText(string text) { _screenText.color = Color.white; // 默认文本颜色 - _screenText.text += text+"
"; + _screenText.text += text + "
"; } + public void MessageBoxSetNull() { _state.text = "未检测到信号"; @@ -86,15 +76,20 @@ namespace AibisDream.FixSystem public IEnumerator EnableDeepInButton() { - yield return _deepinButton.GetTransform().DOLocalMoveX(0.35f, 0.5f).WaitForCompletion(); - _deepinButton.SetActive(true); - + yield return _deepinButton.GetTransform().DOLocalMoveX(0.35f, 0.5f).WaitForCompletion(); + _deepinButton.SetActive(true); } + public IEnumerator DisableDeepInButton() { - yield return _deepinButton.GetTransform().DOLocalMoveX(-0.2f, 0.5f).WaitForCompletion(); - _deepinButton.SetActive(false); - + yield return _deepinButton.GetTransform().DOLocalMoveX(-0.2f, 0.5f).WaitForCompletion(); + _deepinButton.SetActive(false); } + + #endregion + + } + // + // public struct } \ No newline at end of file