Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加按键绑定设置相关ui

Browse Source
This commit is contained in:
bob
2025-06-10 18:18:15 +08:00
parent 9963e4a51e
commit 5996d3563c
12 changed files with 31 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Assets/PlayerInputControl.inputactions
View File

@@ -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
}
]
}

BIN
Assets/Resources/Fgui/Main/Main_fui.bytes
View File

Binary file not shown.

3
Assets/Scripts/Common/Services/Settings/Options/Input.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 9f72256d425749e3a05fd57c209d057d
timeCreated: 1749539093

3
Assets/Scripts/Common/Services/Settings/Options/Input/Play.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a62c4b82ff5b41fcb8dce043124b2451
timeCreated: 1749539107

3
Assets/Scripts/Common/Services/Settings/Options/Input/UI.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: acbdfd25f6584a93a4b750bb757ff2c3
timeCreated: 1749539097

3
Assets/Scripts/Common/Services/Settings/Options/Keyboard.meta
View File

@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 283a2fdc117b4b4c8c5e9a5245740a8e
timeCreated: 1749538578

1
Assets/Scripts/Common/Services/Settings/Options/Sound/AmbientVolumeSetting.cs
View File

@@ -18,6 +18,7 @@ namespace NBF.Setting
SetValue(10);
}
protected override void OnApply()
{
SoundManager.Inst.SetVolume(AudioChannelType.Ambient, GetValue() / 100f);

78
Assets/Scripts/Fishing/PlayerInputControl.cs
View File

@@ -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<IUIActions> m_UIActionsCallbackInterfaces = new List<IUIActions>();
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;
/// <summary>
/// Provides access to input actions defined in input action map "UI".
/// </summary>
@@ -2153,10 +2109,6 @@ namespace NBF
/// </summary>
public UIActions(@PlayerInputControl wrapper) { m_Wrapper = wrapper; }
/// <summary>
/// Provides access to the underlying input action "UI/Roll".
/// </summary>
public InputAction @Roll => m_Wrapper.m_UI_Roll;
/// <summary>
/// Provides access to the underlying input action "UI/Back".
/// </summary>
public InputAction @Back => m_Wrapper.m_UI_Back;
@@ -2201,10 +2153,6 @@ namespace NBF
/// </summary>
public InputAction @Up => m_Wrapper.m_UI_Up;
/// <summary>
/// Provides access to the underlying input action "UI/Newaction".
/// </summary>
public InputAction @Newaction => m_Wrapper.m_UI_Newaction;
/// <summary>
/// Provides access to the underlying input action map instance.
/// </summary>
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;
}
/// <summary>
@@ -2280,9 +2222,6 @@ namespace NBF
/// <seealso cref="UIActions" />
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;
}
/// <summary>
@@ -2677,13 +2613,6 @@ namespace NBF
/// <seealso cref="UIActions.RemoveCallbacks(IUIActions)" />
public interface IUIActions
{
/// <summary>
/// Method invoked when associated input action "Roll" 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 OnRoll(InputAction.CallbackContext context);
/// <summary>
/// Method invoked when associated input action "Back" is either <see cref="UnityEngine.InputSystem.InputAction.started" />, <see cref="UnityEngine.InputSystem.InputAction.performed" /> or <see cref="UnityEngine.InputSystem.InputAction.canceled" />.
/// </summary>
@@ -2761,13 +2690,6 @@ namespace NBF
/// <seealso cref="UnityEngine.InputSystem.InputAction.performed" />
/// <seealso cref="UnityEngine.InputSystem.InputAction.canceled" />
void OnUp(InputAction.CallbackContext context);
/// <summary>
/// Method invoked when associated input action "New action" 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 OnNewaction(InputAction.CallbackContext context);
}
}
}

2
FGUIProject/assets/Common/Com/Slider/CommonSlider.xml
View File

