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

主页面相关内容和快捷键修改

Browse Source
This commit is contained in:
bob
2025-06-03 18:04:28 +08:00
parent 9334999332
commit 372e81508e
101 changed files with 607 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Fgui/Common/Common_fui.bytes
View File

Binary file not shown.

BIN
Assets/Resources/Fgui/Main/Main_fui.bytes
View File

Binary file not shown.

5
Assets/Scripts/Common/Attrobites/Attributes.cs
View File

@@ -57,4 +57,9 @@ namespace NBF
Sort = sort; Sort = sort;
} }
} }
[AttributeUsage(AttributeTargets.Field)]
public class UIInputAttribute : BaseAttribute
{
}
} }

2
Assets/Scripts/Def/UIDef.cs
View File

@@ -20,8 +20,6 @@ namespace NBF
public class UIOrder public class UIOrder
{ {
public const int MeteorChest = 90;
public const int MainPanel = 100;
public const int CommonTopPanel = 200; public const int CommonTopPanel = 200;
public const int Loading = 500; public const int Loading = 500;
public const int Guide = 900; public const int Guide = 900;

2
Assets/Scripts/NBC/Language/Runtime/Lan.cs
View File

@@ -2,7 +2,7 @@
{ {
public class Lan public class Lan
{ {
public static LanguageManager _inst; private static LanguageManager _inst;
public static LanguageManager Inst public static LanguageManager Inst
{ {

9
Assets/Scripts/NBC/Language/Runtime/LanguageManager.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
namespace NBC namespace NBC
@@ -47,6 +48,14 @@ namespace NBC
language = (SystemLanguage)value; language = (SystemLanguage)value;
} }
} }
var list = LanguageConst.languageMap.Values.ToList();
var findLan = list.FindIndex(t => t.Language == language);
if (findLan < 0)
{
language = SystemLanguage.English;
}
UseLanguage(language); UseLanguage(language);
} }

7
Assets/Scripts/NBC/UI/Runtime/Component/IUIPanel.cs
View File

@@ -17,6 +17,11 @@ namespace NBC
bool IsCanVisible { get; } bool IsCanVisible { get; }
bool IsDotDel { get; } bool IsDotDel { get; }
/// <summary>
/// 不能返回
/// </summary>
bool IsDontBack { get; }
bool IsModal { get; } bool IsModal { get; }
bool IsShowCursor { get; } bool IsShowCursor { get; }
@@ -25,7 +30,7 @@ namespace NBC
void SetData(object args); void SetData(object args);
object GetData(); object GetData();
string[] GetDependPackages(); string[] GetDependPackages();
System.Collections.Generic.Dictionary<string, string> GetLanguageConfig();
void Init(); void Init();
void Show(); void Show();
void Hide(); void Hide();

24
Assets/Scripts/NBC/UI/Runtime/Component/UIPanel.cs
View File

@@ -24,7 +24,7 @@ namespace NBC
public virtual bool IsCanVisible => ContentPane != null && ContentPane.parent != null && ContentPane.visible; public virtual bool IsCanVisible => ContentPane != null && ContentPane.parent != null && ContentPane.visible;
public bool IsDotDel { get; protected set; } public bool IsDotDel { get; protected set; }
public bool IsDontBack { get; protected set; }
public virtual string UIPackRootUrl => string.Empty; public virtual string UIPackRootUrl => string.Empty;
public virtual string UIPackName { get; set; } public virtual string UIPackName { get; set; }
@@ -76,10 +76,6 @@ namespace NBC
return new string[] { }; return new string[] { };
} }
public virtual Dictionary<string, string> GetLanguageConfig()
{
return new Dictionary<string, string>();
}
public void Init() public void Init()
{ {
@@ -194,6 +190,15 @@ namespace NBC
Show(); Show();
} }
/// <summary>
/// 设置刷新多语言
/// </summary>
public void SetLanguage()
{
_ui.TrySetPanelLanguage(ContentPane);
OnSetLanguage();
}
public void HideImmediately() public void HideImmediately()
{ {
// ContentPane.visible = false; // ContentPane.visible = false;
@@ -227,6 +232,7 @@ namespace NBC
private void OpenAnimBegin() private void OpenAnimBegin()
{ {
OnShow(); OnShow();
SetLanguage();
_ui?.DispatchEventWith(UIEvents.UIShow, this); _ui?.DispatchEventWith(UIEvents.UIShow, this);
} }
@@ -257,6 +263,13 @@ namespace NBC
{ {
} }
/// <summary>
/// 代码设置多语言，OnShow后和语言变化时会调用
/// </summary>
protected virtual void OnSetLanguage()
{
}
/// <summary> /// <summary>
/// 显示界面显示 /// 显示界面显示
/// </summary> /// </summary>
@@ -270,7 +283,6 @@ namespace NBC
/// </summary> /// </summary>
protected virtual void OnShowed() protected virtual void OnShowed()
{ {
} }
protected virtual void OnUpdate() protected virtual void OnUpdate()

12
Assets/Scripts/NBC/UI/Runtime/UILanguage/UIComponentLanguagePack.cs
View File

@@ -131,12 +131,12 @@ namespace NBC
curField = gtextField; curField = gtextField;
} }
if (curField != null) if (curField == null) return;
{ var textFormat = curField.textFormat;
// var textFormat = curField.textFormat; var font = Lan.GetLanFontByCurFont(textFormat.font);
// textFormat.font = Lan.GetLanFontByCurFont(textFormat.font); if (font == null) return;
// curField.textFormat = textFormat; textFormat.font = font;
} curField.textFormat = textFormat;
} }
} }
} }

3
Assets/Scripts/Old.meta
View File

@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 6f1a2150bd924a06ab285e5e5b2f7878
timeCreated: 1742647242

651
Assets/Scripts/Old/InputManager.cs
View File

