Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

结构大修改，改成朴实无华的结构，不过度架构。能跑就行

Browse Source
This commit is contained in:
BobSong
2025-12-23 00:09:39 +08:00
parent 384f11f620
commit 3d14085920
2837 changed files with 149714 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/UI/Bag/BagPanel.Designer.cs generated
View File

@@ -22,11 +22,11 @@ namespace NBF
public CommonItemList ItemList;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<BagPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<BagPanel>(param); }
public static void Hide(){ App.UI.HideUI<BagPanel>(); }
public static void Hide(){ UI.Inst.HideUI<BagPanel>(); }
public static void Del(){ App.UI.DestroyUI<BagPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<BagPanel>(); }
}
}

9
Assets/Scripts/UI/Bag/BagPanel.cs
View File

@@ -17,14 +17,13 @@ namespace NBF
protected override void OnShow()
{
ItemList.List.OnClickItem += OnClickItem;
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
UseBottomMenu();
List<TabItemData> tabItemList = new List<TabItemData>();
var role = App.Main.GetComponent<Role>();
var roleBag = role.GetComponent<RoleBag>();
var dic = roleBag.GetItemsByType();
var dic = RoleModel.Instance.GetItemsByType();
foreach (var (type, list) in dic)
{
TabItemData tabItem = new TabItemData
@@ -71,7 +70,7 @@ namespace NBF
protected override void OnHide()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
ItemList.List.OnClickItem -= OnClickItem;
}

6
Assets/Scripts/UI/Bag/BagSelectPanel.Designer.cs generated
View File

@@ -26,11 +26,11 @@ namespace NBF
public ClassifyList List;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<BagSelectPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<BagSelectPanel>(param); }
public static void Hide(){ App.UI.HideUI<BagSelectPanel>(); }
public static void Hide(){ UI.Inst.HideUI<BagSelectPanel>(); }
public static void Del(){ App.UI.DestroyUI<BagSelectPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<BagSelectPanel>(); }
}
}

8
Assets/Scripts/UI/Bag/BagSelectPanel.cs
View File

@@ -92,11 +92,11 @@ namespace NBF
private void SetList()
{
var role = App.Main.GetComponent<Role>();
var roleBag = role.GetComponent<RoleBag>();
// var role = Game.Main.GetComponent<Role>();
// var roleBag = role.GetComponent<RoleBag>();
List<object> items = roleBag.GetItemListData();
List.SetListData(items);
// List<object> items = roleBag.GetItemListData();
// List.SetListData(items);
}
}
}

6
Assets/Scripts/UI/Bag/BagSlotPanel.Designer.cs generated
View File

@@ -28,11 +28,11 @@ namespace NBF
public GLoader Test;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<BagSlotPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<BagSlotPanel>(param); }
public static void Hide(){ App.UI.HideUI<BagSlotPanel>(); }
public static void Hide(){ UI.Inst.HideUI<BagSlotPanel>(); }
public static void Del(){ App.UI.DestroyUI<BagSlotPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<BagSlotPanel>(); }
}
}

13
Assets/Scripts/UI/Bag/BagSlotPanel.cs
View File

@@ -14,7 +14,6 @@ namespace NBF
{
private List<ItemInfo> _items = new List<ItemInfo>();
private RoleBag _roleBag;
protected override void OnInit()
{
@@ -23,8 +22,6 @@ namespace NBF
protected override void OnShow()
{
var role = App.Main.GetComponent<Role>();
_roleBag = role.GetComponent<RoleBag>();
SetList();
SetSlotList();
}
@@ -34,7 +31,7 @@ namespace NBF
private void SetList()
{
_items.Clear();
foreach (var roleBagItem in _roleBag.Items)
foreach (var roleBagItem in RoleModel.Instance.Items)
{
if (CanShow(roleBagItem))
{
@@ -42,7 +39,7 @@ namespace NBF
}
}
List<object> items = _roleBag.GetItemListData();
List<object> items = RoleModel.Instance.GetItemListData();
List.SetListData(items);
var children = List.List.GetChildren();
foreach (var gObject in children)
@@ -74,7 +71,7 @@ namespace NBF
{
if (SlotList.AddItemFromPool() is BagSlotItem slotItem)
{
slotItem.SetData(index, _roleBag.GetSlotItem(index));
slotItem.SetData(index, RoleModel.Instance.GetSlotItem(index));
slotItem.OnChangeSlot = OnChangeSlotItem;
}
}
@@ -83,7 +80,7 @@ namespace NBF
private void OnChangeSlotItem(int index, long id)
{
_roleBag.SetSlot(index, id).OnCompleted(OnChangeSlotItemDone);
RoleModel.Instance.SetSlot(index, id).OnCompleted(OnChangeSlotItemDone);
}
private void OnChangeSlotItemDone()
@@ -104,7 +101,7 @@ namespace NBF
private void SelectCallback(long selectId)
{
if (selectId < 1) return;
_roleBag.SetSlot(_lastSelectedItem, selectId).OnCompleted(OnChangeSlotItemDone);
RoleModel.Instance.SetSlot(_lastSelectedItem, selectId).OnCompleted(OnChangeSlotItemDone);
}
#endregion

6
Assets/Scripts/UI/Bag/ItemDetailsPanel.Designer.cs generated
View File

@@ -30,11 +30,11 @@ namespace NBF
public GImage Quality;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<ItemDetailsPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<ItemDetailsPanel>(param); }
public static void Hide(){ App.UI.HideUI<ItemDetailsPanel>(); }
public static void Hide(){ UI.Inst.HideUI<ItemDetailsPanel>(); }
public static void Del(){ App.UI.DestroyUI<ItemDetailsPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<ItemDetailsPanel>(); }
}
}

