From 086a9b0d087f4bbe97f409f4963d39388a05adb6 Mon Sep 17 00:00:00 2001 From: hejiayao <782841784@qq.com> Date: Mon, 24 Feb 2025 18:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Player10007_7002.cs | 4 ++- ...stallAndDismantleTicketPanel_10007_7002.cs | 25 ++++++++++++++++++- .../UI/UI_Panel/UI_TipsForPracticePanel.cs | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Player10007_7002.cs b/Assets/Scripts/Player10007_7002.cs index 206ce22..16bef41 100644 --- a/Assets/Scripts/Player10007_7002.cs +++ b/Assets/Scripts/Player10007_7002.cs @@ -7,10 +7,11 @@ public class Player10007_7002 : SingletonMono public int moveNum = 0; public Vector3 lastMovePos = new Vector3(0, 0, 0); public List cdzList = new List(); - public bool isNearCDZ = false; + public bool isNearCDZ, isTour = false; private void Start() { isNearCDZ = false; + isTour = false; } private void Update() { @@ -20,6 +21,7 @@ public class Player10007_7002 : SingletonMono moveNum++; if (moveNum == 500) { + isTour = true; //Debug.LogError("巡视OK"); //GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId); if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("巡视场站", true) == 0) diff --git a/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs b/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs index b8cf001..1cd4c7e 100644 --- a/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs +++ b/Assets/Scripts/UI_InstallAndDismantleTicketPanel_10007_7002.cs @@ -43,13 +43,36 @@ public class UI_InstallAndDismantleTicketPanel_10007_7002 : BasePanel private void showToogle() { CloseToggle(true); + for (int j = 1; j <= Score_7002.xzDic[1].Count; j++) + { + for (int k = 0; k < Score_7002.xzDic[1][j].Length; k++) + { + if (Player10007_7002.Instance) + { + GetControl("t1_" + j + "_" + k).enabled = Player10007_7002.Instance.isTour; + } + else + { + GetControl("t1_" + j + "_" + k).enabled = false; + } + + } + } for (int j = 1; j <= Score_7002.xzDic[2].Count; j++) { for (int k = 0; k < Score_7002.xzDic[2][j].Length; k++) { - GetControl("t2_" + j + "_" + k).enabled = Player10007_7002.Instance.isNearCDZ; + if (Player10007_7002.Instance) + { + GetControl("t2_" + j + "_" + k).enabled = Player10007_7002.Instance.isNearCDZ; + } + else + { + GetControl("t2_" + j + "_" + k).enabled = false; + } } } + } public void showToggle(int xzDicCount) { diff --git a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs index 9133120..16ad08b 100644 --- a/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs +++ b/Assets/Template/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs @@ -30,6 +30,7 @@ public class UI_TipsForPracticePanel : BasePanel GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); }); } + ScoreManager.instance.ReInit(); break; case "BackBtn": GameManager.Instance.ShowUIPanelAndLoadScene(true);