@@ -1,651 +0,0 @@
// using System.Collections.Generic;
// using System.Runtime.InteropServices;
// // using Rewired;
// using UnityEngine;
// using UnityEngine.SceneManagement;
//
// public class InputManager : MonoBehaviour
// {
// public struct POINT
// {
// public int X;
//
// public int Y;
// }
//
//
// // [Tooltip("Rewired Input Manager's player used for handling player's input")]
// // private Player player;
//
// public bool IgnoreAllInput = false;
//
//
// public static bool IsMouseLeft;
// public static bool IsMouseRight;
//
//
// private bool isPaused;
//
// private float MouseX = Screen.width / 2;
//
// private float MouseY = Screen.height / 2;
//
// private float deltaMouseX;
//
// private float deltaMouseY;
//
// private float slowDownReeling;
//
// private float slowDownFloat;
//
// private bool reelUpClicked;
//
// private bool reelDownClicked;
//
//
// public static Vector2 movementAxis;
//
// public static bool isJumping;
//
// public static bool isCameraChange;
//
// public static bool isUnderwaterCamera;
//
// public static bool isUnderwaterCameraZoomUp;
//
// public static bool isUnderwaterCameraZoomDown;
//
// public static bool isUnderwaterCameraFloatZoom;
//
// public static bool LT;
//
// public static bool showUI = true;
//
//
// public static bool underwaterCameraMini;
//
// public static bool isHeadFlashLight;
//
// public static bool quickHelp;
//
// public static bool isEagleEye;
//
// public static bool isRunning;
//
// public static bool isReelReeling;
//
// public static bool isReelSpeedUp;
//
// public static bool isReelSpeedDown;
//
// public static bool isReelSpeedMax;
//
// public static bool isReelDragUp;
//
// public static bool isReelDragDown;
//
// public static bool isCastNear;
//
// public static bool isCastFar;
//
// public static bool isPullUpRod;
//
//
// public static bool isCastReset;
//
// public static bool isDeepthFloatUp;
//
// public static bool isDeepthFloatDown;
//
//
// public static bool isShowSlot0;
//
// public static bool isShowSlot1;
//
// public static bool isShowSlot2;
//
// public static bool isShowSlot3;
//
// public static bool isShowSlot4;
//
//
// public static bool RB;
//
// [DllImport("user32.dll")]
// private static extern bool SetCursorPos(int X, int Y);
//
// [DllImport("user32.dll")]
// private static extern void mouse_event(int dwFlags, int dx, int dy, int dwData, int dwExtraInfo);
//
// [DllImport("user32.dll")]
// public static extern bool GetCursorPos(out POINT lpPoint);
//
// private void Start()
// {
// player = ReInput.players.GetPlayer(0);
// MouseMap mouseMapInstance = ReInput.mapping.GetMouseMapInstance(0, 0);
// MouseMap mouseMapInstanceSavedOrDefault = ReInput.mapping.GetMouseMapInstanceSavedOrDefault(0, 0, 0);
// KeyboardMap keyboardMapInstance = ReInput.mapping.GetKeyboardMapInstance(0, 0);
// KeyboardMap keyboardMapInstanceSavedOrDefault = ReInput.mapping.GetKeyboardMapInstanceSavedOrDefault(0, 0, 0);
// int num = mouseMapInstance.ButtonMaps.Count - mouseMapInstanceSavedOrDefault.ButtonMaps.Count;
// for (int i = 0; i < num; i++)
// {
// Debug.Log("Added new map: " + mouseMapInstance.ButtonMaps[mouseMapInstance.ButtonMaps.Count - 1 - i]
// .actionDescriptiveName);
// mouseMapInstanceSavedOrDefault.ButtonMaps.Add(
// mouseMapInstance.ButtonMaps[mouseMapInstance.ButtonMaps.Count - 1 - i]);
// }
//
// num = keyboardMapInstance.ButtonMaps.Count - keyboardMapInstanceSavedOrDefault.ButtonMaps.Count;
// for (int j = 0; j < num; j++)
// {
// Debug.Log("Added new map: " + keyboardMapInstance.ButtonMaps[keyboardMapInstance.ButtonMaps.Count - 1 - j]
// .actionDescriptiveName);
// keyboardMapInstanceSavedOrDefault.ButtonMaps.Add(
// keyboardMapInstance.ButtonMaps[keyboardMapInstance.ButtonMaps.Count - 1 - j]);
// }
//
// num = mouseMapInstance.AxisMaps.Count - mouseMapInstanceSavedOrDefault.AxisMaps.Count;
// for (int k = 0; k < num; k++)
// {
// Debug.Log(mouseMapInstance.AxisMaps[mouseMapInstance.AxisMaps.Count - 1 - k].actionDescriptiveName);
// mouseMapInstanceSavedOrDefault.AxisMaps.Add(
// mouseMapInstance.ButtonMaps[mouseMapInstance.ButtonMaps.Count - 1 - k]);
// }
//
// ReInput.userDataStore?.Save();
// ReInput.userDataStore?.SavePlayerData(0);
// ReInput.userDataStore?.Load();
// }
//
// private void recheckMouseDeltaPosition()
// {
// GetCursorPos(out var lpPoint);
// deltaMouseX = Mathf.Abs((float)lpPoint.X - Input.mousePosition.x);
// deltaMouseY = Mathf.Abs((float)lpPoint.Y + (Input.mousePosition.y - (float)Screen.height));
// }
//
// public void SetCursorPositionToScreenCenter()
// {
// recheckMouseDeltaPosition();
// MouseX = Screen.width / 2;
// MouseY = Screen.height / 2;
// SetCursorPos((int)(deltaMouseX + (float)(Screen.width / 2)), (int)(deltaMouseY + (float)(Screen.height / 2)));
// }
//
// private void Update()
// {
// if (IgnoreAllInput)
// {
// return;
// }
//
// if (Input.GetMouseButtonDown(0))
// {
// IsMouseLeft = true;
// }
//
// if (Input.GetMouseButtonUp(0))
// {
// IsMouseLeft = false;
// }
//
// if (Input.GetMouseButtonDown(1))
// {
// IsMouseRight = true;
// }
//
// if (Input.GetMouseButtonUp(1))
// {
// IsMouseRight = false;
// }
//
// // if (player.GetButtonDown("PressRMB"))
// // {
// // Debug.Log("PRESSEDDDDD");
// // }
//
//
// if (player.GetButtonDown("rodPullUpButton") && CanPullUpRod())
// {
// isPullUpRod = true;
// }
//
// if (player.GetButtonUp("rodPullUpButton"))
// {
// isPullUpRod = false;
// }
//
// if (player.GetButtonDown("LT"))
// {
// LT = true;
// }
//
// if (player.GetButtonUp("LT"))
// {
// LT = false;
// }
//
// if (player.GetButtonDown("RB"))
// {
// RB = true;
// }
//
// if (player.GetButtonUp("RB"))
// {
// RB = false;
// }
//
// if (player.GetButtonDown("reelSpeedMax"))
// {
// isReelSpeedMax = true;
// // isreelSpeedMaxHold = true;
// }
// else if (player.GetButtonUp("reelSpeedMax"))
// {
// isReelSpeedMax = false;
// // isreelSpeedMaxHold = false;
// }
// else if (RB)
// {
// if (reelUpClicked)
// {
// isReelSpeedMax = true;
// }
// else
// {
// isReelSpeedMax = false;
// }
// }
//
// // if (!isreelSpeedMaxHold)
// // {
// // isReelSpeedMax = false;
// // }
//
// if (player.GetButtonDown("quickHelpKey"))
// {
// quickHelp = !quickHelp;
// }
//
//
// movementAxis = Vector2.zero;
// // if (!SRDebug.Instance.IsDebugPanelVisible)
// {
// if (Application.isFocused)
// {
// movementAxis.x = player.GetAxis("moveHorizontal") * Time.deltaTime * 500f;
// movementAxis.y = player.GetAxis("moveVertical") * Time.deltaTime * 500f;
// }
// }
//
//
// if (player.GetButtonDown("reelSpeedUp"))
// {
// reelUpClicked = true;
// }
//
// if (player.GetButtonUp("reelSpeedUp"))
// {
// isReelSpeedUp = false;
// reelUpClicked = false;
// }
//
// if (player.GetButtonDown("reelSpeedDown"))
// {
// reelDownClicked = true;
// }
//
// if (player.GetButtonUp("reelSpeedDown"))
// {
// isReelSpeedDown = false;
// reelDownClicked = false;
// }
//
// // if (FScriptsHandler.Instance != null && FScriptsHandler.Instance.m_PlayerMain.currentRod != null &&
// // (!LT || FScriptsHandler.Instance.m_PlayerMain.currentRod.rodType != 0) && !RB)
// // {
// // if (reelUpClicked)
// // {
// // if (slowDownReeling >= 1f)
// // {
// // isReelSpeedUp = true;
// // slowDownReeling = 0f;
// // }
// // else
// // {
// // isReelSpeedUp = false;
// // slowDownReeling += Time.deltaTime * 100f;
// // }
// // }
// //
// // if (reelDownClicked)
// // {
// // if (slowDownReeling >= 1f)
// // {
// // isReelSpeedDown = true;
// // slowDownReeling = 0f;
// // }
// // else
// // {
// // isReelSpeedDown = false;
// // slowDownReeling += Time.deltaTime * 100f;
// // }
// // }
// // }
//
//
// if (player.GetButtonDown("jumping"))
// {
// isJumping = true;
// }
// else
// {
// isJumping = false;
// }
//
//
//
// if (player.GetButtonDown("runKey"))
// {
// isRunning = true;
// }
//
// if (player.GetButtonUp("runKey"))
// {
// isRunning = false;
// }
//
// if (player.GetButtonDown("cameraTypeViewKey"))
// {
// isCameraChange = !isCameraChange;
// }
//
// if (player.GetButtonDown("showGUIKey"))
// {
// showUI = !showUI;
// }
//
//
// if (player.GetButtonDown("eagleEye"))
// {
// isEagleEye = true;
// }
//
// if (player.GetButtonUp("eagleEye"))
// {
// isEagleEye = false;
// }
//
// if (player.GetButtonDown("underwaterCameraKey"))
// {
// isUnderwaterCamera = !isUnderwaterCamera;
// }
//
// if (player.GetButtonDown("underwaterMiniCameraKey"))
// {
// underwaterCameraMini = !underwaterCameraMini;
// }
//
// if (player.GetButtonDown("underwaterZoomUpCameraKey"))
// {
// isUnderwaterCameraZoomUp = true;
// }
//
// if (player.GetButtonUp("underwaterZoomUpCameraKey"))
// {
// isUnderwaterCameraZoomUp = false;
// }
//
// if (player.GetButtonDown("underwaterZoomDownCameraKey"))
// {
// isUnderwaterCameraZoomDown = true;
// }
//
// if (player.GetButtonUp("underwaterZoomDownCameraKey"))
// {
// isUnderwaterCameraZoomDown = false;
// }
//
// if (player.GetButtonDown("underwaterZoomFloat"))
// {
// isUnderwaterCameraFloatZoom = true;
// }
// else
// {
// isUnderwaterCameraFloatZoom = false;
// }
//
// if (player.GetButtonDown("showSlot0"))
// {
// isShowSlot0 = true;
// Debug.LogError("showSlot0======");
// }
// else
// {
// isShowSlot0 = false;
// }
//
// if (player.GetButtonDown("showSlot1"))
// {
// isShowSlot1 = true;
// Debug.LogError("showSlot1======");
// }
// else
// {
// isShowSlot1 = false;
// }
//
// if (player.GetButtonDown("showSlot2"))
// {
// isShowSlot2 = true;
// Debug.LogError("showSlot2======");
// }
// else
// {
// isShowSlot2 = false;
// }
//
// if (player.GetButtonDown("showSlot3"))
// {
// isShowSlot3 = true;
// }
// else
// {
// isShowSlot3 = false;
// }
//
// if (player.GetButtonDown("showSlot4"))
// {
// isShowSlot4 = true;
// }
// else
// {
// isShowSlot4 = false;
// }
//
//
// // if (!isCastFar)
// // {
// // if (GameManager.Instance.currentLevelPopUp != null)
// // {
// // return;
// // }
// //
// // if (player.GetButtonDown("NearCastButton"))
// // {
// // isCastNear = true;
// // }
// // else if (player.GetButtonUp("NearCastButton") && isCastNear)
// // {
// // isCastNear = false;
// // }
// // }
// //
// // if (!isCastNear)
// // {
// // if (GameManager.Instance.currentLevelPopUp != null)
// // {
// // return;
// // }
// //
// // if (player.GetButtonDown("FarCastButton"))
// // {
// // isCastFar = true;
// // }
// // else if (player.GetButtonUp("FarCastButton") && isCastFar)
// // {
// // isCastFar = false;
// // }
// // }
// //
//
// if (player.GetButtonTimePressed("resetCast") >= 1.0)
// {
// isCastReset = true;
// }
// else
// {
// isCastReset = false;
// }
//
//
// if (player.GetButtonDown("reelDragUp"))
// {
// isReelDragUp = true;
// }
// else
// {
// isReelDragUp = false;
// }
//
// if (player.GetButtonDown("reelDragDown"))
// {
// isReelDragDown = true;
// }
// else
// {
// isReelDragDown = false;
// }
//
//
// if (player.GetButtonDown("headFlashLight"))
// {
// isHeadFlashLight = !isHeadFlashLight;
// }
//
//
// if (player.GetButtonDown("floatDeepthUp"))
// {
// isDeepthFloatUp = true;
// }
// else
// {
// isDeepthFloatUp = false;
// }
//
// if (player.GetButtonDown("floatDeepthDown"))
// {
// isDeepthFloatDown = true;
// }
// else
// {
// isDeepthFloatDown = false;
// }
//
// if (player.GetButtonDown("Reeling"))
// {
// isReelReeling = true;
// }
//
// if (player.GetButtonUp("Reeling"))
// {
// isReelReeling = false;
// }
//
// if (LT && !RB)
// {
// if (reelUpClicked)
// {
// if (slowDownFloat >= 1f)
// {
// isDeepthFloatUp = true;
// slowDownFloat = 0f;
// }
// else
// {
// isDeepthFloatUp = false;
// slowDownFloat += Time.deltaTime * 10f;
// }
// }
//
// if (reelDownClicked)
// {
// if (slowDownFloat >= 1f)
// {
// isDeepthFloatDown = true;
// slowDownFloat = 0f;
// }
// else
// {
// isDeepthFloatDown = false;
// slowDownFloat += Time.deltaTime * 10f;
// }
// }
// }
//
// }
//
// private bool CanPullUpRod()
// {
// // if (FScriptsHandler.Instance == null)
// // {
// // return false;
// // }
// //
// // if (FScriptsHandler.Instance.m_PlayerMain == null)
// // {
// // return false;
// // }
// //
// // if (FScriptsHandler.Instance.m_PlayerMain.currentRod == null)
// // {
// // return false;
// // }
// //
// // if (FScriptsHandler.Instance.m_PlayerMain.currentRod.fishingLine == null)
// // {
// // return false;
// // }
// //
// // if (FScriptsHandler.Instance.m_PlayerMain.currentRod.fishingLine.ropeToHookDistance <= 1f)
// // {
// // if (FScriptsHandler.Instance.m_PlayerMain.currentRod.currentFish != null ||
// // FScriptsHandler.Instance.m_PlayerMain.currentRod.takeFish != null)
// // {
// // return true;
// // }
// //
// // return false;
// // }
//
// return true;
// }
//
// public static void ResetMouseButtonsTriggers()
// {
// isCastNear = false;
// isCastFar = false;
// isReelReeling = false;
// }
//
// private void OnApplicationFocus(bool hasFocus)
// {
// isPaused = !hasFocus;
// }
//
// private void OnApplicationPause(bool pauseStatus)
// {
// isPaused = pauseStatus;
// }
// }

