From ebef45c4a330aaa8ef5c8e42aa56aa98fff7f022 Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Sun, 1 Feb 2026 23:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8C=89=E9=94=AE=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=8C=89=E9=94=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AssetCaches.asset | 4 +- Assets/PlayerInputControl.inputactions | 64 +++------ Assets/ResRaw/Fgui/Common/Common_fui.bytes | Bin 44162 -> 44173 bytes Assets/ResRaw/Fgui/Main/Main_fui.bytes | Bin 29445 -> 29445 bytes .../Common/Common/Attrobites/Attributes.cs | 7 +- .../Common/Services/Input/InputManager.cs | 125 ++++++++++++++++- .../Options/Graphics/ResolutionSetting.cs | 2 +- .../Common/Utils/Extends/UIInputExtensions.cs | 33 ----- .../Utils/Extends/UIInputExtensions.cs.meta | 3 - Assets/Scripts/Common/Utils/Reflection.cs | 33 ++++- Assets/Scripts/Fishing/PlayerInputControl.cs | 83 ++++++----- Assets/Scripts/UI/Bag/BagPanel.cs | 28 +--- .../UI/Common/Button/BtnInputControl.cs | 2 +- .../UI/Common/Button/BtnInputControlBase.cs | 28 ++++ .../Common/Button/BtnInputControlBase.cs.meta | 3 + .../UI/Common/Button/BtnTitleInputControl.cs | 11 +- .../Scripts/UI/Common/List/CommonItemList.cs | 1 - Assets/Scripts/UI/Common/Menu/BottomMenu.cs | 39 +++--- Assets/Scripts/UI/Common/Menu/CommonMenu.cs | 4 +- .../Scripts/UI/Common/Menu/CommonSubMenu.cs | 38 ++--- .../Scripts/UI/Common/Panel/CommonTopPanel.cs | 3 - Assets/Scripts/UI/Home/Pages/HomeMainPage.cs | 10 -- Assets/Scripts/UI/Settings/SettingItem.cs | 1 - Assets/Scripts/UI/Settings/SettingPanel.cs | 95 ++++++++----- Assets/Scripts/UI/Shops/FishingShopPanel.cs | 8 +- .../assets/Common/Com/Menu/CommonSubMenu.xml | 6 +- .../{key_code_48.png => keyboard_0.png} | Bin .../{key_code_49.png => keyboard_1.png} | Bin .../{key_code_50.png => keyboard_2.png} | Bin .../{key_code_51.png => keyboard_3.png} | Bin .../{key_code_52.png => keyboard_4.png} | Bin .../{key_code_53.png => keyboard_5.png} | Bin .../{key_code_54.png => keyboard_6.png} | Bin .../{key_code_55.png => keyboard_7.png} | Bin .../{key_code_56.png => keyboard_8.png} | Bin .../{key_code_57.png => keyboard_9.png} | Bin .../{key_code_97.png => keyboard_a.png} | Bin .../{key_code_98.png => keyboard_b.png} | Bin ...{key_code_8.png => keyboard_backspace.png} | Bin .../{key_code_99.png => keyboard_c.png} | Bin ...key_code_301.png => keyboard_capsLock.png} | Bin .../{key_code_100.png => keyboard_d.png} | Bin .../{key_code_127.png => keyboard_delete.png} | Bin .../{key_code_101.png => keyboard_e.png} | Bin .../{key_code_279.png => keyboard_end.png} | Bin .../{key_code_271.png => keyboard_enter.png} | Bin .../{key_code_27.png => keyboard_escape.png} | Bin .../{key_code_102.png => keyboard_f.png} | Bin .../{key_code_282.png => keyboard_f1.png} | Bin .../{key_code_291.png => keyboard_f10.png} | Bin .../{key_code_292.png => keyboard_f11.png} | Bin .../{key_code_293.png => keyboard_f12.png} | Bin .../{key_code_283.png => keyboard_f2.png} | Bin .../{key_code_284.png => keyboard_f3.png} | Bin .../{key_code_285.png => keyboard_f4.png} | Bin .../{key_code_286.png => keyboard_f5.png} | Bin .../{key_code_287.png => keyboard_f6.png} | Bin .../{key_code_288.png => keyboard_f7.png} | Bin .../{key_code_289.png => keyboard_f8.png} | Bin .../{key_code_290.png => keyboard_f9.png} | Bin .../{key_code_103.png => keyboard_g.png} | Bin .../{key_code_104.png => keyboard_h.png} | Bin .../{key_code_278.png => keyboard_home.png} | Bin .../{key_code_105.png => keyboard_i.png} | Bin .../{key_code_277.png => keyboard_insert.png} | Bin .../{key_code_106.png => keyboard_j.png} | Bin .../{key_code_107.png => keyboard_k.png} | Bin .../{key_code_108.png => keyboard_l.png} | Bin ...{key_code_307.png => keyboard_leftAlt.png} | Bin ...key_code_305.png => keyboard_leftCtrl.png} | Bin ...ey_code_303.png => keyboard_leftShift.png} | Bin .../{key_code_109.png => keyboard_m.png} | Bin .../{key_code_110.png => keyboard_n.png} | Bin .../{key_code_111.png => keyboard_o.png} | Bin .../{key_code_112.png => keyboard_p.png} | Bin ...key_code_281.png => keyboard_pageDown.png} | Bin .../{key_code_280.png => keyboard_pageUp.png} | Bin .../{key_code_113.png => keyboard_q.png} | Bin .../{key_code_114.png => keyboard_r.png} | Bin ...key_code_308.png => keyboard_rightAlt.png} | Bin ...ey_code_306.png => keyboard_rightCtrl.png} | Bin ...y_code_304.png => keyboard_rightShift.png} | Bin .../{key_code_115.png => keyboard_s.png} | Bin .../{key_code_32.png => keyboard_space.png} | Bin .../{key_code_116.png => keyboard_t.png} | Bin .../{key_code_9.png => keyboard_tab.png} | Bin .../{key_code_117.png => keyboard_u.png} | Bin .../{key_code_118.png => keyboard_v.png} | Bin .../{key_code_119.png => keyboard_w.png} | Bin .../{key_code_120.png => keyboard_x.png} | Bin .../{key_code_121.png => keyboard_y.png} | Bin .../{key_code_122.png => keyboard_z.png} | Bin FGUIProject/assets/Common/package.xml | 132 +++++++++--------- .../assets/Main/Settings/SettingPanel.xml | 2 +- Fishing2.sln.DotSettings.user | 2 + 95 files changed, 426 insertions(+), 341 deletions(-) delete mode 100644 Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs delete mode 100644 Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs.meta create mode 100644 Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs create mode 100644 Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs.meta rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_48.png => keyboard_0.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_49.png => keyboard_1.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_50.png => keyboard_2.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_51.png => keyboard_3.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_52.png => keyboard_4.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_53.png => keyboard_5.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_54.png => keyboard_6.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_55.png => keyboard_7.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_56.png => keyboard_8.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_57.png => keyboard_9.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_97.png => keyboard_a.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_98.png => keyboard_b.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_8.png => keyboard_backspace.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_99.png => keyboard_c.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_301.png => keyboard_capsLock.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_100.png => keyboard_d.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_127.png => keyboard_delete.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_101.png => keyboard_e.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_279.png => keyboard_end.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_271.png => keyboard_enter.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_27.png => keyboard_escape.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_102.png => keyboard_f.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_282.png => keyboard_f1.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_291.png => keyboard_f10.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_292.png => keyboard_f11.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_293.png => keyboard_f12.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_283.png => keyboard_f2.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_284.png => keyboard_f3.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_285.png => keyboard_f4.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_286.png => keyboard_f5.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_287.png => keyboard_f6.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_288.png => keyboard_f7.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_289.png => keyboard_f8.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_290.png => keyboard_f9.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_103.png => keyboard_g.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_104.png => keyboard_h.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_278.png => keyboard_home.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_105.png => keyboard_i.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_277.png => keyboard_insert.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_106.png => keyboard_j.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_107.png => keyboard_k.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_108.png => keyboard_l.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_307.png => keyboard_leftAlt.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_305.png => keyboard_leftCtrl.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_303.png => keyboard_leftShift.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_109.png => keyboard_m.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_110.png => keyboard_n.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_111.png => keyboard_o.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_112.png => keyboard_p.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_281.png => keyboard_pageDown.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_280.png => keyboard_pageUp.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_113.png => keyboard_q.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_114.png => keyboard_r.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_308.png => keyboard_rightAlt.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_306.png => keyboard_rightCtrl.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_304.png => keyboard_rightShift.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_115.png => keyboard_s.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_32.png => keyboard_space.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_116.png => keyboard_t.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_9.png => keyboard_tab.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_117.png => keyboard_u.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_118.png => keyboard_v.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_119.png => keyboard_w.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_120.png => keyboard_x.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_121.png => keyboard_y.png} (100%) rename FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/{key_code_122.png => keyboard_z.png} (100%) diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index e9eef51d7..705ab3487 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -22830,8 +22830,8 @@ MonoBehaviour: Filter: '*' Bundles: - Name: main/ui.bundle - Hash: a6d6be8890d773594b4e6a1d4acf82d3 - Size: 7664301 + Hash: f08e8dd58157955ebca6ffc7dbe79a1c + Size: 7664401 Assets: - Path: Assets/ResRaw/Fgui/Common/Common_atlas0.png Address: UI/Common_atlas0 diff --git a/Assets/PlayerInputControl.inputactions b/Assets/PlayerInputControl.inputactions index 51f720468..1b4ab5d74 100644 --- a/Assets/PlayerInputControl.inputactions +++ b/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": "/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": "/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": "/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": "/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": "/f1", + "interactions": "", + "processors": "", + "groups": "", + "action": "Test", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/ResRaw/Fgui/Common/Common_fui.bytes b/Assets/ResRaw/Fgui/Common/Common_fui.bytes index c09382e9669f013115a6fd0846a8a03e3ea242d8..bae87818f2ce2f2078023fbf3b2fce99559ff8d4 100644 GIT binary patch delta 1572 zcmY+EyKmD_6vj`|7okx4ni%>(L=obZqz-8WYE^{}RS^t`iAS*=CvhHj>bSX12a1?j zkPsKCLno?2P?=E0&@HTpf1nZr3o8ulleze z=jGt%<(Y-_lfFnIvILKh|3v_Xo{NwqRwRGQ6zYeu8MU{tR=p^kROb81(x{i z^vs*Zr&B9K5g3IG5`OEsHs?_5rfpTv3Fs=;7g*~qoaFmW<=zpNMSgI_z@fvwX)M5tSeS=o>w zWOZZ;VFoglFcVpUum&=Xuytfb7}HhLSW|iD-6W~O!g!f{(?q5dW+ST*wt=ilSPNN= zFovw|vn!&L4no6+g0+#EgjKn-8=npvR6&hJG-cl1{Z2L|dzw~~XcS~A!c=5w!V1Xd z2-A>BgcXrxeAX{EP~zwJE)Ivq>U?$YQFb_(cyS)TQh~r6!UCKLm8m5Expyhy*{+yM zp{8^~lSW$RUpo_9Y5!G+b3r1lsmcw10~Htz0yVAZIvF!mAvC!g@yzVnvsEM63R+FG z{cLqoi!Cb>rZONr7;dVb_c3O|NKk-g*qX(EypP`{y~v`_BEn`vR{eiAY2$97*rrh8 z_ddjl8T`&Me^6phexn@1<}g{CFn>#%gk?M(qvpawSYR$m`~J`tXs VO|Q?6*Oou~f62K@^537{{s$>Z5Gw!x delta 1529 zcmY+E&ubGw6vt;1ja6GK6usFdYFa_inc3a$u9U=DdiBT2gGg=K_#-t2TDzO{V8x3k zK^(zD5wSM5R1hSfc=HeN(qk{;&A-7*>NLKWycd|uXJ===Ki=lWZtB@?>gB}Y0nzzA z-}^G1E$EwRXUv%txA)qP5Qm=HN1k2IMBo0V({^37OIb2%*O*DF_6av7!(fh&4M9M8+d`K?Q^nIA+#HBDWxy>urXc%yJ5-^8& zdB`Z<9x*y@K5tI3KQh%yZ)H>D&p`(eWKyTE2GB&(U=-3!RwxZ2&bnk2@~kT|9&oDp Zx;;WHeF&EHS2{{c?#-yQ$} diff --git a/Assets/ResRaw/Fgui/Main/Main_fui.bytes b/Assets/ResRaw/Fgui/Main/Main_fui.bytes index 1ef91f5f1dcb810cea81a105193122fd24a41c69..08b33aa8198762fbbfc301f69b9328f28abfbb74 100644 GIT binary patch delta 18 acmZpD#@PCdaYMEA @@ -25,6 +40,7 @@ namespace NBF public static bool IsOp1; public static bool IsOp2; + public static event Action OnOp1Action; public static event Action OnOp2Action; @@ -63,6 +79,9 @@ namespace NBF /// public static event Action OnInteractiveObjectAction; + public static event Action OnUIInvokeChange; + + public static PlayerInputControl PlayerInputControl { get; private set; } /// @@ -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> _panelActions = new Dictionary>(); + private Dictionary _keyboardIcons = new Dictionary(); + public void On(object obj) { + var ms = Reflection.GetMethodsAttribute(obj.GetType()); + List inputInvokes = new List(); + 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 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 GetUsableInvokes() + { + List ret = new List(); + + 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 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 diff --git a/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs b/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs index 8b5297229..a3f8578be 100644 --- a/Assets/Scripts/Common/Common/Services/Settings/Options/Graphics/ResolutionSetting.cs +++ b/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 = diff --git a/Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs b/Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs deleted file mode 100644 index 6bce6fc99..000000000 --- a/Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs +++ /dev/null @@ -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); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs.meta b/Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs.meta deleted file mode 100644 index 8d87b4530..000000000 --- a/Assets/Scripts/Common/Utils/Extends/UIInputExtensions.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e9bfb9f042814fb787428551c801aada -timeCreated: 1748944711 \ No newline at end of file diff --git a/Assets/Scripts/Common/Utils/Reflection.cs b/Assets/Scripts/Common/Utils/Reflection.cs index 926bcc755..1cfbd2b7f 100644 --- a/Assets/Scripts/Common/Utils/Reflection.cs +++ b/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; } + + /// + /// 获取所有标记指定特性的方法 + /// + /// 查找类 + /// + public static Dictionary GetMethodsAttribute(Type classType) where T : Attribute + { + Dictionary methodsWithAttribute = new Dictionary(); + + if (classType == null) + { + return methodsWithAttribute; + } + + // 获取所有方法，包括公共、非公共、实例和静态方法 + MethodInfo[] allMethods = + classType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + + foreach (MethodInfo method in allMethods) + { + var attribute = method.GetCustomAttribute(); + if (attribute != null) + { + methodsWithAttribute[method] = attribute; + } + } + + return methodsWithAttribute; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Fishing/PlayerInputControl.cs b/Assets/Scripts/Fishing/PlayerInputControl.cs index 191a0e6d2..154e5230a 100644 --- a/Assets/Scripts/Fishing/PlayerInputControl.cs +++ b/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"": ""/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"": ""/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"": ""/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"": ""/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"": ""/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; /// /// Provides access to input actions defined in input action map "UI". /// @@ -2212,6 +2190,10 @@ namespace NBF /// public InputAction @Reset => m_Wrapper.m_UI_Reset; /// + /// Provides access to the underlying input action "UI/Test". + /// + public InputAction @Test => m_Wrapper.m_UI_Test; + /// /// Provides access to the underlying input action map instance. /// 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; } /// @@ -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; } /// @@ -2769,6 +2757,13 @@ namespace NBF /// /// void OnReset(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Test" is either , or . + /// + /// + /// + /// + void OnTest(InputAction.CallbackContext context); } } } diff --git a/Assets/Scripts/UI/Bag/BagPanel.cs b/Assets/Scripts/UI/Bag/BagPanel.cs index cfe8a15e0..0a53a3086 100644 --- a/Assets/Scripts/UI/Bag/BagPanel.cs +++ b/Assets/Scripts/UI/Bag/BagPanel.cs @@ -13,16 +13,13 @@ namespace NBF { base.OnInit(); } - + protected override void OnShow() { ItemList.List.OnClickItem += OnClickItem; - InputManager.OnUICanceled += OnUICanceled; - UseBottomMenu(); List tabItemList = new List(); - 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; } diff --git a/Assets/Scripts/UI/Common/Button/BtnInputControl.cs b/Assets/Scripts/UI/Common/Button/BtnInputControl.cs index 3fbddb422..4a9e04ff9 100644 --- a/Assets/Scripts/UI/Common/Button/BtnInputControl.cs +++ b/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() { diff --git a/Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs b/Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs new file mode 100644 index 000000000..e790b8c8b --- /dev/null +++ b/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); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs.meta b/Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs.meta new file mode 100644 index 000000000..51f3834a5 --- /dev/null +++ b/Assets/Scripts/UI/Common/Button/BtnInputControlBase.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4da865139cbb401a91f63bcf30d233c4 +timeCreated: 1769960386 \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/Button/BtnTitleInputControl.cs b/Assets/Scripts/UI/Common/Button/BtnTitleInputControl.cs index 4200bb0ff..62b018138 100644 --- a/Assets/Scripts/UI/Common/Button/BtnTitleInputControl.cs +++ b/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; - } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Common/List/CommonItemList.cs b/Assets/Scripts/UI/Common/List/CommonItemList.cs index cce123399..19fb5ab0f 100644 --- a/Assets/Scripts/UI/Common/List/CommonItemList.cs +++ b/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() diff --git a/Assets/Scripts/UI/Common/Menu/BottomMenu.cs b/Assets/Scripts/UI/Common/Menu/BottomMenu.cs index 848ee8bae..1c8b605a4 100644 --- a/Assets/Scripts/UI/Common/Menu/BottomMenu.cs +++ b/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(); - - // AddButtonItem(OnUse, ""); - // AddButtonItem(OnTab, InputDef.UI.Tab); - // AddButtonItem(OnEnter, InputDef.UI.Enter); - // AddButtonItem(OnBack, InputDef.UI.Back); + var invokes = InputManager.Instance.GetUsableInvokes(); + foreach (var uiInputInvoke in invokes) + { + var invokeData = uiInputInvoke.InputInvoke; + 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) diff --git a/Assets/Scripts/UI/Common/Menu/CommonMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonMenu.cs index af51858d3..e59086f91 100644 --- a/Assets/Scripts/UI/Common/Menu/CommonMenu.cs +++ b/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) { diff --git a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs index 63b44317a..2e249b5cc 100644 --- a/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs +++ b/Assets/Scripts/UI/Common/Menu/CommonSubMenu.cs @@ -12,12 +12,9 @@ namespace NBF public partial class CommonSubMenu : GComponent { public event Action OnTabChange; - private UIPanel _panel; - public void SetPanel(UIPanel panel) - { - _panel = panel; - } + private string _leftActionName; + private string _rightActionName; 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 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) { diff --git a/Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs b/Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs index 8669271cd..b50c656d4 100644 --- a/Assets/Scripts/UI/Common/Panel/CommonTopPanel.cs +++ b/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() diff --git a/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs b/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs index 6b564b3a7..4f0a31ffe 100644 --- a/Assets/Scripts/UI/Home/Pages/HomeMainPage.cs +++ b/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); - } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Settings/SettingItem.cs b/Assets/Scripts/UI/Settings/SettingItem.cs index e31d1dfd9..5a2ca2432 100644 --- a/Assets/Scripts/UI/Settings/SettingItem.cs +++ b/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) diff --git a/Assets/Scripts/UI/Settings/SettingPanel.cs b/Assets/Scripts/UI/Settings/SettingPanel.cs index 4950dfd02..5d989d705 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.cs +++ b/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 OnSubPrev() + private void SetActionIcon() + { + 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)] - private void OnSubNext() + [InputInvoke(InputDef.UI.Right, UIInputButtonShowMode.BottomLeft)] + 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() diff --git a/Assets/Scripts/UI/Shops/FishingShopPanel.cs b/Assets/Scripts/UI/Shops/FishingShopPanel.cs index 09e04d55e..e090b40de 100644 --- a/Assets/Scripts/UI/Shops/FishingShopPanel.cs +++ b/Assets/Scripts/UI/Shops/FishingShopPanel.cs @@ -21,7 +21,6 @@ namespace NBF { ItemList.List.OnClickItem += OnClickItem; InputManager.OnUICanceled += OnUICanceled; - UseBottomMenu(); List tabItemList = GoodsConfigHelper.TabItemList; @@ -53,12 +52,7 @@ namespace NBF // ItemDetailsPanel.Show(bagItem.ItemInfo); ShopDetailsPanel.Show(gearItem.Config); } - - private void UseBottomMenu() - { - BottomMenu.Use(this); - } - + protected override void OnHide() { InputManager.OnUICanceled -= OnUICanceled; diff --git a/FGUIProject/assets/Common/Com/Menu/CommonSubMenu.xml b/FGUIProject/assets/Common/Com/Menu/CommonSubMenu.xml index 46efba917..72f91ec35 100644 --- a/FGUIProject/assets/Common/Com/Menu/CommonSubMenu.xml +++ b/FGUIProject/assets/Common/Com/Menu/CommonSubMenu.xml @@ -1,13 +1,15 @@ - + - + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_48.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_0.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_48.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_0.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_49.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_1.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_49.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_1.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_50.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_2.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_50.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_2.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_51.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_3.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_51.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_3.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_52.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_4.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_52.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_4.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_53.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_5.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_53.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_5.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_54.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_6.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_54.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_6.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_55.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_7.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_55.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_7.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_56.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_8.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_56.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_8.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_57.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_9.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_57.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_9.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_97.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_a.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_97.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_a.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_98.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_b.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_98.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_b.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_8.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_backspace.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_8.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_backspace.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_99.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_c.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_99.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_c.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_301.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_capsLock.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_301.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_capsLock.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_100.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_d.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_100.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_d.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_127.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_delete.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_127.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_delete.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_101.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_e.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_101.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_e.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_279.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_end.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_279.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_end.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_271.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_enter.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_271.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_enter.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_27.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_escape.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_27.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_escape.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_102.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_102.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_282.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f1.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_282.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f1.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_291.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f10.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_291.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f10.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_292.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f11.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_292.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f11.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_293.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f12.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_293.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f12.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_283.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f2.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_283.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f2.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_284.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f3.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_284.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f3.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_285.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f4.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_285.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f4.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_286.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f5.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_286.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f5.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_287.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f6.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_287.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f6.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_288.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f7.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_288.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f7.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_289.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f8.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_289.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f8.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_290.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f9.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_290.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_f9.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_103.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_g.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_103.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_g.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_104.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_h.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_104.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_h.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_278.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_home.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_278.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_home.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_105.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_i.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_105.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_i.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_277.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_insert.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_277.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_insert.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_106.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_j.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_106.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_j.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_107.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_k.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_107.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_k.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_108.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_l.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_108.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_l.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_307.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_leftAlt.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_307.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_leftAlt.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_305.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_leftCtrl.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_305.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_leftCtrl.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_303.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_leftShift.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_303.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_leftShift.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_109.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_m.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_109.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_m.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_110.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_n.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_110.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_n.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_111.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_o.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_111.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_o.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_112.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_p.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_112.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_p.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_281.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_pageDown.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_281.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_pageDown.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_280.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_pageUp.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_280.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_pageUp.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_113.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_q.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_113.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_q.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_114.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_r.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_114.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_r.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_308.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_rightAlt.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_308.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_rightAlt.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_306.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_rightCtrl.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_306.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_rightCtrl.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_304.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_rightShift.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_304.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_rightShift.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_115.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_s.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_115.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_s.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_32.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_space.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_32.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_space.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_116.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_t.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_116.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_t.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_9.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_tab.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_9.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_tab.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_117.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_u.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_117.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_u.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_118.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_v.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_118.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_v.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_119.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_w.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_119.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_w.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_120.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_x.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_120.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_x.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_121.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_y.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_121.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_y.png diff --git a/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_122.png b/FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_z.png similarity index 100% rename from FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/key_code_122.png rename to FGUIProject/assets/Common/ImagesNew/Icon/icon_controller/keyboard_z.png diff --git a/FGUIProject/assets/Common/package.xml b/FGUIProject/assets/Common/package.xml index 0eb6b2bb5..8b081fe66 100644 --- a/FGUIProject/assets/Common/package.xml +++ b/FGUIProject/assets/Common/package.xml @@ -342,25 +342,25 @@ - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - + + @@ -368,56 +368,56 @@ - - - - - - - + + + + + + + - + - - - + + + - - + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - + @@ -437,14 +437,14 @@ - - - - - - + + + + + + - + @@ -454,7 +454,7 @@ - + @@ -490,9 +490,9 @@ - - - + + + diff --git a/FGUIProject/assets/Main/Settings/SettingPanel.xml b/FGUIProject/assets/Main/Settings/SettingPanel.xml index 56b4713ee..361cdd316 100644 --- a/FGUIProject/assets/Main/Settings/SettingPanel.xml +++ b/FGUIProject/assets/Main/Settings/SettingPanel.xml @@ -28,7 +28,7 @@ - + diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user index 654069414..a5de48729 100644 --- a/Fishing2.sln.DotSettings.user +++ b/Fishing2.sln.DotSettings.user @@ -5,6 +5,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded @@ -40,6 +41,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded