NBC修改

This commit is contained in:
bob
2025-07-03 14:16:18 +08:00
parent 4febfadd56
commit 800e96aac7
2083 changed files with 60081 additions and 2942 deletions

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class BagPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Main";
public override string UIResName => "BagPanel";
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "Menu")]
@@ -19,6 +22,11 @@ namespace NBF
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<BagPanel>(param); }
public static void Hide(){ App.UI.HideUI<BagPanel>(); }
public static void Del(){ App.UI.DestroyUI<BagPanel>(); }
}
}

View File

@@ -7,9 +7,6 @@ namespace NBF
{
public partial class BagPanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "BagPanel";
protected override void OnInit()
{
base.OnInit();

View File

@@ -9,7 +9,6 @@
FishingBinder.BindAll();
MainBinder.BindAll();
ShopBinder.BindAll();
}
}
}

View File

@@ -4,8 +4,9 @@ using FairyGUI;
namespace NBF
{
public class CommonBinder
public static class CommonBinder
{
[UIExtensionAutoBind]
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(SelectPages.URL, typeof(SelectPages));

View File

@@ -4,8 +4,9 @@ using FairyGUI;
namespace NBF
{
public class FishingBinder
public static class FishingBinder
{
[UIExtensionAutoBind]
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(FishingStateInfo.URL, typeof(FishingStateInfo));

View File

@@ -4,8 +4,9 @@ using FairyGUI;
namespace NBF
{
public class LoadBinder
public static class LoadBinder
{
[UIExtensionAutoBind]
public static void BindAll()
{
}

View File

@@ -4,8 +4,9 @@ using FairyGUI;
namespace NBF
{
public class MainBinder
public static class MainBinder
{
[UIExtensionAutoBind]
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(KeyboardInput.URL, typeof(KeyboardInput));

View File

@@ -4,8 +4,9 @@ using FairyGUI;
namespace NBF
{
public class ShopBinder
public static class ShopBinder
{
[UIExtensionAutoBind]
public static void BindAll()
{
UIObjectFactory.SetPackageItemExtension(ShopGearItem.URL, typeof(ShopGearItem));

View File

@@ -4,12 +4,13 @@ using System;
using UnityEngine;
using FairyGUI;
using NBC;
using UIPanel = NBC.UIPanel;
namespace NBF
{
public partial class BottomMenu : GComponent
{
private IUIPanel _panel;
private UIPanel _panel;
private void OnInited()
{
@@ -24,7 +25,7 @@ namespace NBF
Debug.Log("模拟点击===");
}
public void Use(IUIPanel panel)
public void Use(UIPanel panel)
{
_panel = panel;
List.RemoveChildrenToPool();

View File

@@ -11,10 +11,18 @@ namespace NBF
public partial class CommonTopPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Common";
public override string UIResName => "CommonTopPanel";
[AutoFind(Name = "Marquee")]
public MarqueeTag Marquee;
public override string[] GetDependPackages(){ return new string[] {}; }
public static void Show(object param = null){ App.UI.OpenUI<CommonTopPanel>(param); }
public static void Hide(){ App.UI.HideUI<CommonTopPanel>(); }
public static void Del(){ App.UI.DestroyUI<CommonTopPanel>(); }
}
}

View File

@@ -7,9 +7,6 @@ namespace NBF
{
public partial class CommonTopPanel : UIPanel
{
public override string UIPackName => "Common";
public override string UIResName => "CommonTopPanel";
protected override void OnInit()
{
ContentPane.sortingOrder = UIDef.UIOrder.CommonTopPanel;
@@ -25,13 +22,13 @@ namespace NBF
{
if (action == InputDef.UI.Back)
{
var uis = UI.Inst.GetAllUI();
var uis = App.UI.GetAllUI();
foreach (var ui in uis)
{
if (ui.ContentPane.sortingOrder > 0) continue;
if (ui.IsTop && !ui.IsDontBack)
{
UI.Inst.HideUI(ui.GetType());
App.UI.HideUI(ui.GetType());
// ui.Hide();
}
}

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class GMPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Common";
public override string UIResName => "GMPanel";
[AutoFind(Name = "InputForce")]
public GLabel InputForce;
[AutoFind(Name = "BtnOk")]
@@ -19,6 +22,11 @@ namespace NBF
public GComboBox Dir;
public override string[] GetDependPackages(){ return new string[] {}; }
public static void Show(object param = null){ App.UI.OpenUI<GMPanel>(param); }
public static void Hide(){ App.UI.HideUI<GMPanel>(); }
public static void Del(){ App.UI.DestroyUI<GMPanel>(); }
}
}

View File

@@ -7,9 +7,6 @@ namespace NBF
{
public partial class GMPanel : UIPanel
{
public override string UIPackName => "Common";
public override string UIResName => "GMPanel";
protected override void OnInit()
{
base.OnInit();

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class MessageBox
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Common";
public override string UIResName => "MessageBox";
[AutoFind(Name = "MessageStyle")]
public Controller MessageStyle;
[AutoFind(Name = "back")]
@@ -25,6 +28,11 @@ namespace NBF
public BtnTitleInputControl BtnConfirm;
public override string[] GetDependPackages(){ return new string[] {}; }
public static void Show(object param = null){ App.UI.OpenUI<MessageBox>(param); }
public static void Hide(){ App.UI.HideUI<MessageBox>(); }
public static void Del(){ App.UI.DestroyUI<MessageBox>(); }
}
}

View File

@@ -10,9 +10,6 @@ namespace NBF
{
public partial class MessageBox : UIPanel
{
public override string UIPackName => "Common";
public override string UIResName => "MessageBox";
private static string _confirmText;
private static string _cancelText;
private static string _title;
@@ -44,14 +41,14 @@ namespace NBF
_content = msg;
_title = title;
_style = style;
UI.Inst.OpenUI<MessageBox>();
Show();
}
protected override void OnInit()
{
this.AutoAddClick(OnClick);
ShowAnim = UIPanelAnimation.GetCenterScaleBig(this);
HideAnim = UIPanelAnimation.GetCenterScaleBig(this, true);
ShowAnim = this.ShowCenterScaleBig;
HideAnim = this.HideCenterScaleBig;
IsModal = true;
IsDontBack = true;
InputManager.OnUICanceled += OnUICanceled;

View File

@@ -11,10 +11,18 @@ namespace NBF
public partial class Notices
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Common";
public override string UIResName => "Notices";
[AutoFind(Name = "show")]
public Controller show;
public override string[] GetDependPackages(){ return new string[] {}; }
public static void Show(object param = null){ App.UI.OpenUI<Notices>(param); }
public static void Hide(){ App.UI.HideUI<Notices>(); }
public static void Del(){ App.UI.DestroyUI<Notices>(); }
}
}

View File

@@ -23,10 +23,7 @@ namespace NBF
public NoticeType Type;
public string Text;
}
public override string UIPackName => "Common";
public override string UIResName => "Notices";
private static bool _isOpen;
private static readonly Queue<NoticeData> _msgArr = new();
@@ -46,7 +43,7 @@ namespace NBF
Log.Info($"显示一个notice={msg}");
if (!_isOpen)
{
UI.Inst.OpenUI<Notices>();
Notices.Show();
}
_msgArr.Enqueue(new NoticeData { Type = noticeType, Text = msg });
@@ -75,8 +72,6 @@ namespace NBF
_startX = GRoot.inst.width - ItemWidth - Gap;
_itemUrl = UIPackage.GetItemURL(UIDef.Pack.Common, "NoticeItem");
_noticePool = new GObjectPool(ContentPane.container.cachedTransform);
MonoManager.Inst.OnUpdate += OnUpdate;
}
protected override void OnShow()

View File

@@ -62,22 +62,7 @@ namespace NBF
private void LoadExternalSync(string downloadUrl)
{
if (downloadUrl.EndsWith("66626.png"))
{
}
//TODO:下载缓存存在问题。先注释
// if (_loaderInfo.TryGetValue(downloadUrl, out var tex) && tex != null)
// {
// if (url.Equals(downloadUrl))
// {
// onExternalLoadSuccess(new NTexture(tex));
// }
//
// return;
// }
MonoManager.Inst.StartCoroutine(DownloadTexture(downloadUrl));
App.Inst.StartCoroutine(DownloadTexture(downloadUrl));
}
private IEnumerator DownloadTexture(string downloadUrl)

View File

@@ -11,12 +11,20 @@ namespace NBF
public partial class FishBagPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Main";
public override string UIResName => "FishBagPanel";
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "BottomMenu")]
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<FishBagPanel>(param); }
public static void Hide(){ App.UI.HideUI<FishBagPanel>(); }
public static void Del(){ App.UI.DestroyUI<FishBagPanel>(); }
}
}

View File

@@ -7,8 +7,6 @@ namespace NBF
{
public partial class FishBagPanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "FishBagPanel";
protected override void OnInit()
{

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class FishingPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Fishing";
public override string UIResName => "FishingPanel";
[AutoFind(Name = "throwCtrl")]
public Controller throwCtrl;
[AutoFind(Name = "fishingState")]
@@ -31,6 +34,11 @@ namespace NBF
public GList OperationTips;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<FishingPanel>(param); }
public static void Hide(){ App.UI.HideUI<FishingPanel>(); }
public static void Del(){ App.UI.DestroyUI<FishingPanel>(); }
}
}

View File

@@ -8,9 +8,6 @@ namespace NBF
{
public partial class FishingPanel : UIPanel
{
public override string UIPackName => "Fishing";
public override string UIResName => "FishingPanel";
protected override void OnInit()
{
IsShowCursor = false;
@@ -50,7 +47,7 @@ namespace NBF
if (action == InputDef.UI.Back)
{
if (!IsTop) return;
UI.Inst.OpenUI<HomePanel>();
HomePanel.Show();
}
}

View File

@@ -61,7 +61,7 @@ namespace NBF
}
else if (_interactiveObject.Type == UIDef.InteractiveType.FishingShop)
{
UI.Inst.OpenUI<FishingShopPanel>();
FishingShopPanel.Show();
}
}

View File

@@ -24,23 +24,23 @@ namespace NBF
}
else if (btn == BtnSettings)
{
UI.Inst.OpenUI<SettingPanel>();
SettingPanel.Show();
}
else if (btn == BtnBag)
{
UI.Inst.OpenUI<BagPanel>();
BagPanel.Show();
}
else if (btn == BtnFishBag)
{
UI.Inst.OpenUI<FishBagPanel>();
FishBagPanel.Show();
}
else if (btn == BtnMake)
{
UI.Inst.OpenUI<MakePanel>();
MakePanel.Show();
}
else if (btn == BtnMap)
{
UI.Inst.OpenUI<MapPanel>();
MapPanel.Show();
}
}
}

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class HomePanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Main";
public override string UIResName => "HomePanel";
[AutoFind(Name = "Back")]
public GLabel Back;
[AutoFind(Name = "Pages")]
@@ -19,6 +22,11 @@ namespace NBF
public CommonMenu Menu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<HomePanel>(param); }
public static void Hide(){ App.UI.HideUI<HomePanel>(); }
public static void Del(){ App.UI.DestroyUI<HomePanel>(); }
}
}

View File

@@ -10,8 +10,6 @@ namespace NBF
{
public partial class HomePanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "HomePanel";
private string[] PageNames = new[] { "HomeMainPage", "HomeActivityPage", "HomeRankPage" };
private List<HomePageBase> _pages = new List<HomePageBase>();

View File

@@ -24,10 +24,10 @@ namespace NBF
LoadingPanel.LoadingTask.Add(waitTask);
}
var panel = UI.Inst.GetUI<LoadingPanel>();
var panel = App.UI.GetUI<LoadingPanel>();
if (panel is not { IsShowing: true })
{
UI.Inst.OpenUI<LoadingPanel>(new LoadingShowParam(style, startProgress));
LoadingPanel.Show(new LoadingShowParam(style, startProgress));
}
}

View File

@@ -11,10 +11,20 @@ namespace NBF
public partial class LoadingPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Load";
public override string UIResName => "LoadingPanel";
[AutoFind(Name = "Progress")]
public GProgressBar Progress;
public override string[] GetDependPackages(){ return new string[] {"Main"}; }
[AutoFind(Name = "TextLoading")]
public GTextField TextLoading;
public override string[] GetDependPackages(){ return new string[] {}; }
public static void Show(object param = null){ App.UI.OpenUI<LoadingPanel>(param); }
public static void Hide(){ App.UI.HideUI<LoadingPanel>(); }
public static void Del(){ App.UI.DestroyUI<LoadingPanel>(); }
}
}

