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

Merge branch 'master' of https://git.bobsong.cn/Game/Fishing2

Browse Source
This commit is contained in:
BobSong
2025-06-11 20:29:48 +08:00
parent c31db980f9 3889c0f731
commit b05aa2d5da
15 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Common/Services/Settings/Base/ControllerOption.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace NBF.Setting
{
public abstract class ControllerOption : OptionBase
{
}
}

3
Assets/Scripts/Common/Services/Settings/Base/ControllerOption.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 75e11d5298cd48718d39a3e2af82472f
timeCreated: 1749634909

6
Assets/Scripts/Common/Services/Settings/Base/InputOption.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace NBF.Setting
{
public abstract class InputOption : OptionBase
{
}
}

3
Assets/Scripts/Common/Services/Settings/Base/InputOption.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0df4bee5d9b54ada8be3757d7fe02e30
timeCreated: 1749634814

6
Assets/Scripts/Common/Services/Settings/Base/KeyBoardOption.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace NBF.Setting
{
public abstract class KeyBoardOption : InputOption
{
}
}

3
Assets/Scripts/Common/Services/Settings/Base/KeyBoardOption.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 509d2fb0106b42b79854cca29707207d
timeCreated: 1749634771

14
Assets/Scripts/Common/Services/Settings/Base/MultiOption.cs
View File

@@ -7,14 +7,13 @@ namespace NBF.Setting
public interface IMultiOption : IOptionBase
{
List<string> GetOptionNames();
string GetName();
}
public abstract class MultiOption<T> : OptionBase, IMultiOption
{
protected OptionTable<T> OptionTable = new OptionTable<T>();
protected void AddOption(string name, T value)
{
OptionTable.Add(name, value);
@@ -22,11 +21,7 @@ namespace NBF.Setting
public List<string> GetOptionNames() => OptionTable.GetNames();
public string GetName()
{
return OptionTable.GetName(Value);
}
protected void SelectOption(T value, int defaultIndex = 0)
{
SetValue(TryGetIndex(value, out var index) ? index : defaultIndex);
@@ -59,5 +54,10 @@ namespace NBF.Setting
}
public T GetSelectedOption() => OptionTable.GetValue(Value);
public override string GetDisplayString()
{
return OptionTable.GetName(Value);
}
}
}

8
Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs
View File

@@ -11,6 +11,7 @@ namespace NBF.Setting
void SetValue(int index);
bool HaveNotApple();
ISettings Root { get; }
string GetDisplayString();
}
public abstract class OptionBase : IOptionBase
@@ -50,6 +51,8 @@ namespace NBF.Setting
}
public ISettings Root { get; private set; }
public void Initialize(ISettings root)
{
@@ -81,6 +84,11 @@ namespace NBF.Setting
Value = DefaultValue;
}
public virtual string GetDisplayString()
{
return GetValue().ToString();
}
public virtual int GetValue()
{
return Value;

17
Assets/Scripts/Common/Services/Settings/Base/RangeOption.cs
View File

@@ -1,4 +1,7 @@
namespace NBF.Setting
using System;
using System.Globalization;
namespace NBF.Setting
{
/// <summary>
/// 范围设置
@@ -9,12 +12,22 @@
public abstract int MaxValue { get; }
public virtual int ShowRate => 0;
public override void SetValue(int value)
{
if (value > MaxValue) value = MaxValue;
else if (value < MinValue) value = MinValue;
Value = value;
}
public override string GetDisplayString()
{
if (ShowRate > 0)
{
return Math.Round(GetValue() / (ShowRate * 1f), 1).ToString(CultureInfo.InvariantCulture);
}
return base.GetDisplayString();
}
}
}

7
Assets/Scripts/Common/Services/Settings/Options/Input/InputAddBobSetting.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace NBF.Options.Input
{
public class InputAddBobSetting
{
}
}

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

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 673bfd453717403998342a57e58b9b3a
timeCreated: 1749634714

25
Assets/Scripts/UI/Settings/SettingItem.cs
View File

@@ -1,7 +1,5 @@
// 本脚本只在不存在时会生成一次。组件逻辑写在当前脚本内。已存在不会再次生成覆盖
using System;
using System.Globalization;
using FairyGUI;
using NBC;
using NBF.Setting;
@@ -42,15 +40,6 @@ namespace NBF
private void SetShow()
{
if (Option is IMultiOption multiOption)
{
TextInfo.text = multiOption.GetName();
}
else if (Option is RangeOption range)
{
Slider.value = range.GetValue();
}
UpdateValueText();
}
@@ -148,14 +137,12 @@ namespace NBF
{
if (Option is RangeOption range)
{
if (range.ShowRate > 0)
{
TextSliderValue.text = Math.Round(range.GetValue() / 10f, 1).ToString(CultureInfo.InvariantCulture);
}
else
{
TextSliderValue.text = range.GetValue().ToString();
}
Slider.value = range.GetValue();
TextSliderValue.text = range.GetDisplayString();
}
else if (Option is IMultiOption multiOption)
{
TextInfo.text = multiOption.GetDisplayString();
}
}
}