3
Assets/Scripts/Old/InputManager.cs.meta
View File

@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 06ccb0a1e4364d43bf431b652400cd31
timeCreated: 1742311542

19
Assets/Scripts/Startup/App.cs
View File

@@ -61,9 +61,27 @@ namespace NBF
private void Init() private void Init()
{ {
InitService(); InitService();
InitLanguage();
InitUI(); InitUI();
} }
#region 多语言
private void InitLanguage()
{
Lan.Inst.AddLanguageModule((int)LanguageModuleType.Text, new LanguageText());
Lan.Inst.AddLanguageModule((int)LanguageModuleType.Image, new LanguageImage());
Lan.Inst.AddLanguageModule((int)LanguageModuleType.Font, new LanguageFont());
foreach (var key in LanguageConst.languageMap.Keys)
{
Lan.Inst.AddLanguage(key);
}
UI.Inst.SetUILanguage<UILangeageConfig>();
}
#endregion
#region UI #region UI
@@ -118,6 +136,7 @@ namespace NBF
InputDef.LoadIcon(); InputDef.LoadIcon();
// UI.Inst.OpenUI<FishingShopPanel>(); // UI.Inst.OpenUI<FishingShopPanel>();
LoadData(); LoadData();
UI.Inst.OpenUI<CommonTopPanel>();
// Fishing.Inst.Go(1); // Fishing.Inst.Go(1);
// UI.Inst.OpenUI<SettingPanel>(); // UI.Inst.OpenUI<SettingPanel>();
UI.Inst.OpenUI<HomePanel>(); UI.Inst.OpenUI<HomePanel>();

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

