diff --git a/Assets/Prototype/佩佩/Scripts/EyeManager.cs b/Assets/Prototype/佩佩/Scripts/EyeManager.cs index 80f363225..b58d3f821 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeManager.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeManager.cs @@ -62,6 +62,7 @@ public void Initialize() public void OnEnter() { + SetInitialTargetState(targets[1]); mouseFollowAndZoom.SetIsActive(true); mouseFollowAndZoom.SetIsLock(false); // 进入视图时的逻辑 @@ -78,7 +79,8 @@ public void Initialize() } public void OnExit() - { + { + eyeStateEffect?.CleanupEffect(CurrentTarget); mouseFollowAndZoom.SetIsActive(false); // 离开视图时的逻辑 Debug.Log("EyeView exited."); diff --git a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn index 29b377a1c..1dfe73f93 100644 --- a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn @@ -158,7 +158,7 @@ peipei:我们去手术吧 === title: 手术 tags: -position: -235,-768 +position: -235,-771 --- <> <> @@ -179,6 +179,7 @@ position: -235,-768 peipei: 呼…… peipei: 好像……好多了。 me: 还没结束…我们进视觉和UF模块复查一下吧。 + <> <> <> <> @@ -193,15 +194,14 @@ position: -235,-768 title: 流程结束 tags: -position: 265,-184 +position: 261,-400 --- +me:看起来应该没什么问题了 me:再见佩佩 === - - title: IntoEyeView tags: -position: 1962,-2069 +position: 1965,-2069 --- <> me:这里似乎没什么可看的了 diff --git a/Assets/Scripts/Clue/ClueBoardManager.cs b/Assets/Scripts/Clue/ClueBoardManager.cs index 96532a951..19cf50b1d 100644 --- a/Assets/Scripts/Clue/ClueBoardManager.cs +++ b/Assets/Scripts/Clue/ClueBoardManager.cs @@ -28,7 +28,7 @@ public class ClueBoardManager : MonoBehaviour public IEnumerator WaitForClose() { // 这里等待关闭按钮点击事件 - while (!isBoardOpen) + while (isBoardOpen) { yield return null; // 每帧检查一次 } diff --git a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs index fa179d611..e32227ea5 100644 --- a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs +++ b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs @@ -45,8 +45,26 @@ public class OscilloscopeController : MonoBehaviour DeepInButton.GetComponent