From 1d4a5ebe77ae9be2c64a6e2e0db568f847d46813 Mon Sep 17 00:00:00 2001 From: ddg <1453062510@qq.com> Date: Tue, 30 Sep 2025 14:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daoNiaoShu/FSMManager/FSMManager.cs | 1 + .../FSMManager/State/CaoZuoHouZhuFuState.cs | 15 ++++++++------- .../Application/daoNiaoShu/UI/ScorePanel.cs | 10 +++++++--- .../Application/daoNiaoShu/UI/SpeakPanel.cs | 3 ++- msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat | Bin 197 -> 197 bytes 5 files changed, 18 insertions(+), 11 deletions(-) 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 2dde5cae146bc93197d328282f1c3aa53b65ad19..a9e32db5f09c78380950385b3696de1953de5ede 100644 GIT binary patch delta 172 zcmV;d08{_P0mT6lGB7eVFEBYTGcX`AG&(XhIyI3JBY*HpDaaB(7V?GI#Pab`!=WzQX!K1_GJ*7dOSp8 zRU(%nm@+)d>FT{*aUJOt7l-G?w>wc--kuW~OLm1yi}%Y3fhHKMNrof7+3Iuzk}vOj aN2fv!EfJ;cz|KFM0TMb^E635``2obY5=#XD delta 172 zcmV;d08{_P0mT6lGB7eVFEBYTGC3eIH99mnIx~?HBY)xN%5{UQdOP6-_S{unEE|Uj zc+bC~)-3A%b|u>Y1pXHsB@^^cHd+G8$VAub(fOTS8^;$Fs*gTpsGi^?=ivlpSGq*K zm+%5WD8l8;%949=RD?Ro*q#Tc$2m_x)t}xiVa6;7D|