diff --git a/Assets/Art/Timeline/插管_TimeLine.playable b/Assets/Art/Timeline/插管_TimeLine.playable index 7af2d26..f493b24 100644 --- a/Assets/Art/Timeline/插管_TimeLine.playable +++ b/Assets/Art/Timeline/插管_TimeLine.playable @@ -618,12 +618,118 @@ MonoBehaviour: - {fileID: -4415988120714926337} - {fileID: -304499637217331559} - {fileID: 8387026910049780223} + - {fileID: 1817393580930511363} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 m_ScenePreview: 1 m_DurationMode: 0 m_MarkerTrack: {fileID: 0} +--- !u!114 &746876422758225837 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &1817393580930511363 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track (2) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 1 + m_ClipIn: 0 + m_Asset: {fileID: 746876422758225837} + m_Duration: 6.708333333333335 + m_TimeScale: 1 + m_ParentTrack: {fileID: 1817393580930511363} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Active + m_Markers: + m_Objects: [] + m_PostPlaybackState: 3 --- !u!114 &3170496518164281449 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx b/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx index 5eda611..b508890 100644 Binary files a/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx and b/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx differ diff --git a/Assets/_Scenes/daoNiaoShu.unity b/Assets/_Scenes/daoNiaoShu.unity index 13d5a2b..96d846c 100644 --- a/Assets/_Scenes/daoNiaoShu.unity +++ b/Assets/_Scenes/daoNiaoShu.unity @@ -72598,6 +72598,8 @@ PlayableDirector: value: {fileID: 1631532823} - key: {fileID: 8387026910049780223, guid: 7673c770b56d14045bb43ddb3c306327, type: 2} value: {fileID: 1631532822} + - key: {fileID: 1817393580930511363, guid: 7673c770b56d14045bb43ddb3c306327, type: 2} + value: {fileID: 96000086} m_ExposedReferences: m_References: [] --- !u!114 &745638600 @@ -245403,7 +245405,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 10, y: -20} - m_SizeDelta: {x: 100, y: 25} + m_SizeDelta: {x: 123.3156, y: 25} m_Pivot: {x: 0, y: 0.5} --- !u!1 &2445884765684690209 GameObject: diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs index 8f5b1e0..78e6f99 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs @@ -317,30 +317,30 @@ namespace DongWuYiXue.DaoNiaoShu }; } - public void ShowImgQuestion(int id, int score, int scoreId, Action nextFun) - { - ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI(); - imgSelectQuestionPanel.ShowImgQuestion(id); - imgSelectQuestionPanel.nextAction = nextFun; - imgSelectQuestionPanel.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 ShowImgQuestion(int id, int score, int scoreId, Action nextFun) + //{ + // ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI(); + // imgSelectQuestionPanel.ShowImgQuestion(id); + // imgSelectQuestionPanel.nextAction = nextFun; + // imgSelectQuestionPanel.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 ShowDragQuestion(int id, int score, int scoreId, Action nextFun) //{ // DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI(); @@ -359,6 +359,27 @@ namespace DongWuYiXue.DaoNiaoShu // }; //} + public void ShowImgQuestion(string stepName, int id, int score, int scoreId, Action nextFun) + { + ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI(); + imgSelectQuestionPanel.ShowImgQuestion(id, stepName); + imgSelectQuestionPanel.nextAction = nextFun; + imgSelectQuestionPanel.subAction = isTrue => + { + if (isTrue) + { + GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => { + GameManager.Instance.uiManager.GetUI().SetScore(s.ToString(), t.ToString()); + }); + } + else + { + GameManager.Instance.kaoheManager.AddScore(0, scoreId, null); + } + }; + } + + public void ShowDragQuestion(string stepName, int id, int scoreId, int score, Action nextFun) { DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI(); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs index fcb538d..37609f3 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs @@ -58,7 +58,7 @@ namespace DongWuYiXue.DaoNiaoShu avPro.PlayVideo("daoNiaoShu/Videos/ͷ.mp4", () => { GameManager.Instance.transform.FindFirst("ʼ").gameObject.SetActive(false); - fsm.ShowTip(0); + //fsm.ShowTip(0); if (fsm.main_gameModel.modeType == ModeType.ShiXun) { fsm.nextState = true; diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs index 2729b17..d034696 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs @@ -23,7 +23,7 @@ namespace DongWuYiXue.DaoNiaoShu cor = Game.Instance.IEnumeratorManager.Run(3.0f, () => { isChaGuan = true; - avProValue.gameObject.SetActive(true); + //avProValue.gameObject.SetActive(true); }); } public override void OnStateStay() diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs index 11f93b5..0986a0b 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs @@ -11,14 +11,14 @@ namespace DongWuYiXue.DaoNiaoShu fsm.ShowCamera("WuPinZhunBei_Camera"); if (fsm.main_gameModel.modeType == ModeType.ShiXun) { - fsm.ShowImgQuestion(0, 3, 0, () => + fsm.ShowImgQuestion("ǰ׼Ʒ׼", 0, 3, 0, () => { fsm.nextState = true; }); } if (fsm.main_gameModel.modeType == ModeType.KaoHe) { - fsm.ShowImgQuestion(0, 3, 0, () => + fsm.ShowImgQuestion("ǰ׼Ʒ׼", 0, 3, 0, () => { fsm.nextState = true; }); diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs index 361df29..7b02124 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs @@ -15,6 +15,9 @@ namespace DongWuYiXue.DaoNiaoShu Button subBtn; Button resetBtn; int id; + + string stepName; + public override void Init(IUIManager uictrl) { base.Init(uictrl); @@ -32,11 +35,20 @@ namespace DongWuYiXue.DaoNiaoShu if (imgSelectManagers[id].Check()) { subAction?.Invoke(true); + Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = true }); } else { - subAction?.Invoke(false); - + //subAction?.Invoke(false); + Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false }); + if (MVC.GetModel().modeType == ModeType.ShiXun) + { + ChatUI.Instance.SendAI("ûλڣ" + stepName + "ûΪ" + imgSelectManagers[id].GetYourAnswer() + "ûнܱȷ𰸺,100ڡ", null); + } + else + { + subAction?.Invoke(false); + } } subBtn.interactable = false; resetBtn.interactable = false; @@ -44,6 +56,7 @@ namespace DongWuYiXue.DaoNiaoShu } private void Next() { + ChatUI.Instance.CloseChatTxt(); SetActive(false); subBtn.interactable = true; resetBtn.interactable = true; @@ -64,13 +77,14 @@ namespace DongWuYiXue.DaoNiaoShu } } } - public void ShowImgQuestion(int id) + public void ShowImgQuestion(int id,string stepName) { SetActive(true); nextBtn.gameObject.SetActive(false); subBtn.interactable = true; resetBtn.interactable = true; this.id = id; + this.stepName = stepName; for (int i = 0; i < imgSelectManagers.Length; i++) { if (i == id) diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs index 1350cff..05467ca 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.UI; using ZXKFramework; using static System.Net.Mime.MediaTypeNames; -namespace DongWuYiXue.DaoNiaoShu +namespace DongWuYiXue.DaoNiaoShu { public class TipPanel : UIBase { @@ -25,6 +25,8 @@ namespace DongWuYiXue.DaoNiaoShu Button downBtn; ScrollRect scrollRect; Coroutine coroutine; + + float hei; public override void Init(IUIManager uictrl) { base.Init(uictrl); @@ -32,6 +34,7 @@ namespace DongWuYiXue.DaoNiaoShu upBtn = transform.FindFirst