@@ -24,6 +24,7 @@ namespace NBF
private void OnUICanceled(string action) private void OnUICanceled(string action)
{ {
if (!IsTop) return;
if (action == InputDef.UI.SubPrev) if (action == InputDef.UI.SubPrev)
{ {
} }
@@ -46,59 +47,11 @@ namespace NBF
private void UseBottomMenu() private void UseBottomMenu()
{ {
BottomMenu.OnTab += () => BottomMenu.Use(this);
{
var i = Random.Range(1, 13);
if (i < 3)
{
Notices.Success("离开晶科科技看就看");
}
else if (i < 6)
{
Notices.Warning("离开晶科科技看就看");
}
else if (i < 9)
{
Notices.Error("离开晶科科技看就看");
}
else if (i < 12)
{
Notices.Info("离开晶科科技看就看");
}
};
BottomMenu.OnBack += OnBack;
BottomMenu.OnEnter += OnApplySettings;
BottomMenu.Use();
}
private void OnApplySettings()
{
}
private void OnBack()
{
if (Settings.Instance.HaveNotAppleSettings())
{
MessageBox.Show("还有未保存的信息", (b) =>
{
if (b)
{
Hide();
}
});
}
else
{
Hide();
}
} }
protected override void OnHide() protected override void OnHide()
{ {
BottomMenu.OnBack -= OnBack;
// BottomMenu.OnTab -= OnResetSettings;
BottomMenu.OnEnter -= OnApplySettings;
BottomMenu.UnUse();
InputManager.OnUICanceled -= OnUICanceled; InputManager.OnUICanceled -= OnUICanceled;
} }

1
Assets/Scripts/UI/Binders/CommonBinder.cs
View File

@@ -11,6 +11,7 @@ namespace NBF
UIObjectFactory.SetPackageItemExtension(BottomMenu.URL, typeof(BottomMenu)); UIObjectFactory.SetPackageItemExtension(BottomMenu.URL, typeof(BottomMenu));
UIObjectFactory.SetPackageItemExtension(ClassifyList.URL, typeof(ClassifyList)); UIObjectFactory.SetPackageItemExtension(ClassifyList.URL, typeof(ClassifyList));
UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu)); UIObjectFactory.SetPackageItemExtension(CommonMenu.URL, typeof(CommonMenu));
UIObjectFactory.SetPackageItemExtension(MarqueeTag.URL, typeof(MarqueeTag));
UIObjectFactory.SetPackageItemExtension(BtnTextInputControl.URL, typeof(BtnTextInputControl)); UIObjectFactory.SetPackageItemExtension(BtnTextInputControl.URL, typeof(BtnTextInputControl));
UIObjectFactory.SetPackageItemExtension(BtnTitleInputControl.URL, typeof(BtnTitleInputControl)); UIObjectFactory.SetPackageItemExtension(BtnTitleInputControl.URL, typeof(BtnTitleInputControl));
UIObjectFactory.SetPackageItemExtension(NoticeItem.URL, typeof(NoticeItem)); UIObjectFactory.SetPackageItemExtension(NoticeItem.URL, typeof(NoticeItem));

1
Assets/Scripts/UI/Binders/MainBinder.cs
View File

@@ -13,6 +13,7 @@ namespace NBF
UIObjectFactory.SetPackageItemExtension(HomeMainPage.URL, typeof(HomeMainPage)); UIObjectFactory.SetPackageItemExtension(HomeMainPage.URL, typeof(HomeMainPage));
UIObjectFactory.SetPackageItemExtension(HomeActivityPage.URL, typeof(HomeActivityPage)); UIObjectFactory.SetPackageItemExtension(HomeActivityPage.URL, typeof(HomeActivityPage));
UIObjectFactory.SetPackageItemExtension(HomeRankPage.URL, typeof(HomeRankPage)); UIObjectFactory.SetPackageItemExtension(HomeRankPage.URL, typeof(HomeRankPage));
UIObjectFactory.SetPackageItemExtension(HomeStatisticsPage.URL, typeof(HomeStatisticsPage));
UIObjectFactory.SetPackageItemExtension(HomeButtonGroups.URL, typeof(HomeButtonGroups)); UIObjectFactory.SetPackageItemExtension(HomeButtonGroups.URL, typeof(HomeButtonGroups));
} }
} }

0
Assets/Scripts/UI/BtnTextInputControl.Designer.cs → Assets/Scripts/UI/Common/BtnTextInputControl.Designer.cs generated
View File

0
Assets/Scripts/UI/BtnTextInputControl.Designer.cs.meta → Assets/Scripts/UI/Common/BtnTextInputControl.Designer.cs.meta
View File

0
Assets/Scripts/UI/BtnTextInputControl.cs → Assets/Scripts/UI/Common/BtnTextInputControl.cs
View File

0
Assets/Scripts/UI/BtnTextInputControl.cs.meta → Assets/Scripts/UI/Common/BtnTextInputControl.cs.meta
View File

27
Assets/Scripts/UI/Common/MarqueeTag.Designer.cs generated Normal file
View File

@@ -0,0 +1,27 @@
/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
using FairyGUI;
using FairyGUI.Utils;
using NBC;
namespace NBF
{
public partial class MarqueeTag
{
public const string URL = "ui://6hgkvlaulvqll9";
public GRichTextField TextContent1;
public GRichTextField TextContent2;
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
TextContent1 = (GRichTextField)GetChild("TextContent1");
TextContent2 = (GRichTextField)GetChild("TextContent2");
OnInited();
UILanguage.TrySetComponentLanguage(this);
}
}
}

2
Assets/Scripts/UI/Common/MarqueeTag.Designer.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 6a9cfe2c247599a4aacfea389e45ce14

15
Assets/Scripts/UI/Common/MarqueeTag.cs Normal file
View File

@@ -0,0 +1,15 @@
// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖
using UnityEngine;
using FairyGUI;
using NBC;
namespace NBF
{
public partial class MarqueeTag : GComponent
{
private void OnInited()
{
}
}
}

2
Assets/Scripts/UI/Common/MarqueeTag.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 70a1e1d821a7bc24e8eac7cc9bbf074b

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

