[Fix] Naming

2026-03-01 11:52:15 +07:00
parent 0f9b162061
commit 6c10a35bf9
34 changed files with 133 additions and 93 deletions
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 511dff8ba41dd7e49a817a1053ff3b90
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -9,14 +9,14 @@ namespace YachtDice.Categories
    /// Аналог ModifierCatalogSO.
    /// </summary>
    [CreateAssetMenu(fileName = "CategoryCatalog", menuName = "YachtDice/Categories/Catalog")]
-    public class CategoryCatalogSO : ScriptableObject
+    public class CategoryCatalog : ScriptableObject
    {
-        [SerializeField] private List<CategoryDefinitionSO> categories = new();
+        [SerializeField] private List<CategoryDefinition> categories = new();

-        public IReadOnlyList<CategoryDefinitionSO> All => categories;
+        public IReadOnlyList<CategoryDefinition> All => categories;
        public int Count => categories.Count;

-        public CategoryDefinitionSO FindById(string id)
+        public CategoryDefinition FindById(string id)
        {
            for (int i = 0; i < categories.Count; i++)
            {
@@ -26,7 +26,7 @@ namespace YachtDice.Categories
            return null;
        }

-        public int IndexOf(CategoryDefinitionSO def)
+        public int IndexOf(CategoryDefinition def)
        {
            for (int i = 0; i < categories.Count; i++)
            {
@@ -37,10 +37,10 @@ namespace YachtDice.Categories
        }

 #if UNITY_EDITOR
-        public static CategoryCatalogSO CreateForTest(List<CategoryDefinitionSO> defs)
+        public static CategoryCatalog CreateForTest(List<CategoryDefinition> defs)
        {
-            var catalog = CreateInstance<CategoryCatalogSO>();
-            catalog.categories = defs ?? new List<CategoryDefinitionSO>();
+            var catalog = CreateInstance<CategoryCatalog>();
+            catalog.categories = defs ?? new List<CategoryDefinition>();
            return catalog;
        }
 #endif
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e89ee3a4aac1e6d4eabd79f32b9d8d15
@@ -8,7 +8,7 @@ namespace YachtDice.Categories
    /// Абстрактное определение категории для скоринга.
    /// Каждая категория знает как вычислить очки по набору дайсов.
    /// </summary>
-    public abstract class CategoryDefinitionSO : ScriptableObject
+    public abstract class CategoryDefinition : ScriptableObject
    {
        [Header("Identity")]
        [SerializeField] private string id;
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7b24bbcc7122ad0429210eb02f5b51a7
@@ -9,7 +9,7 @@ namespace YachtDice.Categories
    /// При совпадении возвращает фиксированное число очков.
    /// </summary>
    [CreateAssetMenu(fileName = "FullHouseCategory", menuName = "YachtDice/Categories/Full House")]
-    public class FullHouseCategorySO : CategoryDefinitionSO
+    public class FullHouseCategory : CategoryDefinition
    {
        [Header("Scoring")]
        [Tooltip("Фиксированное число очков за фулл-хаус")]
@@ -22,9 +22,9 @@ namespace YachtDice.Categories
        }

 #if UNITY_EDITOR
-        public static FullHouseCategorySO CreateForTest(string id, string displayName, int score = 25)
+        public static FullHouseCategory CreateForTest(string id, string displayName, int score = 25)
        {
-            var so = CreateInstance<FullHouseCategorySO>();
+            var so = CreateInstance<FullHouseCategory>();
            so.SetTestData(id, displayName);
            so.fixedScore = score;
            return so;
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5fbe9492ec44ebb4da7074b0719b3eda
@@ -10,7 +10,7 @@ namespace YachtDice.Categories
    /// Используется для Тройки (3, сумма), Каре (4, сумма), Яхты (5, fixed=50).
    /// </summary>
    [CreateAssetMenu(fileName = "NOfAKindCategory", menuName = "YachtDice/Categories/N Of A Kind")]
-    public class NOfAKindCategorySO : CategoryDefinitionSO
+    public class NOfAKindCategory : CategoryDefinition
    {
        [Header("Scoring")]
        [Tooltip("Сколько одинаковых дайсов требуется")]
@@ -33,9 +33,9 @@ namespace YachtDice.Categories
        }

 #if UNITY_EDITOR
-        public static NOfAKindCategorySO CreateForTest(string id, string displayName, int count, bool fixedScoreMode = false, int score = 0)
+        public static NOfAKindCategory CreateForTest(string id, string displayName, int count, bool fixedScoreMode = false, int score = 0)
        {
-            var so = CreateInstance<NOfAKindCategorySO>();
+            var so = CreateInstance<NOfAKindCategory>();
            so.SetTestData(id, displayName);
            so.requiredCount = count;
            so.useFixedScore = fixedScoreMode;
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3a4bac360359f3847a088d18e67b5c8b
@@ -10,7 +10,7 @@ namespace YachtDice.Categories
    /// Малый стрит: runLength=4, fixedScore=30. Большой стрит: runLength=5, fixedScore=40.
    /// </summary>
    [CreateAssetMenu(fileName = "StraightCategory", menuName = "YachtDice/Categories/Straight")]
-    public class StraightCategorySO : CategoryDefinitionSO
+    public class StraightCategory : CategoryDefinition
    {
        [Header("Scoring")]
        [Tooltip("Требуемая длина последовательности")]
@@ -26,9 +26,9 @@ namespace YachtDice.Categories
        }

 #if UNITY_EDITOR
-        public static StraightCategorySO CreateForTest(string id, string displayName, int run, int score)
+        public static StraightCategory CreateForTest(string id, string displayName, int run, int score)
        {
-            var so = CreateInstance<StraightCategorySO>();
+            var so = CreateInstance<StraightCategory>();
            so.SetTestData(id, displayName);
            so.runLength = run;
            so.fixedScore = score;
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7f267a540d10bec4b91f1b9c1173257b
@@ -8,7 +8,7 @@ namespace YachtDice.Categories
    /// Категория «Шанс»: суммирует все дайсы без условий.
    /// </summary>
    [CreateAssetMenu(fileName = "SumAllCategory", menuName = "YachtDice/Categories/Sum All (Chance)")]
-    public class SumAllCategorySO : CategoryDefinitionSO
+    public class SumAllCategory : CategoryDefinition
    {
        public override int Calculate(IReadOnlyList<IDie> dice)
        {
@@ -19,9 +19,9 @@ namespace YachtDice.Categories
        }

 #if UNITY_EDITOR
-        public static SumAllCategorySO CreateForTest(string id, string displayName)
+        public static SumAllCategory CreateForTest(string id, string displayName)
        {
-            var so = CreateInstance<SumAllCategorySO>();
+            var so = CreateInstance<SumAllCategory>();
            so.SetTestData(id, displayName);
            return so;
        }
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: aeb4a3033474e7c4b945a3c5a71df067
@@ -9,7 +9,7 @@ namespace YachtDice.Categories
    /// Используется для Единиц (1), Двоек (2), ... Шестёрок (6).
    /// </summary>
    [CreateAssetMenu(fileName = "SumOfValueCategory", menuName = "YachtDice/Categories/Sum Of Value")]
-    public class SumOfValueCategorySO : CategoryDefinitionSO
+    public class SumOfValueCategory : CategoryDefinition
    {
        [Header("Scoring")]
        [Tooltip("Значение грани для суммирования (1-6)")]
@@ -26,9 +26,9 @@ namespace YachtDice.Categories
        }

 #if UNITY_EDITOR
-        public static SumOfValueCategorySO CreateForTest(string id, string displayName, int target)
+        public static SumOfValueCategory CreateForTest(string id, string displayName, int target)
        {
-            var so = CreateInstance<SumOfValueCategorySO>();
+            var so = CreateInstance<SumOfValueCategory>();
            so.SetTestData(id, displayName, upperSection: true);
            so.targetValue = target;
            return so;
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cdb02f59d2ac5894f9f28d4547d3d941
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: aa749c160e90ff54ea903f977051f51d