111
All checks were successful
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 10s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 24s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 7s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 4s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 40s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 4s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 5s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 17s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 20s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 4s
Plugin Library CI / publish (10.XNode) (push) Successful in 4s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 3s
Plugin Library CI / publish (12.WeixinMinigame) (push) Successful in 1m6s

This commit is contained in:
2026-05-15 17:42:02 +08:00
parent 65548d04c7
commit d6710e491a
7 changed files with 54 additions and 115 deletions

View File

@@ -14,6 +14,7 @@ namespace Stary.Evo.UIFarme
/// </summary>
string UIName { get; set; }
string UIPath { get; }
/// <summary>
/// 绑定这个面板的实例
/// </summary>
@@ -81,6 +82,8 @@ namespace Stary.Evo.UIFarme
/// </summary>
public string UIName { get; set; }
public abstract string UIPath { get; }
public abstract UITweenType TweenType { get; }
/// <summary>

View File

@@ -13,6 +13,7 @@ namespace Stary.Evo.UIFarme
/// </summary>
string UIName { get; set; }
string UIPath { get; }
BaseRenderPanel.UITweenType TweenType { get; set; }
/// <summary>
/// 绑定这个面板的实例
@@ -69,13 +70,15 @@ namespace Stary.Evo.UIFarme
/// <summary>
///所有UI面板的父类包含UI面板的状态信息
/// </summary>
public class BaseRenderPanel : IBaseRenderPanel
public abstract class BaseRenderPanel : IBaseRenderPanel
{
/// <summary>
/// UI信息
/// </summary>
public virtual string UIName { get; set; }
public abstract string UIPath { get; }
public UITweenType TweenType { get; set; }

View File

@@ -15,19 +15,22 @@ 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>(string panelName = 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>(string panelName = 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>
@@ -102,8 +105,8 @@ namespace Stary.Evo.UIFarme
public PanelSystem(IAssetLoader assetLoader)
{
this.AssetLoader = assetLoader;
}
protected override void OnInit()
{
stackPanel = new Stack<IBasePanel>();
@@ -114,27 +117,30 @@ namespace Stary.Evo.UIFarme
Debug.LogError("UnityEvo:AssetLoader is null, please set AssetLoader.");
}
}
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
/// <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>(string panelName = null, string packageName = null)
where T : IBasePanel, new()
{
var prefabName = typeof(T).Name;
var prefabName = typeof(T).Name;
if (string.IsNullOrEmpty(panelName))
{
panelName = typeof(T).Name;
}
IBasePanel nextPanel = null;
if (!dicUI.ContainsKey(panelName))
{
nextPanel = new T();
nextPanel.UIName = panelName;
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
if (!string.IsNullOrEmpty(nextPanel.UIPath))
nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
GameObject panelGo = await nextPanel.CreatePanel(prefabName, packageName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
@@ -164,9 +170,10 @@ 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>(string panelName = null, string packageName = null)
where T : IBasePanel, new()
{
var prefabName = typeof(T).Name;
var prefabName = typeof(T).Name;
if (string.IsNullOrEmpty(panelName))
{
panelName = typeof(T).Name;
@@ -178,7 +185,8 @@ namespace Stary.Evo.UIFarme
nextPanel = new T();
nextPanel.UIName = panelName;
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
if (!string.IsNullOrEmpty(nextPanel.UIPath))
nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
GameObject panelGo = await nextPanel.CreatePanel(prefabName, packageName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
@@ -197,16 +205,18 @@ namespace Stary.Evo.UIFarme
nextPanel = dicUI[panelName];
}
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))
{

View File

@@ -12,22 +12,16 @@ namespace Stary.Evo.UIFarme
/// </summary>
IAssetLoader AssetLoader { get; set; }
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
Task PushQueue(string prefabName, string packageName = null, Transform parent = null,BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade);
Task PushQueue<T>(string packageName = null, Transform parent = null,BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
Task PushQueue<T>(string packageName = null,
BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
where T : IBaseRenderPanel, new();
Task PushStack(string prefabName, string packageName = null, Transform parent = null);
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
Task PushStack<T>(Transform parent = null, string packageName = null) where T : IBaseRenderPanel, new();
Task PushStack<T>(string packageName = null) where T : IBaseRenderPanel, new();
/// <summary>
/// 执行面板的出栈操作此操作会执行面板的OnExit方法
@@ -37,9 +31,11 @@ namespace Stary.Evo.UIFarme
/// <summary>
/// 执行面板的出栈操作此操作会执行面板的OnExit方法
/// </summary>
void PopQueue(string panelName,BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade);
void PopQueue(string panelName, BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade);
void PopQueue<T>(BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
where T : IBaseRenderPanel, new();
void PopQueue<T>(BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade) where T : IBaseRenderPanel, new();
/// <summary>
/// 面板全部出栈此操作会执行面板的OnExit方法
/// </summary>
@@ -110,6 +106,7 @@ namespace Stary.Evo.UIFarme
{
this.AssetLoader = assetLoader;
}
protected override void OnInit()
{
stackPanel = new Stack<IBaseRenderPanel>();
@@ -121,44 +118,6 @@ namespace Stary.Evo.UIFarme
}
}
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
/// <param name="parent"></param>
/// <param name="packageName">非热更模式传null</param>
/// <typeparam name="T"></typeparam>
public async Task PushQueue(string prefabName, string packageName = null, Transform parent = null,BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
{
IBaseRenderPanel nextPanel = null;
if (!dicUI.ContainsKey(prefabName))
{
nextPanel = new BaseRenderPanel();
nextPanel.UIName = prefabName;
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
nextPanel.TweenType = tweenType;
GameObject panelGo = await nextPanel.CreatePanel(packageName, prefabName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
dicUI.Add(prefabName, nextPanel);
}
else
{
for (int i = 0; i < queuePanel.Count; i++)
{
if (queuePanel[i].GetType().Name == prefabName)
{
return;
}
}
nextPanel = dicUI[prefabName];
}
queuePanel.Add(nextPanel);
nextPanel.OnEnter();
//TOOD
}
/// <summary>
/// UI的入栈操作此操作会显示一个面板
@@ -166,7 +125,8 @@ namespace Stary.Evo.UIFarme
/// <param name="parent"></param>
/// <param name="packageName">非热更模式传null</param>
/// <typeparam name="T"></typeparam>
public async Task PushQueue<T>(string packageName = null, Transform parent = null,BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
public async Task PushQueue<T>(string packageName = null,
BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
where T : IBaseRenderPanel, new()
{
var prefabName = typeof(T).Name;
@@ -176,7 +136,8 @@ namespace Stary.Evo.UIFarme
{
nextPanel = new T();
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
if (!string.IsNullOrEmpty(nextPanel.UIPath))
nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
nextPanel.TweenType = tweenType;
GameObject panelGo = await nextPanel.CreatePanel(packageName, nextPanel.UIName);
///生成面板后,进行初始化操作
@@ -208,50 +169,7 @@ namespace Stary.Evo.UIFarme
/// <param name="parent"></param>
/// <param name="packageName">非热更模式传null</param>
/// <typeparam name="T"></typeparam>
public async Task PushStack(string prefabName, string packageName = null, Transform parent = null)
{
IBaseRenderPanel nextPanel = null;
if (!dicUI.ContainsKey(prefabName))
{
nextPanel = new BaseRenderPanel();
nextPanel.UIName = prefabName;
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
GameObject panelGo = await nextPanel.CreatePanel(packageName, prefabName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
dicUI.Add(prefabName, nextPanel);
}
else
{
foreach (var panel in stackPanel)
{
if (panel.GetType().Name == prefabName)
{
return;
}
}
nextPanel = dicUI[prefabName];
}
if (stackPanel.Count > 0)
{
stackPanel.Peek().OnExit();
}
stackPanel.Push(nextPanel);
nextPanel.OnEnter();
}
/// <summary>
/// UI的入栈操作此操作会显示一个面板
/// </summary>
/// <param name="parent"></param>
/// <param name="packageName">非热更模式传null</param>
/// <typeparam name="T"></typeparam>
public async Task PushStack<T>(Transform parent = null, string packageName = null)
public async Task PushStack<T>(string packageName = null)
where T : IBaseRenderPanel, new()
{
var prefabName = typeof(T).Name;
@@ -265,7 +183,8 @@ namespace Stary.Evo.UIFarme
{
nextPanel = new T();
await nextPanel.InitializeAsync(this);
nextPanel.SetPanelParent(parent);
if (!string.IsNullOrEmpty(nextPanel.UIPath))
nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
GameObject panelGo = await nextPanel.CreatePanel(packageName, nextPanel.UIName);
///生成面板后,进行初始化操作
await nextPanel.InitializeAsync(panelGo);
@@ -294,11 +213,11 @@ namespace Stary.Evo.UIFarme
nextPanel.OnEnter();
}
public void PopQueue(string panelName,BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
public void PopQueue(string panelName, BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
{
for (int i = 0; i < queuePanel.Count; i++)
{
if (queuePanel[i].UIName == panelName)
if (queuePanel[i].UIName == panelName)
{
queuePanel[i].TweenType = tweenType;
queuePanel[i].OnExit();
@@ -306,7 +225,9 @@ namespace Stary.Evo.UIFarme
}
}
}
public void PopQueue<T>(BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade) where T : IBaseRenderPanel, new()
public void PopQueue<T>(BaseRenderPanel.UITweenType tweenType = BaseRenderPanel.UITweenType.Fade)
where T : IBaseRenderPanel, new()
{
for (int i = 0; i < queuePanel.Count; i++)
{
@@ -318,6 +239,7 @@ namespace Stary.Evo.UIFarme
}
}
}
public void PopStack()
{
if (stackPanel.Count > 0)

View File

@@ -1,6 +1,6 @@
{
"name": "com.staryevo.main",
"version": "2.1.17",
"version": "2.1.18",
"displayName": "00.StaryEvo",
"description": "This is an Framework package(后台服务器版本端口9527)",
"unity": "2021.3",

View File

@@ -31,6 +31,7 @@ public class VideoPanel : BasePanel
}
public override string UIPath => "";
public override UITweenType TweenType => UITweenType.Fade;
public override void Initialize(GameObject panelGo)

View File

@@ -1,6 +1,6 @@
{
"name": "com.staryevo.tools",
"version": "1.5.0",
"version": "1.5.1",
"displayName": "00.StaryEvo.Tools",
"description": "This is an Framework package(后台服务器版本端口9527)",
"unity": "2021.3",