@@ -9,10 +9,7 @@ namespace NBF
{ {
public partial class BottomMenu : GComponent public partial class BottomMenu : GComponent
{ {
public event Action OnBack; private IUIPanel _panel;
public event Action OnEnter;
public event Action OnTab;
public event Action OnUse;
private void OnInited() private void OnInited()
{ {
@@ -26,27 +23,18 @@ namespace NBF
item.OnAction?.Invoke(); item.OnAction?.Invoke();
} }
public void UnUse() public void Use(IUIPanel panel)
{
OnBack = null;
OnEnter = null;
OnTab = null;
OnUse = null;
InputManager.OnUICanceled -= OnAction;
}
public void Use()
{ {
_panel = panel;
List.RemoveChildrenToPool(); List.RemoveChildrenToPool();
LeftList.RemoveChildrenToPool(); LeftList.RemoveChildrenToPool();
InputManager.OnUICanceled += OnAction; InputManager.OnUICanceled += OnAction;
AddButtonItem(OnUse, ""); // AddButtonItem(OnUse, "");
AddButtonItem(OnTab, InputDef.UI.Tab); // AddButtonItem(OnTab, InputDef.UI.Tab);
AddButtonItem(OnEnter, InputDef.UI.Enter); // AddButtonItem(OnEnter, InputDef.UI.Enter);
AddButtonItem(OnBack, InputDef.UI.Back); // AddButtonItem(OnBack, InputDef.UI.Back);
} }
private void AddButtonItem(Action action, string actionName) private void AddButtonItem(Action action, string actionName)
@@ -63,6 +51,7 @@ namespace NBF
private void OnAction(string action) private void OnAction(string action)
{ {
if (_panel == null || !_panel.IsShowing || !_panel.IsTop) return;
var children = List.GetChildren(); var children = List.GetChildren();
foreach (var child in children) foreach (var child in children)
{ {

3
Assets/Scripts/UI/Common/Panel.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 059888fe216d4a789f01c3289be01645
timeCreated: 1748933992

20
Assets/Scripts/UI/Common/Panel/CommonTopPanel.Designer.cs generated Normal file
View File

@@ -0,0 +1,20 @@
/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
using FairyGUI;
using FairyGUI.Utils;
using NBC;
using System.Collections.Generic;
namespace NBF
{
/// <summary> </summary>
public partial class CommonTopPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
[AutoFind(Name = "Marquee")]
public MarqueeTag Marquee;
public override string[] GetDependPackages(){ return new string[] {}; }
}
}

2
Assets/Scripts/UI/Common/Panel/CommonTopPanel.Designer.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: bbb8f680eb100a84c957fad39fae2e96

49
Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs Normal file
View File

@@ -0,0 +1,49 @@
// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖
using UnityEngine;
using NBC;
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;
}
protected override void OnShow()
{
InputManager.OnUICanceled += OnUICanceled;
}
private void OnUICanceled(string action)
{
if (action == InputDef.UI.Back)
{
var uis = UI.Inst.GetAllUI();
foreach (var ui in uis)
{
if (ui.ContentPane.sortingOrder > 0) continue;
if (ui.IsTop && !IsDontBack)
{
ui.Hide();
}
}
}
}
protected override void OnHide()
{
InputManager.OnUICanceled -= OnUICanceled;
}
protected override void OnDestroy()
{
base.OnDestroy();
}
}
}

2
Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: b07b25d31dce1224e913094a95196cbb

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

0
Assets/Scripts/UI/Common/GMPanel.Designer.cs.meta → Assets/Scripts/UI/Common/Panel/GMPanel.Designer.cs.meta
View File

0
Assets/Scripts/UI/Common/GMPanel.cs → Assets/Scripts/UI/Common/Panel/GMPanel.cs
View File

0
Assets/Scripts/UI/Common/GMPanel.cs.meta → Assets/Scripts/UI/Common/Panel/GMPanel.cs.meta
View File

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

0
Assets/Scripts/UI/Common/MessageBox.Designer.cs.meta → Assets/Scripts/UI/Common/Panel/MessageBox.Designer.cs.meta
View File

1
Assets/Scripts/UI/Common/MessageBox.cs → Assets/Scripts/UI/Common/Panel/MessageBox.cs
View File

@@ -53,6 +53,7 @@ namespace NBF
ShowAnim = UIPanelAnimation.GetCenterScaleBig(this); ShowAnim = UIPanelAnimation.GetCenterScaleBig(this);
HideAnim = UIPanelAnimation.GetCenterScaleBig(this, true); HideAnim = UIPanelAnimation.GetCenterScaleBig(this, true);
IsModal = true; IsModal = true;
IsDontBack = true;
} }
protected override void OnShow() protected override void OnShow()

0
Assets/Scripts/UI/Common/MessageBox.cs.meta → Assets/Scripts/UI/Common/Panel/MessageBox.cs.meta
View File

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

0
Assets/Scripts/UI/Common/Notices.Designer.cs.meta → Assets/Scripts/UI/Common/Panel/Notices.Designer.cs.meta
View File

0
Assets/Scripts/UI/Common/Notices.cs → Assets/Scripts/UI/Common/Panel/Notices.cs
View File

0
Assets/Scripts/UI/Common/Notices.cs.meta → Assets/Scripts/UI/Common/Panel/Notices.cs.meta
View File

0
Assets/Scripts/UI/UILangeageConfig.cs → Assets/Scripts/UI/Common/UILangeageConfig.cs
View File

0
Assets/Scripts/UI/UILangeageConfig.cs.meta → Assets/Scripts/UI/Common/UILangeageConfig.cs.meta
View File

3
Assets/Scripts/UI/FishBag.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4021be5a688e4880815366add9c9e2fd
timeCreated: 1748941707

22
Assets/Scripts/UI/FishBag/FishBagPanel.Designer.cs generated Normal file
View File

@@ -0,0 +1,22 @@
/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
using FairyGUI;
using FairyGUI.Utils;
using NBC;
using System.Collections.Generic;
namespace NBF
{
/// <summary> </summary>
public partial class FishBagPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "BottomMenu")]
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
}
}

2
Assets/Scripts/UI/FishBag/FishBagPanel.Designer.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 55a42f040765e1948898ff81902abff4

33
Assets/Scripts/UI/FishBag/FishBagPanel.cs Normal file
View File

@@ -0,0 +1,33 @@
// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖
using UnityEngine;
using NBC;
namespace NBF
{
public partial class FishBagPanel : UIPanel
{
public override string UIPackName => "Main";
public override string UIResName => "FishBagPanel";
protected override void OnInit()
{
base.OnInit();
}
protected override void OnShow()
{
base.OnShow();
}
protected override void OnHide()
{
base.OnHide();
}
protected override void OnDestroy()
{
base.OnDestroy();
}
}
}

2
Assets/Scripts/UI/FishBag/FishBagPanel.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 6de4d8117b1b09340b4d11dd47e74b32

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

@@ -14,6 +14,7 @@ namespace NBF
protected override void OnInit() protected override void OnInit()
{ {
IsShowCursor = false; IsShowCursor = false;
IsDontBack = true;
} }
protected override void OnShow() protected override void OnShow()

0
Assets/Scripts/UI/FishingPower.Designer.cs → Assets/Scripts/UI/Fishing/FishingPower.Designer.cs generated
View File

0
Assets/Scripts/UI/FishingPower.Designer.cs.meta → Assets/Scripts/UI/Fishing/FishingPower.Designer.cs.meta
View File

0
Assets/Scripts/UI/FishingPower.cs → Assets/Scripts/UI/Fishing/FishingPower.cs
View File

0
Assets/Scripts/UI/FishingPower.cs.meta → Assets/Scripts/UI/Fishing/FishingPower.cs.meta
View File

0
Assets/Scripts/UI/FishingStateInfo.Designer.cs → Assets/Scripts/UI/Fishing/FishingStateInfo.Designer.cs generated
View File

0
Assets/Scripts/UI/FishingStateInfo.Designer.cs.meta → Assets/Scripts/UI/Fishing/FishingStateInfo.Designer.cs.meta
View File

0
Assets/Scripts/UI/FishingStateInfo.cs → Assets/Scripts/UI/Fishing/FishingStateInfo.cs
View File

0
Assets/Scripts/UI/FishingStateInfo.cs.meta → Assets/Scripts/UI/Fishing/FishingStateInfo.cs.meta
View File

16
Assets/Scripts/UI/Home/Com/HomeButtonGroups.Designer.cs generated
View File

@@ -11,13 +11,13 @@ namespace NBF
{ {
public const string URL = "ui://hxr7rc7plvqln"; public const string URL = "ui://hxr7rc7plvqln";
public GButton BtnMap; public GButton BtnGo;
public GButton BtnMessage; public GButton BtnMake;
public GButton BtnExit; public GButton BtnExit;
public GButton BtnSettings; public GButton BtnSettings;
public GButton BtnStatistics; public GButton BtnFishBag;
public GButton BtnBag; public GButton BtnBag;
public GButton BtnSkill; public GButton BtnMap;
public GButton BtnPass; public GButton BtnPass;
public GButton BtnMission; public GButton BtnMission;
public GButton BtnTournament; public GButton BtnTournament;
@@ -26,13 +26,13 @@ namespace NBF
{ {
base.ConstructFromXML(xml); base.ConstructFromXML(xml);
BtnMap = (GButton)GetChild("BtnMap"); BtnGo = (GButton)GetChild("BtnGo");
BtnMessage = (GButton)GetChild("BtnMessage"); BtnMake = (GButton)GetChild("BtnMake");
BtnExit = (GButton)GetChild("BtnExit"); BtnExit = (GButton)GetChild("BtnExit");
BtnSettings = (GButton)GetChild("BtnSettings"); BtnSettings = (GButton)GetChild("BtnSettings");
BtnStatistics = (GButton)GetChild("BtnStatistics"); BtnFishBag = (GButton)GetChild("BtnFishBag");
BtnBag = (GButton)GetChild("BtnBag"); BtnBag = (GButton)GetChild("BtnBag");
BtnSkill = (GButton)GetChild("BtnSkill"); BtnMap = (GButton)GetChild("BtnMap");
BtnPass = (GButton)GetChild("BtnPass"); BtnPass = (GButton)GetChild("BtnPass");
BtnMission = (GButton)GetChild("BtnMission"); BtnMission = (GButton)GetChild("BtnMission");
BtnTournament = (GButton)GetChild("BtnTournament"); BtnTournament = (GButton)GetChild("BtnTournament");

14
Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs
View File

@@ -17,7 +17,7 @@ namespace NBF
{ {
if (btn == BtnExit) if (btn == BtnExit)
{ {
MessageBox.Show("确定推出到桌面吗？", (b) => MessageBox.Show("确定退出吗？", (b) =>
{ {
if (b) Application.Quit(); if (b) Application.Quit();
}); });
@@ -30,6 +30,18 @@ namespace NBF
{ {
UI.Inst.OpenUI<BagPanel>(); UI.Inst.OpenUI<BagPanel>();
} }
else if (btn == BtnFishBag)
{
UI.Inst.OpenUI<FishBagPanel>();
}
else if (btn == BtnMake)
{
UI.Inst.OpenUI<MakePanel>();
}
else if (btn == BtnMap)
{
UI.Inst.OpenUI<MapPanel>();
}
} }
} }
} }

2
Assets/Scripts/UI/Home/HomePanel.cs
View File

@@ -56,7 +56,7 @@ namespace NBF
var nowPage = GetPage(index); var nowPage = GetPage(index);
if (nowPage != null) if (nowPage != null)
{ {
nowPage.Show(); nowPage.Show(this);
_currentPage = nowPage; _currentPage = nowPage;
} }
} }

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

