完成按键输入按键显示

Assets/AssetCaches.asset

@@ -22830,8 +22830,8 @@ MonoBehaviour:
       Filter: '*'
   Bundles:
   - Name: main/ui.bundle
-    Hash: a6d6be8890d773594b4e6a1d4acf82d3
+    Hash: f08e8dd58157955ebca6ffc7dbe79a1c
-    Size: 7664301
+    Size: 7664401
     Assets:
     - Path: Assets/ResRaw/Fgui/Common/Common_atlas0.png
       Address: UI/Common_atlas0

Assets/PlayerInputControl.inputactions

@@ -1028,6 +1028,15 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "Test",
+                    "type": "Button",
+                    "id": "23651163-b9ce-4bed-9636-1b816c87524f",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                 }
             ],
             "bindings": [
@@ -1251,17 +1260,6 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
-                {
-                    "name": "",
-                    "id": "ec9eb0c2-a2e0-47eb-ac8b-52cb0ef46101",
-                    "path": "<Keyboard>/rightArrow",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Right",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
                 {
                     "name": "",
                     "id": "031b930d-59b6-4a26-9dfe-97764c3e8b37",
@@ -1284,17 +1282,6 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
-                {
-                    "name": "",
-                    "id": "680b36f2-5797-4257-83a7-3a498891d856",
-                    "path": "<Keyboard>/leftArrow",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Left",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
                 {
                     "name": "",
                     "id": "45f78626-cbf2-4e1f-904d-d82e4c2a2f41",
@@ -1317,17 +1304,6 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
-                {
-                    "name": "",
-                    "id": "40501ac1-9d3e-4059-8e8f-ff7035f6e32e",
-                    "path": "<Keyboard>/downArrow",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Down",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
                 {
                     "name": "",
                     "id": "f1a47b3c-e79f-4ab3-86b6-fcc0a6470114",
@@ -1350,17 +1326,6 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
-                {
-                    "name": "",
-                    "id": "9996c4e1-f7fb-4793-ab51-da569bdbab09",
-                    "path": "<Keyboard>/upArrow",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Up",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
                 {
                     "name": "",
                     "id": "3069f356-c73e-4bac-88f5-88bd6d746bc2",
@@ -1371,6 +1336,17 @@
                     "action": "Reset",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "52d8aeb1-8b70-4dfd-b645-496d47098926",
+                    "path": "<Keyboard>/f1",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Test",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         }

Assets/Scripts/Common/Common/Attrobites/Attributes.cs

@@ -79,13 +79,14 @@ namespace NBF
     {
         public string Name;
         public string Key;
-        public bool ShowLeft;
+        public UIInputButtonShowMode Mode;
 
-        public InputInvokeAttribute(string name, string key = "", bool showLeft = true)
+        public InputInvokeAttribute(string name, UIInputButtonShowMode mode = UIInputButtonShowMode.None,
+            string key = "")
         {
             Name = name;
             Key = key;
-            ShowLeft = showLeft;
+            Mode = mode;
         }
     }
 }

Assets/Scripts/Common/Common/Services/Input/InputManager.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using FairyGUI;
 using NBC;
 // using Rewired;
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.Utilities;
 
 namespace NBF
 {
@@ -14,10 +17,22 @@ namespace NBF
         GamePad = 1
     }
 
-    public struct UIInputInvoke
+    public enum UIInputButtonShowMode
+    {
+        None,
+        MenuLeft,
+        MenuRight,
+        SubMenuLeft,
+        SubMenuRight,
+        BottomLeft,
+        BottomRight,
+    }
+
+    public class UIInputInvoke
     {
         public object UIObject;
         public InputInvokeAttribute InputInvoke;
+        public MethodInfo MethodInfo;
     }
 
     public class InputManager : MonoService<InputManager>
@@ -25,6 +40,7 @@ namespace NBF
         public static bool IsOp1;
         public static bool IsOp2;
 
+
         public static event Action<bool> OnOp1Action;
         public static event Action<bool> OnOp2Action;
 
@@ -63,6 +79,9 @@ namespace NBF
         /// </summary>
         public static event Action<InteractiveObject> OnInteractiveObjectAction;
 
+        public static event Action OnUIInvokeChange;
+
+
         public static PlayerInputControl PlayerInputControl { get; private set; }
 
         /// <summary>
@@ -77,6 +96,9 @@ namespace NBF
 
         public static ControllerType ControllerType = ControllerType.KeyboardMouse;
 
+
+        private InputActionMap _uiInputActionMap;
+
         protected override void OnAwake()
         {
             InputCursorExtension.InputInit();
@@ -140,6 +162,8 @@ namespace NBF
                 actionMap.Enable();
                 if (actionMap.name == "UI")
                 {
+                    _uiInputActionMap = actionMap;
+                    CacheInputActionIcons(actionMap.actions);
                     foreach (var action in actionMap.actions)
                     {
                         if (action.type == InputActionType.Button)
@@ -147,6 +171,8 @@ namespace NBF
                             action.performed += OnUIButtonPerformed;
                             action.canceled += OnUIButtonCanceled;
                         }
+
+                        //var fileName = binding.effectivePath.Replace("<", "").Replace(">", "").Replace("/", "_");
                     }
                 }
                 else if (actionMap.name == "Player")
@@ -184,6 +210,7 @@ namespace NBF
         private void OnUIButtonCanceled(InputAction.CallbackContext context)
         {
             OnUICanceled?.Invoke(context.action.name);
+            InvokeUIInput(context.action.name);
         }
 
         private void OnPlayerButtonPerformed(InputAction.CallbackContext context)
@@ -243,6 +270,7 @@ namespace NBF
         {
             OnUIPerformed?.Invoke(actionName);
             OnUICanceled?.Invoke(actionName);
+            InvokeUIInput(actionName);
         }
 
         #region UI界面按键管理
@@ -250,12 +278,107 @@ namespace NBF
         private readonly Dictionary<object, List<UIInputInvoke>> _panelActions =
             new Dictionary<object, List<UIInputInvoke>>();
 
+        private Dictionary<string, string> _keyboardIcons = new Dictionary<string, string>();
+
         public void On(object obj)
         {
+            var ms = Reflection.GetMethodsAttribute<InputInvokeAttribute>(obj.GetType());
+            List<UIInputInvoke> inputInvokes = new List<UIInputInvoke>();
+            foreach (var kv in ms)
+            {
+                var invokeData = new UIInputInvoke()
+                {
+                    MethodInfo = kv.Key,
+                    UIObject = obj,
+                    InputInvoke = kv.Value
+                };
+                inputInvokes.Add(invokeData);
+            }
+
+            if (inputInvokes.Count > 0)
+            {
+                _panelActions[obj] = inputInvokes;
+            }
+
+            OnUIInvokeChange?.Invoke();
         }
 
         public void Off(object obj)
         {
+            _panelActions.Remove(obj, out List<UIInputInvoke> inputInvokes);
+            OnUIInvokeChange?.Invoke();
+        }
+
+
+        public void InvokeUIInput(string actionName)
+        {
+            foreach (var obj in _panelActions.Keys)
+            {
+                var invokes = _panelActions[obj];
+                foreach (var uiInputInvoke in invokes)
+                {
+                    if (uiInputInvoke.InputInvoke.Name != actionName) continue;
+                    if (uiInputInvoke.UIObject is IUIPanel panel)
+                    {
+                        if (!panel.IsShowing) continue;
+                        if (!panel.IsTop) continue;
+                    }
+                    else if (uiInputInvoke.UIObject is GObject gObject)
+                    {
+                        if (!gObject.visible) continue;
+                    }
+
+                    uiInputInvoke.MethodInfo.Invoke(uiInputInvoke.UIObject, null);
+                }
+            }
+        }
+
+        public List<UIInputInvoke> GetUsableInvokes()
+        {
+            List<UIInputInvoke> ret = new List<UIInputInvoke>();
+
+            foreach (var keyValuePair in _panelActions.Values)
+            {
+                foreach (var uiInputInvoke in keyValuePair)
+                {
+                    if (uiInputInvoke.UIObject is IUIPanel { IsTop: true })
+                    {
+                        ret.Add(uiInputInvoke);
+                    }
+                }
+            }
+
+            return ret;
+        }
+
+        public string GetUIKeyCode(string actionName)
+        {
+            if (_keyboardIcons.TryGetValue(actionName, out var keyboardIcon))
+            {
+                return keyboardIcon;
+            }
+
+            return string.Empty;
+        }
+
+
+        private void CacheInputActionIcons(ReadOnlyArray<InputAction> actions)
+        {
+            _keyboardIcons.Clear();
+            foreach (var inputAction in actions)
+            {
+                foreach (var binding in inputAction.bindings)
+                {
+                    var path = binding.effectivePath.Replace("<", "").Replace(">", "").Replace("/", "_");
+                    if (path.Contains("Keyboard") || path.Contains("keyboard"))
+                    {
+                        path = path.Replace("Keyboard", "keyboard");
+                        _keyboardIcons.TryAdd(inputAction.name, path);
+
+                        Log.Info($"ActionIcons {inputAction.name}={path}");
+                    }
+                }
+            }
         }
 
         #endregion

Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs

@@ -16,7 +16,7 @@ namespace NBF.Setting
         public override string Group => SettingsDef.Group.Graphic;
         protected override int DefaultValue => _defaultResolution;
         public override string Tab => SettingsDef.Tab.Graphic;
-        public override bool IsDropdown => true;
+        // public override bool IsDropdown => true;
 
 
         static readonly (int w, int h)[] Classic16_9 =

Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs

@@ -1,33 +0,0 @@
-using System;
-using FairyGUI;
-using NBC;
-using UIPanel = NBC.UIPanel;
-
-namespace NBF
-{
-    [AttributeUsage(AttributeTargets.Method)]
-    public class UIInputListenAttribute : BaseAttribute
-    {
-    }
-
-    public static class UIInputExtensions
-    {
-        public static void AutoListenInput(this GComponent panel)
-        {
-            var ms = Reflection.GetMethodsWithUIInputAttribute(panel.GetType(), typeof(UIInputListenAttribute));
-            foreach (var method in ms)
-            {
-                Log.Error(method.Name);
-            }
-        }
-
-        public static void AutoListenInput(this UIPanel panel)
-        {
-            var ms = Reflection.GetMethodsWithUIInputAttribute(panel.GetType(), typeof(UIInputListenAttribute));
-            foreach (var method in ms)
-            {
-                Log.Error(method.Name);
-            }
-        }
-    }
-}

Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs.meta

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

Assets/Scripts/Common/Utils/Reflection.cs

@@ -54,7 +54,8 @@ namespace NBF
             }
 
             // 获取所有方法，包括公共、非公共、实例和静态方法
-            MethodInfo[] allMethods = classType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic);
+            MethodInfo[] allMethods =
+                classType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
 
             foreach (MethodInfo method in allMethods)
             {
@@ -66,5 +67,35 @@ namespace NBF
 
             return methodsWithAttribute;
         }
+
+        /// <summary>
+        /// 获取所有标记指定特性的方法
+        /// </summary>
+        /// <param name="classType">查找类</param>
+        /// <returns></returns>
+        public static Dictionary<MethodInfo, T> GetMethodsAttribute<T>(Type classType) where T : Attribute
+        {
+            Dictionary<MethodInfo, T> methodsWithAttribute = new Dictionary<MethodInfo, T>();
+
+            if (classType == null)
+            {
+                return methodsWithAttribute;
+            }
+
+            // 获取所有方法，包括公共、非公共、实例和静态方法
+            MethodInfo[] allMethods =
+                classType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+
+            foreach (MethodInfo method in allMethods)
+            {
+                var attribute = method.GetCustomAttribute<T>();
+                if (attribute != null)
+                {
+                    methodsWithAttribute[method] = attribute;
+                }
+            }
+
+            return methodsWithAttribute;
+        }
     }
 }

Assets/Scripts/Fishing/PlayerInputControl.cs

@@ -1116,6 +1116,15 @@ namespace NBF
                     ""processors"": """",
                     ""interactions"": """",
                     ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""Test"",
+                    ""type"": ""Button"",
+                    ""id"": ""23651163-b9ce-4bed-9636-1b816c87524f"",
+                    ""expectedControlType"": """",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                 }
             ],
             ""bindings"": [
@@ -1339,17 +1348,6 @@ namespace NBF
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
-                {
-                    ""name"": """",
-                    ""id"": ""ec9eb0c2-a2e0-47eb-ac8b-52cb0ef46101"",
-                    ""path"": ""<Keyboard>/rightArrow"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": """",
-                    ""action"": ""Right"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": false
-                },
                 {
                     ""name"": """",
                     ""id"": ""031b930d-59b6-4a26-9dfe-97764c3e8b37"",
@@ -1372,17 +1370,6 @@ namespace NBF
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
-                {
-                    ""name"": """",
-                    ""id"": ""680b36f2-5797-4257-83a7-3a498891d856"",
-                    ""path"": ""<Keyboard>/leftArrow"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": """",
-                    ""action"": ""Left"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": false
-                },
                 {
                     ""name"": """",
                     ""id"": ""45f78626-cbf2-4e1f-904d-d82e4c2a2f41"",
@@ -1405,17 +1392,6 @@ namespace NBF
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
-                {
-                    ""name"": """",
-                    ""id"": ""40501ac1-9d3e-4059-8e8f-ff7035f6e32e"",
-                    ""path"": ""<Keyboard>/downArrow"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": """",
-                    ""action"": ""Down"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": false
-                },
                 {
                     ""name"": """",
                     ""id"": ""f1a47b3c-e79f-4ab3-86b6-fcc0a6470114"",
@@ -1438,17 +1414,6 @@ namespace NBF
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
-                {
-                    ""name"": """",
-                    ""id"": ""9996c4e1-f7fb-4793-ab51-da569bdbab09"",
-                    ""path"": ""<Keyboard>/upArrow"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": """",
-                    ""action"": ""Up"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": false
-                },
                 {
                     ""name"": """",
                     ""id"": ""3069f356-c73e-4bac-88f5-88bd6d746bc2"",
@@ -1459,6 +1424,17 @@ namespace NBF
                     ""action"": ""Reset"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""52d8aeb1-8b70-4dfd-b645-496d47098926"",
+                    ""path"": ""<Keyboard>/f1"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": """",
+                    ""action"": ""Test"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
                 }
             ]
         }
@@ -1578,6 +1554,7 @@ namespace NBF
             m_UI_Down = m_UI.FindAction("Down", throwIfNotFound: true);
             m_UI_Up = m_UI.FindAction("Up", throwIfNotFound: true);
             m_UI_Reset = m_UI.FindAction("Reset", throwIfNotFound: true);
+            m_UI_Test = m_UI.FindAction("Test", throwIfNotFound: true);
         }
 
         ~@PlayerInputControl()
@@ -2152,6 +2129,7 @@ namespace NBF
         private readonly InputAction m_UI_Down;
         private readonly InputAction m_UI_Up;
         private readonly InputAction m_UI_Reset;
+        private readonly InputAction m_UI_Test;
         /// <summary>
         /// Provides access to input actions defined in input action map "UI".
         /// </summary>
@@ -2212,6 +2190,10 @@ namespace NBF
             /// </summary>
             public InputAction @Reset => m_Wrapper.m_UI_Reset;
             /// <summary>
+            /// Provides access to the underlying input action "UI/Test".
+            /// </summary>
+            public InputAction @Test => m_Wrapper.m_UI_Test;
+            /// <summary>
             /// Provides access to the underlying input action map instance.
             /// </summary>
             public InputActionMap Get() { return m_Wrapper.m_UI; }
@@ -2273,6 +2255,9 @@ namespace NBF
                 @Reset.started += instance.OnReset;
                 @Reset.performed += instance.OnReset;
                 @Reset.canceled += instance.OnReset;
+                @Test.started += instance.OnTest;
+                @Test.performed += instance.OnTest;
+                @Test.canceled += instance.OnTest;
             }
 
             /// <summary>
@@ -2320,6 +2305,9 @@ namespace NBF
                 @Reset.started -= instance.OnReset;
                 @Reset.performed -= instance.OnReset;
                 @Reset.canceled -= instance.OnReset;
+                @Test.started -= instance.OnTest;
+                @Test.performed -= instance.OnTest;
+                @Test.canceled -= instance.OnTest;
             }
 
             /// <summary>