4
Assets/Scripts/UI/Bag/ItemDetailsPanel.cs
View File

@@ -36,7 +36,7 @@ namespace NBF
Model.SetData(ItemInfo);
// Model.SetBackground(Back);
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
}
private void OnUICanceled(string action)
@@ -60,7 +60,7 @@ namespace NBF
protected override void OnHide()
{
Model.UnloadModel();
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
}
}
}

12
Assets/Scripts/UI/Bag/ItemGearInfoTag.cs
View File

@@ -15,7 +15,7 @@ namespace NBF
public partial class ItemGearInfoTag : GComponent
{
public ItemInfo Info { get; private set; }
private RoleBag _bag;
// private RoleBag _bag;
private List<ItemInfo> _bindItems;
private void OnInited()
@@ -30,11 +30,11 @@ namespace NBF
public void SetInfo(ItemInfo itemInfo)
{
_usedItems.Clear();
var role = App.Main.GetComponent<Role>();
_bag = role.GetComponent<RoleBag>();
// var role = Game.Main.GetComponent<Role>();
// _bag = role.GetComponent<RoleBag>();
Info = itemInfo;
_bindItems = _bag.GetBindItems(Info.Id);
// _bindItems = _bag.GetBindItems(Info.Id);
var types = itemInfo.GetBindConfig();
List.RemoveChildrenToPool();
if (types != null)
@@ -87,12 +87,12 @@ namespace NBF
{
if (_lastSelectedItem == null) return;
Log.Info($"选中id={selectId}");
_bag.AddRig(Info.Id, selectId, _lastSelectedItem.RigId).OnCompleted(ChangeInfo);
// _bag.AddRig(Info.Id, selectId, _lastSelectedItem.RigId).OnCompleted(ChangeInfo);
}
private void CloseCallback(long id, long removeId)
{
_bag.RemoveRig(Info.Id, removeId).OnCompleted(ChangeInfo);
// _bag.RemoveRig(Info.Id, removeId).OnCompleted(ChangeInfo);
}
private void ChangeInfo()

6
Assets/Scripts/UI/ChatTestPanel.Designer.cs generated
View File

@@ -36,11 +36,11 @@ namespace NBF
public GList ChatList;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<ChatTestPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<ChatTestPanel>(param); }
public static void Hide(){ App.UI.HideUI<ChatTestPanel>(); }
public static void Hide(){ UI.Inst.HideUI<ChatTestPanel>(); }
public static void Del(){ App.UI.DestroyUI<ChatTestPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<ChatTestPanel>(); }
}
}

14
Assets/Scripts/UI/ChatTestPanel.cs
View File

