diff --git a/Assets/_Scenes/daoNiaoShu.unity b/Assets/_Scenes/daoNiaoShu.unity index 43a1683..52b8fad 100644 --- a/Assets/_Scenes/daoNiaoShu.unity +++ b/Assets/_Scenes/daoNiaoShu.unity @@ -69804,7 +69804,7 @@ PrefabInstance: - target: {fileID: 5206904217386052552, guid: f5f8e47786f2ac047b17154888dd753d, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5206904217386052555, guid: f5f8e47786f2ac047b17154888dd753d, type: 3} diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs index 22bd45a..8f5b1e0 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs @@ -272,30 +272,51 @@ namespace DongWuYiXue.DaoNiaoShu Unlight(value); GameManager.Instance.interactionManager.DisableInteraction(value); } - public void ShowTxtQuestion(int id, int score, int scoreId, Action nextFun) + //public void ShowTxtQuestion(int id, int score, int scoreId, Action nextFun) + //{ + // TxtSelectQuestionPanel txtSelectQuestionPanel = GameManager.Instance.uiManager.GetUI(); + // txtSelectQuestionPanel.ShowImgQuestion(id); + // txtSelectQuestionPanel.nextAction = nextFun; + // txtSelectQuestionPanel.subAction = isTrue => + // { + // if (main_gameModel.modeType == ModeType.KaoHe) + // { + // if (isTrue) + // { + // AddScore(score, scoreId); + // } + // else + // { + // AddScore(0, scoreId); + // } + // } + // else + // { + // Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = isTrue }); + // } + // }; + //} + + public void ShowTxtQuestion(string stepName, int id, int scoreId, int score, Action nextFun) { TxtSelectQuestionPanel txtSelectQuestionPanel = GameManager.Instance.uiManager.GetUI(); - txtSelectQuestionPanel.ShowImgQuestion(id); + txtSelectQuestionPanel.ShowImgQuestion(id, stepName); txtSelectQuestionPanel.nextAction = nextFun; - txtSelectQuestionPanel.subAction = isTrue => + txtSelectQuestionPanel.subAction = isTure => { - if (main_gameModel.modeType == ModeType.KaoHe) + if (isTure) { - if (isTrue) - { - AddScore(score, scoreId); - } - else - { - AddScore(0, scoreId); - } + GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => { + GameManager.Instance.uiManager.GetUI().SetScore(s.ToString(), t.ToString()); + }); } else { - Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = isTrue }); + GameManager.Instance.kaoheManager.AddScore(0, scoreId, null); } }; } + public void ShowImgQuestion(int id, int score, int scoreId, Action nextFun) { ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI(); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaoLuYinJingState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaoLuYinJingState.cs index 87b6b2f..123a893 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaoLuYinJingState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaoLuYinJingState.cs @@ -14,7 +14,7 @@ namespace DongWuYiXue.DaoNiaoShu fsm.ShowCamera("±©Â¶Òõ¾¥1_Camera"); fsm.ShowTip(0); fsm.PlayBgm(0); - fsm.ShowSpeakPanel("²åÈëµ¼Äò¹Ü¡·±©Â¶Òõ¾¥", "¼ÌÐø½«°üƤÏòºóÍÆÑ¹", new Vector3(-220f, 235f), 2, 0, 3, (c) => + fsm.ShowSpeakPanel("²åÈëµ¼Äò¹Ü¡·±©Â¶Òõ¾¥", "ÇëÖúÊÖ¼ÌÐø½«°üƤÏòºóÍÆÑ¹£¬±©Â¶Òõ¾¥2-5cm", new Vector3(-220f, 235f), 2, 0, 3, (c) => { fsm.Hide("Å®ÖúÊÖÎÄ×ÖλÖÃ"); fsm.ShowCamera("±©Â¶Òõ¾¥2_Camera"); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs index d1e055f..fcb538d 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs @@ -39,7 +39,7 @@ namespace DongWuYiXue.DaoNiaoShu GameManager.Instance.uiManager.ShowUI(); GameManager.Instance.uiManager.GetUI().callback = () => { - fsm.ShowTxtQuestion(0, 3, 0, () => + fsm.ShowTxtQuestion("²¡Àý¡·²¡Àý¡·²½Öè1",0, 0, 3, () => { PlayVideo(); }); @@ -65,7 +65,7 @@ namespace DongWuYiXue.DaoNiaoShu } if (fsm.main_gameModel.modeType == ModeType.KaoHe) { - fsm.ShowTxtQuestion(1, 3, 1, () => + fsm.ShowTxtQuestion("²¡Àý¡·²¡Àý¡·²½Öè1",1, 1, 3, () => { fsm.nextState = true; }); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs index fdb5dfc..54dd788 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs @@ -16,7 +16,7 @@ namespace DongWuYiXue.DaoNiaoShu this.Log("½øÈë²âÁ¿·½·¨×´Ì¬"); if (fsm.main_gameModel.modeType == ModeType.KaoHe) { - fsm.ShowTxtQuestion(2, 3, 0, () => + fsm.ShowTxtQuestion("²âÁ¿µ¼Äò¹Ü¡·²âÁ¿·½·¨¡·²½Öè1",2, 0, 3, () => { niaoDaoKou_Btn = GameManager.Instance.transform.FindFirst