@@ -2769,6 +2757,13 @@ namespace NBF
             /// <seealso cref="UnityEngine.InputSystem.InputAction.performed" />
             /// <seealso cref="UnityEngine.InputSystem.InputAction.canceled" />
             void OnReset(InputAction.CallbackContext context);
+            /// <summary>
+            /// Method invoked when associated input action "Test" is either <see cref="UnityEngine.InputSystem.InputAction.started" />, <see cref="UnityEngine.InputSystem.InputAction.performed" /> or <see cref="UnityEngine.InputSystem.InputAction.canceled" />.
+            /// </summary>
+            /// <seealso cref="UnityEngine.InputSystem.InputAction.started" />
+            /// <seealso cref="UnityEngine.InputSystem.InputAction.performed" />
+            /// <seealso cref="UnityEngine.InputSystem.InputAction.canceled" />
+            void OnTest(InputAction.CallbackContext context);
         }
     }
 }

Assets/Scripts/UI/Bag/BagPanel.cs

@@ -17,12 +17,9 @@ namespace NBF
         protected override void OnShow()
         {
             ItemList.List.OnClickItem += OnClickItem;
-            InputManager.OnUICanceled += OnUICanceled;
-            UseBottomMenu();
 
             List<TabItemData> tabItemList = new List<TabItemData>();
 
-
             var dic = RoleModel.Instance.GetItemsByType();
             foreach (var (type, list) in dic)
             {
@@ -36,25 +33,8 @@ namespace NBF
 
             ItemList.SetPanel(this);
             ItemList.SetData(tabItemList, true, true);
-            
         }
 
-        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)
-            {
-            }
-        }
 
         private void OnClickItem(object item)
         {
@@ -63,14 +43,8 @@ namespace NBF
             ItemDetailsPanel.Show(bagItem.ItemInfo);
         }
 