@@ -83,7 +83,7 @@ namespace NBF
// 根据用户名来选择目标的鉴权服务器
// 根据鉴权服务器地址来创建一个新的网络会话
_session = SessionHelper.CreateSession(App.Main, "127.0.0.1:20001", OnConnectComplete,
_session = SessionHelper.CreateSession(Game.Main, "127.0.0.1:20001", OnConnectComplete,
OnConnectFail,
OnConnectDisconnect);
@@ -103,13 +103,13 @@ namespace NBF
return;
}
if (!App.Main.GetComponent<JWTParseComponent>().Parse(response.ToKen, out var payload))
if (!Game.Main.GetComponent<JWTParseComponent>().Parse(response.ToKen, out var payload))
{
return;
}
// 根据ToKen返回的Address登录到Gate服务器
_session = SessionHelper.CreateSession(App.Main, payload.Address, OnConnectComplete, OnConnectFail,
_session = SessionHelper.CreateSession(Game.Main, payload.Address, OnConnectComplete, OnConnectFail,
OnConnectDisconnect);
// 发送登录请求到Gate服务器
var loginResponse = (G2C_LoginResponse)await _session.Call(new C2G_LoginRequest()
@@ -123,7 +123,7 @@ namespace NBF
}
SetLoginState(true, InputAccount.text);
Log.Debug(
Log.Info(
$"登录到Gate服务器成功！ErrorCode:{loginResponse.ErrorCode}");
// Log.Debug(
// $"登录到Gate服务器成功！LoginTime:{loginResponse.GameAccountInfo.LoginTime} CreateTime:{loginResponse.GameAccountInfo.CreateTime}");
@@ -136,7 +136,7 @@ namespace NBF
private void OnConnectComplete()
{
Log.Debug("连接成功");
Log.Info("连接成功");
// 添加心跳组件给Session。
// Start(2000)就是2000毫秒。
_session.AddComponent<SessionHeartbeatComponent>().Start(5000);
@@ -144,13 +144,13 @@ namespace NBF
private void OnConnectFail()
{
Log.Debug("连接失败");
Log.Info("连接失败");
SetLoginState(false);
}
private void OnConnectDisconnect()
{
Log.Debug("连接断开");
Log.Info("连接断开");
SetLoginState(false);
}

4
Assets/Scripts/UI/Common/List/ClassifyList.cs
View File

@@ -27,14 +27,14 @@ namespace NBF
private void OnInited()
{
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
List.onClickItem.Add(OnClickListItem);
_selector = new ListSelector(List, typeof(ListTitleItem));
}
public override void Dispose()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
base.Dispose();
}

2
Assets/Scripts/UI/Common/Menu/BottomMenu.cs
View File

@@ -21,7 +21,7 @@ namespace NBF
{
var item = context.data as BtnTitleInputControl;
if (item == null) return;
Game.Input.SendUIInput(item.ActionName);
InputManager.Instance.SendUIInput(item.ActionName);
Debug.Log("模拟点击===");
}

4
Assets/Scripts/UI/Common/Menu/CommonMenu.cs
View File

@@ -25,13 +25,13 @@ namespace NBF
BtnPrev.onClick.Add(OnClickBtnPrev);
BtnNext.onClick.Add(OnClickBtnNext);
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
}
public override void Dispose()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
base.Dispose();
}

4
Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs
View File

@@ -25,12 +25,12 @@ namespace NBF
BtnPrev.onClick.Add(OnClickBtnPrev);
BtnNext.onClick.Add(OnClickBtnNext);
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
}
public override void Dispose()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
base.Dispose();
}

6
Assets/Scripts/UI/Common/Panel/CommonTopPanel.Designer.cs generated
View File

@@ -18,11 +18,11 @@ namespace NBF
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 Show(object param = null){ UI.Inst.OpenUI<CommonTopPanel>(param); }
public static void Hide(){ App.UI.HideUI<CommonTopPanel>(); }
public static void Hide(){ UI.Inst.HideUI<CommonTopPanel>(); }
public static void Del(){ App.UI.DestroyUI<CommonTopPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<CommonTopPanel>(); }
}
}

8
Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs
View File

@@ -15,7 +15,7 @@ namespace NBF
protected override void OnShow()
{
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
}
protected override void OnUpdate()
@@ -31,13 +31,13 @@ namespace NBF
{
if (action == InputDef.UI.Back)
{
var uis = App.UI.GetAllUI();
var uis = UI.Inst.GetAllUI();
foreach (var ui in uis)
{
if (ui.ContentPane.sortingOrder > 0) continue;
if (ui.IsTop && !ui.IsDontBack)
{
App.UI.HideUI(ui.GetType());
UI.Inst.HideUI(ui.GetType());
break;
// ui.Hide();
}
@@ -47,7 +47,7 @@ namespace NBF
protected override void OnHide()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
}
protected override void OnDestroy()

6
Assets/Scripts/UI/Common/Panel/GMPanel.Designer.cs generated
View File

@@ -22,11 +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 Show(object param = null){ UI.Inst.OpenUI<GMPanel>(param); }
public static void Hide(){ App.UI.HideUI<GMPanel>(); }
public static void Hide(){ UI.Inst.HideUI<GMPanel>(); }
public static void Del(){ App.UI.DestroyUI<GMPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<GMPanel>(); }
}
}

