Merge branch 'claude/vibrant-tereshkova'

# Conflicts:
#	Assets/Scripts/Dice/DiceRoller.cs
This commit is contained in:
2026-03-01 21:30:39 +07:00
7 changed files with 58 additions and 88 deletions
+11 -16
View File
@@ -9,20 +9,15 @@ namespace YachtDice.Dice
/// </summary>
public abstract class DiсeDefinition : ScriptableObject, IShopItem
{
[Header("Identity")]
[SerializeField] private string id;
[SerializeField] private string displayName;
[SerializeField, TextArea] private string description;
[SerializeField] private Sprite icon;
[field: Header("Identity")]
[field: SerializeField] public string Id { get; private set; }
[field: SerializeField] public string DisplayName { get; private set; }
[field: SerializeField, TextArea] public string Description { get; private set; }
[field: SerializeField] public Sprite Icon { get; private set; }
[Header("Economy")]
[SerializeField] private int shopPrice;
[field: Header("Economy")]
[field: SerializeField] public int ShopPrice { get; private set; }
public string Id => id;
public string DisplayName => displayName;
public string Description => description;
public Sprite Icon => icon;
public int ShopPrice => shopPrice;
public bool IsRepurchasable => false;
/// <summary>Количество граней.</summary>
@@ -36,10 +31,10 @@ namespace YachtDice.Dice
int shopPrice = 0, string description = null) where T : DiсeDefinition
{
var so = CreateInstance<T>();
so.id = id;
so.displayName = displayName ?? id;
so.description = description ?? id;
so.shopPrice = shopPrice;
so.Id = id;
so.DisplayName = displayName ?? id;
so.Description = description ?? id;
so.ShopPrice = shopPrice;
return so;
}
#endif