root
/
BITKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

1

This commit is contained in:
CortexCore 2024-08-10 18:16:23 +08:00
parent 68a998ff96
commit c563c539a5
1 changed files with 89 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs
View File

@ -14,6 +14,13 @@ namespace BITKit.UX
{
public class UIToolKitPanel : MonoBehaviour,IUXPanel
{
public const string USSEntry = "transition_entry";
public const string USSEntryAsync = "transition_entry_async";
public const string USSEntered = "transition_entried";
public const string USSExit = "transition_exit";
public const string USSExitAsync = "transition_exit_async";
public const string USSExited = "transition_exited";
[RuntimeInitializeOnLoadMethod]
private static void Reload()
{
@ -34,7 +41,7 @@ namespace BITKit.UX
[Header(Constant.Header.Settings)]
[SerializeField, ReadOnly] private bool isActive;
[SerializeField,ReadOnly] private float currentOpacity;
//[SerializeField,ReadOnly] private float currentOpacity;
[Header(Constant.Header.Settings)]
[SerializeField] private bool isWindow;
[SerializeField] private bool closeWhenClickOutside;
@ -53,35 +60,35 @@ namespace BITKit.UX
};
public bool IsWindow => isWindow;
public bool IsAnimate => isAnimate;
public bool IsValid => cancellationToken.IsCancellationRequested is false;
public bool IsValid => destroyCancellationToken.IsCancellationRequested;
public string Index { get; private set; }
public bool AllowCursor => allowCursor;
public bool AllowInput => allowInput;
protected CancellationToken cancellationToken { get; private set; }
protected float TargetOpacity { get; private set; }
protected virtual VisualElement background => document.rootVisualElement;
protected float CurrentOpacity
{
get => background?.GetOpacity() ?? currentOpacity;
set
{
currentOpacity = value;
background?.SetOpacity(value);
}
}
// protected float CurrentOpacity
// {
// get => background?.GetOpacity() ?? currentOpacity;
// set
// {
// currentOpacity = value;
// background?.SetOpacity(value);
// }
// }
protected virtual void Awake()
{
cancellationToken = gameObject.GetCancellationTokenOnDestroy();
Index= typeof(UIToolKitPanel) == GetType() ? gameObject.name : GetType().Name;
document.rootVisualElement.SetActive(false);
background?.SetOpacity(0);
//background?.SetOpacity(0);
if (IsWindow) document.sortingOrder++;
}
protected virtual void Start()
{
BITKit.UX.UXUtils.Inject(this);
document.rootVisualElement.AddToClassList(USSEntry);
UXService.Register(this);
destroyCancellationToken.Register(() => { UXService.UnRegister(this); });
@ -134,11 +141,11 @@ namespace BITKit.UX
{
try
{
CurrentOpacity = 0;
TargetOpacity = 1f;
//CurrentOpacity = 0;
//TargetOpacity = 1f;
document.rootVisualElement.SetActive(true);
OnEntry?.Invoke();
}
catch (Exception e)
@ -148,38 +155,72 @@ namespace BITKit.UX
}
isActive = true;
}
public virtual async UniTask EntryAsync()
async UniTask IEntryElement.EntryAsync()
{
if (entryDuration.Allow is false) return;
while (CurrentOpacity < 1 && TargetOpacity is 1)
document.rootVisualElement.AddToClassList(USSEntry);
// for (var i = 0; i < 32; i++)
// {
// await UniTask.NextFrame();
// }
document.rootVisualElement.AddToClassList(USSEntryAsync);
if (entryDuration.Allow)
{
await UniTask.NextFrame(cancellationToken);
if(destroyCancellationToken.IsCancellationRequested)return;
var task = EntryAsync();
var durationTask = UniTask.Delay(TimeSpan.FromSeconds(entryDuration.Value), cancellationToken: destroyCancellationToken);
await durationTask;
document.rootVisualElement.RemoveFromClassList(USSEntry);
document.rootVisualElement.RemoveFromClassList(USSEntryAsync);
document.rootVisualElement.AddToClassList(USSEntered);
await task;
}
else
{
await EntryAsync();
}
}
public virtual UniTask EntryAsync()
{
return UniTask.CompletedTask;
}
void IEntryElement.Entered()
{
//inputActionGroup.allowInput.AddElement(this);
OnPanelEntry();
}
void IEntryElement.Exit()
{
document.rootVisualElement.AddToClassList(USSExit);
if (IsValid is false) return;
TargetOpacity = 0;
//TargetOpacity = 0;
//inputActionGroup.allowInput.RemoveElement(this);
OnPanelExit();
}
async UniTask IEntryElement.ExitAsync()
{
if (exitDuration.Allow is false) return;
while (CurrentOpacity > 0 && TargetOpacity is 0)
{
await UniTask.NextFrame(cancellationToken);
}
document.rootVisualElement.RemoveFromClassList(USSEntered);
document.rootVisualElement.AddToClassList(USSExitAsync);
// if (exitDuration.Allow is false) return;
// while (CurrentOpacity > 0 && TargetOpacity is 0)
// {
// await UniTask.NextFrame(cancellationToken);
// }
if (entryDuration.Allow is false) return;
await UniTask.Delay(TimeSpan.FromSeconds(entryDuration.Value), cancellationToken: destroyCancellationToken);
//return UniTask.CompletedTask;
}
void IEntryElement.Exited()
{
document.rootVisualElement.RemoveFromClassList(USSExit);
document.rootVisualElement.RemoveFromClassList(USSExitAsync);
document.rootVisualElement.AddToClassList(USSEntry);
document.rootVisualElement.SetActive(false);
isActive = false;
OnExit?.Invoke();
@ -189,26 +230,26 @@ namespace BITKit.UX
public event Action OnExit;
public virtual void OnUpdate(float deltaTime)
{
var duration = 1f;
if (TargetOpacity is not 0)
{
if (entryDuration.Allow is false)
{
CurrentOpacity = TargetOpacity;
return;
}
duration = entryDuration.Value;
}
else
{
if (exitDuration.Allow is false)
{
CurrentOpacity = TargetOpacity;
return;
}
duration = exitDuration.Value;
}
CurrentOpacity = Mathf.MoveTowards(CurrentOpacity,TargetOpacity,1f/duration * Time.deltaTime);
// var duration = 1f;
// if (TargetOpacity is not 0)
// {
// if (entryDuration.Allow is false)
// {
// CurrentOpacity = TargetOpacity;
// return;
// }
// duration = entryDuration.Value;
// }
// else
// {
// if (exitDuration.Allow is false)
// {
// CurrentOpacity = TargetOpacity;
// return;
// }
// duration = exitDuration.Value;
// }
// CurrentOpacity = Mathf.MoveTowards(CurrentOpacity,TargetOpacity,1f/duration * Time.deltaTime);
}
}