[Fix] Conflicts

This commit is contained in:
2026-03-02 05:43:11 +07:00
parent 0cce4a74f0
commit d6b79036b7
13 changed files with 35 additions and 53 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ namespace YachtDice.Dice
[SerializeField] private Rigidbody rb;
/// <summary>Определение типа дайса (назначается в инспекторе).</summary>
[field: SerializeField] public DiceDefinitionSO Definition { get; private set; }
[field: SerializeField] public DiceDefinition Definition { get; private set; }
[Header("Throw Settings")]
[Tooltip("Сила подброса вверх")]