[Fix] Conflicts

2026-03-02 05:43:11 +07:00
parent 0cce4a74f0
commit d6b79036b7
13 changed files with 35 additions and 53 deletions
@@ -6,18 +6,18 @@ namespace YachtDice.Dice
    /// </summary>
    public class DiceInstance : IDice
    {
-        public DiceDefinitionSO Definition { get; }
+        public DiceDefinition Definition { get; }
        public int Value { get; set; }
        public bool IsLocked { get; set; }

-        public DiceInstance(DiceDefinitionSO definition)
+        public DiceInstance(DiceDefinition definition)
        {
            Definition = definition;
            Value = 0;
            IsLocked = false;
        }

-        public DiceInstance(DiceDefinitionSO definition, int initialValue)
+        public DiceInstance(DiceDefinition definition, int initialValue)
        {
            Definition = definition;
            Value = initialValue;