6
Assets/Scripts/UI/Common/Panel/MessageBox.Designer.cs generated
View File

@@ -28,11 +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 Show(object param = null){ UI.Inst.OpenUI<MessageBox>(param); }
public static void Hide(){ App.UI.HideUI<MessageBox>(); }
public static void Hide(){ UI.Inst.HideUI<MessageBox>(); }
public static void Del(){ App.UI.DestroyUI<MessageBox>(); }
public static void Del(){ UI.Inst.DestroyUI<MessageBox>(); }
}
}

8
Assets/Scripts/UI/Common/Panel/MessageBox.cs
View File

@@ -47,11 +47,11 @@ namespace NBF
protected override void OnInit()
{
this.AutoAddClick(OnClick);
ShowAnim = this.ShowCenterScaleBig;
HideAnim = this.HideCenterScaleBig;
// HideAnim = this.HideCenterScaleBig;
// ShowAnim = this.ShowCenterScaleBig;
IsModal = true;
IsDontBack = true;
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
}
protected override void OnShow()
@@ -80,7 +80,7 @@ namespace NBF
protected override void OnDestroy()
{
base.OnDestroy();
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
}

6
Assets/Scripts/UI/Common/Panel/Notices.Designer.cs generated
View File

@@ -18,11 +18,11 @@ namespace NBF
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 Show(object param = null){ UI.Inst.OpenUI<Notices>(param); }
public static void Hide(){ App.UI.HideUI<Notices>(); }
public static void Hide(){ UI.Inst.HideUI<Notices>(); }
public static void Del(){ App.UI.DestroyUI<Notices>(); }
public static void Del(){ UI.Inst.DestroyUI<Notices>(); }
}
}

2
Assets/Scripts/UI/Ex/XGLoader.cs
View File

@@ -63,7 +63,7 @@ namespace NBF
private void LoadExternalSync(string downloadUrl)
{
App.Inst.StartCoroutine(DownloadTexture(downloadUrl));
Game.Instance.StartCoroutine(DownloadTexture(downloadUrl));
}
private IEnumerator DownloadTexture(string downloadUrl)

6
Assets/Scripts/UI/FishBag/FishBagPanel.Designer.cs generated
View File

@@ -20,11 +20,11 @@ namespace NBF
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<FishBagPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<FishBagPanel>(param); }
public static void Hide(){ App.UI.HideUI<FishBagPanel>(); }
public static void Hide(){ UI.Inst.HideUI<FishBagPanel>(); }
public static void Del(){ App.UI.DestroyUI<FishBagPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<FishBagPanel>(); }
}
}

6
Assets/Scripts/UI/Fishing/FishingPanel.Designer.cs generated
View File

@@ -36,11 +36,11 @@ namespace NBF
public FishingTeam Team;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
public static void Show(object param = null){ App.UI.OpenUI<FishingPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<FishingPanel>(param); }
public static void Hide(){ App.UI.HideUI<FishingPanel>(); }
public static void Hide(){ UI.Inst.HideUI<FishingPanel>(); }
public static void Del(){ App.UI.DestroyUI<FishingPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<FishingPanel>(); }
}
}

12
Assets/Scripts/UI/Fishing/FishingPanel.cs
View File

@@ -16,9 +16,9 @@ namespace NBF
protected override void OnShow()
{
Game.Input.OnUICanceled += OnUICanceled;
Game.Input.OnInteractiveObjectAction += OnInteractiveObjectAction;
Game.Input.OnPlayerCanceled += OnPlayerCanceled;
InputManager.OnUICanceled += OnUICanceled;
InputManager.OnInteractiveObjectAction += OnInteractiveObjectAction;
InputManager.OnPlayerCanceled += OnPlayerCanceled;
// InputManager.OnUseAction += OnUseAction;
// InputManager.OnUse2Action += OnUse2Action;
}
@@ -70,9 +70,9 @@ namespace NBF
protected override void OnHide()
{
base.OnHide();
Game.Input.OnUICanceled -= OnUICanceled;
Game.Input.OnInteractiveObjectAction -= OnInteractiveObjectAction;
Game.Input.OnUICanceled -= OnPlayerCanceled;
InputManager.OnUICanceled -= OnUICanceled;
InputManager.OnInteractiveObjectAction -= OnInteractiveObjectAction;
InputManager.OnUICanceled -= OnPlayerCanceled;
}
}
}

6
Assets/Scripts/UI/Home/HomePanel.Designer.cs generated
View File

@@ -22,11 +22,11 @@ namespace NBF
public CommonMenu Menu;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<HomePanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<HomePanel>(param); }
public static void Hide(){ App.UI.HideUI<HomePanel>(); }
public static void Hide(){ UI.Inst.HideUI<HomePanel>(); }
public static void Del(){ App.UI.DestroyUI<HomePanel>(); }
public static void Del(){ UI.Inst.DestroyUI<HomePanel>(); }
}
}

4
Assets/Scripts/UI/Home/Pages/HomeMainPage.cs
View File

@@ -29,7 +29,7 @@ namespace NBF
protected override void OnShow()
{
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
UseBottomMenu();
// Model.LoadAsset(0);
@@ -39,7 +39,7 @@ namespace NBF
protected override void OnHide()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
}
private void OnUICanceled(string action)

2
Assets/Scripts/UI/Loading/Loading.cs
View File

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

6
Assets/Scripts/UI/Loading/LoadingPanel.Designer.cs generated
View File

@@ -22,11 +22,11 @@ namespace NBF
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 Show(object param = null){ UI.Inst.OpenUI<LoadingPanel>(param); }
public static void Hide(){ App.UI.HideUI<LoadingPanel>(); }
public static void Hide(){ UI.Inst.HideUI<LoadingPanel>(); }
public static void Del(){ App.UI.DestroyUI<LoadingPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<LoadingPanel>(); }
}
}

1
Assets/Scripts/UI/Loading/LoadingPanel.cs
View File

@@ -3,7 +3,6 @@
using Fantasy.Event;
using UnityEngine;
using NBC;
using NBC.Event;
namespace NBF
{

6
Assets/Scripts/UI/Loading/LoadingTask.cs
View File

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

6
Assets/Scripts/UI/Login/LoginPanel.Designer.cs generated
View File

@@ -22,11 +22,11 @@ namespace NBF
public GButton BtnLogin;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<LoginPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<LoginPanel>(param); }
public static void Hide(){ App.UI.HideUI<LoginPanel>(); }
public static void Hide(){ UI.Inst.HideUI<LoginPanel>(); }
public static void Del(){ App.UI.DestroyUI<LoginPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<LoginPanel>(); }
}
}

5
Assets/Scripts/UI/Login/LoginPanel.cs
View File

@@ -30,10 +30,13 @@ namespace NBF
{
await LoginHelper.Login(InputAccount.text);
await Fishing.Instance.Go(RoleModel.Instance.Info.MapId);
// await MapHelper.EnterMap(mapId, role.RoomCode);
// BagPanel.Show();
// BagSlotPanel.Show();
// FishingShopPanel.Show();
Del();
}
}

6
Assets/Scripts/UI/Make/MakePanel.Designer.cs generated
View File

@@ -22,11 +22,11 @@ namespace NBF
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<MakePanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<MakePanel>(param); }
public static void Hide(){ App.UI.HideUI<MakePanel>(); }
public static void Hide(){ UI.Inst.HideUI<MakePanel>(); }
public static void Del(){ App.UI.DestroyUI<MakePanel>(); }
public static void Del(){ UI.Inst.DestroyUI<MakePanel>(); }
}
}

6
Assets/Scripts/UI/MapPanel.Designer.cs generated
View File

@@ -20,11 +20,11 @@ namespace NBF
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<MapPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<MapPanel>(param); }
public static void Hide(){ App.UI.HideUI<MapPanel>(); }
public static void Hide(){ UI.Inst.HideUI<MapPanel>(); }
public static void Del(){ App.UI.DestroyUI<MapPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<MapPanel>(); }
}
}

4
Assets/Scripts/UI/Settings/SettingInputItem.cs
View File

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

6
Assets/Scripts/UI/Settings/SettingPanel.Designer.cs generated
View File

@@ -30,11 +30,11 @@ namespace NBF
public GComponent InputWait;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<SettingPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<SettingPanel>(param); }
public static void Hide(){ App.UI.HideUI<SettingPanel>(); }
public static void Hide(){ UI.Inst.HideUI<SettingPanel>(); }
public static void Del(){ App.UI.DestroyUI<SettingPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<SettingPanel>(); }
}
}

