111
This commit is contained in:
@@ -21,29 +21,34 @@ namespace Stary.Evo.UIFarme
|
|||||||
/// 绑定这个面板的实例
|
/// 绑定这个面板的实例
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void Initialize(GameObject panelGo);
|
void Initialize(GameObject panelGo);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 绑定这个面板的实例
|
/// 绑定这个面板的实例
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Task InitializeAsync(GameObject panelGo);
|
Task InitializeAsync(GameObject panelGo);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 初始化面板管理器
|
/// 初始化面板管理器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="panelManager"></param>
|
/// <param name="panelManager"></param>
|
||||||
void Initialize(IPanelSystem sysytem);
|
void Initialize(IPanelSystem sysytem);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 初始化面板管理器
|
/// 初始化面板管理器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="panelManager"></param>
|
/// <param name="panelManager"></param>
|
||||||
Task InitializeAsync(IPanelSystem sysytem);
|
Task InitializeAsync(IPanelSystem sysytem);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 虚方法,UI进入时执行的操作,只会执行一次
|
/// 虚方法,UI进入时执行的操作,只会执行一次
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void OnEnter(Action complete = null);
|
void OnEnter(Action complete = null);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 虚方法,UI暂停时执行的操作,只会执行一次
|
||||||
|
/// </summary>
|
||||||
|
void OnPause();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 虚方法,UI继续时执行的操作,只会执行一次
|
||||||
|
/// </summary>
|
||||||
|
void OnResume();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 虚方法,UI退出时执行的操作,只会执行一次
|
/// 虚方法,UI退出时执行的操作,只会执行一次
|
||||||
@@ -58,7 +63,7 @@ namespace Stary.Evo.UIFarme
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="type">ui信息</param>
|
/// <param name="type">ui信息</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<GameObject> CreatePanel(string packageName, string panelName);
|
Task<GameObject> CreatePanel(string panelName, string packageName);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 销毁一个Ui对象
|
/// 销毁一个Ui对象
|
||||||
@@ -81,8 +86,6 @@ namespace Stary.Evo.UIFarme
|
|||||||
|
|
||||||
public abstract UITweenType TweenType { get; }
|
public abstract UITweenType TweenType { get; }
|
||||||
|
|
||||||
public abstract UIInstantiateType UIType { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 面板管理器
|
/// 面板管理器
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -94,44 +97,31 @@ namespace Stary.Evo.UIFarme
|
|||||||
protected Transform panelParent { get; private set; }
|
protected Transform panelParent { get; private set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 缓存该面板所有的SpriteRenderer
|
|
||||||
/// </summary>
|
|
||||||
private Dictionary<string, SpriteRenderer> spriteRendererDict;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 缓存该面板所有的Button,Toggle,Slider,InputField,Dropdown,ScroolBar
|
/// 缓存该面板所有的Button,Toggle,Slider,InputField,Dropdown,ScroolBar
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private Dictionary<string, Selectable> selectableDict;
|
private Dictionary<string, Selectable> selectableDict;
|
||||||
|
|
||||||
|
protected CanvasGroup canvasGroup { get; private set; }
|
||||||
|
|
||||||
protected GameObject activePanel { get; private set; }
|
protected GameObject activePanel { get; private set; }
|
||||||
|
|
||||||
protected BasePanel()
|
protected BasePanel()
|
||||||
{
|
{
|
||||||
spriteRendererDict = new Dictionary<string, SpriteRenderer>();
|
|
||||||
selectableDict = new Dictionary<string, Selectable>();
|
selectableDict = new Dictionary<string, Selectable>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void Initialize(GameObject panelGo)
|
public virtual void Initialize(GameObject panelGo)
|
||||||
{
|
{
|
||||||
activePanel = panelGo;
|
activePanel = panelGo;
|
||||||
if (UIType == UIInstantiateType.SpriteNormal)
|
Selectable[] selectables = activePanel.GetComponentsInChildren<Selectable>(true);
|
||||||
|
foreach (Selectable item in selectables)
|
||||||
{
|
{
|
||||||
SpriteRenderer[] spriteRenderers = activePanel.GetComponentsInChildren<SpriteRenderer>(true);
|
selectableDict[item.name] = item;
|
||||||
foreach (SpriteRenderer item in spriteRenderers)
|
|
||||||
{
|
|
||||||
spriteRendererDict[item.name] = item;
|
|
||||||
}
|
|
||||||
}else if(UIType == UIInstantiateType.UINormal){
|
|
||||||
Selectable[] selectables = activePanel.GetComponentsInChildren<Selectable>(true);
|
|
||||||
foreach (Selectable item in selectables)
|
|
||||||
{
|
|
||||||
selectableDict[item.name] = item;
|
|
||||||
}
|
|
||||||
var canvasGroup = UITool.GetOrAddComponent<CanvasGroup>(activePanel);
|
|
||||||
canvasGroup.alpha = 0f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
canvasGroup = UITool.GetOrAddComponent<CanvasGroup>(activePanel);
|
||||||
|
canvasGroup.alpha = 0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual Task InitializeAsync(GameObject panelGo)
|
public virtual Task InitializeAsync(GameObject panelGo)
|
||||||
@@ -155,15 +145,43 @@ namespace Stary.Evo.UIFarme
|
|||||||
public virtual void OnEnter(Action complete = null)
|
public virtual void OnEnter(Action complete = null)
|
||||||
{
|
{
|
||||||
activePanel.SetActive(true);
|
activePanel.SetActive(true);
|
||||||
|
canvasGroup.blocksRaycasts = true;
|
||||||
|
if (TweenType == UITweenType.None)
|
||||||
|
{
|
||||||
|
canvasGroup.alpha = 1f;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TweenType == UITweenType.Fade)
|
||||||
SetCanvasGroupTween(1f, complete);
|
{
|
||||||
|
canvasGroup.DOFade(1f, 2f).OnComplete(() => { complete?.Invoke(); });
|
||||||
|
}
|
||||||
|
else if (TweenType == UITweenType.Yoyo)
|
||||||
|
{
|
||||||
|
canvasGroup.DOFade(1, 2f).SetLoops(2, LoopType.Yoyo).OnComplete(() => { complete?.Invoke(); });
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
canvasGroup.DOFade(1, 2f).SetLoops(-1).OnComplete(() => { complete?.Invoke(); });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual void OnPause()
|
||||||
|
{
|
||||||
|
canvasGroup.blocksRaycasts = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void OnResume()
|
||||||
|
{
|
||||||
|
canvasGroup.blocksRaycasts = true;
|
||||||
|
}
|
||||||
|
|
||||||
public virtual void OnExit(float delay = 0f)
|
public virtual void OnExit(float delay = 0f)
|
||||||
{
|
{
|
||||||
SetCanvasGroupTween(0f, () => { activePanel.SetActive(false); });
|
canvasGroup.DOFade(0f, delay).OnComplete(() =>
|
||||||
|
{
|
||||||
|
activePanel.SetActive(false);
|
||||||
|
canvasGroup.blocksRaycasts = false;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void OnDestroy()
|
public virtual void OnDestroy()
|
||||||
@@ -172,7 +190,7 @@ namespace Stary.Evo.UIFarme
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<GameObject> CreatePanel(string packageName, string panelName)
|
public async Task<GameObject> CreatePanel(string panelName, string packageName)
|
||||||
{
|
{
|
||||||
if (panelParent == null)
|
if (panelParent == null)
|
||||||
{
|
{
|
||||||
@@ -184,8 +202,7 @@ namespace Stary.Evo.UIFarme
|
|||||||
return activePanel.gameObject;
|
return activePanel.gameObject;
|
||||||
}
|
}
|
||||||
#if HotUpdate
|
#if HotUpdate
|
||||||
|
AssetHandle handle = null;
|
||||||
AssetHandle handle = null;
|
|
||||||
if (packageName == null)
|
if (packageName == null)
|
||||||
{
|
{
|
||||||
handle = YooAssets.LoadAssetAsync<GameObject>(panelName);
|
handle = YooAssets.LoadAssetAsync<GameObject>(panelName);
|
||||||
@@ -212,15 +229,14 @@ namespace Stary.Evo.UIFarme
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
activePanel.name = this.GetType().Name;
|
activePanel.name = this.GetType().Name;
|
||||||
|
|
||||||
|
|
||||||
// if (!activePanel.GetComponentInChildren<Canvas>() && !activePanel.GetComponentInParent<Canvas>())
|
if (!activePanel.GetComponentInChildren<Canvas>() && !activePanel.GetComponentInParent<Canvas>())
|
||||||
// {
|
{
|
||||||
// Debug.LogError($"UnityEvo:panelParent上不存在Canvas组件,{panelName}无法正常运行,进程已中断,请检查!!!!!");
|
Debug.LogError($"UnityEvo:panelParent上不存在Canvas组件,{panelName}无法正常运行,进程已中断,请检查!!!!!");
|
||||||
// return null;
|
return null;
|
||||||
// }
|
}
|
||||||
|
|
||||||
return activePanel;
|
return activePanel;
|
||||||
}
|
}
|
||||||
@@ -239,79 +255,21 @@ namespace Stary.Evo.UIFarme
|
|||||||
panelParent = parent;
|
panelParent = parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetCanvasGroup(float alpha)
|
/// <summary>
|
||||||
|
/// 获取组件:Button,Toggle,Slider,InputField,Dropdown,ScroolBar
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <param name="name"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
protected T GetComp<T>(string name) where T : Selectable
|
||||||
{
|
{
|
||||||
foreach (var spriteRenderer in spriteRendererDict)
|
selectableDict.TryGetValue(name, out Selectable t);
|
||||||
|
if (t == null)
|
||||||
{
|
{
|
||||||
Color c = spriteRenderer.Value.color;
|
Debug.LogError($"{this.GetType()}---{name}:在selectableDict不存在");
|
||||||
c.a = alpha;
|
|
||||||
spriteRenderer.Value.color = c;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void SetCanvasGroupTween(float alpha, Action complete = null)
|
return t as T;
|
||||||
{
|
|
||||||
if (UIType == UIInstantiateType.SpriteNormal)
|
|
||||||
{
|
|
||||||
// 创建一个新的序列
|
|
||||||
Sequence sequence = DOTween.Sequence();
|
|
||||||
|
|
||||||
|
|
||||||
foreach (var spriteRenderer in spriteRendererDict)
|
|
||||||
{
|
|
||||||
if (TweenType == UITweenType.None)
|
|
||||||
{
|
|
||||||
Color c = spriteRenderer.Value.color;
|
|
||||||
c.a = alpha;
|
|
||||||
spriteRenderer.Value.color = c;
|
|
||||||
}
|
|
||||||
else if (TweenType == UITweenType.Fade)
|
|
||||||
{
|
|
||||||
sequence.Join(spriteRenderer.Value.DOFade(alpha, 1f));
|
|
||||||
}
|
|
||||||
else if (TweenType == UITweenType.Yoyo)
|
|
||||||
{
|
|
||||||
sequence.Join(spriteRenderer.Value.DOFade(alpha, 1f)
|
|
||||||
.SetLoops(2, LoopType.Yoyo));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TweenType == UITweenType.None)
|
|
||||||
{
|
|
||||||
complete?.Invoke();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sequence.OnComplete(() => complete?.Invoke());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (UIType == UIInstantiateType.UINormal)
|
|
||||||
{
|
|
||||||
activePanel.SetActive(true);
|
|
||||||
var canvasGroup = activePanel.GetComponent<CanvasGroup>();
|
|
||||||
canvasGroup.blocksRaycasts = true;
|
|
||||||
if (TweenType == UITweenType.None)
|
|
||||||
{
|
|
||||||
canvasGroup.alpha = alpha;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TweenType == UITweenType.Fade)
|
|
||||||
{
|
|
||||||
canvasGroup.DOFade(alpha, 1f).OnComplete(() =>
|
|
||||||
{
|
|
||||||
complete?.Invoke();
|
|
||||||
canvasGroup.blocksRaycasts = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else if (TweenType == UITweenType.Yoyo)
|
|
||||||
{
|
|
||||||
canvasGroup.DOFade(alpha, 1f).SetLoops(2, LoopType.Yoyo).OnComplete(() => { complete?.Invoke(); });
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
canvasGroup.DOFade(alpha, 1f).SetLoops(-1).OnComplete(() => { complete?.Invoke(); });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public IArchitecture GetArchitecture()
|
public IArchitecture GetArchitecture()
|
||||||
@@ -341,18 +299,5 @@ namespace Stary.Evo.UIFarme
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
Yoyo,
|
Yoyo,
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum UIInstantiateType
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 普通面板
|
|
||||||
/// </summary>
|
|
||||||
SpriteNormal,
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// UI普通面板
|
|
||||||
/// </summary>
|
|
||||||
UINormal
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,289 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using DG.Tweening;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
#if HotUpdate
|
||||||
|
using YooAsset;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace Stary.Evo.UIFarme
|
||||||
|
{
|
||||||
|
public interface IBaseRenderPanel : IController
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// UI信息
|
||||||
|
/// </summary>
|
||||||
|
string UIName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 绑定这个面板的实例
|
||||||
|
/// </summary>
|
||||||
|
void Initialize(GameObject panelGo);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 绑定这个面板的实例
|
||||||
|
/// </summary>
|
||||||
|
Task InitializeAsync(GameObject panelGo);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化面板管理器
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="panelManager"></param>
|
||||||
|
void Initialize(ISpriteRenderSystem sysytem);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 初始化面板管理器
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="panelManager"></param>
|
||||||
|
Task InitializeAsync(ISpriteRenderSystem sysytem);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 虚方法,UI进入时执行的操作,只会执行一次
|
||||||
|
/// </summary>
|
||||||
|
void OnEnter(Action complete = null);
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 虚方法,UI退出时执行的操作,只会执行一次
|
||||||
|
/// </summary>
|
||||||
|
void OnExit(float delay = 0f);
|
||||||
|
|
||||||
|
void OnDestroy();
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成/获取一个UI对象
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="type">ui信息</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<GameObject> CreatePanel(string packageName, string panelName);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 销毁一个Ui对象
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="type"></param>
|
||||||
|
void DestoryUI();
|
||||||
|
|
||||||
|
void SetPanelParent(Transform parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///所有UI面板的父类,包含UI面板的状态信息
|
||||||
|
/// </summary>
|
||||||
|
public abstract class BaseRenderPanel : IBaseRenderPanel
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// UI信息
|
||||||
|
/// </summary>
|
||||||
|
public string UIName { get; set; }
|
||||||
|
|
||||||
|
public abstract UITweenType TweenType { get; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 面板管理器
|
||||||
|
/// </summary>
|
||||||
|
protected ISpriteRenderSystem PanelSystem { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成的父物体
|
||||||
|
/// </summary>
|
||||||
|
protected Transform panelParent { get; private set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 缓存该面板所有的SpriteRenderer
|
||||||
|
/// </summary>
|
||||||
|
private Dictionary<string, SpriteRenderer> spriteRendererDict;
|
||||||
|
|
||||||
|
|
||||||
|
protected GameObject activePanel { get; private set; }
|
||||||
|
|
||||||
|
protected void Awake()
|
||||||
|
{
|
||||||
|
spriteRendererDict = new Dictionary<string, SpriteRenderer>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void Initialize(GameObject panelGo)
|
||||||
|
{
|
||||||
|
activePanel = panelGo;
|
||||||
|
|
||||||
|
SpriteRenderer[] spriteRenderers = activePanel.GetComponentsInChildren<SpriteRenderer>(true);
|
||||||
|
foreach (SpriteRenderer item in spriteRenderers)
|
||||||
|
{
|
||||||
|
spriteRendererDict[item.name] = item;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual Task InitializeAsync(GameObject panelGo)
|
||||||
|
{
|
||||||
|
Initialize(panelGo);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void Initialize(ISpriteRenderSystem sysytem)
|
||||||
|
{
|
||||||
|
PanelSystem = sysytem;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual Task InitializeAsync(ISpriteRenderSystem sysytem)
|
||||||
|
{
|
||||||
|
Initialize(sysytem);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public virtual void OnEnter(Action complete = null)
|
||||||
|
{
|
||||||
|
activePanel.SetActive(true);
|
||||||
|
|
||||||
|
|
||||||
|
SetCanvasGroupTween(1f, complete);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public virtual void OnExit(float delay = 0f)
|
||||||
|
{
|
||||||
|
SetCanvasGroupTween(0f, () => { activePanel.SetActive(false); });
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void OnDestroy()
|
||||||
|
{
|
||||||
|
DestoryUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task<GameObject> CreatePanel(string packageName, string panelName)
|
||||||
|
{
|
||||||
|
if (panelParent == null)
|
||||||
|
{
|
||||||
|
Debug.LogWarning($"UnityEvo:parent为空,{panelName}自动设置为root节点下,请检查是否正确!!!!!");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.activePanel != null)
|
||||||
|
{
|
||||||
|
return activePanel.gameObject;
|
||||||
|
}
|
||||||
|
#if HotUpdate
|
||||||
|
AssetHandle handle = null;
|
||||||
|
if (packageName == null)
|
||||||
|
{
|
||||||
|
handle = YooAssets.LoadAssetAsync<GameObject>(panelName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var package = YooAssets.TryGetPackage(packageName);
|
||||||
|
if (package == null)
|
||||||
|
{
|
||||||
|
handle = YooAssets.LoadAssetAsync<GameObject>(panelName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
handle = package.LoadAssetAsync<GameObject>(panelName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await handle.Task;
|
||||||
|
|
||||||
|
activePanel = GameObject.Instantiate(handle.AssetObject as GameObject, panelParent);
|
||||||
|
#else
|
||||||
|
GameObject handle = Resources.Load<GameObject>(panelName);
|
||||||
|
activePanel = GameObject.Instantiate(handle, panelParent);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
activePanel.name = this.GetType().Name;
|
||||||
|
|
||||||
|
return activePanel;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DestoryUI()
|
||||||
|
{
|
||||||
|
if (activePanel != null)
|
||||||
|
{
|
||||||
|
GameObject.Destroy(activePanel);
|
||||||
|
PanelSystem.Get_Dic().Remove(this.GetType().Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetPanelParent(Transform parent)
|
||||||
|
{
|
||||||
|
panelParent = parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetCanvasGroup(float alpha)
|
||||||
|
{
|
||||||
|
foreach (var spriteRenderer in spriteRendererDict)
|
||||||
|
{
|
||||||
|
Color c = spriteRenderer.Value.color;
|
||||||
|
c.a = alpha;
|
||||||
|
spriteRenderer.Value.color = c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetCanvasGroupTween(float alpha, Action complete = null)
|
||||||
|
{
|
||||||
|
|
||||||
|
// 创建一个新的序列
|
||||||
|
Sequence sequence = DOTween.Sequence();
|
||||||
|
|
||||||
|
|
||||||
|
foreach (var spriteRenderer in spriteRendererDict)
|
||||||
|
{
|
||||||
|
if (TweenType == UITweenType.None)
|
||||||
|
{
|
||||||
|
Color c = spriteRenderer.Value.color;
|
||||||
|
c.a = alpha;
|
||||||
|
spriteRenderer.Value.color = c;
|
||||||
|
}
|
||||||
|
else if (TweenType == UITweenType.Fade)
|
||||||
|
{
|
||||||
|
sequence.Join(spriteRenderer.Value.DOFade(alpha, 1f));
|
||||||
|
}
|
||||||
|
else if (TweenType == UITweenType.Yoyo)
|
||||||
|
{
|
||||||
|
sequence.Join(spriteRenderer.Value.DOFade(alpha, 1f)
|
||||||
|
.SetLoops(-1, LoopType.Yoyo));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TweenType == UITweenType.None)
|
||||||
|
{
|
||||||
|
complete?.Invoke();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sequence.OnComplete(() => complete?.Invoke());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public IArchitecture GetArchitecture()
|
||||||
|
{
|
||||||
|
return PanelSystem.GetArchitecture();
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum UITweenType
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 无动画
|
||||||
|
/// </summary>
|
||||||
|
None,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 淡入淡出
|
||||||
|
/// </summary>
|
||||||
|
Fade,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 循环播放
|
||||||
|
/// </summary>
|
||||||
|
Loop,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 往返播放
|
||||||
|
/// </summary>
|
||||||
|
Yoyo,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ba0c8ac52d5440d8a07046b9dd2de8b1
|
||||||
|
timeCreated: 1765527320
|
||||||
@@ -10,20 +10,19 @@ namespace Stary.Evo.UIFarme
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// UI的入栈操作,此操作会显示一个面板
|
/// UI的入栈操作,此操作会显示一个面板
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Task PushQueue<T>(Transform parent = null, string packageName = null) where T : IBasePanel, new();
|
Task PushQueue<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// UI的入栈操作,此操作会显示一个面板
|
/// UI的入栈操作,此操作会显示一个面板
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Task PushStack<T>(Transform parent = null, string packageName = null) where T : IBasePanel, new();
|
Task PushStack<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 执行面板的出栈操作,此操作会执行面板的OnExit方法
|
/// 执行面板的出栈操作,此操作会执行面板的OnExit方法
|
||||||
/// </summary>
|
/// </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>
|
/// <summary>
|
||||||
/// 执行面板的出栈操作,此操作会执行面板的OnExit方法
|
/// 执行面板的出栈操作,此操作会执行面板的OnExit方法
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -104,38 +103,37 @@ namespace Stary.Evo.UIFarme
|
|||||||
/// <param name="parent"></param>
|
/// <param name="parent"></param>
|
||||||
/// <param name="packageName">非热更模式传null</param>
|
/// <param name="packageName">非热更模式传null</param>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
public async Task PushQueue<T>(Transform parent = null, string packageName = null)
|
public async Task PushQueue<T>(string panelName=null, Transform parent = null, string packageName = null)
|
||||||
where T : IBasePanel, new()
|
where T : IBasePanel, new()
|
||||||
{
|
{
|
||||||
var prefabName = typeof(T).Name;
|
var prefabName = typeof(T).Name;
|
||||||
if (string.IsNullOrEmpty(prefabName))
|
if (string.IsNullOrEmpty(panelName))
|
||||||
{
|
{
|
||||||
prefabName = typeof(T).Name;
|
panelName = typeof(T).Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
IBasePanel nextPanel = null;
|
IBasePanel nextPanel = null;
|
||||||
if (!dicUI.ContainsKey(prefabName))
|
if (!dicUI.ContainsKey(panelName))
|
||||||
{
|
{
|
||||||
nextPanel = new T();
|
nextPanel = new T();
|
||||||
nextPanel.UIName = prefabName;
|
nextPanel.UIName = panelName;
|
||||||
await nextPanel.InitializeAsync(this);
|
await nextPanel.InitializeAsync(this);
|
||||||
nextPanel.SetPanelParent(parent);
|
nextPanel.SetPanelParent(parent);
|
||||||
GameObject panelGo = await nextPanel.CreatePanel(packageName, prefabName);
|
GameObject panelGo = await nextPanel.CreatePanel($"Prefabs_{prefabName}", packageName);
|
||||||
///生成面板后,进行初始化操作
|
///生成面板后,进行初始化操作
|
||||||
await nextPanel.InitializeAsync(panelGo);
|
await nextPanel.InitializeAsync(panelGo);
|
||||||
dicUI.Add(prefabName, nextPanel);
|
dicUI.Add(panelName, nextPanel);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for (int i = 0; i < queuePanel.Count; i++)
|
for (int i = 0; i < queuePanel.Count; i++)
|
||||||
{
|
{
|
||||||
if (queuePanel[i].GetType().Name == prefabName)
|
if (queuePanel[i].GetType().Name == panelName)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nextPanel = dicUI[prefabName];
|
nextPanel = dicUI[panelName];
|
||||||
}
|
}
|
||||||
|
|
||||||
queuePanel.Add(nextPanel);
|
queuePanel.Add(nextPanel);
|
||||||
@@ -149,51 +147,49 @@ namespace Stary.Evo.UIFarme
|
|||||||
/// <param name="parent"></param>
|
/// <param name="parent"></param>
|
||||||
/// <param name="packageName">非热更模式传null</param>
|
/// <param name="packageName">非热更模式传null</param>
|
||||||
/// <typeparam name="T"></typeparam>
|
/// <typeparam name="T"></typeparam>
|
||||||
public async Task PushStack<T>(Transform parent = null, string packageName = null) where T : IBasePanel, new()
|
public async Task PushStack<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new()
|
||||||
{
|
{
|
||||||
var prefabName = typeof(T).Name;
|
var prefabName = typeof(T).Name;
|
||||||
if (string.IsNullOrEmpty(prefabName))
|
if (string.IsNullOrEmpty(panelName))
|
||||||
{
|
{
|
||||||
prefabName = typeof(T).Name;
|
panelName = typeof(T).Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
IBasePanel nextPanel = null;
|
IBasePanel nextPanel = null;
|
||||||
if (!dicUI.ContainsKey(prefabName))
|
if (!dicUI.ContainsKey(panelName))
|
||||||
{
|
{
|
||||||
nextPanel = new T();
|
nextPanel = new T();
|
||||||
nextPanel.UIName = prefabName;
|
nextPanel.UIName = panelName;
|
||||||
await nextPanel.InitializeAsync(this);
|
await nextPanel.InitializeAsync(this);
|
||||||
nextPanel.SetPanelParent(parent);
|
nextPanel.SetPanelParent(parent);
|
||||||
GameObject panelGo = await nextPanel.CreatePanel(packageName, prefabName);
|
GameObject panelGo = await nextPanel.CreatePanel($"Prefabs_{prefabName}", packageName);
|
||||||
///生成面板后,进行初始化操作
|
///生成面板后,进行初始化操作
|
||||||
await nextPanel.InitializeAsync(panelGo);
|
await nextPanel.InitializeAsync(panelGo);
|
||||||
|
|
||||||
dicUI.Add(prefabName, nextPanel);
|
dicUI.Add(panelName, nextPanel);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
foreach (var panel in stackPanel)
|
foreach (var panel in stackPanel)
|
||||||
{
|
{
|
||||||
if (panel.GetType().Name == prefabName)
|
if (panel.GetType().Name == panelName)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nextPanel = dicUI[prefabName];
|
nextPanel = dicUI[panelName];
|
||||||
}
|
}
|
||||||
|
if(stackPanel.Count > 0)
|
||||||
if (stackPanel.Count > 0)
|
|
||||||
{
|
{
|
||||||
stackPanel.Peek().OnExit();
|
stackPanel.Peek().OnExit();
|
||||||
}
|
}
|
||||||
|
|
||||||
stackPanel.Push(nextPanel);
|
stackPanel.Push(nextPanel);
|
||||||
nextPanel.OnEnter();
|
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))
|
if (string.IsNullOrEmpty(panelName))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,235 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace Stary.Evo.UIFarme
|
||||||
|
{
|
||||||
|
public interface ISpriteRenderSystem : ISystem
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// UI的入栈操作,此操作会显示一个面板
|
||||||
|
/// </summary>
|
||||||
|
Task PushQueue<T>(string packageName, string prefabName, Transform parent = null)
|
||||||
|
where T : IBaseRenderPanel, new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// UI的入栈操作,此操作会显示一个面板
|
||||||
|
/// </summary>
|
||||||
|
Task PushStack<T>(Transform parent = null, string packageName = null) where T : IBaseRenderPanel, new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行面板的出栈操作,此操作会执行面板的OnExit方法
|
||||||
|
/// </summary>
|
||||||
|
void PopStack();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 执行面板的出栈操作,此操作会执行面板的OnExit方法
|
||||||
|
/// </summary>
|
||||||
|
void PopQueue<T>() where T : IBaseRenderPanel, new();
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 面板全部出栈此操作会执行面板的OnExit方法
|
||||||
|
/// </summary>
|
||||||
|
void PopAll();
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 返回存储面板实例的字典
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
Dictionary<string, IBaseRenderPanel> Get_Dic();
|
||||||
|
|
||||||
|
IBaseRenderPanel GetPanel(string PanelName);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 面板管理器,用栈来存储UI
|
||||||
|
/// </summary>
|
||||||
|
public class SpriteRendererSystem : AbstractSystem, ISpriteRenderSystem
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 存储普通UI面板
|
||||||
|
/// </summary>
|
||||||
|
private List<IBaseRenderPanel> queuePanel;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 存储堆栈UI面板
|
||||||
|
/// </summary>
|
||||||
|
private Stack<IBaseRenderPanel> stackPanel;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 存储所有UI信息的字典,每个UI信息都会对应一个GameObject
|
||||||
|
/// </summary>
|
||||||
|
private Dictionary<string, IBaseRenderPanel> dicUI;
|
||||||
|
|
||||||
|
|
||||||
|
protected override void OnInit()
|
||||||
|
{
|
||||||
|
stackPanel = new Stack<IBaseRenderPanel>();
|
||||||
|
queuePanel = new List<IBaseRenderPanel>();
|
||||||
|
dicUI = new Dictionary<string, IBaseRenderPanel>();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// UI的入栈操作,此操作会显示一个面板
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="parent"></param>
|
||||||
|
/// <param name="packageName">非热更模式传null</param>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
public async Task PushQueue<T>(string packageName, string prefabName, Transform parent = null)
|
||||||
|
where T : IBaseRenderPanel, new()
|
||||||
|
{
|
||||||
|
IBaseRenderPanel nextPanel = null;
|
||||||
|
if (!dicUI.ContainsKey(prefabName))
|
||||||
|
{
|
||||||
|
nextPanel = new T();
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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的入栈操作,此操作会显示一个面板
|
||||||
|
/// </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)
|
||||||
|
where T : IBaseRenderPanel, new()
|
||||||
|
{
|
||||||
|
var prefabName = typeof(T).Name;
|
||||||
|
if (string.IsNullOrEmpty(prefabName))
|
||||||
|
{
|
||||||
|
prefabName = typeof(T).Name;
|
||||||
|
}
|
||||||
|
|
||||||
|
IBaseRenderPanel nextPanel = null;
|
||||||
|
if (!dicUI.ContainsKey(prefabName))
|
||||||
|
{
|
||||||
|
nextPanel = new T();
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void PopQueue<T>() where T : IBaseRenderPanel, new()
|
||||||
|
{
|
||||||
|
string panelName = typeof(T).Name;
|
||||||
|
|
||||||
|
|
||||||
|
for (int i = 0; i < queuePanel.Count; i++)
|
||||||
|
{
|
||||||
|
if (queuePanel[i].GetType().Name == panelName)
|
||||||
|
{
|
||||||
|
queuePanel[i].OnExit();
|
||||||
|
queuePanel.RemoveAt(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PopStack()
|
||||||
|
{
|
||||||
|
if (stackPanel.Count > 0)
|
||||||
|
{
|
||||||
|
stackPanel.Pop().OnExit();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stackPanel.Count > 0)
|
||||||
|
{
|
||||||
|
stackPanel.Peek().OnEnter();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PopAll()
|
||||||
|
{
|
||||||
|
while (stackPanel.Count > 0)
|
||||||
|
stackPanel.Pop().OnExit();
|
||||||
|
foreach (var panel in queuePanel)
|
||||||
|
{
|
||||||
|
panel.OnExit();
|
||||||
|
}
|
||||||
|
|
||||||
|
queuePanel.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public Dictionary<string, IBaseRenderPanel> Get_Dic()
|
||||||
|
{
|
||||||
|
if (dicUI.Count > 0)
|
||||||
|
{
|
||||||
|
return dicUI;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IBaseRenderPanel GetPanel(string PanelName)
|
||||||
|
{
|
||||||
|
if (dicUI.ContainsKey(PanelName))
|
||||||
|
{
|
||||||
|
return dicUI[PanelName];
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Dispose()
|
||||||
|
{
|
||||||
|
PopAll();
|
||||||
|
stackPanel = null;
|
||||||
|
queuePanel = null;
|
||||||
|
dicUI = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6c8492e998a14a6f96e96902acbf587a
|
||||||
|
timeCreated: 1765527058
|
||||||
@@ -32,7 +32,6 @@ public class VideoPanel : BasePanel
|
|||||||
|
|
||||||
|
|
||||||
public override UITweenType TweenType => UITweenType.Fade;
|
public override UITweenType TweenType => UITweenType.Fade;
|
||||||
public override UIInstantiateType UIType => UIInstantiateType.UINormal;
|
|
||||||
|
|
||||||
public override void Initialize(GameObject panelGo)
|
public override void Initialize(GameObject panelGo)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "com.staryevo.tools",
|
"name": "com.staryevo.tools",
|
||||||
"version": "1.2.4",
|
"version": "1.2.5",
|
||||||
"displayName": "00.StaryEvo.Tools",
|
"displayName": "00.StaryEvo.Tools",
|
||||||
"description": "This is an Framework package(后台服务器版本,端口9527)",
|
"description": "This is an Framework package(后台服务器版本,端口9527)",
|
||||||
"unity": "2021.3",
|
"unity": "2021.3",
|
||||||
|
|||||||
Reference in New Issue
Block a user