111
This commit is contained in:
@@ -1,16 +1,19 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using Tuan.GameScripts.Main;
|
||||
|
||||
public class LoadingWindow : UIBase,IProgress<float>
|
||||
namespace Tuan.GameScripts.Main
|
||||
{
|
||||
public Slider slider;
|
||||
public Text progressText;
|
||||
public void Report(float value)
|
||||
public class LoadingWindow : UIBase, IProgress<float>
|
||||
{
|
||||
slider.value = value;
|
||||
progressText.text = $"{value * 100:F0}%";
|
||||
Debug.Log($"{gameObject.name};{value}");
|
||||
public Slider slider;
|
||||
public Text progressText;
|
||||
public void Report(float value)
|
||||
{
|
||||
slider.value = value;
|
||||
progressText.text = $"{value * 100:F0}%";
|
||||
Debug.Log($"{gameObject.name};{value}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -30,10 +30,10 @@ namespace Tuan.GameScripts.Main
|
||||
|
||||
public void SetParent(RectTransform ui, bool isFull = false)
|
||||
{
|
||||
rectTransform.SetParent(ui);
|
||||
rectTransform.localScale = Vector3.one;
|
||||
rectTransform.localPosition = Vector3.zero;
|
||||
rectTransform.localRotation = Quaternion.identity;
|
||||
rectTransform.SetParent(ui,false);
|
||||
//rectTransform.localScale = Vector3.one;
|
||||
//rectTransform.localPosition = Vector3.zero;
|
||||
//rectTransform.localRotation = Quaternion.identity;
|
||||
if (isFull)
|
||||
SetFull();
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace Tuan.GameScripts.Main
|
||||
string uiType = typeof(T).Name;
|
||||
if (!openedUIs.ContainsKey(uiName))
|
||||
{
|
||||
GameObject uiPrefab = AssetLoad.Inst.Load<GameObject>(uiType);
|
||||
GameObject uiPrefab = AssetLoader.Inst.Load<GameObject>(uiType);
|
||||
ui = CreateUI<T>(uiPrefab, uiName, parent, isFull);
|
||||
openedUIs[uiName] = ui;
|
||||
}
|
||||
@@ -27,7 +27,7 @@ namespace Tuan.GameScripts.Main
|
||||
ui = openedUIs[uiName] as T;
|
||||
uiLinkedList.Remove(ui);
|
||||
}
|
||||
Debug.Log($"ShowUI====>name:{uiName} type:{typeof(T).Name}");
|
||||
Debug.Log($"UIManager.ShowUI====>name:{uiName} type:{typeof(T).Name}");
|
||||
ui.gameObject.SetActive(true);
|
||||
ui.OnShow();
|
||||
uiLinkedList.AddLast(ui);
|
||||
@@ -39,7 +39,7 @@ namespace Tuan.GameScripts.Main
|
||||
string uiType = typeof(T).Name;
|
||||
if (!openedUIs.ContainsKey(uiName))
|
||||
{
|
||||
GameObject uiPrefab = await AssetLoad.Inst.LoadAsync<GameObject>(uiType);
|
||||
GameObject uiPrefab = await AssetLoader.Inst.LoadAsync<GameObject>(uiType);
|
||||
ui = CreateUI<T>(uiPrefab, uiName, parent, isFull);
|
||||
openedUIs[uiName] = ui;
|
||||
}
|
||||
@@ -48,7 +48,7 @@ namespace Tuan.GameScripts.Main
|
||||
ui = openedUIs[uiName] as T;
|
||||
uiLinkedList.Remove(ui);
|
||||
}
|
||||
Debug.Log($"ShowUIAsync====>name:{uiName} type:{typeof(T).Name}");
|
||||
Debug.Log($"UIManager.ShowUIAsync====>name:{uiName} type:{typeof(T).Name}");
|
||||
ui.gameObject.SetActive(true);
|
||||
ui.OnShow();
|
||||
uiLinkedList.AddLast(ui);
|
||||
@@ -56,15 +56,17 @@ namespace Tuan.GameScripts.Main
|
||||
}
|
||||
public void CloseUI(string uiName)
|
||||
{
|
||||
if (!openedUIs.ContainsKey(uiName))
|
||||
return;
|
||||
if (!openedUIs.ContainsKey(uiName)) return;
|
||||
var ui = openedUIs[uiName];
|
||||
Debug.Log($"UIManager.CloseUI====>name:{uiName} type:{ui}");
|
||||
ui.OnHide();
|
||||
ui.gameObject.SetActive(false);
|
||||
uiLinkedList.Remove(ui);
|
||||
}
|
||||
public void CloseUI(UIBase ui)
|
||||
{
|
||||
if (!openedUIs.ContainsKey(ui.gameObject.name)) return;
|
||||
Debug.Log($"UIManager.CloseUI====>name:{ui.gameObject.name} type:{ui}");
|
||||
ui.OnHide();
|
||||
ui.gameObject.SetActive(false);
|
||||
uiLinkedList.Remove(ui);
|
||||
@@ -76,7 +78,7 @@ namespace Tuan.GameScripts.Main
|
||||
T ui = uiObj.GetComponent<T>();
|
||||
ui.OnCreate();
|
||||
if (parent) ui.SetParent(parent, isFull);
|
||||
Debug.Log($"CreateUI====>name:{uiName} type:{typeof(T).Name}");
|
||||
Debug.Log($"UIManager.CreateUI====>name:{uiName} type:{typeof(T).Name}");
|
||||
return ui;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user