diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs index 7d25c69..3357147 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs @@ -417,6 +417,7 @@ namespace DongWuYiXue.DaoNiaoShu else { AddScore(0, scoreId); + //GameManager.Instance.kaoheManager.AddScore(0, scoreId, null); } }; } diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CaoZuoHouZhuFuState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CaoZuoHouZhuFuState.cs index e7bbfbe..ec19102 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CaoZuoHouZhuFuState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CaoZuoHouZhuFuState.cs @@ -41,15 +41,16 @@ namespace DongWuYiXue.DaoNiaoShu fsm.ShowSpeakPanel("操作后处理》操作后嘱咐", "先生,您好。已经将患宠膀胱内潴留的尿液通过导尿管已经引流出来了,下一步需要查找导致急性尿潴留的病因,然后再对因治疗", new Vector3(730f, 85f), 2, 0, 2, c => { - fsm.PlayClip("操作后嘱咐_TimeLine", () => - { - Game.Instance.sound.StopBGM(); - fsm.PlayClip("好的_TimeLine", () => - { + GameManager.Instance.uiManager.CloseUI(); + //fsm.PlayClip("操作后嘱咐_TimeLine", () => + //{ + Game.Instance.sound.StopBGM(); + //fsm.PlayClip("好的_TimeLine", () => + //{ fsm.Hide("男护士文字位置"); fsm.nextState = true; - }); - }); + //}); + //}); }); } } diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/ScorePanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/ScorePanel.cs index e0d03ec..d44d29f 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/ScorePanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/ScorePanel.cs @@ -23,9 +23,13 @@ namespace DongWuYiXue.DaoNiaoShu } void AddEffect(string score, string totalScore) { - transform.FindFirst("AddScore_Txt").text = $"+{score}"; - transform.FindFirst("AddScoreAnim").gameObject.SetActive(false); - transform.FindFirst("AddScoreAnim").gameObject.SetActive(true); + if (!score.Equals("0")) + { + transform.FindFirst("AddScore_Txt").text = $"+{score}"; + transform.FindFirst("AddScoreAnim").gameObject.SetActive(false); + transform.FindFirst("AddScoreAnim").gameObject.SetActive(true); + } + scoreText.text = totalScore; //switch (score) //{ diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/SpeakPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/SpeakPanel.cs index 4257f21..f922106 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/SpeakPanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/SpeakPanel.cs @@ -122,7 +122,8 @@ namespace DongWuYiXue.DaoNiaoShu } else if (str.Contains("error") || string.IsNullOrEmpty(str)) { - GameManager.Instance.fsm.AddScore(0, id); + GameManager.Instance.kaoheManager.AddScore(0, id, null); + Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false }); userInput.text = tipTxt; sendAction?.Invoke(false); } diff --git a/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat b/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat index 2dde5ca..a9e32db 100644 Binary files a/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat and b/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat differ