Merge branch 'claude/vibrant-tereshkova'

# Conflicts: # Assets/Scripts/Dice/DiceCatalog.cs # Assets/Scripts/Dice/DiceDefinitionSO.cs # Assets/Scripts/Dice/DiceDefinitionSO.cs.meta # Assets/Scripts/Dice/DiceInstance.cs # Assets/Scripts/Dice/DiceRoller.cs # Assets/Scripts/Dice/DieDefinitionSO.cs # Assets/Scripts/Dice/DieDefinitionSO.cs.meta # Assets/Scripts/Dice/DiсeDefinition.cs # Assets/Scripts/Dice/DiсeDefinition.cs.meta # Assets/Scripts/Dice/IDice.cs # Assets/Scripts/Dice/StandardDiceSO.cs # Assets/Scripts/Dice/StandardDiceSO.cs.meta # Assets/Scripts/Dice/StandardDieSO.cs # Assets/Scripts/Dice/StandardDieSO.cs.meta # Assets/Scripts/Dice/StandardDiсe.cs # Assets/Scripts/Dice/StandardDiсe.cs.meta # Assets/Scripts/Player/DiceCollection.cs # Assets/Scripts/Shop/ShopModel.cs # Assets/Scripts/Tests/Editor/DiceCollectionTests.cs # Assets/Scripts/Tests/Editor/ScoringSystemTests.cs # Assets/Scripts/Tests/Editor/ShopModelTests.cs
2026-03-02 05:39:54 +07:00
parent 29ee43807e 13b18b0a8b
commit 0cce4a74f0
24 changed files with 137 additions and 120 deletions
@@ -0,0 +1,43 @@
+using UnityEngine;
+
+namespace YachtDice.Dice
+{
+    /// <summary>
+    /// Стандартный дайс с настраиваемыми значениями граней.
+    /// По умолчанию — классический d6 (1-6).
+    /// </summary>
+    [CreateAssetMenu(fileName = "StandardDice", menuName = "YachtDice/Dice/Standard Dice")]
+<<<<<<<< HEAD:Assets/Scripts/Dice/StandardDiсe.cs
+    public class StandardDiсe : DiсeDefinition
+========
+    public class StandardDiceSO : DiceDefinitionSO
+>>>>>>>> claude/vibrant-tereshkova:Assets/Scripts/Dice/StandardDiceSO.cs
+    {
+        [Header("Configuration")]
+        [SerializeField] private int[] faceValues = { 1, 2, 3, 4, 5, 6 };
+
+        public override int FaceCount => faceValues.Length;
+
+        public override int[] GetFaceValues()
+        {
+            int[] copy = new int[faceValues.Length];
+            System.Array.Copy(faceValues, copy, faceValues.Length);
+            return copy;
+        }
+
+#if UNITY_EDITOR
+<<<<<<<< HEAD:Assets/Scripts/Dice/StandardDiсe.cs
+        public static StandardDiсe CreateStandardD6ForTest()
+        {
+            var so = CreateForTest<StandardDiсe>("standard_d6", "Стандартный d6");
+========
+        public static StandardDiceSO CreateStandardD6ForTest()
+        {
+            var so = CreateForTest<StandardDiceSO>("standard_d6", "Стандартный d6");
+>>>>>>>> claude/vibrant-tereshkova:Assets/Scripts/Dice/StandardDiceSO.cs
+            so.faceValues = new[] { 1, 2, 3, 4, 5, 6 };
+            return so;
+        }
+#endif
+    }
+}