From cdf9d6726935e5677d0f4edb5daf9a821adfc3e0 Mon Sep 17 00:00:00 2001 From: hejiayao <782841784@qq.com> Date: Thu, 9 Apr 2026 13:22:25 +0800 Subject: [PATCH] 1 --- Assets/StreamingAssets/info.ini | 2 +- Assets/Zion/Scripts/Manager/GameManager.cs | 4 ++-- Assets/Zion/Scripts/Manager/ScoreBase.cs | 2 +- Assets/Zion/Scripts/Manager/StepState_10001.cs | 10 ---------- .../Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs | 8 ++++++-- .../Scripts/TSQManager/EquipmentProcessExample_TSQ.cs | 4 +--- 6 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Assets/StreamingAssets/info.ini b/Assets/StreamingAssets/info.ini index c1484ea..4d09eb7 100644 --- a/Assets/StreamingAssets/info.ini +++ b/Assets/StreamingAssets/info.ini @@ -1 +1 @@ -2026-04-07 17:45:56#'efficiencymanagement://29,55,118,1,3,1491131907079929856,eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4ZjVhNGUzLTNhNDItNDExNy04YTkyLWMyYzAwMzE3NWIzZiJ9.K0fYzaENp2Nm0gfHE0QVR1rYIRaeCvfBEQO_jj6BJvTeUGxJ3hFJIkisuXQM5Cwnke_EQVY52WqO5QG0kTPp6Q,&/#116;est1212,10001,172.16.1.135:8081,60'| \ No newline at end of file +2026-04-09 11:04:34#'efficiencymanagement://31,56,118,1,3,1491755674177110016,eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjExZmY1ZmQ3LTAxN2QtNGNlMC1hOGZkLTg1NzExY2M0OGQzNyJ9.fxpB_DdhcmFI0eRwbKyBMzV6ErQsYjRAeXHCTWIWE1cFbk5FVD6wuv3VB2_b40gFk4lYSCf0pTTiJVJwCTOeOg,&/#116;est1212,10001,172.16.1.135:8081,60'| \ No newline at end of file diff --git a/Assets/Zion/Scripts/Manager/GameManager.cs b/Assets/Zion/Scripts/Manager/GameManager.cs index b986613..f8c2cc8 100644 --- a/Assets/Zion/Scripts/Manager/GameManager.cs +++ b/Assets/Zion/Scripts/Manager/GameManager.cs @@ -73,13 +73,13 @@ public class GameManager : MonoSingleton { Debug.Log("数据不对"); } - SceneLoader.LoadAsync("Models"); + SceneLoader.LoadAsync("Models _tsq"); RunModelMgr.startTime = DateTime.Now; } else { ///练习模式和学习模式 - SceneLoader.LoadAsync("Models"); + SceneLoader.LoadAsync("Models _tsq"); } tokenUrl = NetMgr.GetTokenURL(); diff --git a/Assets/Zion/Scripts/Manager/ScoreBase.cs b/Assets/Zion/Scripts/Manager/ScoreBase.cs index 5387253..c667bed 100644 --- a/Assets/Zion/Scripts/Manager/ScoreBase.cs +++ b/Assets/Zion/Scripts/Manager/ScoreBase.cs @@ -27,7 +27,7 @@ public abstract class ScoreBase : MonoBehaviour /// /// 此科目步骤 /// - protected Dictionary steps; + public Dictionary steps; public virtual void Init() { systemId = 10001; diff --git a/Assets/Zion/Scripts/Manager/StepState_10001.cs b/Assets/Zion/Scripts/Manager/StepState_10001.cs index 3a9384d..19129d1 100644 --- a/Assets/Zion/Scripts/Manager/StepState_10001.cs +++ b/Assets/Zion/Scripts/Manager/StepState_10001.cs @@ -24,16 +24,6 @@ public class StepState_10001 : ScoreBase { steps.Add(a.subProcessId, a); }); - steps[1].SetScore(true); - steps[2].SetScore(true); - steps[3].SetScore(false); - steps[4].SetScore(true); - steps[5].SetScore(true); - steps[6].SetScore(true); - steps[7].SetScore(true); - steps[8].SetScore(true); - - } public override void LoadSceneBufferList(string sceneInfo) diff --git a/Assets/Zion/Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs b/Assets/Zion/Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs index 436fdb4..e575380 100644 --- a/Assets/Zion/Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs +++ b/Assets/Zion/Scripts/TSQManager/EquipmentIIntroduction_TSQ.cs @@ -5,6 +5,7 @@ using SK.Framework; using UnityEngine.UI; using TMPro; using UnityEngine.EventSystems; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical; public class EquipmentIIntroduction_TSQ : MonoBehaviour { @@ -13,13 +14,13 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour public int firstStep = 0; public int secondStep = 0; private int currentStep; - private bool currentState; + public bool currentState; void Awake() { instance = this; currentStep = firstStep; taskStep.Add(new TaskStep { StepId = firstStep, Description = currentState ? "关闭" + transform.name : "开启" + transform.name }); - taskStep.Add(new TaskStep { StepId = secondStep, Description = currentState ? "关闭" + transform.name : "开启" + transform.name }); + taskStep.Add(new TaskStep { StepId = secondStep, Description = currentState ? "关闭" + transform.name : "开启" + transform.name }); } void OnMouseDown() @@ -60,10 +61,13 @@ public class EquipmentIIntroduction_TSQ : MonoBehaviour private void SetStep(bool state) { + if (EquipmentProcessExample_TSQ.Instance._expectStepIndex > EquipmentProcessExample_TSQ.Instance.EquipmentProcess_Task.Steps.Count) return; bool isError = currentStep != EquipmentProcessExample_TSQ.Instance._expectStepIndex; TaskManager.Instance.ReportCurrentStepResult(isError); + ScoreManager.Instance?.GetScoreBaseBySchemeID(GameManager.RunModelMgr.schemeID).steps[EquipmentProcessExample_TSQ.Instance._expectStepIndex].SetScore(!isError); EquipmentProcessExample_TSQ.Instance._expectStepIndex++; currentStep = secondStep; + currentState = state; } /// /// 开启冷却塔风机1面板 diff --git a/Assets/Zion/Scripts/TSQManager/EquipmentProcessExample_TSQ.cs b/Assets/Zion/Scripts/TSQManager/EquipmentProcessExample_TSQ.cs index f0c4488..1c55eb0 100644 --- a/Assets/Zion/Scripts/TSQManager/EquipmentProcessExample_TSQ.cs +++ b/Assets/Zion/Scripts/TSQManager/EquipmentProcessExample_TSQ.cs @@ -8,9 +8,7 @@ using SK.Framework; /// public class EquipmentProcessExample_TSQ : MonoSingleton { - private TaskData EquipmentProcess_Task; - public List taskSteps = new List(); - + public TaskData EquipmentProcess_Task; /// /// 当前期望输入的 Step 索引（0-based） /// 仅用于示例判断“是否按对”，不控制流程