-        private void UseBottomMenu()
-        {
-            BottomMenu.Use(this);
-        }
-
         protected override void OnHide()
         {
-            InputManager.OnUICanceled -= OnUICanceled;
             ItemList.List.OnClickItem -= OnClickItem;
         }
 

Assets/Scripts/UI/Common/Button/BtnInputControl.cs

@@ -6,7 +6,7 @@ using NBC;
 
 namespace NBF
 {
-    public partial class BtnInputControl : GButton
+    public partial class BtnInputControl : BtnInputControlBase
     {
         private void OnInited()
         {

Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs

@@ -0,0 +1,28 @@
+using FairyGUI;
+using NBC;
+
+namespace NBF
+{
+    public abstract class BtnInputControlBase : GButton
+    {
+        public string ActionName;
+        public string ShowName;
+
+        public virtual void SetData(string actionName, string showName)
+        {
+            this.ActionName = actionName;
+            this.ShowName = showName;
+            if (!string.IsNullOrEmpty(showName))
+            {
+                title = Lan.Get(showName);
+            }
+            else
+            {
+                title = Lan.Get(actionName);
+            }
+
+            var iconName = InputManager.Instance.GetUIKeyCode(ActionName);
+            icon = UIPackage.GetItemURL(UIDef.Pack.Common, iconName);
+        }
+    }
+}

Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4da865139cbb401a91f63bcf30d233c4
+timeCreated: 1769960386

Assets/Scripts/UI/Common/Button/BtnTitleInputControl.cs

@@ -7,19 +7,10 @@ using NBC;
 
 namespace NBF
 {
-    public partial class BtnTitleInputControl : GButton
+    public partial class BtnTitleInputControl : BtnInputControlBase
     {
-        public string ActionName;
-        public string ShowName;
-
         private void OnInited()
         {
         }
-
-        public void SetData(string actionName, string showName)
-        {
-            this.ActionName = actionName;
-            this.ShowName = showName;
-        }
     }
 }

Assets/Scripts/UI/Common/List/CommonItemList.cs

@@ -18,7 +18,6 @@ namespace NBF
         public void SetPanel(UIPanel panel)
         {
             Menu.SetPanel(panel);
-            SubMenu.SetPanel(panel);
         }
 
         private void OnInited()

Assets/Scripts/UI/Common/Menu/BottomMenu.cs

@@ -15,6 +15,14 @@ namespace NBF
         private void OnInited()
         {
             List.onClickItem.Add(OnClickItem);
+            LeftList.onClickItem.Add(OnClickItem);
+            InputManager.OnUIInvokeChange += OnUIInvokeChange;
+        }
+
+        public override void Dispose()
+        {
+            InputManager.OnUIInvokeChange -= OnUIInvokeChange;
+            base.Dispose();
         }
 
         private void OnClickItem(EventContext context)
@@ -25,29 +33,26 @@ namespace NBF
             Debug.Log("模拟点击===");
         }
 
-        public void Use(UIPanel panel)
+        private void OnUIInvokeChange()
         {
-            _panel = panel;
             List.RemoveChildrenToPool();
             LeftList.RemoveChildrenToPool();
-
+            var invokes = InputManager.Instance.GetUsableInvokes();
-            // AddButtonItem(OnUse, "");
+            foreach (var uiInputInvoke in invokes)
-            // AddButtonItem(OnTab, InputDef.UI.Tab);
+            {
-            // AddButtonItem(OnEnter, InputDef.UI.Enter);
+                var invokeData = uiInputInvoke.InputInvoke;
-            // AddButtonItem(OnBack, InputDef.UI.Back);
+                if (uiInputInvoke.InputInvoke.Mode == UIInputButtonShowMode.BottomLeft)
+                {
+                    AddButton(invokeData.Name, invokeData.Key, false);
+                }
+                else if (uiInputInvoke.InputInvoke.Mode == UIInputButtonShowMode.BottomRight)
+                {
+                    AddButton(invokeData.Name, invokeData.Key);
+                }
+            }
         }
 
 
-        public void AddRightButton(string inputName, string showName = "")
-        {
-            AddButton(inputName, string.Empty, true);
-        }
-
-        public void AddLeftButton(string inputName, string showName = "")
-        {
-            AddButton(inputName, string.Empty, false);
-        }
-
         public void AddButton(string inputName, string showName = "", bool isRight = true)
         {
             if (isRight)

Assets/Scripts/UI/Common/Menu/CommonMenu.cs

@@ -79,7 +79,7 @@ namespace NBF
             OnTabChange?.Invoke(List.selectedIndex);
         }
 
-        private void OnClickBtnPrev()
+        public void OnClickBtnPrev()
         {
             if (List.selectedIndex > 0)
             {
@@ -93,7 +93,7 @@ namespace NBF
             OnClickItem();
         }
 
-        private void OnClickBtnNext()
+        public void OnClickBtnNext()
         {
             if (List.selectedIndex < List.numItems - 1)
             {

Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs

@@ -12,12 +12,9 @@ namespace NBF
     public partial class CommonSubMenu : GComponent
     {
         public event Action<int> OnTabChange;
-        private UIPanel _panel;
 
-        public void SetPanel(UIPanel panel)
+        private string _leftActionName;
-        {
+        private string _rightActionName;
-            _panel = panel;
-        }
 
         private void OnInited()
         {
@@ -25,31 +22,22 @@ namespace NBF
             BtnPrev.onClick.Add(OnClickBtnPrev);
             BtnNext.onClick.Add(OnClickBtnNext);
 
-            InputManager.OnUICanceled += OnUICanceled;
+            // CommonSubMenu
+        }
+
+        public void SetBtnActionName(string leftActionName, string rightActionName)
+        {
+            _leftActionName = leftActionName;
+            _rightActionName = rightActionName;
+            BtnPrev.SetData(leftActionName, string.Empty);
+            BtnNext.SetData(rightActionName, string.Empty);
         }
 
         public override void Dispose()
         {
-            InputManager.OnUICanceled -= OnUICanceled;
             base.Dispose();
         }
 
-        private void OnUICanceled(string action)
-        {
-            if (_panel == null) return;
-            if (!_panel.IsShowing) return;
-            if (!_panel.IsTop) return;
-
-            if (action == InputDef.UI.SubPrev)
-            {
-                OnClickBtnPrev();
-            }
-            else if (action == InputDef.UI.SubNext)
-            {
-                OnClickBtnNext();
-            }
-        }
-
         public void SetTabs(List<TabItemData> subItems, int selectIndex = 0)
         {
             List.RemoveChildrenToPool();
@@ -79,7 +67,7 @@ namespace NBF
             OnTabChange?.Invoke(List.selectedIndex);
         }
 
-        private void OnClickBtnPrev()
+        public void OnClickBtnPrev()
         {
             if (List.selectedIndex > 0)
             {
@@ -93,7 +81,7 @@ namespace NBF
             OnClickItem();
         }
 
-        private void OnClickBtnNext()
+        public void OnClickBtnNext()
         {
             if (List.selectedIndex < List.numItems - 1)
             {

Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs

@@ -15,7 +15,6 @@ namespace NBF
 
         protected override void OnShow()
         {
-            InputManager.OnUICanceled += OnUICanceled;
         }
 
         protected override void OnUpdate()
@@ -39,7 +38,6 @@ namespace NBF
                     {
                         UI.Inst.HideUI(ui.GetType());
                         break;
-                        // ui.Hide();
                     }
                 }
             }
@@ -47,7 +45,6 @@ namespace NBF
 
         protected override void OnHide()
         {
-            InputManager.OnUICanceled -= OnUICanceled;
         }
 
         protected override void OnDestroy()

Assets/Scripts/UI/Home/Pages/HomeMainPage.cs

@@ -24,13 +24,11 @@ namespace NBF
             // buttons.Add(BtnTest);
 
             navigate = new ButtonNavigate(buttons);
-            this.AutoListenInput();
         }
 
         protected override void OnShow()
         {
             InputManager.OnUICanceled += OnUICanceled;
-            UseBottomMenu();
             
             // Model.LoadAsset(0);
             // Model.SetBackground(Panel.Back.GetChild("back"));//, Panel.Back.GetChild("icon")
@@ -72,13 +70,5 @@ namespace NBF
                 navigate.Click();
             }
         }
-
-        private void UseBottomMenu()
-        {
-            BottomMenu.Use(Panel);
-
-            BottomMenu.AddRightButton(InputDef.UI.Enter);
-            BottomMenu.AddRightButton(InputDef.UI.Back);
-        }
     }
 }

Assets/Scripts/UI/Settings/SettingItem.cs

@@ -22,7 +22,6 @@ namespace NBF
         public void SetData(OptionBase option)
         {
             Option = option;
-
             if (option is IMultiOption multiOption)
             {
                 if (multiOption.IsDropdown)

Assets/Scripts/UI/Settings/SettingPanel.cs

@@ -42,10 +42,10 @@ namespace NBF
 
         protected override void OnShow()
         {
-            InputManager.Instance.Off(this);
+            InputManager.Instance.On(this);
+            SetActionIcon();
             Settings.Instance.LoadAllSettings();
             MenuList.SetTabs(tabList);
-            UseBottomMenu();
         }
 
         private void ChangeTab(int index)
@@ -109,11 +109,6 @@ namespace NBF
             }
         }
 
-        private void UseBottomMenu()
-        {
-            BottomMenu.Use(this);
-        }
-
 
         private void OnResetSettings()
         {
@@ -173,6 +168,15 @@ namespace NBF
                 Introduce.TextIntroduce.SetLanguage(item.Option.Name);
                 // Introduce.
             }
+
+            for (var i = 0; i < _canSelectIndex.Count; i++)
+            {
+                var targetIndex = _canSelectIndex[i];
+                if (targetIndex == index)
+                {
+                    _nowSelectIndex = i;
+                }
+            }
         }
 
 
@@ -194,8 +198,26 @@ namespace NBF
 
         #region Input Evnet
 
-        [InputInvoke(InputDef.UI.SubPrev)]
+        private void SetActionIcon()
-        private void OnSubPrev()
+        {
+            MenuList.SetBtnActionName(InputDef.UI.Prev, InputDef.UI.Next);
+        }
+
+        [InputInvoke(InputDef.UI.Prev, UIInputButtonShowMode.MenuLeft)]
+        private void OnPrev()
+        {
+            MenuList.OnClickBtnPrev();
+        }
+
+        [InputInvoke(InputDef.UI.Next, UIInputButtonShowMode.MenuRight)]
+        private void OnNext()
+        {
+            MenuList.OnClickBtnNext();
+        }
+
+
+        [InputInvoke(InputDef.UI.Left, UIInputButtonShowMode.BottomLeft)]
+        private void OnLeft()
         {
             if (List.GetChildAt(List.selectedIndex) is SettingItem item)
             {
@@ -203,8 +225,8 @@ namespace NBF
             }
         }
 
-        [InputInvoke(InputDef.UI.SubNext)]
+        [InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)]
-        private void OnSubNext()
+        private void OnRight()
         {
             if (List.GetChildAt(List.selectedIndex) is SettingItem item)
             {
@@ -212,19 +234,42 @@ namespace NBF
             }
         }
 
-        [InputInvoke(InputDef.UI.Up)]
+        [InputInvoke(InputDef.UI.Up, UIInputButtonShowMode.BottomLeft)]
         private void OnUp()
         {
             ChangeListSelected();
         }
 
-        [InputInvoke(InputDef.UI.Down)]
+        [InputInvoke(InputDef.UI.Down, UIInputButtonShowMode.BottomLeft)]
         private void OnDown()
         {
             ChangeListSelected(false);
         }
 
-        [InputInvoke(InputDef.UI.Back)]
+
+        [InputInvoke(InputDef.UI.Enter, UIInputButtonShowMode.BottomRight, "保存")]
+        private void OnApplySettings()
+        {
+            var options = Settings.Instance.GetOptionsByTab(_currentTab);
+            Log.Info("OnApplySettings");
+            foreach (var option in options)
+            {
+                option.Apply();
+            }
+
+            Notices.Success("TEXT_OP_SUCCESS");
+        }
+
+        [InputInvoke(InputDef.UI.Reset, UIInputButtonShowMode.BottomRight, "重置")]
+        private void OnReset()
+        {
+            MessageBox.Show("是否重置为默认？", (ret) =>
+            {
+                if (ret) OnResetSettings();
+            });
+        }
+
+        [InputInvoke(InputDef.UI.Back, UIInputButtonShowMode.BottomRight, "返回")]
         private void OnBack()
         {
             if (Settings.Instance.HaveNotAppleSettings())
@@ -244,28 +289,6 @@ namespace NBF
             }
         }
 
