From d953ea4b7a3aa2a415c05ca0a4f126f46bd0bb41 Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Sat, 21 Feb 2026 19:51:53 +0800 Subject: [PATCH] change --- Assets/AssetCaches.asset | 8 +- .../Materials/Eyelashes/M_Eyebrows_Masked.mat | 2 +- Assets/ResRaw/Fgui/Main/Main_fui.bytes | Bin 30652 -> 30653 bytes Assets/ResRaw/Maps/Map1/Map1.unity | 102 +++++++++--------- .../ResRaw/Prefabs/Player/Human_Male.prefab | 2 +- .../Player/States/PlayerStateFishing.cs | 75 ++++++++++++- Assets/Scripts/UI/Bag/ItemDetailsPanel.cs | 92 +++++++++++++--- Assets/Scripts/UI/Binders/Binder.cs | 1 + .../Scripts/UI/Home/Com/HomeButtonGroups.cs | 3 +- Assets/Scripts/UI/Login/LoginPanel.cs | 4 +- .../assets/Main/Bag/BagSelectPanel.xml | 2 +- 11 files changed, 212 insertions(+), 79 deletions(-) diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index 716236044..03932e299 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -23295,8 +23295,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: d60b2d9427fe9d3675d8a7dfcd87355e - Size: 15629342 + Hash: 87fb02b0e4a45289b5e84b52150afd3f + Size: 15629341 Assets: - Path: Assets/ResRaw/Fgui/Common/Background - Gray (Light).png Address: UI/Background - Gray (Light) @@ -41928,8 +41928,8 @@ MonoBehaviour: Dependencies: [] Tags: - Name: main/plyaer.bundle - Hash: 44e8e09453d51e947b7f6f0034ba15d5 - Size: 393873086 + Hash: 3b776aff4b78aa80eb66895d5a7df917 + Size: 393872102 Assets: - Path: Assets/ResRaw/Prefabs/chwytak/chwytak.prefab Address: Plyaer/chwytak diff --git a/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat b/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat index fc6d1cbe9..1d30dd9f5 100644 --- a/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat +++ b/Assets/CharacterCustomizer/Characters/Human/Materials/Eyelashes/M_Eyebrows_Masked.mat @@ -284,7 +284,7 @@ Material: - _DoubleSidedNormalMode: 1 - _DstBlend: 0 - _DstBlend2: 10 - - _DstBlendAlpha: 10 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 diff --git a/Assets/ResRaw/Fgui/Main/Main_fui.bytes b/Assets/ResRaw/Fgui/Main/Main_fui.bytes index 2a3f3e1a06f8877e1d6a2ddd37b66db777855343..6bd0bbab866c46fd0a7fcb5189c8a90ebea884de 100644 GIT binary patch delta 36 rcmdn 0) + { + var upForce = 1; + var addNum = upForce * Time.deltaTime; + if (!isUpRod) + { + addNum *= -1; + } + else + { + addNum *= 0.5f; + } + + // Debug.Log($"addNum={addNum}"); + Player.ModelAsset.PlayerAnimator.FishingUp += addNum; + Debug.LogError($"ishingFinal={Player.ModelAsset.PlayerAnimator.FishingUp}"); + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 1) + { + Player.ModelAsset.PlayerAnimator.FishingUp = 1; + } + else if (Player.ModelAsset.PlayerAnimator.FishingUp < 0) + { + Player.ModelAsset.PlayerAnimator.FishingUp = 0; + } + + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 0.8f) + { + ret = CheckTackFish(); + } + } + else + { + Player.ModelAsset.PlayerAnimator.FishingUp = 0; + } + + return ret; } + + #region 检查上鱼或者返回待机 + + private uint CheckTackFish() + { + return (uint)PlayerState.Idle; + } + + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs index 7f263f907..4226971f3 100644 --- a/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs +++ b/Assets/Scripts/UI/Bag/ItemDetailsPanel.cs @@ -19,6 +19,7 @@ namespace NBF protected override void OnShow() { + InputManager.Instance.On(this); ItemInfo = GetData() as ItemInfo; if (ItemInfo == null || ItemInfo.Config == null) { @@ -35,32 +36,89 @@ namespace NBF // var model = PrefabsHelper.CreatePrefab(ItemInfo.Config.Model); Model.SetData(ItemInfo); // Model.SetBackground(Back); - - InputManager.OnUICanceled += OnUICanceled; } - private void OnUICanceled(string action) + #region UI事件 + + // + // [InputInvoke(InputDef.UI.Prev, UIInputButtonShowMode.MenuLeft)] + // private void OnPrev() + // { + // ItemList.Menu.OnClickBtnPrev(); + // } + // + // [InputInvoke(InputDef.UI.Next, UIInputButtonShowMode.MenuRight)] + // private void OnNext() + // { + // ItemList.Menu.OnClickBtnNext(); + // } + // + // [InputInvoke(InputDef.UI.Left, UIInputButtonShowMode.BottomLeft)] + // private void OnLeft() + // { + // ItemList.List.Selector.Left(); + // } + // + // [InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)] + // private void OnRight() + // { + // ItemList.List.Selector.Right(); + // } + // + // [InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)] + // private void OnUp() + // { + // ItemList.List.Selector.Up(); + // // ChangeListSelected(); + // } + // + // [InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)] + // private void OnDown() + // { + // ItemList.List.Selector.Down(); + // } + // + // [InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomLeft, "查看")] + // private void OnApplySettings() + // { + // var selectedItem = ItemList.List.Selector.SelectedItem; + // if (selectedItem != null) + // { + // ItemList.List.InvokeClickItem(selectedItem); + // } + // } + + + [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight)] + private void OnBack() { - if (!IsTop) return; - if (action == InputDef.UI.SubPrev) - { - } - else if (action == InputDef.UI.SubNext) - { - } - else if (action == InputDef.UI.Up) - { - } - else if (action == InputDef.UI.Down) - { - } + Hide(); } + #endregion + + // private void OnUICanceled(string action) + // { + // if (!IsTop) return; + // if (action == InputDef.UI.SubPrev) + // { + // } + // else if (action == InputDef.UI.SubNext) + // { + // } + // else if (action == InputDef.UI.Up) + // { + // } + // else if (action == InputDef.UI.Down) + // { + // } + // } + protected override void OnHide() { + InputManager.Instance.Off(this); Model.UnloadModel(); - InputManager.OnUICanceled -= OnUICanceled; } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Binders/Binder.cs b/Assets/Scripts/UI/Binders/Binder.cs index b1f7bb041..6d45ddcbc 100644 --- a/Assets/Scripts/UI/Binders/Binder.cs +++ b/Assets/Scripts/UI/Binders/Binder.cs @@ -8,6 +8,7 @@ CommonBinder.BindAll(); FishingBinder.BindAll(); MainBinder.BindAll(); + Common2Binder.BindAll(); } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs b/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs index 8f11515cd..152618cad 100644 --- a/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs +++ b/Assets/Scripts/UI/Home/Com/HomeButtonGroups.cs @@ -37,7 +37,8 @@ namespace NBF } else if (btn == BtnMake) { - MakePanel.Show(); + BagSlotPanel.Show(); + // MakePanel.Show(); } else if (btn == BtnMap) { diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs index 60c175670..fcdd0d8eb 100644 --- a/Assets/Scripts/UI/Login/LoginPanel.cs +++ b/Assets/Scripts/UI/Login/LoginPanel.cs @@ -32,14 +32,14 @@ namespace NBF { await LoginHelper.Login(InputAccount.text); - // await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); + await Fishing.Instance.Go(RoleModel.Instance.Info.MapId); // FishingShopPanel.Show(); // BagPanel.Show(); // BagSlotPanel.Show(); - SettingPanel.Show(); + // SettingPanel.Show(); // HomePanel.Show(); diff --git a/FGUIProject/assets/Main/Bag/BagSelectPanel.xml b/FGUIProject/assets/Main/Bag/BagSelectPanel.xml index d8582538f..8973acb9e 100644 --- a/FGUIProject/assets/Main/Bag/BagSelectPanel.xml +++ b/FGUIProject/assets/Main/Bag/BagSelectPanel.xml @@ -12,7 +12,7 @@ -