horooko/YachtDice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Conflicts

Browse Source
This commit is contained in:
Konstantin Dyachenko
2026-03-02 05:43:11 +07:00
parent 0cce4a74f0
commit d6b79036b7
13 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Dice/DiceCatalog.cs
+5 -5
View File
@@ -6,11 +6,11 @@ namespace YachtDice.Dice
[CreateAssetMenu(fileName = "DiceCatalog", menuName = "YachtDice/Dice/Catalog")]
public class DiceCatalog : ScriptableObject
{
[SerializeField] private List<DiceDefinitionSO> dice = new();
[SerializeField] private List<DiceDefinition> dice = new();
public IReadOnlyList<DiceDefinitionSO> All => dice;
public IReadOnlyList<DiceDefinition> All => dice;
public DiceDefinitionSO FindById(string id)
public DiceDefinition FindById(string id)
{
for (int i = 0; i < dice.Count; i++)
{
@@ -21,10 +21,10 @@ namespace YachtDice.Dice
}
#if UNITY_EDITOR
public static DiceCatalog CreateForTest(List<DiceDefinitionSO> defs)
public static DiceCatalog CreateForTest(List<DiceDefinition> defs)
{
var catalog = CreateInstance<DiceCatalog>();
catalog.dice = defs ?? new List<DiceDefinitionSO>();
catalog.dice = defs ?? new List<DiceDefinition>();
return catalog;
}
#endif