taosuqi
/
ND_SimulationAutomaticControl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

This commit is contained in:
taosuqi 2025-12-10 09:26:31 +08:00
parent 20a2074d69
commit 81e3c17015
5 changed files with 67 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Resources/UI/UIPanel/UI_TeacherStudentPanel.prefab
View File

@ -1421,7 +1421,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: b90bbac2febfe424aa9321aa04becd6c, type: 3} m_Sprite: {fileID: 21300000, guid: c0addab229469754d89e9bee5c8dfa29, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1464,11 +1464,11 @@ RectTransform:
m_Father: {fileID: 6919760414615302427} m_Father: {fileID: 6919760414615302427}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 24.502, y: -52.617} m_AnchoredPosition: {x: -0.000061035156, y: -27.900024}
m_SizeDelta: {x: 167.1493, y: 34.9825} m_SizeDelta: {x: 167.14929, y: 34.9825}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6919760414617370646 --- !u!222 &6919760414617370646
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1531,7 +1531,7 @@ MonoBehaviour:
m_fontSizeMin: 18 m_fontSizeMin: 18
m_fontSizeMax: 72 m_fontSizeMax: 72
m_fontStyle: 0 m_fontStyle: 0
m_HorizontalAlignment: 1 m_HorizontalAlignment: 2
m_VerticalAlignment: 512 m_VerticalAlignment: 512
m_textAlignment: 65535 m_textAlignment: 65535
m_characterSpacing: 0 m_characterSpacing: 0

14
Assets/Resources/UI/UIPanel/UI_TopTitlePanel.prefab
View File

@ -249,7 +249,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} 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_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -816,7 +816,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0} m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0} m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 2 m_Transition: 1
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &4260632125344439941 --- !u!224 &4260632125344439941
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -878,8 +878,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -701.65466, y: 18.0203} m_AnchoredPosition: {x: -429, y: 20.643}
m_SizeDelta: {x: 79.6544, y: 81.9797} m_SizeDelta: {x: 180.0188, y: 58.7133}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!222 &8506850147581141538 --- !u!222 &8506850147581141538
CanvasRenderer: CanvasRenderer:
@ -909,8 +909,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 21300000, guid: d99c682d794250b4aa966ae6ef8fe932, type: 3}
m_Type: 1 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4

25
Assets/Scripts/SubjectToggle.cs
View File

@ -1,6 +1,5 @@
using DG.Tweening; using DG.Tweening;
using System.Collections; using System.Collections;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
@ -22,7 +21,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
switch (transform.name) switch (transform.name)
{ {
case "Subject1": case "Subject1":
Bootstrap.Instance.uiManager.HidePanel<UI_TopTitlePanel>(); //Bootstrap.Instance.uiManager.HidePanel<UI_TopTitlePanel>();
Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) => Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
{ {
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.5f); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.5f);
@ -30,7 +29,6 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
{ {
Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) => Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) =>
{ {
Bootstrap.Instance.uiManager.HidePanel<UI_ChooesPanel>(); Bootstrap.Instance.uiManager.HidePanel<UI_ChooesPanel>();
Debug.Log("¼ÓÔس¡¾°³É¹¦"); Debug.Log("¼ÓÔس¡¾°³É¹¦");
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f); Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f);
@ -38,6 +36,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
}); });
}); });
}); });
break; break;
case "Subject2": case "Subject2":
@ -62,6 +61,7 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
{ {
case "Subject1": case "Subject1":
LoadImage("Sprite/1"); LoadImage("Sprite/1");
Toggle_Subject.isOn = false;
Debug.Log("1111"); Debug.Log("1111");
break; break;
case "Subject2": case "Subject2":
@ -85,6 +85,25 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
Image image = GetComponentInChildren<Image>(); Image image = GetComponentInChildren<Image>();
image.sprite = subjectSprites[1]; 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;
}
} }
/// <summary> /// <summary>

1
Assets/Scripts/UI/UIPanel/UI_TeacherStudentPanel.cs
View File

@ -38,6 +38,7 @@ public class UI_TeacherStudentPanel : BasePanel
{ {
base.ShowMe(); base.ShowMe();
FadeIn(0.5f); FadeIn(0.5f);
Player = GameObject.FindGameObjectWithTag("Player");
} }
public override void HideMe() public override void HideMe()

26
Assets/Scripts/UI/UIPanel/UI_TopTitlePanel.cs
View File

@ -1,7 +1,7 @@
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class UI_TopTitlePanel : BasePanel public class UI_TopTitlePanel : BasePanel
{ {
@ -35,7 +35,8 @@ public class UI_TopTitlePanel : BasePanel
ReturnBtn.gameObject.SetActive(true); ReturnBtn.gameObject.SetActive(true);
NameText.text = LoginManager.Instance.loginRespons.data.login_name; NameText.text = LoginManager.Instance.loginRespons.data.login_name;
}else if (currentScene.name == "ChooesSubjectScene") }
else if (currentScene.name == "ChooesSubjectScene")
{ {
AskBtn.gameObject.SetActive(false); AskBtn.gameObject.SetActive(false);
ReturnBtn.gameObject.SetActive(false); ReturnBtn.gameObject.SetActive(false);
@ -53,11 +54,11 @@ public class UI_TopTitlePanel : BasePanel
switch (btnPath) switch (btnPath)
{ {
case "ÎÊ´ð°´Å¥": case "ÎÊ´ð°´Å¥":
Bootstrap.Instance.uiManager.ShowPanel<UI_TeacherStudentPanel>(this, E_UI_Layer.Mid, Bootstrap.Instance.uiManager.ShowPanel<UI_TeacherStudentPanel>(this, E_UI_Layer.Top,
(panel) => (panel) =>
{ {
Debug.Log("ÎÊ´ðÃæ°åÏÔʾ"); Debug.Log("ÎÊ´ðÃæ°åÏÔʾ");
GameObject Player=GameObject.FindGameObjectWithTag("Player"); GameObject Player = GameObject.FindGameObjectWithTag("Player");
Player.GetComponent<FirstPersonController>().enabled = false; Player.GetComponent<FirstPersonController>().enabled = false;
}); });
@ -65,7 +66,7 @@ public class UI_TopTitlePanel : BasePanel
case "·µ»Ø": case "·µ»Ø":
ReturnScene(); ReturnScene();
break; break;
case "Í˳ö" : case "Í˳ö":
QuitGame(); QuitGame();
break; break;
default: default:
@ -81,8 +82,19 @@ public class UI_TopTitlePanel : BasePanel
Scene currentScene = SceneManager.GetActiveScene(); Scene currentScene = SceneManager.GetActiveScene();
switch (currentScene.name) switch (currentScene.name)
{ {
case "xianchang-TSQ": case "xianchang":
Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "ChooesSubjectScene", () =>
{
Bootstrap.Instance.uiManager.ShowPanel<UI_ChooesPanel>(this, E_UI_Layer.Mid, (panel) =>
{
Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) =>
{
Bootstrap.Instance.uiManager.HidePanel<UI_LoginPanel>();
Debug.Log("³¡¾°¼ÓÔسɹ¦");
});
});
}
);
break; break;
case "ChooesSubjectScene": case "ChooesSubjectScene":
break; break;