@@ -1,15 +1,11 @@
// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖 // 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖
using System.Collections.Generic;
using UnityEngine;
using FairyGUI;
using NBC; using NBC;
namespace NBF namespace NBF
{ {
public partial class HomeMainPage : HomePageBase public partial class HomeMainPage : HomePageBase
{ {
private void OnInited() private void OnInited()
{ {
} }
@@ -22,15 +18,12 @@ namespace NBF
protected override void OnHide() protected override void OnHide()
{ {
BottomMenu.OnBack -= OnBack;
BottomMenu.OnEnter -= OnApplySettings;
BottomMenu.UnUse();
InputManager.OnUICanceled -= OnUICanceled; InputManager.OnUICanceled -= OnUICanceled;
} }
private void OnUICanceled(string action) private void OnUICanceled(string action)
{ {
if (!Panel.IsTop) return;
if (action == InputDef.UI.SubPrev) if (action == InputDef.UI.SubPrev)
{ {
} }
@@ -47,18 +40,7 @@ namespace NBF
private void UseBottomMenu() private void UseBottomMenu()
{ {
BottomMenu.OnBack += OnBack; BottomMenu.Use(Panel);
BottomMenu.OnEnter += OnApplySettings;
BottomMenu.Use();
}
private void OnApplySettings()
{
}
private void OnBack()
{
UI.Inst.HideUI<HomePanel>();
} }
} }
} }

10
Assets/Scripts/UI/Home/Pages/HomePageBase.cs
View File

@@ -6,8 +6,11 @@ namespace NBF
{ {
public int Page; public int Page;
public void Show() public HomePanel Panel;
public void Show(HomePanel panel)
{ {
Panel = panel;
ShowAnimation(); ShowAnimation();
OnShow(); OnShow();
} }
@@ -34,10 +37,7 @@ namespace NBF
private void HideAnimation() private void HideAnimation()
{ {
GTween.Kill(this); GTween.Kill(this);
TweenFade(0, 0.2f).OnComplete(() => TweenFade(0, 0.2f).OnComplete(() => { visible = false; });
{
visible = false;
});
} }
#endregion #endregion

25
Assets/Scripts/UI/Home/Pages/HomeStatisticsPage.Designer.cs generated Normal file
View File

@@ -0,0 +1,25 @@
/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
using FairyGUI;
using FairyGUI.Utils;
using NBC;
namespace NBF
{
public partial class HomeStatisticsPage
{
public const string URL = "ui://hxr7rc7plvql13";
public BottomMenu BottomMenu;
public override void ConstructFromXML(XML xml)
{
base.ConstructFromXML(xml);
BottomMenu = (BottomMenu)GetChild("BottomMenu");
OnInited();
UILanguage.TrySetComponentLanguage(this);
}
}
}

2
Assets/Scripts/UI/Home/Pages/HomeStatisticsPage.Designer.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 06d572bce2eeaf24d8a2d235976dc02c

15
Assets/Scripts/UI/Home/Pages/HomeStatisticsPage.cs Normal file
View File

@@ -0,0 +1,15 @@
// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖
using UnityEngine;
using FairyGUI;
using NBC;
namespace NBF
{
public partial class HomeStatisticsPage : GComponent
{
private void OnInited()
{
}
}
}

2
Assets/Scripts/UI/Home/Pages/HomeStatisticsPage.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 1b12895a3e4e7fb4287cbf7a026d7887

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

@@ -26,7 +26,7 @@ namespace NBF
protected override void OnInit() protected override void OnInit()
{ {
base.OnInit(); ContentPane.sortingOrder = UIDef.UIOrder.Loading;
} }
protected override void OnShow() protected override void OnShow()

3
Assets/Scripts/UI/Make.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 40364b7c47864017827ec33f9d7333b1
timeCreated: 1748941666

24
Assets/Scripts/UI/Make/MakePanel.Designer.cs generated Normal file
View File

@@ -0,0 +1,24 @@
/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
using FairyGUI;
using FairyGUI.Utils;
using NBC;
using System.Collections.Generic;
namespace NBF
{
/// <summary> </summary>
public partial class MakePanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "Menu")]
public CommonMenu Menu;
[AutoFind(Name = "BottomMenu")]
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
}
}

2
Assets/Scripts/UI/Make/MakePanel.Designer.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 0325840d66749994ca0ba6436eaef4aa

33
Assets/Scripts/UI/Make/MakePanel.cs Normal file
View File

@@ -0,0 +1,33 @@
// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖
using UnityEngine;
using NBC;
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();
}
}
}

2
Assets/Scripts/UI/Make/MakePanel.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 12d3dad5e220cfd47907482e50d15e13

22
Assets/Scripts/UI/MapPanel.Designer.cs generated Normal file
View File

@@ -0,0 +1,22 @@
/**本脚本为自动生成，每次生成会覆盖！请勿手动修改，生成插件文档及项目地址：https://git.whoot.com/whoot-games/whoot.fguieditorplugin**/
using FairyGUI;
using FairyGUI.Utils;
using NBC;
using System.Collections.Generic;
namespace NBF
{
/// <summary> </summary>
public partial class MapPanel
{
public GObject this[string aKey] => ContentPane.GetChild(aKey);
[AutoFind(Name = "back")]
public GImage back;
[AutoFind(Name = "BottomMenu")]
public BottomMenu BottomMenu;
public override string[] GetDependPackages(){ return new string[] {"Common"}; }
}
}

2
Assets/Scripts/UI/MapPanel.Designer.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e4254804b3cc16d44bcafcd96139ab90

33
Assets/Scripts/UI/MapPanel.cs Normal file
View File

@@ -0,0 +1,33 @@
// 本脚本只在不存在时会生成一次。已存在不会再次生成覆盖
using UnityEngine;
using NBC;
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();
}
}
}

2
Assets/Scripts/UI/MapPanel.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 69a29998a66d1ec4cb15ebb8e5de9cb6

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

