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

完善框架通用性功能

Browse Source
This commit is contained in:
shenjianxing 2025-01-09 10:08:22 +08:00
parent 1fab8f8e19
commit 92ebf0bcc9
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Art/UIPrefab/UIModuleSelect.prefab
View File

@ -403,7 +403,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -30, y: -30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7870331819941572208 --- !u!222 &7870331819941572208
CanvasRenderer: CanvasRenderer:
@ -433,7 +433,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "\u6A21\u5757\u540D\u79F0" m_text:
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2} m_fontAsset: {fileID: 11400000, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}
m_sharedMaterial: {fileID: 5103963756306747964, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2} m_sharedMaterial: {fileID: 5103963756306747964, guid: 9bbfb1bdb0251664eb0932e39724900e, type: 2}

11
Assets/Scripts/Controller/OperationController.cs
View File

@ -46,6 +46,7 @@ public class OperationController : MonoSingleton<OperationController>
{ {
Refresh(); Refresh();
}).UnRegisterWhenGameObjectDestroyed(gameObject); }).UnRegisterWhenGameObjectDestroyed(gameObject);
} }
public void Refresh() public void Refresh()
@ -66,18 +67,24 @@ public class OperationController : MonoSingleton<OperationController>
} }
TypeEventSystem.Global.Register<StepExecute>(OnExecute); TypeEventSystem.Global.Register<StepExecute>(OnExecute);
TypeEventSystem.Global.Register<OnNextStep>(OnNext); TypeEventSystem.Global.Register<OnNextStep>(OnNext);
TypeEventSystem.Global.Register<OnModuleQuit>(arg => Clear()); TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuitHandler);
} }
} }
} }
private void OnModuleQuitHandler(OnModuleQuit quit)
{
Clear();
}
public void Clear() public void Clear()
{ {
index = -1;
curAction.Deinit(); curAction.Deinit();
steps.Clear(); steps.Clear();
TypeEventSystem.Global.UnRegister<OnModuleQuit>(arg => Clear()); TypeEventSystem.Global.UnRegister<OnModuleQuit>(OnModuleQuitHandler);
TypeEventSystem.Global.UnRegister<StepExecute>(OnExecute); TypeEventSystem.Global.UnRegister<StepExecute>(OnExecute);
TypeEventSystem.Global.UnRegister<OnNextStep>(OnNext); TypeEventSystem.Global.UnRegister<OnNextStep>(OnNext);

9
Assets/Scripts/UI/UIOperationList.cs
View File

@ -20,7 +20,6 @@ namespace QFramework.Example
protected override void OnInit(IUIData uiData = null) protected override void OnInit(IUIData uiData = null)
{ {
mData = uiData as UIOperationListData ?? new UIOperationListData(); mData = uiData as UIOperationListData ?? new UIOperationListData();
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
TypeEventSystem.Global.Register<OnModuleQuit>((arg)=>Hide()).UnRegisterWhenGameObjectDestroyed(gameObject); TypeEventSystem.Global.Register<OnModuleQuit>((arg)=>Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
} }
@ -83,6 +82,8 @@ namespace QFramework.Example
protected override void OnOpen(IUIData uiData = null) protected override void OnOpen(IUIData uiData = null)
{ {
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(this);
btns.Clear();
op = OperationController.Instance.operation; op = OperationController.Instance.operation;
StepContent.RemoveAllChildren(); StepContent.RemoveAllChildren();
foreach (var item in op.Steps) foreach (var item in op.Steps)
@ -139,13 +140,9 @@ namespace QFramework.Example
protected override void OnShow() protected override void OnShow()
{ {
} }
protected override void OnHide()
{
}
protected override void OnClose() protected override void OnClose()
{ {
TypeEventSystem.Global.UnRegister<StepStatusOnChange>(OnStepChanged);
} }
} }
} }

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

@ -25,7 +25,7 @@ namespace QFramework.Example
data.btns.Add(new UITipWindowData.ItemData() { txt = "·ñ" }); data.btns.Add(new UITipWindowData.ItemData() { txt = "·ñ" });
UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(); UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
}); });
closeBtn.onClick.AddListener(Home); backBtn.onClick.AddListener(Home);
homeBtn.onClick.AddListener(Home); homeBtn.onClick.AddListener(Home);
desBtn.onClick.AddListener(() => desBtn.onClick.AddListener(() =>
@ -45,7 +45,7 @@ namespace QFramework.Example
data.txt = "ÊÇ·ñÍ˳öµ±Ç°Ä£¿é£¿"; data.txt = "ÊÇ·ñÍ˳öµ±Ç°Ä£¿é£¿";
data.btns.Add(new UITipWindowData.ItemData() data.btns.Add(new UITipWindowData.ItemData()
{ {
txt = "È·¶¨", txt = "是",
OnClick = () => OnClick = () =>
{ {
Hide(); Hide();
@ -53,7 +53,7 @@ namespace QFramework.Example
UIKit.OpenPanelAsync<UIModeSelect>().ToAction().StartGlobal(); UIKit.OpenPanelAsync<UIModeSelect>().ToAction().StartGlobal();
} }
}); });
data.btns.Add(new UITipWindowData.ItemData() { txt = "È¡Ïû" }); data.btns.Add(new UITipWindowData.ItemData() { txt = "否" });
UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(); UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
} }