[Refactor] Replace [SerializeField] + getter with [field: SerializeField] auto-properties
This commit is contained in:
@@ -6,11 +6,11 @@ namespace YachtDice.Dice
|
||||
[CreateAssetMenu(fileName = "DiceCatalog", menuName = "YachtDice/Dice/Catalog")]
|
||||
public class DiceCatalog : ScriptableObject
|
||||
{
|
||||
[SerializeField] private List<DieDefinitionSO> dice = new();
|
||||
[SerializeField] private List<DiсeDefinition> dice = new();
|
||||
|
||||
public IReadOnlyList<DieDefinitionSO> All => dice;
|
||||
public IReadOnlyList<DiсeDefinition> All => dice;
|
||||
|
||||
public DieDefinitionSO FindById(string id)
|
||||
public DiсeDefinition FindById(string id)
|
||||
{
|
||||
for (int i = 0; i < dice.Count; i++)
|
||||
{
|
||||
@@ -21,10 +21,10 @@ namespace YachtDice.Dice
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public static DiceCatalog CreateForTest(List<DieDefinitionSO> defs)
|
||||
public static DiceCatalog CreateForTest(List<DiсeDefinition> defs)
|
||||
{
|
||||
var catalog = CreateInstance<DiceCatalog>();
|
||||
catalog.dice = defs ?? new List<DieDefinitionSO>();
|
||||
catalog.dice = defs ?? new List<DiсeDefinition>();
|
||||
return catalog;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -14,10 +14,10 @@ namespace YachtDice.Dice
|
||||
[Header("References")]
|
||||
[SerializeField] private Dice dice;
|
||||
[SerializeField] private Rigidbody rb;
|
||||
[SerializeField] private DieDefinitionSO definition;
|
||||
[SerializeField] private DiсeDefinition definition;
|
||||
|
||||
/// <summary>Определение типа дайса (назначается в инспекторе).</summary>
|
||||
public DieDefinitionSO Definition => definition;
|
||||
public DiсeDefinition Definition => definition;
|
||||
|
||||
[Header("Throw Settings")]
|
||||
[Tooltip("Сила подброса вверх")]
|
||||
|
||||
@@ -6,18 +6,18 @@ namespace YachtDice.Dice
|
||||
/// </summary>
|
||||
public class DieInstance : IDie
|
||||
{
|
||||
public DieDefinitionSO Definition { get; }
|
||||
public DiсeDefinition Definition { get; }
|
||||
public int Value { get; set; }
|
||||
public bool IsLocked { get; set; }
|
||||
|
||||
public DieInstance(DieDefinitionSO definition)
|
||||
public DieInstance(DiсeDefinition definition)
|
||||
{
|
||||
Definition = definition;
|
||||
Value = 0;
|
||||
IsLocked = false;
|
||||
}
|
||||
|
||||
public DieInstance(DieDefinitionSO definition, int initialValue)
|
||||
public DieInstance(DiсeDefinition definition, int initialValue)
|
||||
{
|
||||
Definition = definition;
|
||||
Value = initialValue;
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace YachtDice.Dice
|
||||
/// Абстрактное определение типа дайса.
|
||||
/// Наследники описывают конкретные виды (стандартный d6, специальные и т.д.).
|
||||
/// </summary>
|
||||
public abstract class DieDefinitionSO : ScriptableObject, IShopItem
|
||||
public abstract class DiсeDefinition : ScriptableObject, IShopItem
|
||||
{
|
||||
[Header("Identity")]
|
||||
[SerializeField] private string id;
|
||||
@@ -33,7 +33,7 @@ namespace YachtDice.Dice
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public static T CreateForTest<T>(string id, string displayName = null,
|
||||
int shopPrice = 0, string description = null) where T : DieDefinitionSO
|
||||
int shopPrice = 0, string description = null) where T : DiсeDefinition
|
||||
{
|
||||
var so = CreateInstance<T>();
|
||||
so.id = id;
|
||||
@@ -10,6 +10,6 @@ namespace YachtDice.Dice
|
||||
int Value { get; }
|
||||
|
||||
/// <summary>Определение типа дайса (ScriptableObject).</summary>
|
||||
DieDefinitionSO Definition { get; }
|
||||
DiсeDefinition Definition { get; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace YachtDice.Dice
|
||||
/// По умолчанию — классический d6 (1-6).
|
||||
/// </summary>
|
||||
[CreateAssetMenu(fileName = "StandardDie", menuName = "YachtDice/Dice/Standard Die")]
|
||||
public class StandardDieSO : DieDefinitionSO
|
||||
public class StandardDiсe : DiсeDefinition
|
||||
{
|
||||
[Header("Configuration")]
|
||||
[SerializeField] private int[] faceValues = { 1, 2, 3, 4, 5, 6 };
|
||||
@@ -22,9 +22,9 @@ namespace YachtDice.Dice
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
public static StandardDieSO CreateStandardD6ForTest()
|
||||
public static StandardDiсe CreateStandardD6ForTest()
|
||||
{
|
||||
var so = CreateForTest<StandardDieSO>("standard_d6", "Стандартный d6");
|
||||
var so = CreateForTest<StandardDiсe>("standard_d6", "Стандартный d6");
|
||||
so.faceValues = new[] { 1, 2, 3, 4, 5, 6 };
|
||||
return so;
|
||||
}
|
||||
Reference in New Issue
Block a user