@@ -21,6 +21,7 @@ namespace NBF
{ {
base.OnInit(); base.OnInit();
IsShowCursor = true; IsShowCursor = true;
IsDontBack = true;
var groupNames = Settings.Instance.GetAllGroups(); var groupNames = Settings.Instance.GetAllGroups();
foreach (var group in groupNames) foreach (var group in groupNames)
@@ -73,29 +74,7 @@ namespace NBF
private void UseBottomMenu() private void UseBottomMenu()
{ {
BottomMenu.OnTab += () => BottomMenu.Use(this);
{
var i = Random.Range(1, 13);
if (i < 3)
{
Notices.Success("离开晶科科技看就看");
}
else if (i < 6)
{
Notices.Warning("离开晶科科技看就看");
}
else if (i < 9)
{
Notices.Error("离开晶科科技看就看");
}
else if (i < 12)
{
Notices.Info("离开晶科科技看就看");
}
};
BottomMenu.OnBack += OnBack;
BottomMenu.OnEnter += OnApplySettings;
BottomMenu.Use();
} }
private void OnApplySettings() private void OnApplySettings()
@@ -149,6 +128,14 @@ namespace NBF
SetListSelected(List.selectedIndex + 1); SetListSelected(List.selectedIndex + 1);
} }
} }
else if (action == InputDef.UI.Back)
{
OnBack();
}
else if (action == InputDef.UI.Enter)
{
OnApplySettings();
}
} }
private void SetListSelected(int selectedIndex) private void SetListSelected(int selectedIndex)
@@ -181,7 +168,6 @@ namespace NBF
private void OnBack() private void OnBack()
{ {
if (Settings.Instance.HaveNotAppleSettings()) if (Settings.Instance.HaveNotAppleSettings())
{ {
MessageBox.Show("还有未保存的信息", (b) => MessageBox.Show("还有未保存的信息", (b) =>
@@ -201,10 +187,6 @@ namespace NBF
protected override void OnHide() protected override void OnHide()
{ {
base.OnHide(); base.OnHide();
BottomMenu.OnBack -= OnBack;
BottomMenu.OnTab -= OnResetSettings;
BottomMenu.OnEnter -= OnApplySettings;
BottomMenu.UnUse();
InputManager.OnUICanceled -= OnUICanceled; InputManager.OnUICanceled -= OnUICanceled;
} }

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

@@ -47,9 +47,7 @@ namespace NBF
private void UseBottomMenu() private void UseBottomMenu()
{ {
BottomMenu.OnBack += Hide; BottomMenu.Use(this);
BottomMenu.Use();
} }
@@ -81,12 +79,6 @@ namespace NBF
// } // }
} }
protected override void OnHide()
{
base.OnHide();
BottomMenu.UnUse();
}
protected override void OnDestroy() protected override void OnDestroy()
{ {
base.OnDestroy(); base.OnDestroy();

7
Assets/Scripts/Utils/Extends/UIInputExtensions.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace NBF
{
public static class UIInputExtensions
{
}
}

3
Assets/Scripts/Utils/Extends/UIInputExtensions.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e9bfb9f042814fb787428551c801aada
timeCreated: 1748944711

30
Assets/Scripts/Utils/Reflection.cs
View File

@@ -36,5 +36,35 @@ namespace NBF
return derivedTypes; return derivedTypes;
} }
/// <summary>
/// 获取所有标记指定特性的方法
/// </summary>
/// <param name="classType">查找类</param>
/// <param name="attributeType">特性类</param>
/// <returns></returns>
public static List<MethodInfo> GetMethodsWithUIInputAttribute(Type classType, Type attributeType)
{
List<MethodInfo> methodsWithAttribute = new List<MethodInfo>();
if (classType == null)
{
return methodsWithAttribute;
}
// 获取所有方法，包括公共、非公共、实例和静态方法
MethodInfo[] allMethods = classType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic);
foreach (MethodInfo method in allMethods)
{
if (method.GetCustomAttributes(attributeType, false).Length > 0)
{
methodsWithAttribute.Add(method);
}
}
return methodsWithAttribute;
}
} }
} }

8
FGUIProject/assets/Common/Com/MarqueeTag.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="988,46">
<displayList>
<image id="n0_lvql" name="n0" src="kryob" fileName="Images/Square.png" xy="0,0" size="988,46" alpha="0.6" color="#000000"/>
<richtext id="n1_lvql" name="TextContent1" xy="17,8" size="107,30" fontSize="21" color="#ffffff" text="跑马灯内容"/>
<richtext id="n2_lvql" name="TextContent2" xy="447,8" size="107,30" fontSize="21" color="#ffffff" text="跑马灯内容"/>
</displayList>
</component>

8
FGUIProject/assets/Common/Panel/CommonTopPanel.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1920,1080" opaque="false">
<displayList>
<component id="n0_lvql" name="Marquee" src="lvqll9" fileName="Com/MarqueeTag.xml" xy="466,183" visible="false">
<relation target="" sidePair="center-center,top-top"/>
</component>
</displayList>
</component>

2
FGUIProject/assets/Common/package.xml
View File

@@ -192,6 +192,8 @@
<image id="nmzbl6" name="LDR_LLL1_0.png" path="/Images/bluenoise64/" exported="true" scale="tile" scale9grid="0,0,64,64"/> <image id="nmzbl6" name="LDR_LLL1_0.png" path="/Images/bluenoise64/" exported="true" scale="tile" scale9grid="0,0,64,64"/>
<component id="tmu81h" name="WeatherInfo.xml" path="/Com/" exported="true"/> <component id="tmu81h" name="WeatherInfo.xml" path="/Com/" exported="true"/>
<component id="lvqll7" name="CommonContainer.xml" path="/Com/" exported="true"/> <component id="lvqll7" name="CommonContainer.xml" path="/Com/" exported="true"/>
<component id="lvqll8" name="CommonTopPanel.xml" path="/Panel/" exported="true"/>
<component id="lvqll9" name="MarqueeTag.xml" path="/Com/" exported="true"/>
</resources> </resources>
<publish name="" path="../Assets/Resources/Fgui/Common" packageCount="2" genCode="true"/> <publish name="" path="../Assets/Resources/Fgui/Common" packageCount="2" genCode="true"/>
</packageDescription> </packageDescription>

3
FGUIProject/assets/Main/Com/Home/BtnHomeMap.xml
View File

@@ -6,9 +6,10 @@
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</loader> </loader>
<image id="n22_lvql" name="n22" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,0" size="732,370" color="#34a7de"> <image id="n22_lvql" name="n22" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,0" size="732,370" color="#34a7de">
<gearDisplay controller="button" pages="3,5"/>
<gearColor controller="button" pages="4" values="#34a7de" default="#4297be"/> <gearColor controller="button" pages="4" values="#34a7de" default="#4297be"/>
</image> </image>
<component id="n23_lvql" name="Weather" src="tmu81h" fileName="Com/WeatherInfo.xml" pkg="6hgkvlau" xy="4,4"/> <component id="n23_lvql" name="Weather" src="tmu81h" fileName="Com/WeatherInfo.xml" pkg="6hgkvlau" xy="4,4"/>
</displayList> </displayList>
<Button/> <Button mode="Radio"/>
</component> </component>

6
FGUIProject/assets/Main/Com/Home/BtnHomeMedium.xml
View File

@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="410,242" extention="Button"> <component size="410,242" extention="Button">
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
<displayList> <displayList>
<graph id="n33_lvql" name="back" xy="0,0" size="410,242" type="rect" lineSize="0" lineColor="#ff4297be" fillColor="#cc0e0f11"> <graph id="n33_lvql" name="back" xy="0,0" size="410,242" type="rect" lineSize="0" lineColor="#ff4297be" fillColor="#cc0e0f11">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</graph> </graph>
<image id="n36_lvql" name="n36" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,-1" size="410,242" color="#34a7de">
<gearDisplay controller="button" pages="3,5"/>
</image>
<text id="n34_lvql" name="title" xy="180,104" size="49,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" text="title"/> <text id="n34_lvql" name="title" xy="180,104" size="49,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" text="title"/>
</displayList> </displayList>
<Button/> <Button mode="Radio"/>
</component> </component>

11
FGUIProject/assets/Main/Com/Home/BtnHomeSmall.xml
View File

@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="356,112" pivot="0.5,0.5" extention="Button"> <component size="356,112" pivot="0.5,0.5" extention="Button">
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="1"/> <controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
<displayList> <displayList>
<image id="n36_lvql" name="n36" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="356,112" alpha="0.8" color="#0e0f11"/> <image id="n36_lvql" name="n36" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="356,112" alpha="0.8" color="#0e0f11"/>
<image id="n37_lvql" name="overBack" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="356,112" color="#34a7de">
<gearDisplay controller="button" pages="3,4,5"/>
<gearColor controller="button" pages="3,5" values="#34a7de|#34a7de" default="#4297be"/>
</image>
<loader id="n33_lvql" name="icon" xy="253,11" size="90,90" alpha="0.7" url="ui://hxr7rc7plvqlr" align="center" vAlign="middle" fill="scale"/> <loader id="n33_lvql" name="icon" xy="253,11" size="90,90" alpha="0.7" url="ui://hxr7rc7plvqlr" align="center" vAlign="middle" fill="scale"/>
<text id="n34_lvql" name="title" xy="16,17" size="217,73" alpha="0.7" fontSize="25" color="#ffffff" vAlign="middle" autoSize="none" text="设置"/> <text id="n34_lvql" name="title" xy="16,17" size="217,73" alpha="0.7" fontSize="25" color="#ffffff" vAlign="middle" autoSize="none" text="设置"/>
<image id="n38_lvql" name="n38" src="r03uiv" fileName="Images/Shapes/Square/Square - Stroke 2px.png" pkg="6hgkvlau" xy="0,0" size="356,112" color="#34a7de">
<gearDisplay controller="button" pages="3,5"/>
</image>
</displayList> </displayList>
<Button/> <Button mode="Radio"/>
</component> </component>

14
FGUIProject/assets/Main/Com/Home/HomeButtonGroups.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1162,766"> <component size="1162,766">
<displayList> <displayList>
<component id="n20_nmzb" name="BtnMap" src="lvqlq" fileName="Com/Home/BtnHomeMap.xml" xy="0,0"/> <component id="n20_nmzb" name="BtnGo" src="lvqlq" fileName="Com/Home/BtnHomeMap.xml" xy="0,0"/>
<component id="n19_nmzb" name="BtnMessage" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="0,522" size="356,112"> <component id="n19_nmzb" name="BtnMake" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="0,522" size="356,112">
<Button title="消息" icon="ui://hxr7rc7plvqlv"/> <Button title="制作" icon="ui://hxr7rc7plvqlv"/>
</component> </component>
<component id="n27_nmzb" name="BtnExit" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="0,654" size="356,112"> <component id="n27_nmzb" name="BtnExit" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="0,654" size="356,112">
<Button title="退出" icon="ui://hxr7rc7plvqls"/> <Button title="退出" icon="ui://hxr7rc7plvqls"/>
@@ -11,14 +11,14 @@
<component id="n28_nmzb" name="BtnSettings" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="376,654" size="356,112"> <component id="n28_nmzb" name="BtnSettings" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="376,654" size="356,112">
<Button title="设置" icon="ui://hxr7rc7plvqlr"/> <Button title="设置" icon="ui://hxr7rc7plvqlr"/>
</component> </component>
<component id="n21_nmzb" name="BtnStatistics" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="376,522" size="356,112"> <component id="n21_nmzb" name="BtnFishBag" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="376,522" size="356,112">
<Button title="统计" icon="ui://hxr7rc7plvqlw"/> <Button title="鱼护" icon="ui://hxr7rc7plvqlw"/>
</component> </component>
<component id="n22_nmzb" name="BtnBag" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="0,390" size="356,112"> <component id="n22_nmzb" name="BtnBag" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="0,390" size="356,112">
<Button title="背包" icon="ui://hxr7rc7plvqly"/> <Button title="背包" icon="ui://hxr7rc7plvqly"/>
</component> </component>
<component id="n23_nmzb" name="BtnSkill" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="376,390" size="356,112"> <component id="n23_nmzb" name="BtnMap" src="lvqlo" fileName="Com/Home/BtnHomeSmall.xml" xy="376,390" size="356,112">
<Button title="能力" icon="ui://hxr7rc7plvqlx"/> <Button title="地图" icon="ui://hxr7rc7plvqlx"/>
</component> </component>
<component id="n24_nmzb" name="BtnPass" src="lvqlp" fileName="Com/Home/BtnHomeMedium.xml" xy="752,0" size="410,242"> <component id="n24_nmzb" name="BtnPass" src="lvqlp" fileName="Com/Home/BtnHomeMedium.xml" xy="752,0" size="410,242">
<Button title="通行证"/> <Button title="通行证"/>

9
FGUIProject/assets/Main/Com/Home/Pages/HomeStatisticsPage.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1920,1080">
<displayList>
<component id="n1_lvql" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="0,992">
<relation target="" sidePair="center-center,bottom-bottom"/>
</component>
<text id="n2_lvql" name="n2" xy="237,428" size="111,35" fontSize="25" color="#ffffff" text="Statistics"/>
</displayList>
</component>

11
FGUIProject/assets/Main/FishBagPanel.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1920,1080">
<displayList>
<image id="n0_lvql" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" color="#182128">
<relation target="" sidePair="width-width,height-height"/>
</image>
<component id="n2_lvql" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="0,992" size="1920,88">
<relation target="" sidePair="width-width,center-center,bottom-bottom"/>
</component>
</displayList>
</component>

14
FGUIProject/assets/Main/MakePanel.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1920,1080">
<displayList>
<image id="n0_lvql" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" color="#182128">
<relation target="" sidePair="width-width,height-height"/>
</image>
<component id="n1_lvql" name="Menu" src="fcfggr" fileName="Com/Menu/CommonMenu.xml" pkg="6hgkvlau" xy="0,0">
<relation target="" sidePair="width-width,center-center,top-top"/>
</component>
<component id="n2_lvql" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="0,992" size="1920,88">
<relation target="" sidePair="width-width,center-center,bottom-bottom"/>
</component>
</displayList>
</component>

11
FGUIProject/assets/Main/MapPanel.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="1920,1080">
<displayList>
<image id="n0_lvql" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="1920,1080" color="#182128">
<relation target="" sidePair="width-width,height-height"/>
</image>
<component id="n2_lvql" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="0,992" size="1920,88">
<relation target="" sidePair="width-width,center-center,bottom-bottom"/>
</component>
</displayList>
</component>

4
FGUIProject/assets/Main/package.xml
View File

@@ -37,6 +37,10 @@
<component id="lvql10" name="HomeMainPage.xml" path="/Com/Home/Pages/" exported="true"/> <component id="lvql10" name="HomeMainPage.xml" path="/Com/Home/Pages/" exported="true"/>
<component id="lvql11" name="HomeActivityPage.xml" path="/Com/Home/Pages/" exported="true"/> <component id="lvql11" name="HomeActivityPage.xml" path="/Com/Home/Pages/" exported="true"/>
<component id="lvql12" name="HomeRankPage.xml" path="/Com/Home/Pages/" exported="true"/> <component id="lvql12" name="HomeRankPage.xml" path="/Com/Home/Pages/" exported="true"/>
<component id="lvql13" name="HomeStatisticsPage.xml" path="/Com/Home/Pages/" exported="true"/>
<component id="lvql14" name="FishBagPanel.xml" path="/" exported="true"/>
<component id="lvql15" name="MakePanel.xml" path="/" exported="true"/>
<component id="lvql16" name="MapPanel.xml" path="/" exported="true"/>
</resources> </resources>
<publish name="" path="../Assets/Resources/Fgui/Main" packageCount="2" genCode="true"/> <publish name="" path="../Assets/Resources/Fgui/Main" packageCount="2" genCode="true"/>
</packageDescription> </packageDescription>

1
FGUIProject/settings/whoot/6hgkvlaulvqll8.json Normal file
View File

@@ -0,0 +1 @@
{"url":"ui://6hgkvlaulvqll8","name":"CommonTopPanel","scriptType":"panel","isCustomName":false,"customName":"","annotation":"","member":{}}

1
FGUIProject/settings/whoot/6hgkvlaulvqll9.json Normal file
View File

@@ -0,0 +1 @@
{"url":"ui://6hgkvlaulvqll9","name":"MarqueeTag","scriptType":"component","isCustomName":false,"customName":"","annotation":"","member":{}}

1
FGUIProject/settings/whoot/hxr7rc7plvql13.json Normal file
View File

@@ -0,0 +1 @@
{"url":"ui://hxr7rc7plvql13","name":"HomeStatisticsPage","scriptType":"component","isCustomName":false,"customName":"","annotation":"","member":{}}

1
FGUIProject/settings/whoot/hxr7rc7plvql14.json Normal file
View File

@@ -0,0 +1 @@
{"url":"ui://hxr7rc7plvql14","name":"FishBagPanel","scriptType":"panel","isCustomName":false,"customName":"","annotation":"","member":{}}

1
FGUIProject/settings/whoot/hxr7rc7plvql15.json Normal file
View File

@@ -0,0 +1 @@
{"url":"ui://hxr7rc7plvql15","name":"MakePanel","scriptType":"panel","isCustomName":false,"customName":"","annotation":"","member":{}}

1
FGUIProject/settings/whoot/hxr7rc7plvql16.json Normal file
View File

@@ -0,0 +1 @@
{"url":"ui://hxr7rc7plvql16","name":"MapPanel","scriptType":"panel","isCustomName":false,"customName":"","annotation":"","member":{}}

Some files were not shown because too many files have changed in this diff Show More