[Fix] Conflicts
This commit is contained in:
@@ -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("Сила подброса вверх")]
|
||||
|
||||
Reference in New Issue
Block a user