View File

@@ -19,8 +19,6 @@ namespace NBF
public partial class LoadingPanel : UIPanel
{
public override string UIPackName => "Load";
public override string UIResName => "LoadingPanel";
public static readonly LoadingTask<LoadingPanel> LoadingTask = new();

View File

@@ -27,7 +27,7 @@ namespace NBF
public LoadingTask()
{
MonoManager.Inst.OnUpdate += OnUpdate;
App.OnUpdate += OnUpdate;
}
enum StepType
@@ -125,7 +125,8 @@ namespace NBF
private void End()
{
_step = StepType.Done;
UI.Inst.HideUI<T>();
App.UI.HideUI<T>();
// App.Main.TimerComponent.Unity.OnceTimer()
Timer.FrameOnce(1, this, _ => { Reset(); });
}
}

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class MakePanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Main";
public override string UIResName => "MakePanel";
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "Menu")]
@@ -19,6 +22,11 @@ namespace NBF
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<MakePanel>(param); }
public static void Hide(){ App.UI.HideUI<MakePanel>(); }
public static void Del(){ App.UI.DestroyUI<MakePanel>(); }
}
}

View File

@@ -7,27 +7,6 @@ namespace NBF
{
public partial class MakePanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "MakePanel";
protected override void OnInit()
{
base.OnInit();
}
protected override void OnShow()
{
base.OnShow();
}
protected override void OnHide()
{
base.OnHide();
}
protected override void OnDestroy()
{
base.OnDestroy();
}
}
}

