diff --git a/Assets/CultivationOfBrewing - 快捷方式.lnk b/Assets/CultivationOfBrewing - 快捷方式.lnk
deleted file mode 100644
index a47c315..0000000
Binary files a/Assets/CultivationOfBrewing - 快捷方式.lnk and /dev/null differ
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("缼");