-        [InputInvoke(InputDef.UI.Enter)]
-        private void OnApplySettings()
-        {
-            var options = Settings.Instance.GetOptionsByTab(_currentTab);
-            Log.Info("OnApplySettings");
-            foreach (var option in options)
-            {
-                option.Apply();
-            }
-
-            Notices.Success("TEXT_OP_SUCCESS");
-        }
-
-        [InputInvoke(InputDef.UI.Reset)]
-        private void OnReset()
-        {
-            MessageBox.Show("是否重置为默认？", (ret) =>
-            {
-                if (ret) OnResetSettings();
-            });
-        }
-
         #endregion
 
         protected override void OnHide()

Assets/Scripts/UI/Shops/FishingShopPanel.cs

@@ -21,7 +21,6 @@ namespace NBF
         {
             ItemList.List.OnClickItem += OnClickItem;
             InputManager.OnUICanceled += OnUICanceled;
-            UseBottomMenu();
 
             List<TabItemData> tabItemList = GoodsConfigHelper.TabItemList;
 
@@ -54,11 +53,6 @@ namespace NBF
             ShopDetailsPanel.Show(gearItem.Config);
         }
         
-        private void UseBottomMenu()
-        {
-            BottomMenu.Use(this);
-        }
-
         protected override void OnHide()
         {
             InputManager.OnUICanceled -= OnUICanceled;

FGUIProject/assets/Common/Com/Menu/CommonSubMenu.xml

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1920,52">
   <displayList>
-    <list id="n29_vboj" name="List" xy="50,0" size="999,52" layout="row" colGap="-36" defaultItem="ui://6hgkvlauvbojxi" autoClearItems="true">
+    <list id="n29_vboj" name="List" xy="50,0" size="704,52" layout="row" colGap="-36" defaultItem="ui://6hgkvlauvbojxi" autoClearItems="true">
       <item url="ui://6hgkvlaumbu9y9"/>
       <item/>
       <item/>
       <item/>
     </list>
     <component id="n27_r03u" name="BtnPrev" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" xy="1,12"/>
-    <component id="n28_r03u" name="BtnNext" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" xy="1064,12"/>
+    <component id="n28_r03u" name="BtnNext" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" xy="773,12">
+      <relation target="n29_vboj" sidePair="middle-middle,right-right"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Common/package.xml

@@ -342,25 +342,25 @@
     <image id="vboju6" name="icon_controller_31.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vboju7" name="icon_controller_64.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vboju8" name="icon_controller_66.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vboju9" name="key_code_108.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vboju9" name="keyboard_l.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojua" name="key_code_109.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojua" name="keyboard_m.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojub" name="key_code_110.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojub" name="keyboard_n.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuc" name="key_code_111.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuc" name="keyboard_o.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojud" name="key_code_112.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojud" name="keyboard_p.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojue" name="key_code_113.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojue" name="keyboard_q.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojuf" name="icon_controller_9.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojug" name="key_code_114.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojug" name="keyboard_r.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuh" name="key_code_115.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuh" name="keyboard_s.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojui" name="key_code_116.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojui" name="keyboard_t.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuj" name="key_code_117.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuj" name="keyboard_u.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuk" name="key_code_118.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuk" name="keyboard_v.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojul" name="key_code_119.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojul" name="keyboard_w.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojum" name="key_code_120.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojum" name="keyboard_x.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojun" name="key_code_121.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojun" name="keyboard_y.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuo" name="key_code_107.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuo" name="keyboard_k.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojup" name="icon_controller_65.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuq" name="key_code_106.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuq" name="keyboard_j.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojur" name="key_code_104.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojur" name="keyboard_h.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojus" name="icon_controller_67.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojut" name="icon_controller_68.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojuu" name="icon_controller_69.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
@@ -368,56 +368,56 @@
     <image id="vbojuw" name="icon_controller_70.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojux" name="icon_controller_71.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojuy" name="icon_controller_72.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojuz" name="key_code_97.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojuz" name="keyboard_a.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv0" name="key_code_98.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv0" name="keyboard_b.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv1" name="key_code_99.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv1" name="keyboard_c.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv2" name="key_code_100.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv2" name="keyboard_d.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv3" name="key_code_101.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv3" name="keyboard_e.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv4" name="key_code_102.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv4" name="keyboard_f.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv5" name="key_code_103.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv5" name="keyboard_g.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojv6" name="icon_controller_8.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojv7" name="key_code_105.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojv7" name="keyboard_i.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojv8" name="icon_controller_30.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojv9" name="icon_controller_3.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojva" name="icon_controller_29.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvb" name="key_code_289.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvb" name="keyboard_f8.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvc" name="key_code_290.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvc" name="keyboard_f9.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvd" name="key_code_291.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvd" name="keyboard_f10.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojve" name="icon_controller_12.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvf" name="key_code_292.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvf" name="keyboard_f11.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvg" name="key_code_293.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvg" name="keyboard_f12.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojvh" name="icon_controller_122.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvi" name="key_code_27.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvi" name="keyboard_escape.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvj" name="key_code_307.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvj" name="keyboard_leftAlt.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvk" name="key_code_305.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvk" name="keyboard_leftCtrl.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvl" name="key_code_127.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvl" name="keyboard_delete.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvm" name="key_code_9.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvm" name="keyboard_tab.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvn" name="key_code_303.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvn" name="keyboard_leftShift.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvo" name="key_code_271.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvo" name="keyboard_enter.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojvp" name="icon_controller_13.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvq" name="key_code_288.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvq" name="keyboard_f7.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvr" name="key_code_32.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvr" name="keyboard_space.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvs" name="key_code_287.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvs" name="keyboard_f6.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvt" name="key_code_285.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvt" name="keyboard_f4.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojvu" name="icon_controller_10.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvv" name="key_code_49.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvv" name="keyboard_1.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvw" name="key_code_50.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvw" name="keyboard_2.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvx" name="key_code_51.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvx" name="keyboard_3.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvy" name="key_code_52.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvy" name="keyboard_4.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojvz" name="key_code_53.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojvz" name="keyboard_5.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw0" name="key_code_54.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw0" name="keyboard_6.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw1" name="key_code_55.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw1" name="keyboard_7.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw2" name="key_code_56.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw2" name="keyboard_8.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw3" name="key_code_57.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw3" name="keyboard_9.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojw4" name="icon_controller_109.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojw5" name="icon_controller_11.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw6" name="key_code_282.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw6" name="keyboard_f1.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw7" name="key_code_283.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw7" name="keyboard_f2.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw8" name="key_code_284.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw8" name="keyboard_f3.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojw9" name="key_code_286.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojw9" name="keyboard_f5.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwa" name="icon_controller_131.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwb" name="icon_controller_132.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojwc" name="key_code_301.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojwc" name="keyboard_capsLock.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwd" name="icon_controller_152.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwe" name="icon_controller_16.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwf" name="icon_controller_17.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
@@ -437,14 +437,14 @@
     <image id="vbojwt" name="icon_controller_150.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwu" name="icon_controller_15.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojwv" name="icon_controller_149.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojww" name="key_code_277.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojww" name="keyboard_insert.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojwx" name="key_code_278.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojwx" name="keyboard_home.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojwy" name="key_code_279.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojwy" name="keyboard_end.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojwz" name="key_code_280.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojwz" name="keyboard_pageUp.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojx0" name="key_code_281.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojx0" name="keyboard_pageDown.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojx1" name="key_code_8.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojx1" name="keyboard_backspace.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojx2" name="icon_controller_14.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojx3" name="key_code_122.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojx3" name="keyboard_z.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojx4" name="icon_controller_140.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojx5" name="icon_controller_142.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojx6" name="icon_controller_143.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
@@ -454,7 +454,7 @@
     <image id="vbojxa" name="icon_controller_147.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojxb" name="icon_controller_148.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojxc" name="icon_controller_141.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="vbojxd" name="key_code_48.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="vbojxd" name="keyboard_0.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="vbojxf" name="SubMenuLeft.png" path="/ImagesNew/Button/" scale="9grid" scale9grid="5,0,30,52"/>
     <image id="vbojxg" name="SubMenuMid.png" path="/ImagesNew/Button/" scale="9grid" scale9grid="48,0,6,52"/>
     <image id="vbojxh" name="SubMenuRight.png" path="/ImagesNew/Button/" scale="9grid" scale9grid="65,0,10,52"/>
@@ -490,9 +490,9 @@
     <image id="mbu9yc" name="triangle_left.png" path="/ImagesNew/Triangle/" exported="true"/>
     <image id="mbu9yd" name="triangle_right.png" path="/ImagesNew/Triangle/" exported="true"/>
     <image id="mbu9ye" name="Loading_Slovakia_4.png" path="/Images/Back/" exported="true" atlas="alone"/>
-    <image id="mbu9yf" name="key_code_308.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="mbu9yf" name="keyboard_rightAlt.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="mbu9yg" name="key_code_306.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="mbu9yg" name="keyboard_rightCtrl.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
-    <image id="mbu9yh" name="key_code_304.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
+    <image id="mbu9yh" name="keyboard_rightShift.png" path="/ImagesNew/Icon/icon_controller/" exported="true"/>
     <image id="mbu9yi" name="square128_stroke3px.png" path="/ImagesNew/Square/mini/" exported="true" scale="9grid" scale9grid="5,5,10,10"/>
     <image id="mbu9yj" name="square20_stroke1px.png" path="/ImagesNew/Square/mini/" exported="true" scale="9grid" scale9grid="5,5,10,10"/>
     <image id="mbu9yk" name="square20_stroke2px.png" path="/ImagesNew/Square/mini/" exported="true" scale="9grid" scale9grid="5,5,10,10"/>

FGUIProject/assets/Main/Settings/SettingPanel.xml

@@ -28,7 +28,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n11_e9z8" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="-1,1014">
+    <component id="n11_e9z8" name="BottomMenu" src="9mf1z" fileName="Com/Menu/BottomMenu.xml" pkg="6hgkvlau" xy="0,1014">
       <relation target="" sidePair="width-width,center-center,bottom-bottom"/>
     </component>
     <component id="n13_j6rn" name="Mask" src="j6rn18" fileName="Com/SettingMask.xml" xy="0,0" visible="false"/>

Fishing2.sln.DotSettings.user

@@ -5,6 +5,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4c8c45fec274213bfac03ee0e9a3d621f5a00_003F68_003F617b5af4_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArraySortHelper_00601_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F59bd7c40c082431db25e1e728ab6278946ae00_003F21_003Febacfe84_003FArraySortHelper_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAttributeUsageAttribute_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5a41d6b7189842eca409fd0b1c3e3dcf17bf78_003F87_003F656e3c96_003FAttributeUsageAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingFlags_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3272951baa974b2ab5e8de68d60bfc1e46ae00_003F19_003Fd51853c3_003FBindingFlags_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingFlags_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5a41d6b7189842eca409fd0b1c3e3dcf17bf78_003Fa8_003F57a4f791_003FBindingFlags_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingFlags_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F94_003F16186629_003FBindingFlags_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACameraClearFlags_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4c8c45fec274213bfac03ee0e9a3d621f5a00_003F95_003Ff32b203b_003FCameraClearFlags_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -40,6 +41,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALineRenderer_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4c8c45fec274213bfac03ee0e9a3d621f5a00_003F80_003F9c0662cb_003FLineRenderer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F314938d17f3848e8ac683e11b27f62ee46ae00_003Fe8_003F01e5a04a_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMathf_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003Fdd_003F448b7101_003FMathf_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMethodBase_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3272951baa974b2ab5e8de68d60bfc1e46ae00_003F35_003F5dbb2059_003FMethodBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMonoBehaviour_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4c8c45fec274213bfac03ee0e9a3d621f5a00_003F57_003Fe1f1d73b_003FMonoBehaviour_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F28_003Fb85198b6_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4c8c45fec274213bfac03ee0e9a3d621f5a00_003F87_003F6890e286_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>