View File

@@ -11,12 +11,20 @@ namespace NBF
public partial class MapPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Main";
public override string UIResName => "MapPanel";
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "BottomMenu")]
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<MapPanel>(param); }
public static void Hide(){ App.UI.HideUI<MapPanel>(); }
public static void Del(){ App.UI.DestroyUI<MapPanel>(); }
}
}

View File

@@ -7,27 +7,6 @@ namespace NBF
{
public partial class MapPanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "MapPanel";
protected override void OnInit()
{
base.OnInit();
}
protected override void OnShow()
{
base.OnShow();
}
protected override void OnHide()
{
base.OnHide();
}
protected override void OnDestroy()
{
base.OnDestroy();
}
}
}

View File

@@ -31,7 +31,7 @@ namespace NBF
// InputWaitingPanel.Show(true);
// UI.Inst.OpenUI<InputWaitingPanel>();
// 取消当前绑定
var settingPanel = UI.Inst.GetUI<SettingPanel>();
var settingPanel = App.UI.GetUI<SettingPanel>();
settingPanel.InputWait.visible = true;
Option.InputAction.Disable();
@@ -49,7 +49,7 @@ namespace NBF
UpdateValueText();
Option.InputAction.Enable();
var settingPanel = UI.Inst.GetUI<SettingPanel>();
var settingPanel = App.UI.GetUI<SettingPanel>();
settingPanel.InputWait.visible = false;
// UI.Inst.HideUI<InputWaitingPanel>();
// startRebindObject.SetActive(true);

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class SettingPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Main";
public override string UIResName => "SettingPanel";
[AutoFind(Name = "Menu")]
public CommonMenu Menu;
[AutoFind(Name = "Introduce")]
@@ -27,6 +30,11 @@ namespace NBF
public GComponent InputWait;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<SettingPanel>(param); }
public static void Hide(){ App.UI.HideUI<SettingPanel>(); }
public static void Del(){ App.UI.DestroyUI<SettingPanel>(); }
}
}

