111
This commit is contained in:
parent
1aed526eee
commit
d48fdd1173
|
|
@ -117181,14 +117181,14 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1489201652}
|
||||
m_LocalRotation: {x: -0, y: -0.13137257, z: -0, w: 0.9913331}
|
||||
m_LocalPosition: {x: 8.408, y: 0, z: -1.0900002}
|
||||
m_LocalRotation: {x: -0, y: -0.29764953, z: -0, w: 0.95467526}
|
||||
m_LocalPosition: {x: 8.886, y: 0, z: -1.0900002}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1246553323}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -15.098, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -34.633, z: 0}
|
||||
--- !u!114 &1491686039
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -30,24 +30,24 @@ public class SubjectToggle : BaseItem, IPointerEnterHandler, IPointerExitHandler
|
|||
case "Subject1":
|
||||
//Bootstrap.Instance.uiManager.HidePanel<UI_TopTitlePanel>();
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_RoamingPanel>(this, E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.5f);
|
||||
Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "xianchang", () =>
|
||||
{
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) =>
|
||||
{
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_ExperimentChooesPanel>(this, E_UI_Layer.Top, (panel) =>
|
||||
{
|
||||
Debug.Log("¼ÓÔØ³¡¾°³É¹¦");
|
||||
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f);
|
||||
Bootstrap.Instance.uiManager.HidePanel<UI_ChooesPanel>();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
{
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_RoamingPanel>(this, E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.9f);
|
||||
Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "xianchang", () =>
|
||||
{
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_TopTitlePanel>(this, E_UI_Layer.Top, (panel) =>
|
||||
{
|
||||
Bootstrap.Instance.uiManager.ShowPanel<UI_ExperimentChooesPanel>(this, E_UI_Layer.Top, (panel) =>
|
||||
{
|
||||
Debug.Log("¼ÓÔØ³¡¾°³É¹¦");
|
||||
///Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, f);
|
||||
Bootstrap.Instance.uiManager.HidePanel<UI_ChooesPanel>();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
break;
|
||||
case "Subject2":
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ public class UI_RoamingPanel : BasePanel
|
|||
{
|
||||
base.ShowMe();
|
||||
FadeIn(0.5f);
|
||||
StopAllCoroutines();
|
||||
StartCoroutine(RoamingIE());
|
||||
}
|
||||
|
||||
|
|
@ -53,7 +54,7 @@ public class UI_RoamingPanel : BasePanel
|
|||
/// <returns></returns>
|
||||
private IEnumerator RoamingIE()
|
||||
{
|
||||
yield return new WaitForSeconds(7f);
|
||||
yield return new WaitForSeconds(3f);
|
||||
GameManager.Instance.MoveCamera.transform.SetLocalPositionAndRotation(GameManager.Instance.MoveAndRotatePonit[1].position,
|
||||
GameManager.Instance.MoveAndRotatePonit[2].rotation);
|
||||
GameManager.Instance.MoveCamera.transform.position = GameManager.Instance.MoveAndRotatePonit[1].position;
|
||||
|
|
|
|||
Loading…
Reference in New Issue