@@ -4,7 +4,7 @@
<graph id="n0_e9z8" name="n0" xy="0,0" size="50,5" type="rect" lineSize="0" lineColor="#ffa0a0a0" fillColor="#ff5c748b">
<relation target="" sidePair="width-width,height-height"/>
</graph>
<graph id="n1_e9z8" name="bar" xy="0,0" size="50,5" type="rect" lineSize="0" fillColor="#ff8bf3ff"/>
<graph id="n1_e9z8" name="bar" xy="0,0" size="50,5" type="rect" lineSize="0" fillColor="#ffcbcbcb"/>
<component id="n2_e9z8" name="grip" src="e9z8k3" fileName="Com/Slider/Slider1_grip.xml" xy="45,-12">
<relation target="n1_e9z8" sidePair="right-right"/>
</component>

6
FGUIProject/assets/Common/Com/Slider/Slider1_grip.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="10,30" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="2"/>
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList>
<graph id="n0_e9z8" name="n0" xy="0,0" size="10,30" touchable="false" type="rect" lineSize="0" fillColor="#ff8bf3ff">
<graph id="n0_e9z8" name="n0" xy="0,0" size="10,30" touchable="false" type="rect" lineSize="0" fillColor="#ffcbcbcb">
<relation target="" sidePair="width-width,height-height"/>
</graph>
<graph id="n3_e9z8" name="n3" xy="0,0" size="10,30" touchable="false" type="rect" lineSize="0" fillColor="#ffd8fbff">
<graph id="n3_e9z8" name="n3" xy="0,0" size="10,30" touchable="false" type="rect" lineSize="0">
<gearDisplay controller="button" pages="1,3"/>
<relation target="" sidePair="width-width,height-height"/>
</graph>

10
FGUIProject/assets/Main/Com/Items/SettingItem.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="874,70" extention="Button">
<controller name="style" pages="0,文本,1,进度条" selected="0"/>
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="0"/>
<controller name="style" pages="0,文本,1,进度条,6,键鼠输入,7,手柄输入" selected="2"/>
<controller name="button" pages="2,up,3,down,4,over,5,selectedOver" selected="1"/>
<displayList>
<image id="n5_e9z8" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="868,70" alpha="0.2" color="#5c748b">
<image id="n5_e9z8" name="back" src="kryob" fileName="Images/Square.png" pkg="6hgkvlau" xy="0,0" size="868,70" alpha="0.5" color="#5c748b">
<gearLook controller="button" pages="3,5" values="0.5,0,0,0|0.5,0,0,0" default="0.2,0,0,0"/>
<gearColor controller="button" pages="4" values="#8bf3ff" default="#5c748b"/>
<gearColor controller="button" pages="2,4" values="#5c748b|#8bf3ff" default="#5c748b"/>
<relation target="" sidePair="width-width,height-height"/>
</image>
<text id="n6_e9z8" name="TextName" xy="22,19" size="189,32" fontSize="22" color="#ffffff" text="Screen resolution"/>
@@ -20,10 +20,12 @@
</component>
<component id="n10_e9z8" name="BtnPrev" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" pkg="6hgkvlau" xy="509,17">
<gearDisplay controller="button" pages="3,4,5"/>
<gearDisplay2 controller="style" pages="0,1" condition="0"/>
<relation target="n9_e9z8" sidePair="middle-middle,left-left"/>
</component>
<component id="n11_e9z8" name="BtnNext" src="r03ut" fileName="Com/Buttons/BtnInputControl.xml" pkg="6hgkvlau" xy="818,17">
<gearDisplay controller="button" pages="3,4,5"/>
<gearDisplay2 controller="style" pages="0,1" condition="0"/>
<relation target="n9_e9z8" sidePair="middle-middle,right-right"/>
</component>
<text id="n13_oivj" name="TextSliderValue" xy="772,17" size="34,29" fontSize="20" color="#d8fbff" text="2.9">

22
UserSettings/EditorUserSettings.asset
View File

@@ -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