View File

@@ -13,9 +13,6 @@ namespace NBF
[UIBind(UIDef.ID.SettingPanel)]
public partial class SettingPanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "SettingPanel";
private readonly List<TabListData> tabList = new List<TabListData>();
private string _currentTab = "";
private List<int> _canSelectIndex = new List<int>();

View File

@@ -11,6 +11,9 @@ namespace NBF
public partial class FishingShopPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Shop";
public override string UIResName => "FishingShopPanel";
[AutoFind(Name = "Menu")]
public CommonMenu Menu;
[AutoFind(Name = "SubMenu")]
@@ -23,6 +26,11 @@ namespace NBF
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<FishingShopPanel>(param); }
public static void Hide(){ App.UI.HideUI<FishingShopPanel>(); }
public static void Del(){ App.UI.DestroyUI<FishingShopPanel>(); }
}
}

View File

@@ -14,9 +14,6 @@ namespace NBF
public partial class FishingShopPanel : UIPanel
{
public override string UIPackName => "Shop";
public override string UIResName => "FishingShopPanel";
private List<TabListAndSubListData> _tabList = new List<TabListAndSubListData>();
private TabListAndSubListData _currentTab;

View File

@@ -11,10 +11,18 @@ namespace NBF
public partial class PreviewPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
public override string UIPackName => "Tools";
public override string UIResName => "PreviewPanel";
[AutoFind(Name = "Model")]
public ModelTexture Model;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<PreviewPanel>(param); }
public static void Hide(){ App.UI.HideUI<PreviewPanel>(); }
public static void Del(){ App.UI.DestroyUI<PreviewPanel>(); }
}
}

View File

@@ -7,9 +7,6 @@ namespace NBF
{
public partial class PreviewPanel : UIPanel
{
public override string UIPackName => "Tools";
public override string UIResName => "PreviewPanel";
public GameObject Instance { get; private set; }
public GameObject LoadModel(GameObject prefab)

View File

@@ -4,8 +4,9 @@ using FairyGUI;
namespace NBF
{
public class ToolsBinder
public static class ToolsBinder
{
[UIExtensionAutoBind]
public static void BindAll()
{
}