From 837eabc06959411ab32d3d4ccbc8962a8e097146 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Mon, 2 Sep 2024 09:43:07 +0800 Subject: [PATCH] ss --- Assets/Scripts/CXX/Score/Score_1002.cs | 97 ++++++++++--------- .../CXX/StepState/1002/StepState_1002.cs | 72 +++++++------- .../UI_DisassemblyAssemblyNoticePanel.cs | 1 + .../Setting/科目/10002_1002_计量装置轮换.xml | 46 ++++----- 4 files changed, 112 insertions(+), 104 deletions(-) diff --git a/Assets/Scripts/CXX/Score/Score_1002.cs b/Assets/Scripts/CXX/Score/Score_1002.cs index f278daa..09090a5 100644 --- a/Assets/Scripts/CXX/Score/Score_1002.cs +++ b/Assets/Scripts/CXX/Score/Score_1002.cs @@ -14,24 +14,24 @@ public class Score_1002 : ScoreBase { base.Init(); List tmps= new List(); - tmps.Add(new ScoreSubjectStep(3001, 0)); - tmps.Add(new ScoreSubjectStep(3002,0)); - tmps.Add(new ScoreSubjectStep(3003,5)); - tmps.Add(new ScoreSubjectStep(3004,5)); - tmps.Add(new ScoreSubjectStep(3005, 5)); - tmps.Add(new ScoreSubjectStep(3006, 10)); - tmps.Add(new ScoreSubjectStep(3007, 5)); - tmps.Add(new ScoreSubjectStep(3008, 0)); - tmps.Add(new ScoreSubjectStep(3009, 3)); - tmps.Add(new ScoreSubjectStep(3010,4)); - tmps.Add(new ScoreSubjectStep(3011, 3)); - tmps.Add(new ScoreSubjectStep(3012, 20,true)); - tmps.Add(new ScoreSubjectStep(3013, 20,true)); - tmps.Add(new ScoreSubjectStep(3014, 5)); - tmps.Add(new ScoreSubjectStep(3015, 5)); - tmps.Add(new ScoreSubjectStep(3016, 3)); - tmps.Add(new ScoreSubjectStep(3017, 4)); - tmps.Add(new ScoreSubjectStep(3018, 3)); + tmps.Add(new ScoreSubjectStep(1, 0)); + tmps.Add(new ScoreSubjectStep(2,0)); + tmps.Add(new ScoreSubjectStep(3,5)); + tmps.Add(new ScoreSubjectStep(4,5)); + tmps.Add(new ScoreSubjectStep(5, 5)); + tmps.Add(new ScoreSubjectStep(6, 10)); + tmps.Add(new ScoreSubjectStep(7, 5)); + tmps.Add(new ScoreSubjectStep(8, 0)); + tmps.Add(new ScoreSubjectStep(9, 3)); + tmps.Add(new ScoreSubjectStep(10,4)); + tmps.Add(new ScoreSubjectStep(11, 3)); + tmps.Add(new ScoreSubjectStep(12, 20,true)); + tmps.Add(new ScoreSubjectStep(13, 20,true)); + tmps.Add(new ScoreSubjectStep(14, 5)); + tmps.Add(new ScoreSubjectStep(15, 5)); + tmps.Add(new ScoreSubjectStep(16, 3)); + tmps.Add(new ScoreSubjectStep(17, 4)); + tmps.Add(new ScoreSubjectStep(18, 3)); steps = new Dictionary(); tmps.ForEach(a => @@ -126,20 +126,20 @@ public class Score_1002 : ScoreBase { if (para.ToString() == "") { - steps[3001].SetScore(true); + steps[1].SetScore(true); } else if (para.ToString() == "ԤԼ") { - steps[3002].SetScore(true); + steps[2].SetScore(true); } } else if(triggerName== "ѹƱȷϰť") { - steps[3003].SetScore(true); + steps[3].SetScore(true); } else if(triggerName== "װť") { - steps[3004].SetScore(true); + steps[4].SetScore(true); } else if (triggerName == "ֳť") { @@ -149,7 +149,7 @@ public class Score_1002 : ScoreBase tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("") ? 0.25f : 0); tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("Ե") ? 0.25f : 0); tmp += (PacksackBagMgr.Instance.wearDic.ContainsKey("Եѥ") ? 0.25f : 0); - steps[3005].SetScore(tmp); + steps[5].SetScore(tmp); //鱳ǷЯ string[] shoudleTools = new string[] { "ǯ", "Ե˿", "", "֤", "װӡ", "Ե", "ߵܱ", "ȫñ", "", "Ե", "Եѥ" }; @@ -158,32 +158,32 @@ public class Score_1002 : ScoreBase { tmp2 -= (PacksackBagMgr.Instance.toolAndMaterialDic.ContainsKey(a) ? 0 : 0.1f); }); - steps[3006].SetScore(Mathf.Clamp01(tmp2)); + steps[6].SetScore(Mathf.Clamp01(tmp2)); } else if (triggerName == "֤") { //ͻͨ - steps[3007].SetScore(true); + steps[7].SetScore(true); } else if (triggerName == "NPC") { //ǰ - steps[3008].SetScore(true); + steps[8].SetScore(true); } else if (triggerName == "") { if ((bool)para) { - //3012֮ǰʱ̣֮ʱװ - if (!steps[3012].isDone) + //12֮ǰʱ̣֮ʱװ + if (!steps[12].isDone) { //߼֣жǷȷ - steps[3009].SetScore(isCheckE()); + steps[9].SetScore(isCheckE()); } else { //װ - steps[3014].SetScore(true); + steps[14].SetScore(true); } } } @@ -195,13 +195,13 @@ public class Score_1002 : ScoreBase else if (triggerName == "+in_˿1" || triggerName == "+in_˿2" || triggerName == "+in_˿3") { //3012֮ǰDz֮ǰװ - if (!steps[3012].isDone) + if (!steps[12].isDone) { //ϵ if (SiteManager.instance.measuringCabinet.inSwitch.isOpen == false) { InSwitchCloseYDList.Add(triggerName); - steps[3010].SetScore(isInSwitchCheckE(),true); + steps[10].SetScore(isInSwitchCheckE(),true); } } else @@ -215,13 +215,13 @@ public class Score_1002 : ScoreBase } else if(triggerName == "ܱ") { - steps[3011].SetScore(true); + steps[11].SetScore(true); } else if(unInstallJieXian.Contains(triggerName)) { //3012֮ǰDz֮ǰװ //˿ - if (!steps[3012].isDone) + if (!steps[12].isDone) { //жϲ if ((bool)para) @@ -240,7 +240,7 @@ public class Score_1002 : ScoreBase //з if (triggerName.Contains("A_in_˿")) { - steps[3013].SetScore(IsInstallJieXianCheckE(), true); + steps[13].SetScore(IsInstallJieXianCheckE(), true); } } } @@ -249,13 +249,13 @@ public class Score_1002 : ScoreBase //ȡµܱʱж˳ if(!(bool)para) { - steps[3012].SetScore(IsUninstallJieXianCheckE()); + steps[12].SetScore(IsUninstallJieXianCheckE()); } } else if(triggerName.Contains("ܱװ˿")) { //װ - if (steps[3012].isDone) + if (steps[12].isDone) { //װ˿ if ((bool)para) @@ -267,42 +267,49 @@ public class Score_1002 : ScoreBase else if(triggerName.Contains("ܱӹ̶˿")) { //װ - if (steps[3012].isDone) + if (steps[12].isDone) { if ((bool)para) installCover.Add(triggerName); else installCover.Remove(triggerName); - steps[3015].SetScore(Check3015(),true); + steps[15].SetScore(Check15(),true); } } else if(installTestJieXian.Any(a=>triggerName.StartsWith(a))) { // - if (steps[3012].isDone) + if (steps[12].isDone) { currentInstallTestJieXian.Add(triggerName); } } else if(triggerName.Contains("ܱӡ")) { - if (steps[3012].isDone) + if (steps[12].isDone) { if((bool)para) { if(!SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.isCut && !SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.isCut) { - steps[3016].SetScore(true,true); + steps[16].SetScore(true,true); } } } } + else if(triggerName=="֪ť") + { + if (steps[12].isDone) + { + steps[17].SetScore(true); + } + } else if(triggerName== "") { - if (steps[3012].isDone) + if (steps[12].isDone) { - steps[3018].SetScore(true); + steps[18].SetScore(true); } } } @@ -417,7 +424,7 @@ public class Score_1002 : ScoreBase return true; } - public bool Check3015() + public bool Check15() { //عˣš if (SiteManager.instance.measuringCabinet.inSwitch.isOpen && installCover.Contains("ܱӹ̶˿1") && installCover.Contains("ܱӹ̶˿2")) diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index e6bd909..41f2233 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -11,24 +11,24 @@ public class StepState_1002 : StepState { private void Awake() { - steps.Add(3001, E_SceneType.Office); - steps.Add(3002, E_SceneType.Office); - steps.Add(3003, E_SceneType.Office); - steps.Add(3004, E_SceneType.Office); - steps.Add(3005, E_SceneType.ToolRoom); - steps.Add(3006, E_SceneType.ToolRoom); - steps.Add(3007, E_SceneType.Site); - steps.Add(3008, E_SceneType.Site); - steps.Add(3009, E_SceneType.Site); - steps.Add(3010, E_SceneType.Site); - steps.Add(3011, E_SceneType.Site); - steps.Add(3012, E_SceneType.Site); - steps.Add(3013, E_SceneType.Site); - steps.Add(3014, E_SceneType.Site); - steps.Add(3015, E_SceneType.Site); - steps.Add(3016, E_SceneType.Site); - steps.Add(3017, E_SceneType.Site); - steps.Add(3018, E_SceneType.Site); + steps.Add(1, E_SceneType.Office); + steps.Add(2, E_SceneType.Office); + steps.Add(3, E_SceneType.Office); + steps.Add(4, E_SceneType.Office); + steps.Add(5, E_SceneType.ToolRoom); + steps.Add(6, E_SceneType.ToolRoom); + steps.Add(7, E_SceneType.Site); + steps.Add(8, E_SceneType.Site); + steps.Add(9, E_SceneType.Site); + steps.Add(10, E_SceneType.Site); + steps.Add(11, E_SceneType.Site); + steps.Add(12, E_SceneType.Site); + steps.Add(13, E_SceneType.Site); + steps.Add(14, E_SceneType.Site); + steps.Add(15, E_SceneType.Site); + steps.Add(16, E_SceneType.Site); + steps.Add(17, E_SceneType.Site); + steps.Add(18, E_SceneType.Site); } /// @@ -41,26 +41,26 @@ public class StepState_1002 : StepState //ɾĶ LiveSceneManager.Instance?.OnCheckSubProcess(); - if (num == 3001) + if (num == 1) { //鿴 OfficeManager.Instance.mobileController.downIndex = 0; } - else if (num == 3002) + else if (num == 2) { //ԤԼ OfficeManager.Instance.mobileController.downIndex = 1; } - else if (num == 3003) + else if (num == 3) { //Ʊ OfficeManager.Instance.mobileController.downIndex = 2; } - else if (num == 3004) + else if (num == 4) { //дװ𹤵 } - else if (num == 3005) + else if (num == 5) { //׸ //ȷװ @@ -80,7 +80,7 @@ public class StepState_1002 : StepState GameManager.RunModelMgr.SceneType = curret; } } - else if (num == 3006) + else if (num == 6) { //ѡȡ @@ -95,7 +95,7 @@ public class StepState_1002 : StepState PacksackBagMgr.Instance.WearItemState(item.itemInfo, true); }); } - else if (num == 3007) + else if (num == 7) { //׸ //ͻͨ @@ -141,18 +141,18 @@ public class StepState_1002 : StepState //ԭnpcԻ GameObject.FindObjectsOfType().ToList().ForEach(a => { a.speackIndex = 0; }); } - else if (num == 3008) + else if (num == 8) { //ǰ } - else if (num == 3009) + else if (num == 9) { //߼ //ԭnpc GameObject.FindObjectsOfType().ToList().Find(a => a.triggerName == "NPC").speackIndex = 1; } - else if(num == 3010) + else if(num == 10) { //ϿԴ @@ -169,20 +169,20 @@ public class StepState_1002 : StepState SiteManager.instance.measuringCabinet.check_JieXian.GetComponent().enabled = false; } - else if (num == 3011) + else if (num == 11) { //˶Ժͳ¼豸Ϣ //ԴϿ SiteManager.instance.measuringCabinet.inSwitch.CloseState(); } - else if(num== 3012) + else if(num== 12) { //ܼװ //Ѷȡ SiteManager.instance.measuringCabinet.meteringDevice.namePlate.isChecked = true; } - else if( num == 3013) + else if( num == 13) { //װܱ @@ -202,7 +202,7 @@ public class StepState_1002 : StepState //ˢ´״̬ SiteManager.instance.measuringCabinet.CheckHasElectricity(); } - else if (num == 3014) + else if (num == 14) { //װ @@ -226,7 +226,7 @@ public class StepState_1002 : StepState //ˢ´״̬ SiteManager.instance.measuringCabinet.CheckHasElectricity(); } - else if(num== 3015) + else if(num== 15) { //ֳͨ缰 @@ -234,7 +234,7 @@ public class StepState_1002 : StepState SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true; SiteManager.instance.measuringCabinet.check_JieXian.GetComponent().enabled = false; } - else if(num== 3016) + else if(num== 16) { //ʵʩӡ @@ -243,13 +243,13 @@ public class StepState_1002 : StepState //Ӹ SiteManager.instance.measuringCabinet.meteringDevice.CoverInstallState(); } - else if(num== 3017) + else if(num== 17) { //д֪ SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install(); SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install(); } - else if(num== 3018) + else if(num== 18) { //ֳ } diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.cs index a00dfaa..c3f6a52 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.cs @@ -20,6 +20,7 @@ public class UI_DisassemblyAssemblyNoticePanel : BasePanel break; case "Button_Define": GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true); + ScoreManager.instance.Check(triggerName, null); GameManager.UIMgr.HidePanel(); break; } diff --git a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml index 47e8302..059c463 100644 --- a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml +++ b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml @@ -3,48 +3,48 @@ - + - + - - + + - + - + - + - + - - + + - + - + @@ -55,17 +55,17 @@ - - + + - + - + - + - + - + @@ -110,19 +110,19 @@ - + - + - - + +