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

Merge branch 'master' into LouDi_Quan

Browse Source
This commit is contained in:
shenjianxing 2024-12-30 19:16:22 +08:00
commit 18092474ad
10 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/QFramework/Toolkits/UIKit/Scripts/UIKit.cs
View File

@ -308,6 +308,17 @@ UIKit.GetPanel(""UIHomePanel"");
return retPanel as T;
}
public static UIPanel GetPanel(Type type)
{
var panelSearchKeys = PanelSearchKeys.Allocate();
panelSearchKeys.PanelType = type;
var retPanel = UIManager.Instance.GetUI(panelSearchKeys);
panelSearchKeys.Recycle2Cache();
return retPanel;
}
#region 给脚本层用的 api

3
Assets/Scripts/Actions/ActionHelper.cs
View File

@ -16,7 +16,10 @@ public class ActionHelper
{ "UIBtns", typeof(QFramework.Example.UIBtns) },
{ "UITools", typeof(QFramework.Example.UITools) },
{ "UIHint", typeof(QFramework.Example.UIHint) },
{ "UIPointQuestion", typeof(QFramework.Example.UIPointQuestion) },
{ "UIBtns", typeof(QFramework.Example.UIPointQuestion) },
{ "UICameraSwitch", typeof(QFramework.Example.UICameraSwitch) },
};

6
Assets/Scripts/Actions/UIShowAction.cs
View File

@ -53,7 +53,11 @@ public class UIShowAction : IAction
}
else
{
UIKit.HidePanel(ActionHelper.typeDict[uiName]);
if (UIKit.GetPanel(ActionHelper.typeDict[uiName]) != null)
{
UIKit.HidePanel(ActionHelper.typeDict[uiName]);
}
this.Finish();
}
}

8
Assets/Scripts/UI/UIBtns.cs
View File

@ -3,6 +3,8 @@ using UnityEngine.UI;
using QFramework;
using System.Collections.Generic;
using TMPro;
using static OperationController;
using System;
namespace QFramework.Example
{
@ -16,6 +18,12 @@ namespace QFramework.Example
{
mData = uiData as UIBtnsData ?? new UIBtnsData();
// please add init code here
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)

6
Assets/Scripts/UI/UIHint.cs
View File

@ -3,6 +3,7 @@ using UnityEngine.UI;
using QFramework;
using DG.Tweening;
using System.Runtime.CompilerServices;
using static OperationController;
namespace QFramework.Example
{
@ -20,8 +21,13 @@ namespace QFramework.Example
{
mData = uiData as UIHintData ?? new UIHintData();
SetItem(0);
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)
{
mData = uiData as UIHintData ?? new UIHintData();

7
Assets/Scripts/UI/UIPointQuestion.cs
View File

@ -2,6 +2,7 @@ using UnityEngine;
using UnityEngine.UI;
using QFramework;
using System.Collections.Generic;
using static OperationController;
namespace QFramework.Example
{
@ -16,6 +17,12 @@ namespace QFramework.Example
{
mData = uiData as UIPointQuestionData ?? new UIPointQuestionData();
// please add init code here
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)

6
Assets/Scripts/UI/UIResultTip.cs
View File

@ -3,6 +3,7 @@ using UnityEngine.UI;
using QFramework;
using TMPro;
using System;
using static OperationController;
namespace QFramework.Example
{
@ -19,8 +20,13 @@ namespace QFramework.Example
mData = uiData as UIResultTipData ?? new UIResultTipData();
Right.gameObject.SetActive(false);
Wrong.gameObject.SetActive(false);
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)
{
Right.gameObject.SetActive(false);

6
Assets/Scripts/UI/UITextQuestion.cs
View File

@ -6,6 +6,7 @@ using TMPro;
using System;
using Microsoft.SqlServer.Server;
using XMLTool;
using static OperationController;
namespace QFramework.Example
{
@ -32,8 +33,13 @@ namespace QFramework.Example
{
mData = uiData as UITextQuestionData ?? new UITextQuestionData();
// please add init code here
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)
{
mData = uiData as UITextQuestionData ?? new UITextQuestionData();

7
Assets/Scripts/UI/UITipWindow.cs
View File

@ -4,6 +4,7 @@ using QFramework;
using System;
using System.Collections.Generic;
using TMPro;
using static OperationController;
namespace QFramework.Example
{
@ -24,6 +25,12 @@ namespace QFramework.Example
mData = uiData as UITipWindowData ?? new UITipWindowData();
// please add init code here
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)

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

@ -5,6 +5,7 @@ using System.Collections.Generic;
using TMPro;
using System.Linq;
using DG.Tweening;
using static OperationController;
namespace QFramework.Example
{
@ -29,6 +30,12 @@ namespace QFramework.Example
{
mData = uiData as UIToolsData ?? new UIToolsData();
// please add init code here
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
}
private void OnStepChanged(StepStatusOnChange change)
{
Hide();
}
protected override void OnOpen(IUIData uiData = null)