From 81e3c1701588cbf51526579167f411de6f660148 Mon Sep 17 00:00:00 2001 From: taosuqi <2274240467@qq.com> Date: Wed, 10 Dec 2025 09:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/UIPanel/UI_TeacherStudentPanel.prefab | 14 +++---- .../UI/UIPanel/UI_TopTitlePanel.prefab | 14 +++---- Assets/Scripts/SubjectToggle.cs | 35 +++++++++++++---- .../UI/UIPanel/UI_TeacherStudentPanel.cs | 1 + Assets/Scripts/UI/UIPanel/UI_TopTitlePanel.cs | 38 ++++++++++++------- 5 files changed, 67 insertions(+), 35 deletions(-) diff --git a/Assets/Resources/UI/UIPanel/UI_TeacherStudentPanel.prefab b/Assets/Resources/UI/UIPanel/UI_TeacherStudentPanel.prefab index cff4703..fcff846 100644 --- a/Assets/Resources/UI/UIPanel/UI_TeacherStudentPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_TeacherStudentPanel.prefab @@ -1421,7 +1421,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b90bbac2febfe424aa9321aa04becd6c, type: 3} + m_Sprite: {fileID: 21300000, guid: c0addab229469754d89e9bee5c8dfa29, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1464,11 +1464,11 @@ RectTransform: m_Father: {fileID: 6919760414615302427} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 24.502, y: -52.617} - m_SizeDelta: {x: 167.1493, y: 34.9825} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: -27.900024} + m_SizeDelta: {x: 167.14929, y: 34.9825} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &6919760414617370646 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1531,7 +1531,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/Assets/Resources/UI/UIPanel/UI_TopTitlePanel.prefab b/Assets/Resources/UI/UIPanel/UI_TopTitlePanel.prefab index a72c3e9..ee5933d 100644 --- a/Assets/Resources/UI/UIPanel/UI_TopTitlePanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_TopTitlePanel.prefab @@ -249,7 +249,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -816,7 +816,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 2 + m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -859,7 +859,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4260632125344439941 RectTransform: m_ObjectHideFlags: 0 @@ -878,8 +878,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -701.65466, y: 18.0203} - m_SizeDelta: {x: 79.6544, y: 81.9797} + m_AnchoredPosition: {x: -429, y: 20.643} + m_SizeDelta: {x: 180.0188, y: 58.7133} m_Pivot: {x: 1, y: 0} --- !u!222 &8506850147581141538 CanvasRenderer: @@ -909,8 +909,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d99c682d794250b4aa966ae6ef8fe932, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Scripts/SubjectToggle.cs b/Assets/Scripts/SubjectToggle.cs index c86c0d2..e0120eb 100644 --- a/Assets/Scripts/SubjectToggle.cs +++ b/Assets/Scripts/SubjectToggle.cs @@ -1,6 +1,5 @@ using DG.Tweening; using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -22,7 +21,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler switch (transform.name) { case "Subject1": - Bootstrap.Instance.uiManager.HidePanel(); + //Bootstrap.Instance.uiManager.HidePanel(); Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.System, (panel) => { Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.5f); @@ -30,14 +29,14 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler { Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Top, (panel) => { - - Bootstrap.Instance.uiManager.HidePanel(); - Debug.Log("加载场景成功"); - Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f); + Bootstrap.Instance.uiManager.HidePanel(); + Debug.Log("加载场景成功"); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f); }); }); }); + break; case "Subject2": @@ -62,6 +61,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler { case "Subject1": LoadImage("Sprite/1"); + Toggle_Subject.isOn = false; Debug.Log("1111"); break; case "Subject2": @@ -84,7 +84,26 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler //ChooesPanel.targetimage.gameObject.SetActive(isIPointer); Image image = GetComponentInChildren(); image.sprite = subjectSprites[1]; - StartCoroutine(ToggleDoScale(isIPointer)); + StartCoroutine(ToggleDoScale(isIPointer)); + switch (transform.name) + { + case "Subject1": + //LoadImage("Sprite/1"); + Toggle_Subject.isOn = false; + Debug.Log("1111"); + break; + case "Subject2": + //LoadImage("Sprite/2"); + Debug.Log("2222"); + break; + case "Subject3": + //LoadImage("Sprite/3"); + Debug.Log("3333"); + break; + case "Subject4": + // Debug.Log("4444"); + break; + } } /// @@ -104,7 +123,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler Debug.Log("sprite加载失败，当前文件夹未找到"); } } - + /// /// toggle变大 /// diff --git a/Assets/Scripts/UI/UIPanel/UI_TeacherStudentPanel.cs b/Assets/Scripts/UI/UIPanel/UI_TeacherStudentPanel.cs index 2813d46..22ef0ff 100644 --- a/Assets/Scripts/UI/UIPanel/UI_TeacherStudentPanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_TeacherStudentPanel.cs @@ -38,6 +38,7 @@ public class UI_TeacherStudentPanel : BasePanel { base.ShowMe(); FadeIn(0.5f); + Player = GameObject.FindGameObjectWithTag("Player"); } public override void HideMe() diff --git a/Assets/Scripts/UI/UIPanel/UI_TopTitlePanel.cs b/Assets/Scripts/UI/UIPanel/UI_TopTitlePanel.cs index a6492bc..9af0566 100644 --- a/Assets/Scripts/UI/UIPanel/UI_TopTitlePanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_TopTitlePanel.cs @@ -1,7 +1,7 @@ using TMPro; using UnityEngine; -using UnityEngine.UI; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class UI_TopTitlePanel : BasePanel { @@ -9,7 +9,7 @@ public class UI_TopTitlePanel : BasePanel public Button ReturnBtn; //返回按钮 public Button ExitBtn; //退出按钮 public TextMeshProUGUI NameText; //用户名 - + protected override void Awake() { @@ -35,7 +35,8 @@ public class UI_TopTitlePanel : BasePanel ReturnBtn.gameObject.SetActive(true); NameText.text = LoginManager.Instance.loginRespons.data.login_name; - }else if (currentScene.name == "ChooesSubjectScene") + } + else if (currentScene.name == "ChooesSubjectScene") { AskBtn.gameObject.SetActive(false); ReturnBtn.gameObject.SetActive(false); @@ -53,19 +54,19 @@ public class UI_TopTitlePanel : BasePanel switch (btnPath) { case "问答按钮": - Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Mid, + Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Top, (panel) => { - Debug.Log("问答面板显示"); - GameObject Player=GameObject.FindGameObjectWithTag("Player"); - Player.GetComponent().enabled = false; - + Debug.Log("问答面板显示"); + GameObject Player = GameObject.FindGameObjectWithTag("Player"); + Player.GetComponent().enabled = false; + }); break; case "返回": ReturnScene(); break; - case "退出" : + case "退出": QuitGame(); break; default: @@ -81,15 +82,26 @@ public class UI_TopTitlePanel : BasePanel Scene currentScene = SceneManager.GetActiveScene(); switch (currentScene.name) { - case "xianchang-TSQ": - + case "xianchang": + Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "ChooesSubjectScene", () => + { + Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Mid, (panel) => + { + Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Top, (panel) => + { + Bootstrap.Instance.uiManager.HidePanel(); + Debug.Log("场景加载成功"); + }); + }); + } + ); break; case "ChooesSubjectScene": break; - + } } - + /// /// 退出应用 ///