From 0e1669b12dcd9f4822b6a6d8d8c9d32e136a4792 Mon Sep 17 00:00:00 2001 From: lujiajian <204551278@qq.com> Date: Mon, 2 Mar 2026 14:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9E=E7=BA=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/xianchang.unity | 65 ++++++++++--------- Assets/Scripts/Line/LineManager.cs | 17 ++++- .../UI/UIPanel/UI_ExperimentChooesPanel.cs | 2 + Assets/StreamingAssets/cmd2.ini | 2 +- 4 files changed, 52 insertions(+), 34 deletions(-) diff --git a/Assets/Scenes/xianchang.unity b/Assets/Scenes/xianchang.unity index 452ba30..23f24d2 100644 --- a/Assets/Scenes/xianchang.unity +++ b/Assets/Scenes/xianchang.unity @@ -11511,6 +11511,7 @@ MonoBehaviour: - {fileID: 1678785031} - {fileID: 1735319917} - {fileID: 871829737} + - {fileID: 2033294241} - {fileID: 270167579} - {fileID: 338281663} - {fileID: 2031216179} @@ -12249,8 +12250,8 @@ MonoBehaviour: Entry: 10 Data: 28 - Name: - Entry: 6 - Data: + Entry: 10 + Data: 31 - Name: Entry: 10 Data: 12 @@ -12499,9 +12500,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 9 - - Name: - Entry: 10 - Data: 31 - Name: Entry: 10 Data: 32 @@ -12526,6 +12524,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 39 + - Name: + Entry: 10 + Data: 40 - Name: Entry: 13 Data: @@ -12548,9 +12549,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 9 - - Name: - Entry: 10 - Data: 40 - Name: Entry: 10 Data: 41 @@ -12575,6 +12573,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 48 + - Name: + Entry: 10 + Data: 49 - Name: Entry: 13 Data: @@ -12597,9 +12598,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 8 - - Name: - Entry: 10 - Data: 49 - Name: Entry: 10 Data: 50 @@ -12621,6 +12619,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 56 + - Name: + Entry: 10 + Data: 57 - Name: Entry: 13 Data: @@ -12643,9 +12644,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 8 - - Name: - Entry: 10 - Data: 57 - Name: Entry: 10 Data: 58 @@ -12667,6 +12665,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 64 + - Name: + Entry: 10 + Data: 65 - Name: Entry: 13 Data: @@ -12689,9 +12690,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 9 - - Name: - Entry: 10 - Data: 65 - Name: Entry: 10 Data: 66 @@ -12716,6 +12714,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 73 + - Name: + Entry: 10 + Data: 74 - Name: Entry: 13 Data: @@ -12738,9 +12739,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 9 - - Name: - Entry: 10 - Data: 74 - Name: Entry: 10 Data: 75 @@ -12765,6 +12763,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 82 + - Name: + Entry: 10 + Data: 83 - Name: Entry: 13 Data: @@ -12787,9 +12788,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 10 - - Name: - Entry: 10 - Data: 83 - Name: Entry: 10 Data: 84 @@ -12817,6 +12815,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 92 + - Name: + Entry: 10 + Data: 93 - Name: Entry: 13 Data: @@ -12839,9 +12840,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 10 - - Name: - Entry: 10 - Data: 93 - Name: Entry: 10 Data: 94 @@ -12869,6 +12867,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 102 + - Name: + Entry: 10 + Data: 103 - Name: Entry: 13 Data: @@ -12891,9 +12892,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 10 - - Name: - Entry: 10 - Data: 103 - Name: Entry: 10 Data: 104 @@ -12921,6 +12919,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 112 + - Name: + Entry: 10 + Data: 113 - Name: Entry: 13 Data: @@ -12943,9 +12944,6 @@ MonoBehaviour: - Name: Entry: 12 Data: 10 - - Name: - Entry: 10 - Data: 113 - Name: Entry: 10 Data: 114 @@ -12973,6 +12971,9 @@ MonoBehaviour: - Name: Entry: 10 Data: 122 + - Name: + Entry: 10 + Data: 123 - Name: Entry: 13 Data: diff --git a/Assets/Scripts/Line/LineManager.cs b/Assets/Scripts/Line/LineManager.cs index 2f62f87..a9aae4f 100644 --- a/Assets/Scripts/Line/LineManager.cs +++ b/Assets/Scripts/Line/LineManager.cs @@ -104,7 +104,7 @@ public class LineManager : SerializedMonoBehaviour //重新选择初始化 ComputerPanel.gameObject.SetActive(false); allline = 0; - Highlights.ForEach((x) => { x.highlighted = false; }); + Highlights_Backup.ForEach((x) => { x.highlighted = false; }); HighlightInit(""); for (int i = 0; i < Highlights.Count; i++) { @@ -162,6 +162,21 @@ public class LineManager : SerializedMonoBehaviour UI_TopTipPanel.instance.Init("提示：" + "当前实验是" + Laboratorycourse, "，请点击" + LineName + "。"); ComputerPanel.sprite = Experimentalresults[5]; break; + case 542: + Laboratorycourse = "比例微分（PD）环节，T=2S"; + UI_TopTipPanel.instance.Init("提示：" + "当前实验是" + Laboratorycourse, "，请点击" + LineName + "。"); + ComputerPanel.sprite = Experimentalresults[5]; + break; + case 551: + Laboratorycourse = "惯性环节，T=1S"; + UI_TopTipPanel.instance.Init("提示：" + "当前实验是" + Laboratorycourse, "，请点击" + LineName + "。"); + ComputerPanel.sprite = Experimentalresults[5]; + break; + case 552: + Laboratorycourse = "惯性环节，T=2S"; + UI_TopTipPanel.instance.Init("提示：" + "当前实验是" + Laboratorycourse, "，请点击" + LineName + "。"); + ComputerPanel.sprite = Experimentalresults[5]; + break; } } bool isshow; diff --git a/Assets/Scripts/UI/UIPanel/UI_ExperimentChooesPanel.cs b/Assets/Scripts/UI/UIPanel/UI_ExperimentChooesPanel.cs index 287c354..a5fe298 100644 --- a/Assets/Scripts/UI/UIPanel/UI_ExperimentChooesPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_ExperimentChooesPanel.cs @@ -65,9 +65,11 @@ public class UI_ExperimentChooesPanel : BasePanel LineManager.instance.ChangeClass(542); break; case "5-5-1": + LineManager.instance.ChangeClass(551); break; case "5-5-2": + LineManager.instance.ChangeClass(552); break; } diff --git a/Assets/StreamingAssets/cmd2.ini b/Assets/StreamingAssets/cmd2.ini index 82e44e3..bcf5ce4 100644 --- a/Assets/StreamingAssets/cmd2.ini +++ b/Assets/StreamingAssets/cmd2.ini @@ -1,4 +1,4 @@ [config] -td=2 +td=0 td=3 time=20 \ No newline at end of file