This commit is contained in:
zhangzheng
2025-12-12 15:58:37 +08:00
parent 56596dcd19
commit 7fb5fa6850
4 changed files with 153 additions and 110 deletions

View File

@@ -10,19 +10,20 @@ namespace Stary.Evo.UIFarme
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
Task PushQueue<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new();
Task PushQueue<T>(Transform parent = null, string packageName = null) where T : IBasePanel, new();
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
Task PushStack<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new();
Task PushStack<T>(Transform parent = null, string packageName = null) where T : IBasePanel, new();
/// <summary>
/// 执行面板的出栈操作此操作会执行面板的OnExit方法
/// </summary>
void PopQueue<T>(string panelName=null) where T : IBasePanel, new();
void PopQueue<T>(string panelName = null) where T : IBasePanel, new();
void PopQueue<T>(T t, string panelName = null) where T : IBasePanel, new();
void PopQueue<T>(T t, string panelName=null) where T : IBasePanel, new();
/// <summary>
/// 执行面板的出栈操作此操作会执行面板的OnExit方法
/// </summary>
@@ -103,37 +104,38 @@ namespace Stary.Evo.UIFarme
/// <param name="parent"></param>
/// <param name="packageName">非热更模式传null</param>
/// <typeparam name="T"></typeparam>
public async Task PushQueue<T>(string panelName=null, Transform parent = null, string packageName = null)
public async Task PushQueue<T>(Transform parent = null, string packageName = null)
where T : IBasePanel, new()
{
var prefabName = typeof(T).Name;
if (string.IsNullOrEmpty(panelName))
var prefabName = typeof(T).Name;
if (string.IsNullOrEmpty(prefabName))
{
panelName = typeof(T).Name;
prefabName = typeof(T).Name;
}
IBasePanel nextPanel = null;
if (!dicUI.ContainsKey(panelName))
if (!dicUI.ContainsKey(prefabName))
{
nextPanel = new T();
nextPanel.UIName = panelName;
nextPanel.UIName = prefabName;
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
GameObject panelGo = await nextPanel.CreatePanel($"Prefabs_{prefabName}", packageName);
GameObject panelGo = await nextPanel.CreatePanel(packageName, prefabName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
dicUI.Add(panelName, nextPanel);
dicUI.Add(prefabName, nextPanel);
}
else
{
for (int i = 0; i < queuePanel.Count; i++)
{
if (queuePanel[i].GetType().Name == panelName)
if (queuePanel[i].GetType().Name == prefabName)
{
return;
}
}
nextPanel = dicUI[panelName];
nextPanel = dicUI[prefabName];
}
queuePanel.Add(nextPanel);
@@ -147,49 +149,51 @@ namespace Stary.Evo.UIFarme
/// <param name="parent"></param>
/// <param name="packageName">非热更模式传null</param>
/// <typeparam name="T"></typeparam>
public async Task PushStack<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new()
public async Task PushStack<T>(Transform parent = null, string packageName = null) where T : IBasePanel, new()
{
var prefabName = typeof(T).Name;
if (string.IsNullOrEmpty(panelName))
var prefabName = typeof(T).Name;
if (string.IsNullOrEmpty(prefabName))
{
panelName = typeof(T).Name;
prefabName = typeof(T).Name;
}
IBasePanel nextPanel = null;
if (!dicUI.ContainsKey(panelName))
if (!dicUI.ContainsKey(prefabName))
{
nextPanel = new T();
nextPanel.UIName = panelName;
nextPanel.UIName = prefabName;
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
GameObject panelGo = await nextPanel.CreatePanel($"Prefabs_{prefabName}", packageName);
GameObject panelGo = await nextPanel.CreatePanel(packageName, prefabName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
dicUI.Add(panelName, nextPanel);
dicUI.Add(prefabName, nextPanel);
}
else
{
foreach (var panel in stackPanel)
{
if (panel.GetType().Name == panelName)
if (panel.GetType().Name == prefabName)
{
return;
}
}
nextPanel = dicUI[panelName];
nextPanel = dicUI[prefabName];
}
if(stackPanel.Count > 0)
if (stackPanel.Count > 0)
{
stackPanel.Peek().OnExit();
}
stackPanel.Push(nextPanel);
nextPanel.OnEnter();
}
public void PopQueue<T>(string panelName=null) where T : IBasePanel, new()
public void PopQueue<T>(string panelName = null) where T : IBasePanel, new()
{
if (string.IsNullOrEmpty(panelName))
{