4
Assets/Scripts/UI/Settings/SettingPanel.cs
View File

@@ -42,7 +42,7 @@ namespace NBF
protected override void OnShow()
{
Settings.Instance.LoadAllSettings();
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
Menu.SetTabs(tabList);
UseBottomMenu();
}
@@ -270,7 +270,7 @@ namespace NBF
protected override void OnHide()
{
base.OnHide();
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
}
protected override void OnDestroy()

6
Assets/Scripts/UI/Shops/FishingShopPanel.Designer.cs generated
View File

@@ -26,11 +26,11 @@ namespace NBF
public GButton Head;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<FishingShopPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<FishingShopPanel>(param); }
public static void Hide(){ App.UI.HideUI<FishingShopPanel>(); }
public static void Hide(){ UI.Inst.HideUI<FishingShopPanel>(); }
public static void Del(){ App.UI.DestroyUI<FishingShopPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<FishingShopPanel>(); }
}
}

4
Assets/Scripts/UI/Shops/FishingShopPanel.cs
View File

@@ -20,7 +20,7 @@ namespace NBF
protected override void OnShow()
{
ItemList.List.OnClickItem += OnClickItem;
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
UseBottomMenu();
List<TabItemData> tabItemList = GoodsConfigHelper.TabItemList;
@@ -61,7 +61,7 @@ namespace NBF
protected override void OnHide()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
ItemList.List.OnClickItem -= OnClickItem;
}

6
Assets/Scripts/UI/Shops/ShopDetailsPanel.Designer.cs generated
View File

@@ -30,11 +30,11 @@ namespace NBF
public GImage Quality;
public override string[] GetDependPackages(){ return new string[] {"Common","CommonNew"}; }
public static void Show(object param = null){ App.UI.OpenUI<ShopDetailsPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<ShopDetailsPanel>(param); }
public static void Hide(){ App.UI.HideUI<ShopDetailsPanel>(); }
public static void Hide(){ UI.Inst.HideUI<ShopDetailsPanel>(); }
public static void Del(){ App.UI.DestroyUI<ShopDetailsPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<ShopDetailsPanel>(); }
}
}

6
Assets/Scripts/UI/Tools/PreviewDetailsPanel.Designer.cs generated
View File

@@ -32,11 +32,11 @@ namespace NBF
public GButton BtnSaveSetting;
public override string[] GetDependPackages(){ return new string[] {"Common","Main"}; }
public static void Show(object param = null){ App.UI.OpenUI<PreviewDetailsPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<PreviewDetailsPanel>(param); }
public static void Hide(){ App.UI.HideUI<PreviewDetailsPanel>(); }
public static void Hide(){ UI.Inst.HideUI<PreviewDetailsPanel>(); }
public static void Del(){ App.UI.DestroyUI<PreviewDetailsPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<PreviewDetailsPanel>(); }
}
}

2
Assets/Scripts/UI/Tools/PreviewDetailsPanel.cs
View File

@@ -37,7 +37,7 @@ namespace NBF
});
// Model.SetBackground(Back);
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
}

6
Assets/Scripts/UI/Tools/PreviewPanel.Designer.cs generated
View File

@@ -24,11 +24,11 @@ namespace NBF
public ModelViewer GenModel;
public override string[] GetDependPackages(){ return new string[] {"Common","Main"}; }
public static void Show(object param = null){ App.UI.OpenUI<PreviewPanel>(param); }
public static void Show(object param = null){ UI.Inst.OpenUI<PreviewPanel>(param); }
public static void Hide(){ App.UI.HideUI<PreviewPanel>(); }
public static void Hide(){ UI.Inst.HideUI<PreviewPanel>(); }
public static void Del(){ App.UI.DestroyUI<PreviewPanel>(); }
public static void Del(){ UI.Inst.DestroyUI<PreviewPanel>(); }
}
}

4
Assets/Scripts/UI/Tools/PreviewPanel.cs
View File

@@ -26,7 +26,7 @@ namespace NBF
protected override void OnShow()
{
ItemList.List.OnClickItem += OnClickItem;
Game.Input.OnUICanceled += OnUICanceled;
InputManager.OnUICanceled += OnUICanceled;
List<TabItemData> tabItemList = new List<TabItemData>();
@@ -159,7 +159,7 @@ namespace NBF
protected override void OnHide()
{
Game.Input.OnUICanceled -= OnUICanceled;
InputManager.OnUICanceled -= OnUICanceled;
ItemList.List.OnClickItem -= OnClickItem;
}