diff --git a/Assets/PlayerInputControl.inputactions b/Assets/PlayerInputControl.inputactions index ed539d7fa..afb71c8e1 100644 --- a/Assets/PlayerInputControl.inputactions +++ b/Assets/PlayerInputControl.inputactions @@ -900,15 +900,6 @@ "name": "UI", "id": "1e134a50-caf1-48ef-a011-2fabe2c0d049", "actions": [ - { - "name": "Roll", - "type": "Button", - "id": "379cc72d-f733-45da-b173-b881ab8ab0ed", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "Back", "type": "Button", @@ -1007,29 +998,9 @@ "processors": "", "interactions": "Hold", "initialStateCheck": false - }, - { - "name": "New action", - "type": "Button", - "id": "a21da899-9653-49b5-8fd8-73934d7f180c", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false } ], "bindings": [ - { - "name": "", - "id": "0e66040a-5980-401a-85c3-b2ef2cc13664", - "path": "", - "interactions": "", - "processors": "", - "groups": "", - "action": "Roll", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "89052787-93ee-47da-ae8f-5bd86adfb2ff", @@ -1359,17 +1330,6 @@ "action": "Up", "isComposite": false, "isPartOfComposite": false - }, - { - "name": "", - "id": "393f1eb9-d10d-4cd1-87e7-ea299f92b2da", - "path": "", - "interactions": "", - "processors": "", - "groups": "", - "action": "New action", - "isComposite": false, - "isPartOfComposite": false } ] } diff --git a/Assets/Resources/Fgui/Main/Main_fui.bytes b/Assets/Resources/Fgui/Main/Main_fui.bytes index 8f46912c3..43f56b7ee 100644 Binary files a/Assets/Resources/Fgui/Main/Main_fui.bytes and b/Assets/Resources/Fgui/Main/Main_fui.bytes differ diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input.meta b/Assets/Scripts/Common/Services/Settings/Options/Input.meta new file mode 100644 index 000000000..a296e8eb6 --- /dev/null +++ b/Assets/Scripts/Common/Services/Settings/Options/Input.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9f72256d425749e3a05fd57c209d057d +timeCreated: 1749539093 \ No newline at end of file diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/Play.meta b/Assets/Scripts/Common/Services/Settings/Options/Input/Play.meta new file mode 100644 index 000000000..417034393 --- /dev/null +++ b/Assets/Scripts/Common/Services/Settings/Options/Input/Play.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a62c4b82ff5b41fcb8dce043124b2451 +timeCreated: 1749539107 \ No newline at end of file diff --git a/Assets/Scripts/Common/Services/Settings/Options/Input/UI.meta b/Assets/Scripts/Common/Services/Settings/Options/Input/UI.meta new file mode 100644 index 000000000..44f259279 --- /dev/null +++ b/Assets/Scripts/Common/Services/Settings/Options/Input/UI.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: acbdfd25f6584a93a4b750bb757ff2c3 +timeCreated: 1749539097 \ No newline at end of file diff --git a/Assets/Scripts/Common/Services/Settings/Options/Keyboard.meta b/Assets/Scripts/Common/Services/Settings/Options/Keyboard.meta deleted file mode 100644 index b0574e1b8..000000000 --- a/Assets/Scripts/Common/Services/Settings/Options/Keyboard.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 283a2fdc117b4b4c8c5e9a5245740a8e -timeCreated: 1749538578 \ No newline at end of file diff --git a/Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs b/Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs index b5acca6ab..82d5d1286 100644 --- a/Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs +++ b/Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs @@ -18,6 +18,7 @@ namespace NBF.Setting SetValue(10); } + protected override void OnApply() { SoundManager.Inst.SetVolume(AudioChannelType.Ambient, GetValue() / 100f); diff --git a/Assets/Scripts/Fishing/PlayerInputControl.cs b/Assets/Scripts/Fishing/PlayerInputControl.cs index 5885c3188..851ad9d9b 100644 --- a/Assets/Scripts/Fishing/PlayerInputControl.cs +++ b/Assets/Scripts/Fishing/PlayerInputControl.cs @@ -988,15 +988,6 @@ namespace NBF ""name"": ""UI"", ""id"": ""1e134a50-caf1-48ef-a011-2fabe2c0d049"", ""actions"": [ - { - ""name"": ""Roll"", - ""type"": ""Button"", - ""id"": ""379cc72d-f733-45da-b173-b881ab8ab0ed"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, { ""name"": ""Back"", ""type"": ""Button"", @@ -1095,29 +1086,9 @@ namespace NBF ""processors"": """", ""interactions"": ""Hold"", ""initialStateCheck"": false - }, - { - ""name"": ""New action"", - ""type"": ""Button"", - ""id"": ""a21da899-9653-49b5-8fd8-73934d7f180c"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false } ], ""bindings"": [ - { - ""name"": """", - ""id"": ""0e66040a-5980-401a-85c3-b2ef2cc13664"", - ""path"": """", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Roll"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, { ""name"": """", ""id"": ""89052787-93ee-47da-ae8f-5bd86adfb2ff"", @@ -1447,17 +1418,6 @@ namespace NBF ""action"": ""Up"", ""isComposite"": false, ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""393f1eb9-d10d-4cd1-87e7-ea299f92b2da"", - ""path"": """", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""New action"", - ""isComposite"": false, - ""isPartOfComposite"": false } ] } @@ -1564,7 +1524,6 @@ namespace NBF m_Player_Use2 = m_Player.FindAction("Use2", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); - m_UI_Roll = m_UI.FindAction("Roll", throwIfNotFound: true); m_UI_Back = m_UI.FindAction("Back", throwIfNotFound: true); m_UI_Enter = m_UI.FindAction("Enter", throwIfNotFound: true); m_UI_Tab = m_UI.FindAction("Tab", throwIfNotFound: true); @@ -1576,7 +1535,6 @@ namespace NBF m_UI_Left = m_UI.FindAction("Left", throwIfNotFound: true); m_UI_Down = m_UI.FindAction("Down", throwIfNotFound: true); m_UI_Up = m_UI.FindAction("Up", throwIfNotFound: true); - m_UI_Newaction = m_UI.FindAction("New action", throwIfNotFound: true); } ~@PlayerInputControl() @@ -2128,7 +2086,6 @@ namespace NBF // UI private readonly InputActionMap m_UI; private List m_UIActionsCallbackInterfaces = new List(); - private readonly InputAction m_UI_Roll; private readonly InputAction m_UI_Back; private readonly InputAction m_UI_Enter; private readonly InputAction m_UI_Tab; @@ -2140,7 +2097,6 @@ namespace NBF private readonly InputAction m_UI_Left; private readonly InputAction m_UI_Down; private readonly InputAction m_UI_Up; - private readonly InputAction m_UI_Newaction; /// /// Provides access to input actions defined in input action map "UI". /// @@ -2153,10 +2109,6 @@ namespace NBF /// public UIActions(@PlayerInputControl wrapper) { m_Wrapper = wrapper; } /// - /// Provides access to the underlying input action "UI/Roll". - /// - public InputAction @Roll => m_Wrapper.m_UI_Roll; - /// /// Provides access to the underlying input action "UI/Back". /// public InputAction @Back => m_Wrapper.m_UI_Back; @@ -2201,10 +2153,6 @@ namespace NBF /// public InputAction @Up => m_Wrapper.m_UI_Up; /// - /// Provides access to the underlying input action "UI/Newaction". - /// - public InputAction @Newaction => m_Wrapper.m_UI_Newaction; - /// /// Provides access to the underlying input action map instance. /// public InputActionMap Get() { return m_Wrapper.m_UI; } @@ -2230,9 +2178,6 @@ namespace NBF { if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return; m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance); - @Roll.started += instance.OnRoll; - @Roll.performed += instance.OnRoll; - @Roll.canceled += instance.OnRoll; @Back.started += instance.OnBack; @Back.performed += instance.OnBack; @Back.canceled += instance.OnBack; @@ -2266,9 +2211,6 @@ namespace NBF @Up.started += instance.OnUp; @Up.performed += instance.OnUp; @Up.canceled += instance.OnUp; - @Newaction.started += instance.OnNewaction; - @Newaction.performed += instance.OnNewaction; - @Newaction.canceled += instance.OnNewaction; } /// @@ -2280,9 +2222,6 @@ namespace NBF /// private void UnregisterCallbacks(IUIActions instance) { - @Roll.started -= instance.OnRoll; - @Roll.performed -= instance.OnRoll; - @Roll.canceled -= instance.OnRoll; @Back.started -= instance.OnBack; @Back.performed -= instance.OnBack; @Back.canceled -= instance.OnBack; @@ -2316,9 +2255,6 @@ namespace NBF @Up.started -= instance.OnUp; @Up.performed -= instance.OnUp; @Up.canceled -= instance.OnUp; - @Newaction.started -= instance.OnNewaction; - @Newaction.performed -= instance.OnNewaction; - @Newaction.canceled -= instance.OnNewaction; } /// @@ -2677,13 +2613,6 @@ namespace NBF /// public interface IUIActions { - /// - /// Method invoked when associated input action "Roll" is either , or . - /// - /// - /// - /// - void OnRoll(InputAction.CallbackContext context); /// /// Method invoked when associated input action "Back" is either , or . /// @@ -2761,13 +2690,6 @@ namespace NBF /// /// void OnUp(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "New action" is either , or . - /// - /// - /// - /// - void OnNewaction(InputAction.CallbackContext context); } } } diff --git a/FGUIProject/assets/Common/Com/Slider/CommonSlider.xml b/FGUIProject/assets/Common/Com/Slider/CommonSlider.xml index 088c98a86..beb341ea1 100644 --- a/FGUIProject/assets/Common/Com/Slider/CommonSlider.xml +++ b/FGUIProject/assets/Common/Com/Slider/CommonSlider.xml @@ -4,7 +4,7 @@ - + diff --git a/FGUIProject/assets/Common/Com/Slider/Slider1_grip.xml b/FGUIProject/assets/Common/Com/Slider/Slider1_grip.xml index 643c4ee4f..47e696cf1 100644 --- a/FGUIProject/assets/Common/Com/Slider/Slider1_grip.xml +++ b/FGUIProject/assets/Common/Com/Slider/Slider1_grip.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/FGUIProject/assets/Main/Com/Items/SettingItem.xml b/FGUIProject/assets/Main/Com/Items/SettingItem.xml index 3bd66d6f7..bcd635abd 100644 --- a/FGUIProject/assets/Main/Com/Items/SettingItem.xml +++ b/FGUIProject/assets/Main/Com/Items/SettingItem.xml @@ -1,11 +1,11 @@ - - + + - + - + @@ -20,10 +20,12 @@ + + diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6e53de067..16bb7f816 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,35 +9,35 @@ EditorUserSettings: value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda flags: 0 RecentlyUsedSceneGuid-0: - value: 020056535456585e0f0d0a7541210d441215482c2d297f36752c1b65b3b0376e - flags: 0 - RecentlyUsedSceneGuid-1: value: 025005075d000f0c095c0f7145730b4447161e2c787923327a7c4965e0b66669 flags: 0 - RecentlyUsedSceneGuid-2: + RecentlyUsedSceneGuid-1: value: 55545602010350590b0d5d20162708444f4e1e7e2a7d74602c2c4e6ab3b1306f flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-2: value: 5b000052510d5b0a5b565a2344770b444e4e1d7c79797f622b7b1c35b3e2606a flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-3: value: 5309000306505b0d0b565f20427a5e44104e1d2c2a7f7467287c4d64b0b66469 flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 065006565505590b0b0f5e7240730f4046154a7a7c7876607f2b4f63b2b06468 flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-5: value: 5303020755510a0f5e085c2744775a40454e1a2f282b72632f284d61e1e5673d flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-6: value: 52530c5601535f020f565a2043770d1612154d2f747975692c7b4e66b5e3303b flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-7: value: 025002565403500e5b5b55724321064445161a7b7b7c22367a7e4467b4b76160 flags: 0 - RecentlyUsedSceneGuid-9: + RecentlyUsedSceneGuid-8: value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e flags: 0 + RecentlyUsedSceneGuid-9: + value: 05070d5f50535d5e0c0c5472427008444e4e1b2f7a7170622e784e37bab3636a + flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9afeffa9ffff8e85dd8390e2969e8899daa7 flags: 0