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-09-07 23:50:53 +08:00
parent deaca48bf3
commit debfcf41f4
64 changed files with 1017 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ namespace NBF
protected override void OnShow()
{
InputManager.OnUICanceled += OnUICanceled;
Game.Input.OnUICanceled += OnUICanceled;
UseBottomMenu();
}
@@ -49,7 +49,7 @@ namespace NBF
protected override void OnHide()
{
InputManager.OnUICanceled -= OnUICanceled;
Game.Input.OnUICanceled -= OnUICanceled;
}
protected override void OnDestroy()

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

@@ -18,12 +18,12 @@ namespace NBF
private void OnInited()
{
InputManager.OnUICanceled += OnUICanceled;
Game.Input.OnUICanceled += OnUICanceled;
}
public override void Dispose()
{
InputManager.OnUICanceled -= OnUICanceled;
Game.Input.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;
InputManager.Instance.SendUIInput(item.ActionName);
Game.Input.SendUIInput(item.ActionName);
Debug.Log("模拟点击===");
}

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

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

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

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

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

@@ -15,7 +15,7 @@ namespace NBF
protected override void OnShow()
{
InputManager.OnUICanceled += OnUICanceled;
Game.Input.OnUICanceled += OnUICanceled;
}
private void OnUICanceled(string action)
@@ -37,7 +37,7 @@ namespace NBF
protected override void OnHide()
{
InputManager.OnUICanceled -= OnUICanceled;
Game.Input.OnUICanceled -= OnUICanceled;
}
protected override void OnDestroy()

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

@@ -51,7 +51,7 @@ namespace NBF
HideAnim = this.HideCenterScaleBig;
IsModal = true;
IsDontBack = true;
InputManager.OnUICanceled += OnUICanceled;
Game.Input.OnUICanceled += OnUICanceled;
}
protected override void OnShow()
@@ -80,7 +80,7 @@ namespace NBF
protected override void OnDestroy()
{
base.OnDestroy();
InputManager.OnUICanceled -= OnUICanceled;
Game.Input.OnUICanceled -= OnUICanceled;
}

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

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

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

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

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

@@ -5,6 +5,7 @@ using UnityEngine;
using NBC;
using NBC.Entitas;
using NBF.Fishing2;
using UnityEngine.InputSystem;
using UIPanel = NBC.UIPanel;
namespace NBF
@@ -14,6 +15,54 @@ namespace NBF
protected override void OnInit()
{
this.AutoAddClick(OnClick);
Game.Input.OnPlayerPerformed += OnPlayerCanceled;
Game.Input.OnPlayerPerformed += OnPlayerPerformed;
Game.Input.OnPlayerValueCanceled += OnPlayerValueCanceled;
Game.Input.OnPlayerValuePerformed += OnPlayerValuePerformed;
}
private bool _isRun;
private void OnPlayerPerformed(string action)
{
if (action == "Run")
{
_isRun = true;
}
Log.Info($"OnPlayerPerformed action = {action}");
}
private void OnPlayerCanceled(string action)
{
if (action == "Run")
{
_isRun = false;
}
Log.Info($"OnPlayerCanceled action = {action}");
}
private void OnPlayerValueCanceled(InputAction.CallbackContext context)
{
var name = context.action.name;
if (name == "Move")
{
var v2 = context.ReadValue<Vector2>();
Log.Info($"OnPlayerValueCanceled name={name} v2={v2}");
}
}
private void OnPlayerValuePerformed(InputAction.CallbackContext context)
{
var name = context.action.name;
if (name == "Move")
{
var v2 = context.ReadValue<Vector2>();
Log.Info($"OnPlayerValuePerformed name={name} v2={v2}");
}
}
private void OnClick(GComponent btn)

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

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