From 04642aaf719c094ef47df2136a963883e9b4f3f6 Mon Sep 17 00:00:00 2001 From: taosuqi <2274240467@qq.com> Date: Mon, 14 Apr 2025 09:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E8=AE=AD=E7=82=B9?= =?UTF-8?q?=E4=B8=8D=E4=BA=86toggle=E7=9A=84=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/CultivationOfBrewing - 快捷方式.lnk | Bin 993 -> 0 bytes .../CultivationOfBrewing - 快捷方式.lnk.meta | 7 --- .../UI/UIPanel/UI_TipsForPracticePanel.prefab | 2 +- .../ProjectBase/UIManager/BasePanel.cs | 2 +- Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs | 44 +++++------------- 5 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 Assets/CultivationOfBrewing - 快捷方式.lnk delete mode 100644 Assets/CultivationOfBrewing - 快捷方式.lnk.meta diff --git a/Assets/CultivationOfBrewing - 快捷方式.lnk b/Assets/CultivationOfBrewing - 快捷方式.lnk deleted file mode 100644 index a47c3156c4c64d448bbcb66d7aa8b2d1397a6a3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 993 zcmeZaU|?VrVFHp23Ha6$0~aGj6_?wW@r{ZN@UGkJ}4@G*}WS z&j?WuC*>JM7~}&U_+LN1Nd|pas~ET<1fz(-6wIlPnyM?nP&Vy+ zlY68Qg8_pPP`q-+yR!DwZ+@1M3=CcjoD3`s@AtVyJ1+AX37)U{)u0+3_@>qii+ zm-HBMo1?){$6yFn+!PhTBEaBWnp2WlmRORRpXZtq^ECa-#fCJGG*Dx@|0okHJ%nZbjmY-b!3j7mq_xxi32Hcser>`D+W@KPwdj8#! z{pXJC`M2jn40fk8G3Wtd0>q#N5kMLQiVe&l3@AD0aM9M}%gK(b1pN#u`<`!qua3F|HU(7C4o$E+5wpeV!)Cb$aFp+2CHr>iswvU3{37oPzl5!w=K&` z*07y=NpR~mh6DaLB`(AQ#pOT>KqjdIF~~zPIK3Q0lG{P%S^_c1;*DatE^B)WJeGSn m=q<6W=#d4AXMhxV0CB}am9=M*nB3>Zom{PXCAe diff --git a/Assets/CultivationOfBrewing - 快捷方式.lnk.meta b/Assets/CultivationOfBrewing - 快捷方式.lnk.meta deleted file mode 100644 index 0783c51..0000000 --- a/Assets/CultivationOfBrewing - 快捷方式.lnk.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 75ae750f8fa5293489e7f67efce226d7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/UI/UIPanel/UI_TipsForPracticePanel.prefab b/Assets/Resources/UI/UIPanel/UI_TipsForPracticePanel.prefab index fab3925..6c7e4f2 100644 --- a/Assets/Resources/UI/UIPanel/UI_TipsForPracticePanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_TipsForPracticePanel.prefab @@ -183,7 +183,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} m_Name: m_EditorClassIdentifier: - m_AllowSwitchOff: 1 + m_AllowSwitchOff: 0 --- !u!1 &1274212127849608913 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs b/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs index a7c658b..6c66287 100644 --- a/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs +++ b/Assets/Scripts/Project/ProjectBase/UIManager/BasePanel.cs @@ -57,7 +57,7 @@ public class BasePanel : MonoBehaviour /// 查找子控件并添加到字典中，同时添加事件监听器 /// /// 控件类型 - private void FindChildrenControl() where T : UIBehaviour + public void FindChildrenControl() where T : UIBehaviour { T[] controls = GetComponentsInChildren(true); diff --git a/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs b/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs index 2a16da6..6417cea 100644 --- a/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs @@ -30,7 +30,6 @@ public class UI_StepsPanel : BasePanel public string jsonFileName = "StepsConfig"; // JSONļ protected override void Awake() { - base.Awake(); canvasGroup.alpha = 0f; data = JsonManager.LoadData(jsonFileName); foreach (var pptFile in data.pptFiles) @@ -52,6 +51,8 @@ public class UI_StepsPanel : BasePanel buttonText.text = $"{pptFile.fileName}"; } } + base.Awake(); + //FindChildrenControl(); } public override async void ShowMe(int time = 0) @@ -107,43 +108,22 @@ public class UI_StepsPanel : BasePanel await ToolManager.RefreshScrollView(StepsContent, scrollRect); switch (togglePath) { - case "retrun_Btn": + case "ǰӴ": if (isOn) { - Bootstrap.Instance.scenesManager.LoadSceneAsyn("MenuScene", () => - { - Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Top, (panel) => - { - Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Bot, (panel) => - { - Debug.Log("سɹ"); - Bootstrap.Instance.uiManager.HidePanel(); - Bootstrap.Instance.uiManager.HidePanel(); - Bootstrap.Instance.uiManager.HidePanel(); - Bootstrap.Instance.uiManager.HidePanel(); - Bootstrap.Instance.uiManager.HidePanel(); - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); - Debug.Log("UI_StepsPanelѾʾ" + E_UI_Layer.System); + Debug.Log("ǰӴ"); - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.ϳ, false); - }); - }); + UI_ContentPanel.instance.Tips = "1.ѡΪ̭Сˡùӣѡ۹⻬йѡַѡɸѡѡ÷糵ӡȵɸѡʹ3.5-4׿׾ɸɸȥСӡѡֺӷѿʸߣһ£׳硣(ѡӲݷ)\r\n" + + "\n2.%ˮ1012Сʱͺ˸ɱáַЧβܱ֤ƷлƷ" + ; + UI_ContentPanel.instance.fizhi(); + Bootstrap.Instance.uiManager.HidePanel(); + CameraManager.instance.Camera.transform.SetPositionAndRotation + (CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation); - }); + UI_ContentPanel.instance.Tips = ""; } - break; - case "ǰӴ": - Debug.Log("ǰӴ"); - UI_ContentPanel.instance.Tips = "1.ѡΪ̭Сˡùӣѡ۹⻬йѡַѡɸѡѡ÷糵ӡȵɸѡʹ3.5-4׿׾ɸɸȥСӡѡֺӷѿʸߣһ£׳硣(ѡӲݷ)\r\n" + - "\n2.%ˮ1012Сʱͺ˸ɱáַЧβܱ֤ƷлƷ" - ; - UI_ContentPanel.instance.fizhi(); - Bootstrap.Instance.uiManager.HidePanel(); - CameraManager.instance.Camera.transform.SetPositionAndRotation - (CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation); - - UI_ContentPanel.instance.Tips = ""; break; case "缼": Debug.Log("缼");