diff --git a/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4 b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4 index 519c3f3..81e49ff 100644 Binary files a/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4 and b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4 differ diff --git a/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4.meta b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4.meta index 94565e3..8bc6a20 100644 --- a/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4.meta +++ b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画.mp4.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be8de9e69f1474d459db0246d20b478a +guid: 6840726ff56cd64428c73b0828c0805d DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4 b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4 new file mode 100644 index 0000000..519c3f3 Binary files /dev/null and b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4 differ diff --git a/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4.meta b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4.meta new file mode 100644 index 0000000..94565e3 --- /dev/null +++ b/Assets/StreamingAssets/daoNiaoShu/Videos/开头动画1.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: be8de9e69f1474d459db0246d20b478a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs index 78e6f99..7d25c69 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs @@ -306,7 +306,8 @@ namespace DongWuYiXue.DaoNiaoShu { if (isTure) { - GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => { + GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => + { GameManager.Instance.uiManager.GetUI().SetScore(s.ToString(), t.ToString()); }); } @@ -368,7 +369,8 @@ namespace DongWuYiXue.DaoNiaoShu { if (isTrue) { - GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => { + GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => + { GameManager.Instance.uiManager.GetUI().SetScore(s.ToString(), t.ToString()); }); } @@ -385,7 +387,8 @@ namespace DongWuYiXue.DaoNiaoShu DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI(); dragQuestionPanel.ShowDragQuestion(id, stepName); dragQuestionPanel.nextAction = nextFun; - dragQuestionPanel.subAction = isTrue => { + dragQuestionPanel.subAction = isTrue => + { if (isTrue) { GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => @@ -395,10 +398,7 @@ namespace DongWuYiXue.DaoNiaoShu } else { - GameManager.Instance.kaoheManager.AddScore(0, scoreId, (s, t) => - { - GameManager.Instance.uiManager.GetUI().SetScore(s.ToString(), t.ToString()); - }); + GameManager.Instance.kaoheManager.AddScore(0, scoreId, null); } }; } diff --git a/Assets/_Scripts/Application/daoNiaoShu/Other/推拽题/DragManager.cs b/Assets/_Scripts/Application/daoNiaoShu/Other/推拽题/DragManager.cs index a84f0c7..8958f6f 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/Other/推拽题/DragManager.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/Other/推拽题/DragManager.cs @@ -140,7 +140,7 @@ namespace DongWuYiXue.DaoNiaoShu { if (!drags[i].drag && drags[i].yourTarget != null) { - str += drags[i].yourTarget.dragName; + str += drags[i].yourTarget.dragName + "、"; } } if (string.IsNullOrEmpty(str)) diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/DragQuestionPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/DragQuestionPanel.cs index a3a260f..f486a35 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/DragQuestionPanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/DragQuestionPanel.cs @@ -39,6 +39,7 @@ namespace DongWuYiXue.DaoNiaoShu else { nextBtn.gameObject.SetActive(true); + subAction?.Invoke(false); Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false }); if (MVC.GetModel().modeType == ModeType.ShiXun) { diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs index 7b02124..c4e921a 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs @@ -39,7 +39,7 @@ namespace DongWuYiXue.DaoNiaoShu } else { - //subAction?.Invoke(false); + subAction?.Invoke(false); Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false }); if (MVC.GetModel().modeType == ModeType.ShiXun) { diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/TxtSelectQuestionPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/TxtSelectQuestionPanel.cs index fe667f6..189bdbb 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/TxtSelectQuestionPanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/TxtSelectQuestionPanel.cs @@ -33,6 +33,7 @@ namespace DongWuYiXue.DaoNiaoShu } else { + subAction?.Invoke(false); Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false }); if (MVC.GetModel().modeType == ModeType.ShiXun) { diff --git a/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat b/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat index bb1025e..4bacd15 100644 Binary files a/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat and b/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat differ