[Fix] Conflicts

2026-03-02 05:43:11 +07:00
parent 0cce4a74f0
commit d6b79036b7
13 changed files with 35 additions and 53 deletions
@@ -6,13 +6,13 @@ namespace YachtDice.Player
 {
    public class DiceCollection
    {
-        private readonly List<DiceDefinitionSO> ownedDice = new();
+        private readonly List<DiceDefinition> ownedDice = new();

        public event Action OnChanged;

-        public IReadOnlyList<DiceDefinitionSO> OwnedDice => ownedDice;
+        public IReadOnlyList<DiceDefinition> OwnedDice => ownedDice;

-        public void Add(DiceDefinitionSO definition)
+        public void Add(DiceDefinition definition)
        {
            if (definition == null) return;
            if (OwnsById(definition.Id)) return;
@@ -21,7 +21,7 @@ namespace YachtDice.Player
            OnChanged?.Invoke();
        }

-        public void Remove(DiceDefinitionSO definition)
+        public void Remove(DiceDefinition definition)
        {
            if (ownedDice.Remove(definition))
                OnChanged?.Invoke();