JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into AnHui_BaoShi

Browse Source
This commit is contained in:
shenjianxing 2025-03-26 15:01:15 +08:00
commit 6638df69be
4 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Internal/Action/ConditionGroup.cs
View File

@ -43,6 +43,11 @@ namespace QFramework
public ActionStatus Status { get; set; }
public void OnStart()
{
foreach (var item in mCondition)
{
item.OnStart();
}
}
public void OnExecute(float dt)

5
Assets/QFramework/Toolkits/_CoreKit/EventKit/EventSystem/StringEventSystem.cs
View File

@ -44,6 +44,7 @@ namespace QFramework
public void Send(string key)
{
if (mEvents.TryGetValue(key, out var e))
{
var easyEvent = e.As<EasyEvent>();
@ -67,6 +68,10 @@ namespace QFramework
}
}
public bool HasRegister(string key)
{
return mEvents.ContainsKey(key);
}
public void UnRegister<T>(string key, Action<T> onEvent)
{

6
Assets/Scripts/Conditions/StrEventCondition.cs
View File

@ -13,7 +13,7 @@ namespace QFramework
private StrEventCondition() { }
string key;
bool isFinished = false;
public static StrEventCondition Allocate(string key)
{
var conditionAction = mSimpleObjectPool.Allocate();
@ -21,11 +21,12 @@ namespace QFramework
conditionAction.Deinited = false;
conditionAction.Reset();
conditionAction.key = key;
conditionAction.isFinished = false;
return conditionAction;
}
public bool Check()
{
return false;
return isFinished;
}
public bool Paused { get; set; }
public bool Deinited { get; set; }
@ -39,6 +40,7 @@ namespace QFramework
private void OnEventFnished()
{
StringEventSystem.Global.UnRegister(key, OnEventFnished);
isFinished = true;
this.Finish();
}

22
Assets/Scripts/UI/UITools.cs
View File

@ -102,6 +102,8 @@ namespace QFramework.Example
ScoreController.Instance.Add(mData.scoreStepName, mData.rightScore);
answers.Remove(item.Name);
if (answers.Count <= 0)
{
if (string.IsNullOrEmpty(mData.rightLable) == false)
{
var data = new UIResultTipData();
data.label = mData.rightLable;
@ -116,15 +118,26 @@ namespace QFramework.Example
data.autoHideTime = mData.autoHideResult;
UIKit.OpenPanelAsync<UIResultTip>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
}
else
{
if (string.IsNullOrEmpty(mData.rightEvent) == false)
{
StringEventSystem.Global.Send(mData.rightEvent);
}
}
}
}
else
{
ScoreController.Instance.Add(mData.scoreStepName, mData.wrongScore);
if (string.IsNullOrEmpty(mData.wrongLabel) == false)
{
var data = new UIResultTipData();
data.label = mData.wrongLabel;
data.isRight = false;
data.callback = () =>
{
if (string.IsNullOrEmpty(mData.wrongEvent) == false)
{
StringEventSystem.Global.Send(mData.wrongEvent);
@ -133,9 +146,18 @@ namespace QFramework.Example
};
data.autoHideTime = mData.autoHideResult;
UIKit.OpenPanelAsync<UIResultTip>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().Start(this);
}
else
{
if (string.IsNullOrEmpty(mData.wrongEvent) == false)
{
StringEventSystem.Global.Send(mData.wrongEvent);
}
SetSelected(obj, false);
}
}
}
});
}