From 29ee43807eedb698dad7266462c04537b199226a Mon Sep 17 00:00:00 2001 From: Konstantin Dyachenko Date: Mon, 2 Mar 2026 05:25:05 +0700 Subject: [PATCH] [Add] Data --- Assets/Data.meta | 8 + Assets/Data/Categories.meta | 8 + .../10_StraightCategory_small.asset | 22 + .../10_StraightCategory_small.asset.meta | 8 + .../11_StraightCategory_large.asset | 22 + .../11_StraightCategory_large.asset.meta | 8 + .../12_NOfAKindCategory_yacht.asset | 22 + .../12_NOfAKindCategory_yacht.asset.meta | 8 + .../Data/Categories/13_SumAllCategory.asset | 19 + .../Categories/13_SumAllCategory.asset.meta | 8 + .../Categories/1_SumOfValueCategory1.asset | 20 + .../1_SumOfValueCategory1.asset.meta | 8 + .../Categories/2_SumOfValueCategory2.asset | 20 + .../2_SumOfValueCategory2.asset.meta | 8 + .../Categories/3_SumOfValueCategory3.asset | 20 + .../3_SumOfValueCategory3.asset.meta | 8 + .../Categories/4_SumOfValueCategory4.asset | 21 + .../4_SumOfValueCategory4.asset.meta | 8 + .../Categories/5_SumOfValueCategory5.asset | 20 + .../5_SumOfValueCategory5.asset.meta | 8 + .../Categories/6_SumOfValueCategory6.asset | 21 + .../6_SumOfValueCategory6.asset.meta | 8 + .../Categories/7_NOfAKindCategory_3.asset | 23 + .../7_NOfAKindCategory_3.asset.meta | 8 + .../Categories/8_NOfAKindCategory_4.asset | 23 + .../8_NOfAKindCategory_4.asset.meta | 8 + .../Data/Categories/9_FullHouseCategory.asset | 21 + .../Categories/9_FullHouseCategory.asset.meta | 8 + Assets/Data/ModifierCatalog.meta | 8 + .../ModifierCatalog/ModifierCatalog.asset | 15 + .../ModifierCatalog.asset.meta | 8 + Assets/Data/ModifierCatalog/Modifiers.meta | 8 + .../Modifiers/DiceCountCondition 1.asset | 16 + .../Modifiers/DiceCountCondition 1.asset.meta | 8 + .../Modifiers/DiceCountCondition 2.asset | 16 + .../Modifiers/DiceCountCondition 2.asset.meta | 8 + .../Modifiers/DiceCountCondition 3.asset | 16 + .../Modifiers/DiceCountCondition 3.asset.meta | 8 + .../Modifiers/DiceCountCondition 4.asset | 16 + .../Modifiers/DiceCountCondition 4.asset.meta | 8 + .../Modifiers/DiceCountCondition 5.asset | 16 + .../Modifiers/DiceCountCondition 5.asset.meta | 8 + .../Modifiers/DiceCountCondition 6.asset | 16 + .../Modifiers/DiceCountCondition 6.asset.meta | 8 + Assets/Data/ShopCatalog.asset | 15 + Assets/Data/ShopCatalog.asset.meta | 8 + .../Plugins/vFavorites/vFavorites Data.asset | 11 +- Assets/Plugins/vFolders/vFolders Data.asset | 30 ++ Assets/Scenes/Scene.unity | 452 ++++++++++++++++++ Assets/Scenes/Scene.unity.meta | 7 + .../Definition/CategoryDefinition.cs | 2 +- .../Definition/FullHouseCategory.cs | 2 +- .../Categories/Definition/NOfAKindCategory.cs | 2 +- .../Categories/Definition/StraightCategory.cs | 2 +- .../Categories/Definition/SumAllCategory.cs | 2 +- .../Definition/SumOfValueCategory.cs | 2 +- Assets/Scripts/Categories/DiceCheckUtility.cs | 2 +- .../Dice/{DieInstance.cs => DiceInstance.cs} | 6 +- ...eInstance.cs.meta => DiceInstance.cs.meta} | 0 Assets/Scripts/Dice/{IDie.cs => IDice.cs} | 2 +- .../Dice/{IDie.cs.meta => IDice.cs.meta} | 0 Assets/Scripts/Dice/StandardDiсe.cs | 2 +- Assets/Scripts/Game/DiceManager.cs | 12 +- .../Conditions/DiceCountCondition.cs | 2 +- .../Scripts/Modifiers/Core/ModifierContext.cs | 4 +- Assets/Scripts/Scoring/ScoreResult.cs | 2 +- Assets/Scripts/Scoring/ScoringSystem.cs | 6 +- Assets/Scripts/Shop/IShopItem.cs | 2 +- .../Tests/Editor/ScoringSystemTests.cs | 6 +- Assets/Scripts/UI/GameController.cs | 6 +- Assets/Textures/TEMP.meta | 8 + 71 files changed, 1139 insertions(+), 33 deletions(-) create mode 100644 Assets/Data.meta create mode 100644 Assets/Data/Categories.meta create mode 100644 Assets/Data/Categories/10_StraightCategory_small.asset create mode 100644 Assets/Data/Categories/10_StraightCategory_small.asset.meta create mode 100644 Assets/Data/Categories/11_StraightCategory_large.asset create mode 100644 Assets/Data/Categories/11_StraightCategory_large.asset.meta create mode 100644 Assets/Data/Categories/12_NOfAKindCategory_yacht.asset create mode 100644 Assets/Data/Categories/12_NOfAKindCategory_yacht.asset.meta create mode 100644 Assets/Data/Categories/13_SumAllCategory.asset create mode 100644 Assets/Data/Categories/13_SumAllCategory.asset.meta create mode 100644 Assets/Data/Categories/1_SumOfValueCategory1.asset create mode 100644 Assets/Data/Categories/1_SumOfValueCategory1.asset.meta create mode 100644 Assets/Data/Categories/2_SumOfValueCategory2.asset create mode 100644 Assets/Data/Categories/2_SumOfValueCategory2.asset.meta create mode 100644 Assets/Data/Categories/3_SumOfValueCategory3.asset create mode 100644 Assets/Data/Categories/3_SumOfValueCategory3.asset.meta create mode 100644 Assets/Data/Categories/4_SumOfValueCategory4.asset create mode 100644 Assets/Data/Categories/4_SumOfValueCategory4.asset.meta create mode 100644 Assets/Data/Categories/5_SumOfValueCategory5.asset create mode 100644 Assets/Data/Categories/5_SumOfValueCategory5.asset.meta create mode 100644 Assets/Data/Categories/6_SumOfValueCategory6.asset create mode 100644 Assets/Data/Categories/6_SumOfValueCategory6.asset.meta create mode 100644 Assets/Data/Categories/7_NOfAKindCategory_3.asset create mode 100644 Assets/Data/Categories/7_NOfAKindCategory_3.asset.meta create mode 100644 Assets/Data/Categories/8_NOfAKindCategory_4.asset create mode 100644 Assets/Data/Categories/8_NOfAKindCategory_4.asset.meta create mode 100644 Assets/Data/Categories/9_FullHouseCategory.asset create mode 100644 Assets/Data/Categories/9_FullHouseCategory.asset.meta create mode 100644 Assets/Data/ModifierCatalog.meta create mode 100644 Assets/Data/ModifierCatalog/ModifierCatalog.asset create mode 100644 Assets/Data/ModifierCatalog/ModifierCatalog.asset.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset create mode 100644 Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta create mode 100644 Assets/Data/ShopCatalog.asset create mode 100644 Assets/Data/ShopCatalog.asset.meta create mode 100644 Assets/Scenes/Scene.unity create mode 100644 Assets/Scenes/Scene.unity.meta rename Assets/Scripts/Dice/{DieInstance.cs => DiceInstance.cs} (79%) rename Assets/Scripts/Dice/{DieInstance.cs.meta => DiceInstance.cs.meta} (100%) rename Assets/Scripts/Dice/{IDie.cs => IDice.cs} (95%) rename Assets/Scripts/Dice/{IDie.cs.meta => IDice.cs.meta} (100%) create mode 100644 Assets/Textures/TEMP.meta diff --git a/Assets/Data.meta b/Assets/Data.meta new file mode 100644 index 0000000..a308e63 --- /dev/null +++ b/Assets/Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3006e1caaf8b7d94189adb6708eb0075 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories.meta b/Assets/Data/Categories.meta new file mode 100644 index 0000000..e3a6417 --- /dev/null +++ b/Assets/Data/Categories.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86677aceb4c5dca44a2ae8dc1b738222 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/10_StraightCategory_small.asset b/Assets/Data/Categories/10_StraightCategory_small.asset new file mode 100644 index 0000000..7183beb --- /dev/null +++ b/Assets/Data/Categories/10_StraightCategory_small.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f267a540d10bec4b91f1b9c1173257b, type: 3} + m_Name: 10_StraightCategory_small + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.StraightCategory + k__BackingField: small_straight + k__BackingField: "\u041C\u0430\u043B\u044B\u0439 \u0444\u0443\u043B\u043B" + k__BackingField: "\u041C\u0430\u043B\u044B\u0439 \u0444\u0443\u043B\u043B + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + runLength: 4 + fixedScore: 30 diff --git a/Assets/Data/Categories/10_StraightCategory_small.asset.meta b/Assets/Data/Categories/10_StraightCategory_small.asset.meta new file mode 100644 index 0000000..2b0fb16 --- /dev/null +++ b/Assets/Data/Categories/10_StraightCategory_small.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ed686ef060a26a48a9892d467f83bc2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/11_StraightCategory_large.asset b/Assets/Data/Categories/11_StraightCategory_large.asset new file mode 100644 index 0000000..9f65513 --- /dev/null +++ b/Assets/Data/Categories/11_StraightCategory_large.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f267a540d10bec4b91f1b9c1173257b, type: 3} + m_Name: 11_StraightCategory_large + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.StraightCategory + k__BackingField: large_straight + k__BackingField: "\u0411\u043E\u043B\u044C\u0448\u043E\u0439 \u0444\u0443\u043B\u043B" + k__BackingField: "\u0411\u043E\u043B\u044C\u0448\u043E\u0439 \u0444\u0443\u043B\u043B + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + runLength: 5 + fixedScore: 40 diff --git a/Assets/Data/Categories/11_StraightCategory_large.asset.meta b/Assets/Data/Categories/11_StraightCategory_large.asset.meta new file mode 100644 index 0000000..39a8f51 --- /dev/null +++ b/Assets/Data/Categories/11_StraightCategory_large.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9bf7be35c88f2845a4ad5dc81c5b9d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/12_NOfAKindCategory_yacht.asset b/Assets/Data/Categories/12_NOfAKindCategory_yacht.asset new file mode 100644 index 0000000..88c61eb --- /dev/null +++ b/Assets/Data/Categories/12_NOfAKindCategory_yacht.asset @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a4bac360359f3847a088d18e67b5c8b, type: 3} + m_Name: 12_NOfAKindCategory_yacht + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.NOfAKindCategory + k__BackingField: + k__BackingField: + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: 0 + requiredCount: 5 + useFixedScore: 1 + fixedScore: 60 diff --git a/Assets/Data/Categories/12_NOfAKindCategory_yacht.asset.meta b/Assets/Data/Categories/12_NOfAKindCategory_yacht.asset.meta new file mode 100644 index 0000000..9d94035 --- /dev/null +++ b/Assets/Data/Categories/12_NOfAKindCategory_yacht.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3241fb265c623174fac9d0d1ca1f5f05 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/13_SumAllCategory.asset b/Assets/Data/Categories/13_SumAllCategory.asset new file mode 100644 index 0000000..f8ab897 --- /dev/null +++ b/Assets/Data/Categories/13_SumAllCategory.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aeb4a3033474e7c4b945a3c5a71df067, type: 3} + m_Name: 13_SumAllCategory + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumAllCategory + k__BackingField: chance + k__BackingField: "\u0428\u0430\u043D\u0441" + k__BackingField: "\u0428\u0430\u043D\u0441 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 diff --git a/Assets/Data/Categories/13_SumAllCategory.asset.meta b/Assets/Data/Categories/13_SumAllCategory.asset.meta new file mode 100644 index 0000000..57977ef --- /dev/null +++ b/Assets/Data/Categories/13_SumAllCategory.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0822490ecb8ce224d861379ddb7b76ab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/1_SumOfValueCategory1.asset b/Assets/Data/Categories/1_SumOfValueCategory1.asset new file mode 100644 index 0000000..ba34201 --- /dev/null +++ b/Assets/Data/Categories/1_SumOfValueCategory1.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdb02f59d2ac5894f9f28d4547d3d941, type: 3} + m_Name: 1_SumOfValueCategory1 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumOfValueCategory + k__BackingField: ones + k__BackingField: "\u0415\u0434\u0438\u043D\u0438\u0446\u044B" + k__BackingField: "\u0415\u0434\u0438\u043D\u0438\u0446\u044B \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 1 diff --git a/Assets/Data/Categories/1_SumOfValueCategory1.asset.meta b/Assets/Data/Categories/1_SumOfValueCategory1.asset.meta new file mode 100644 index 0000000..23ddc81 --- /dev/null +++ b/Assets/Data/Categories/1_SumOfValueCategory1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad75115a9ee3dd34598b1521d1f34a08 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/2_SumOfValueCategory2.asset b/Assets/Data/Categories/2_SumOfValueCategory2.asset new file mode 100644 index 0000000..0088a26 --- /dev/null +++ b/Assets/Data/Categories/2_SumOfValueCategory2.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdb02f59d2ac5894f9f28d4547d3d941, type: 3} + m_Name: 2_SumOfValueCategory2 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumOfValueCategory + k__BackingField: twos + k__BackingField: "\u0414\u0432\u043E\u0439\u043A\u0438" + k__BackingField: "\u0414\u0432\u043E\u0439\u043A\u0438 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 2 diff --git a/Assets/Data/Categories/2_SumOfValueCategory2.asset.meta b/Assets/Data/Categories/2_SumOfValueCategory2.asset.meta new file mode 100644 index 0000000..3d3c8d7 --- /dev/null +++ b/Assets/Data/Categories/2_SumOfValueCategory2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5be00d38f4e40664788d28114856e446 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/3_SumOfValueCategory3.asset b/Assets/Data/Categories/3_SumOfValueCategory3.asset new file mode 100644 index 0000000..a088ea4 --- /dev/null +++ b/Assets/Data/Categories/3_SumOfValueCategory3.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdb02f59d2ac5894f9f28d4547d3d941, type: 3} + m_Name: 3_SumOfValueCategory3 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumOfValueCategory + k__BackingField: threes + k__BackingField: "\u0422\u0440\u043E\u0439\u043A\u0438" + k__BackingField: "\u0422\u0440\u043E\u0439\u043A\u0438 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 3 diff --git a/Assets/Data/Categories/3_SumOfValueCategory3.asset.meta b/Assets/Data/Categories/3_SumOfValueCategory3.asset.meta new file mode 100644 index 0000000..c7f2f82 --- /dev/null +++ b/Assets/Data/Categories/3_SumOfValueCategory3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7474d22b4785b4b42a16be1fe12e53e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/4_SumOfValueCategory4.asset b/Assets/Data/Categories/4_SumOfValueCategory4.asset new file mode 100644 index 0000000..d6e3f0d --- /dev/null +++ b/Assets/Data/Categories/4_SumOfValueCategory4.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdb02f59d2ac5894f9f28d4547d3d941, type: 3} + m_Name: 4_SumOfValueCategory4 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumOfValueCategory + k__BackingField: fours + k__BackingField: "\u0427\u0435\u0442\u0432\u0435\u0440\u043A\u0438" + k__BackingField: "\u0427\u0435\u0442\u0432\u0435\u0440\u043A\u0438 + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 4 diff --git a/Assets/Data/Categories/4_SumOfValueCategory4.asset.meta b/Assets/Data/Categories/4_SumOfValueCategory4.asset.meta new file mode 100644 index 0000000..b942f13 --- /dev/null +++ b/Assets/Data/Categories/4_SumOfValueCategory4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 492827790313e6f43944e19a0f3a6a9c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/5_SumOfValueCategory5.asset b/Assets/Data/Categories/5_SumOfValueCategory5.asset new file mode 100644 index 0000000..aff2163 --- /dev/null +++ b/Assets/Data/Categories/5_SumOfValueCategory5.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdb02f59d2ac5894f9f28d4547d3d941, type: 3} + m_Name: 5_SumOfValueCategory5 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumOfValueCategory + k__BackingField: fives + k__BackingField: "\u041F\u044F\u0442\u0435\u0440\u043A\u0438" + k__BackingField: "\u041F\u044F\u0442\u0435\u0440\u043A\u0438 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 5 diff --git a/Assets/Data/Categories/5_SumOfValueCategory5.asset.meta b/Assets/Data/Categories/5_SumOfValueCategory5.asset.meta new file mode 100644 index 0000000..5d79314 --- /dev/null +++ b/Assets/Data/Categories/5_SumOfValueCategory5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e18f115081820946a1a4a53d56f4f0f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/6_SumOfValueCategory6.asset b/Assets/Data/Categories/6_SumOfValueCategory6.asset new file mode 100644 index 0000000..cae05c7 --- /dev/null +++ b/Assets/Data/Categories/6_SumOfValueCategory6.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdb02f59d2ac5894f9f28d4547d3d941, type: 3} + m_Name: 6_SumOfValueCategory6 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.SumOfValueCategory + k__BackingField: sixes + k__BackingField: "\u0428\u0435\u0441\u0442\u0435\u0440\u043A\u0438" + k__BackingField: "\u0428\u0435\u0441\u0442\u0435\u0440\u043A\u0438 + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + k__BackingField: 6 diff --git a/Assets/Data/Categories/6_SumOfValueCategory6.asset.meta b/Assets/Data/Categories/6_SumOfValueCategory6.asset.meta new file mode 100644 index 0000000..c78971f --- /dev/null +++ b/Assets/Data/Categories/6_SumOfValueCategory6.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b1c9794957ddfb48a7674531139919b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/7_NOfAKindCategory_3.asset b/Assets/Data/Categories/7_NOfAKindCategory_3.asset new file mode 100644 index 0000000..a2db81c --- /dev/null +++ b/Assets/Data/Categories/7_NOfAKindCategory_3.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a4bac360359f3847a088d18e67b5c8b, type: 3} + m_Name: 7_NOfAKindCategory_3 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.NOfAKindCategory + k__BackingField: three_of_a_kind + k__BackingField: "\u0422\u0440\u0438 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0435" + k__BackingField: "\u0422\u0440\u0438 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0435 + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + requiredCount: 3 + useFixedScore: 1 + fixedScore: 30 diff --git a/Assets/Data/Categories/7_NOfAKindCategory_3.asset.meta b/Assets/Data/Categories/7_NOfAKindCategory_3.asset.meta new file mode 100644 index 0000000..2293b57 --- /dev/null +++ b/Assets/Data/Categories/7_NOfAKindCategory_3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89432fbaba032e646994088d85b96c99 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/8_NOfAKindCategory_4.asset b/Assets/Data/Categories/8_NOfAKindCategory_4.asset new file mode 100644 index 0000000..d7ecf4d --- /dev/null +++ b/Assets/Data/Categories/8_NOfAKindCategory_4.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a4bac360359f3847a088d18e67b5c8b, type: 3} + m_Name: 8_NOfAKindCategory_4 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.NOfAKindCategory + k__BackingField: four_of_a_kind + k__BackingField: "\u0427\u0435\u0442\u044B\u0440\u0435 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0435" + k__BackingField: "\u0427\u0435\u0442\u044B\u0440\u0435 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0435 + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + requiredCount: 4 + useFixedScore: 1 + fixedScore: 40 diff --git a/Assets/Data/Categories/8_NOfAKindCategory_4.asset.meta b/Assets/Data/Categories/8_NOfAKindCategory_4.asset.meta new file mode 100644 index 0000000..581c5cc --- /dev/null +++ b/Assets/Data/Categories/8_NOfAKindCategory_4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ea1413e6e9091d4996ee74dd769d671 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/9_FullHouseCategory.asset b/Assets/Data/Categories/9_FullHouseCategory.asset new file mode 100644 index 0000000..757e77c --- /dev/null +++ b/Assets/Data/Categories/9_FullHouseCategory.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fbe9492ec44ebb4da7074b0719b3eda, type: 3} + m_Name: 9_FullHouseCategory + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.FullHouseCategory + k__BackingField: full_house + k__BackingField: "\u0424\u0443\u043B\u043B \u0425\u0430\u0443\u0441" + k__BackingField: "\u0424\u0443\u043B\u043B \u0425\u0430\u0443\u0441 + \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 0} + k__BackingField: 0 + fixedScore: 25 diff --git a/Assets/Data/Categories/9_FullHouseCategory.asset.meta b/Assets/Data/Categories/9_FullHouseCategory.asset.meta new file mode 100644 index 0000000..c94632f --- /dev/null +++ b/Assets/Data/Categories/9_FullHouseCategory.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 24c8bd19b58357749a1819c0e0c124d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog.meta b/Assets/Data/ModifierCatalog.meta new file mode 100644 index 0000000..7cb1f75 --- /dev/null +++ b/Assets/Data/ModifierCatalog.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc0b4ef791d91dc48b6c5aaed46387ad +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/ModifierCatalog.asset b/Assets/Data/ModifierCatalog/ModifierCatalog.asset new file mode 100644 index 0000000..29693a8 --- /dev/null +++ b/Assets/Data/ModifierCatalog/ModifierCatalog.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13866bbc2935c3c4b8c9f3637c91f639, type: 3} + m_Name: ModifierCatalog + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Definition.ModifierCatalog + modifiers: [] diff --git a/Assets/Data/ModifierCatalog/ModifierCatalog.asset.meta b/Assets/Data/ModifierCatalog/ModifierCatalog.asset.meta new file mode 100644 index 0000000..3288cc3 --- /dev/null +++ b/Assets/Data/ModifierCatalog/ModifierCatalog.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1386f6ebccbca674eb47e12a0bb34180 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers.meta b/Assets/Data/ModifierCatalog/Modifiers.meta new file mode 100644 index 0000000..17bedb2 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 376a1917fa5dc3745b8d8789b306aade +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset new file mode 100644 index 0000000..a184cf8 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} + m_Name: DiceCountCondition 1 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition + targetValue: 0 + minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta new file mode 100644 index 0000000..170b830 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6077ab915ebb9e41871ebaed82fd5b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset new file mode 100644 index 0000000..9f6296c --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} + m_Name: DiceCountCondition 2 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition + targetValue: 0 + minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta new file mode 100644 index 0000000..621e38c --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53b3975adc72ffa429fd60a33ae3aabf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset new file mode 100644 index 0000000..3761507 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} + m_Name: DiceCountCondition 3 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition + targetValue: 0 + minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta new file mode 100644 index 0000000..6c29673 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 810be46ce0245ca489f2aa9002b5df65 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset new file mode 100644 index 0000000..5261fc7 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} + m_Name: DiceCountCondition 4 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition + targetValue: 0 + minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta new file mode 100644 index 0000000..4220f67 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 153b1bc291f95524f8b60fe29792b97d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset new file mode 100644 index 0000000..d2fe92e --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} + m_Name: DiceCountCondition 5 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition + targetValue: 0 + minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta new file mode 100644 index 0000000..ef9d71c --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 502d0fa3344e11e40aa810ac84dc037c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset new file mode 100644 index 0000000..da3af8d --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be178fd1aebd683499a1866da63c65fb, type: 3} + m_Name: DiceCountCondition 6 + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Modifiers.Conditions.DiceCountCondition + targetValue: 0 + minCount: 10 diff --git a/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta new file mode 100644 index 0000000..168be58 --- /dev/null +++ b/Assets/Data/ModifierCatalog/Modifiers/DiceCountCondition 6.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f454c289930e48f49904a0bc57768ad3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ShopCatalog.asset b/Assets/Data/ShopCatalog.asset new file mode 100644 index 0000000..9846330 --- /dev/null +++ b/Assets/Data/ShopCatalog.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b92d482ba23ca7d43a2e7ee8cc1beab2, type: 3} + m_Name: ShopCatalog + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Shop.ShopCatalog + items: [] diff --git a/Assets/Data/ShopCatalog.asset.meta b/Assets/Data/ShopCatalog.asset.meta new file mode 100644 index 0000000..e6076a1 --- /dev/null +++ b/Assets/Data/ShopCatalog.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7efc21139c0b2234194047239dcf8a71 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/vFavorites/vFavorites Data.asset b/Assets/Plugins/vFavorites/vFavorites Data.asset index a8862cd..20500a7 100644 --- a/Assets/Plugins/vFavorites/vFavorites Data.asset +++ b/Assets/Plugins/vFavorites/vFavorites Data.asset @@ -13,7 +13,16 @@ MonoBehaviour: m_Name: vFavorites Data m_EditorClassIdentifier: VFavorites::VFavorites.VFavoritesData pages: - - items: [] + - items: + - globalId: + globalObjectIdString: GlobalObjectId_V1-1-cc0b4ef791d91dc48b6c5aaed46387ad-102900000-0 + _typeString: UnityEditor.DefaultAsset, UnityEditor.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + _obj: {fileID: 102900000, guid: cc0b4ef791d91dc48b6c5aaed46387ad, type: 3} + isSceneGameObject: 0 + isFolder: 1 + isAsset: 0 + _id: 1035653409 name: Page 1 _id: 1035708465 - items: [] diff --git a/Assets/Plugins/vFolders/vFolders Data.asset b/Assets/Plugins/vFolders/vFolders Data.asset index c3c715d..9f6ed25 100644 --- a/Assets/Plugins/vFolders/vFolders Data.asset +++ b/Assets/Plugins/vFolders/vFolders Data.asset @@ -32,6 +32,12 @@ MonoBehaviour: - f95ef1c56a8ef6b4097ee6b979583e88 - 3a28e7d2b52cc184fbc831b6c950af5b - d8f62dfd9f1023245884a18eaec0692a + - 8389dee2aebfcea4e8414981416c8c9b + - 9191bf86efa11bc47bcd9383d3a106f2 + - aea0302c3f28ae944b5971aa23d17510 + - 511dff8ba41dd7e49a817a1053ff3b90 + - a725ef1be87875b408eabcf857e72131 + - 3006e1caaf8b7d94189adb6708eb0075 values: - iconNameOrGuid: Material Icon colorIndex: 6 @@ -105,4 +111,28 @@ MonoBehaviour: colorIndex: 3 isIconRecursive: 0 isColorRecursive: 0 + - iconNameOrGuid: + colorIndex: 8 + isIconRecursive: 0 + isColorRecursive: 0 + - iconNameOrGuid: + colorIndex: 3 + isIconRecursive: 0 + isColorRecursive: 0 + - iconNameOrGuid: + colorIndex: 8 + isIconRecursive: 0 + isColorRecursive: 1 + - iconNameOrGuid: + colorIndex: 8 + isIconRecursive: 0 + isColorRecursive: 1 + - iconNameOrGuid: + colorIndex: 8 + isIconRecursive: 0 + isColorRecursive: 1 + - iconNameOrGuid: ScriptableObject Icon + colorIndex: 10 + isIconRecursive: 1 + isColorRecursive: 1 bookmarks: [] diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity new file mode 100644 index 0000000..5c54629 --- /dev/null +++ b/Assets/Scenes/Scene.unity @@ -0,0 +1,452 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 2 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &21499161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 21499163} + - component: {fileID: 21499162} + m_Layer: 0 + m_Name: GameLifetimeScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &21499162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21499161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05cc5e09c759f224991c5b5512fa0797, type: 3} + m_Name: + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.DI.GameLifetimeScope + parentReference: + TypeName: + autoRun: 1 + autoInjectGameObjects: [] + modifierCatalog: {fileID: 0} + categoryCatalog: {fileID: 0} + diceCatalog: {fileID: 0} + shopCatalog: {fileID: 0} + scoringSystem: {fileID: 0} + currencyBank: {fileID: 0} + gameManager: {fileID: 0} + diceManager: {fileID: 0} + gameController: {fileID: 0} + shopController: {fileID: 0} + inventoryController: {fileID: 0} + maxActiveModifierSlots: 5 +--- !u!4 &21499163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21499161} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.39505, y: 8.67578, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &82204378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 82204380} + - component: {fileID: 82204379} + - component: {fileID: 82204381} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &82204379 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82204378} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &82204380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82204378} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &82204381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82204378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!1 &1375693286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1375693289} + - component: {fileID: 1375693288} + - component: {fileID: 1375693287} + - component: {fileID: 1375693290} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1375693287 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375693286} + m_Enabled: 1 +--- !u!20 &1375693288 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375693286} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1375693289 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375693286} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1375693290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375693286} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1375693289} + - {fileID: 82204380} + - {fileID: 21499163} diff --git a/Assets/Scenes/Scene.unity.meta b/Assets/Scenes/Scene.unity.meta new file mode 100644 index 0000000..360c84a --- /dev/null +++ b/Assets/Scenes/Scene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef129a95f37dd24408b2a79a2fcfd9c6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Categories/Definition/CategoryDefinition.cs b/Assets/Scripts/Categories/Definition/CategoryDefinition.cs index 311836e..53c1010 100644 --- a/Assets/Scripts/Categories/Definition/CategoryDefinition.cs +++ b/Assets/Scripts/Categories/Definition/CategoryDefinition.cs @@ -22,7 +22,7 @@ namespace YachtDice.Categories /// /// Вычисляет очки для данного набора дайсов. /// - public abstract int Calculate(IReadOnlyList dice); + public abstract int Calculate(IReadOnlyList dice); #if UNITY_EDITOR public void SetTestData(string testId, string testDisplayName, bool upperSection = false) diff --git a/Assets/Scripts/Categories/Definition/FullHouseCategory.cs b/Assets/Scripts/Categories/Definition/FullHouseCategory.cs index 549cda5..9a0c491 100644 --- a/Assets/Scripts/Categories/Definition/FullHouseCategory.cs +++ b/Assets/Scripts/Categories/Definition/FullHouseCategory.cs @@ -15,7 +15,7 @@ namespace YachtDice.Categories [Tooltip("Фиксированное число очков за фулл-хаус")] [SerializeField] private int fixedScore = 25; - public override int Calculate(IReadOnlyList dice) + public override int Calculate(IReadOnlyList dice) { int[] values = DiceCheckUtility.ExtractValues(dice); return DiceCheckUtility.IsFullHouse(values) ? fixedScore : 0; diff --git a/Assets/Scripts/Categories/Definition/NOfAKindCategory.cs b/Assets/Scripts/Categories/Definition/NOfAKindCategory.cs index 6ce0e5e..f3d8e2a 100644 --- a/Assets/Scripts/Categories/Definition/NOfAKindCategory.cs +++ b/Assets/Scripts/Categories/Definition/NOfAKindCategory.cs @@ -22,7 +22,7 @@ namespace YachtDice.Categories [Tooltip("Фиксированное число очков (если useFixedScore = true)")] [SerializeField] private int fixedScore; - public override int Calculate(IReadOnlyList dice) + public override int Calculate(IReadOnlyList dice) { int[] values = DiceCheckUtility.ExtractValues(dice); diff --git a/Assets/Scripts/Categories/Definition/StraightCategory.cs b/Assets/Scripts/Categories/Definition/StraightCategory.cs index 15b9d4a..4e1e23b 100644 --- a/Assets/Scripts/Categories/Definition/StraightCategory.cs +++ b/Assets/Scripts/Categories/Definition/StraightCategory.cs @@ -19,7 +19,7 @@ namespace YachtDice.Categories [Tooltip("Фиксированное число очков")] [SerializeField] private int fixedScore = 30; - public override int Calculate(IReadOnlyList dice) + public override int Calculate(IReadOnlyList dice) { int[] values = DiceCheckUtility.ExtractValues(dice); return DiceCheckUtility.HasStraightRun(values, runLength) ? fixedScore : 0; diff --git a/Assets/Scripts/Categories/Definition/SumAllCategory.cs b/Assets/Scripts/Categories/Definition/SumAllCategory.cs index 8235c19..f2c3739 100644 --- a/Assets/Scripts/Categories/Definition/SumAllCategory.cs +++ b/Assets/Scripts/Categories/Definition/SumAllCategory.cs @@ -10,7 +10,7 @@ namespace YachtDice.Categories [CreateAssetMenu(fileName = "SumAllCategory", menuName = "YachtDice/Categories/Sum All (Chance)")] public class SumAllCategory : CategoryDefinition { - public override int Calculate(IReadOnlyList dice) + public override int Calculate(IReadOnlyList dice) { int sum = 0; for (int i = 0; i < dice.Count; i++) diff --git a/Assets/Scripts/Categories/Definition/SumOfValueCategory.cs b/Assets/Scripts/Categories/Definition/SumOfValueCategory.cs index 82dd8bf..fcb7bc6 100644 --- a/Assets/Scripts/Categories/Definition/SumOfValueCategory.cs +++ b/Assets/Scripts/Categories/Definition/SumOfValueCategory.cs @@ -15,7 +15,7 @@ namespace YachtDice.Categories [field: Tooltip("Значение грани для суммирования (1-6)")] [field: SerializeField, Range(1, 6)] public int TargetValue { get; private set; } = 1; - public override int Calculate(IReadOnlyList dice) + public override int Calculate(IReadOnlyList dice) { int sum = 0; for (int i = 0; i < dice.Count; i++) diff --git a/Assets/Scripts/Categories/DiceCheckUtility.cs b/Assets/Scripts/Categories/DiceCheckUtility.cs index 05e4417..eae8208 100644 --- a/Assets/Scripts/Categories/DiceCheckUtility.cs +++ b/Assets/Scripts/Categories/DiceCheckUtility.cs @@ -11,7 +11,7 @@ namespace YachtDice.Categories public static class DiceCheckUtility { /// Извлекает массив значений из абстрактных дайсов. - public static int[] ExtractValues(IReadOnlyList dice) + public static int[] ExtractValues(IReadOnlyList dice) { int[] values = new int[dice.Count]; for (int i = 0; i < dice.Count; i++) diff --git a/Assets/Scripts/Dice/DieInstance.cs b/Assets/Scripts/Dice/DiceInstance.cs similarity index 79% rename from Assets/Scripts/Dice/DieInstance.cs rename to Assets/Scripts/Dice/DiceInstance.cs index 35b4c71..84258e9 100644 --- a/Assets/Scripts/Dice/DieInstance.cs +++ b/Assets/Scripts/Dice/DiceInstance.cs @@ -4,20 +4,20 @@ namespace YachtDice.Dice /// Рантайм-состояние одного дайса. /// Хранит текущее значение верхней грани и ссылку на определение типа. /// - public class DieInstance : IDie + public class DiceInstance : IDice { public DiсeDefinition Definition { get; } public int Value { get; set; } public bool IsLocked { get; set; } - public DieInstance(DiсeDefinition definition) + public DiceInstance(DiсeDefinition definition) { Definition = definition; Value = 0; IsLocked = false; } - public DieInstance(DiсeDefinition definition, int initialValue) + public DiceInstance(DiсeDefinition definition, int initialValue) { Definition = definition; Value = initialValue; diff --git a/Assets/Scripts/Dice/DieInstance.cs.meta b/Assets/Scripts/Dice/DiceInstance.cs.meta similarity index 100% rename from Assets/Scripts/Dice/DieInstance.cs.meta rename to Assets/Scripts/Dice/DiceInstance.cs.meta diff --git a/Assets/Scripts/Dice/IDie.cs b/Assets/Scripts/Dice/IDice.cs similarity index 95% rename from Assets/Scripts/Dice/IDie.cs rename to Assets/Scripts/Dice/IDice.cs index db4b686..172945a 100644 --- a/Assets/Scripts/Dice/IDie.cs +++ b/Assets/Scripts/Dice/IDice.cs @@ -4,7 +4,7 @@ namespace YachtDice.Dice /// Минимальный контракт для любого дайса. /// Каждый дайс всегда имеет текущее значение (верхняя грань) и определение типа. /// - public interface IDie + public interface IDice { /// Текущее значение верхней грани. int Value { get; } diff --git a/Assets/Scripts/Dice/IDie.cs.meta b/Assets/Scripts/Dice/IDice.cs.meta similarity index 100% rename from Assets/Scripts/Dice/IDie.cs.meta rename to Assets/Scripts/Dice/IDice.cs.meta diff --git a/Assets/Scripts/Dice/StandardDiсe.cs b/Assets/Scripts/Dice/StandardDiсe.cs index eb3b27a..3dfeb3e 100644 --- a/Assets/Scripts/Dice/StandardDiсe.cs +++ b/Assets/Scripts/Dice/StandardDiсe.cs @@ -6,7 +6,7 @@ namespace YachtDice.Dice /// Стандартный дайс с настраиваемыми значениями граней. /// По умолчанию — классический d6 (1-6). /// - [CreateAssetMenu(fileName = "StandardDie", menuName = "YachtDice/Dice/Standard Die")] + [CreateAssetMenu(fileName = "StandardDice", menuName = "YachtDice/Dice/Standard Dice")] public class StandardDiсe : DiсeDefinition { [Header("Configuration")] diff --git a/Assets/Scripts/Game/DiceManager.cs b/Assets/Scripts/Game/DiceManager.cs index ba4114b..ccd1951 100644 --- a/Assets/Scripts/Game/DiceManager.cs +++ b/Assets/Scripts/Game/DiceManager.cs @@ -10,22 +10,22 @@ namespace YachtDice.Game [SerializeField] private List diceRollers = new(); public event Action OnAllDiceSettled; - public event Action OnDieSettled; + public event Action OnDiceSettled; public int DiceCount => diceRollers.Count; - private DieInstance[] diceInstances; + private DiceInstance[] diceInstances; private int pendingCount; private void Awake() { int count = diceRollers.Count; - diceInstances = new DieInstance[count]; + diceInstances = new DiceInstance[count]; for (int i = 0; i < count; i++) { var definition = diceRollers[i].Definition; - diceInstances[i] = new DieInstance(definition); + diceInstances[i] = new DiceInstance(definition); } } @@ -65,7 +65,7 @@ namespace YachtDice.Game { diceRollers[capturedIndex].OnRollFinished -= Handler; diceInstances[capturedIndex].Value = value; - OnDieSettled?.Invoke(capturedIndex, value); + OnDiceSettled?.Invoke(capturedIndex, value); pendingCount--; if (pendingCount <= 0) @@ -81,7 +81,7 @@ namespace YachtDice.Game } /// Возвращает абстрактный список дайсов (основной API). - public IReadOnlyList GetDice() => diceInstances; + public IReadOnlyList GetDice() => diceInstances; /// Возвращает копию текущих значений (обратная совместимость). public int[] GetCurrentValues() diff --git a/Assets/Scripts/Modifiers/Conditions/DiceCountCondition.cs b/Assets/Scripts/Modifiers/Conditions/DiceCountCondition.cs index af3edc4..6b524ca 100644 --- a/Assets/Scripts/Modifiers/Conditions/DiceCountCondition.cs +++ b/Assets/Scripts/Modifiers/Conditions/DiceCountCondition.cs @@ -8,7 +8,7 @@ namespace YachtDice.Modifiers.Conditions [CreateAssetMenu(fileName = "DiceCountCondition", menuName = "YachtDice/Modifiers/Conditions/Dice Count")] public class DiceCountCondition : Condition { - [Tooltip("Die face value to count (1-6). 0 = any value.")] + [Tooltip("Dice face value to count (1-6). 0 = any value.")] [SerializeField, Range(0, 6)] private int targetValue; [Tooltip("Minimum number of dice that must match.")] diff --git a/Assets/Scripts/Modifiers/Core/ModifierContext.cs b/Assets/Scripts/Modifiers/Core/ModifierContext.cs index 8887687..cef537f 100644 --- a/Assets/Scripts/Modifiers/Core/ModifierContext.cs +++ b/Assets/Scripts/Modifiers/Core/ModifierContext.cs @@ -16,7 +16,7 @@ namespace YachtDice.Modifiers.Core public float PostMultiplier = 1f; /// Абстрактные дайсы (основной API). - public IReadOnlyList Dice; + public IReadOnlyList Dice; /// Значения дайсов (обратная совместимость с существующими модификаторами). public int[] DiceValues; @@ -55,7 +55,7 @@ namespace YachtDice.Modifiers.Core public static ModifierContext CreateForScoring( int baseScore, - IReadOnlyList dice, + IReadOnlyList dice, CategoryDefinition category, int currentRoll, int currentTurn, diff --git a/Assets/Scripts/Scoring/ScoreResult.cs b/Assets/Scripts/Scoring/ScoreResult.cs index d4cdaba..4b5f317 100644 --- a/Assets/Scripts/Scoring/ScoreResult.cs +++ b/Assets/Scripts/Scoring/ScoreResult.cs @@ -17,7 +17,7 @@ namespace YachtDice.Scoring public int FinalScore => Mathf.FloorToInt((BaseScore + FlatBonus) * Multiplier); - public static ScoreResult Create(int baseScore, IReadOnlyList dice, CategoryDefinition category) + public static ScoreResult Create(int baseScore, IReadOnlyList dice, CategoryDefinition category) { return new ScoreResult { diff --git a/Assets/Scripts/Scoring/ScoringSystem.cs b/Assets/Scripts/Scoring/ScoringSystem.cs index 363c592..5615528 100644 --- a/Assets/Scripts/Scoring/ScoringSystem.cs +++ b/Assets/Scripts/Scoring/ScoringSystem.cs @@ -57,7 +57,7 @@ namespace YachtDice.Scoring public bool IsComplete => CategoriesFilledCount >= TotalCategoryCount; - public ScoreResult PreviewScore(IReadOnlyList dice, CategoryDefinition category, + public ScoreResult PreviewScore(IReadOnlyList dice, CategoryDefinition category, int currentRoll = 0, int currentTurn = 0, int playerCurrency = 0) { int baseScore = category.Calculate(dice); @@ -75,7 +75,7 @@ namespace YachtDice.Scoring return context.ToScoreResult(); } - public async UniTask ScoreCategoryAsync(IReadOnlyList dice, CategoryDefinition category, + public async UniTask ScoreCategoryAsync(IReadOnlyList dice, CategoryDefinition category, int currentRoll, int currentTurn, int playerCurrency) { if (usedCategories.Contains(category)) @@ -118,7 +118,7 @@ namespace YachtDice.Scoring return result; } - public ScoreResult ScoreCategory(IReadOnlyList dice, CategoryDefinition category) + public ScoreResult ScoreCategory(IReadOnlyList dice, CategoryDefinition category) { if (usedCategories.Contains(category)) throw new InvalidOperationException($"Category {category.DisplayName} has already been scored."); diff --git a/Assets/Scripts/Shop/IShopItem.cs b/Assets/Scripts/Shop/IShopItem.cs index c50d9eb..26c96bb 100644 --- a/Assets/Scripts/Shop/IShopItem.cs +++ b/Assets/Scripts/Shop/IShopItem.cs @@ -4,7 +4,7 @@ namespace YachtDice.Shop { /// /// Any item that can appear in the shop. - /// Implemented by ScriptableObject definitions (ModifierDefinition, DieDefinitionSO). + /// Implemented by ScriptableObject definitions (ModifierDefinition, DiceDefinitionSO). /// public interface IShopItem { diff --git a/Assets/Scripts/Tests/Editor/ScoringSystemTests.cs b/Assets/Scripts/Tests/Editor/ScoringSystemTests.cs index 34048cb..3d2b35d 100644 --- a/Assets/Scripts/Tests/Editor/ScoringSystemTests.cs +++ b/Assets/Scripts/Tests/Editor/ScoringSystemTests.cs @@ -52,11 +52,11 @@ namespace YachtDice.Tests return go.AddComponent(); } - private IReadOnlyList CreateDice(params int[] values) + private IReadOnlyList CreateDice(params int[] values) { - var dice = new DieInstance[values.Length]; + var dice = new DiceInstance[values.Length]; for (int i = 0; i < values.Length; i++) - dice[i] = new DieInstance(_standardDiсe, values[i]); + dice[i] = new DiceInstance(_standardDiсe, values[i]); return dice; } diff --git a/Assets/Scripts/UI/GameController.cs b/Assets/Scripts/UI/GameController.cs index 9e033ed..9d094fa 100644 --- a/Assets/Scripts/UI/GameController.cs +++ b/Assets/Scripts/UI/GameController.cs @@ -79,7 +79,7 @@ namespace YachtDice.UI gameManager.OnRollComplete += HandleRollComplete; gameManager.OnScored += HandleScored; gameManager.OnGameOver += HandleGameOver; - diceManager.OnDieSettled += HandleDieSettled; + diceManager.OnDiceSettled += HandleDiceSettled; // View → Controller scoreCardView.OnCategorySelected += HandleCategorySelected; @@ -108,7 +108,7 @@ namespace YachtDice.UI gameManager.OnRollComplete -= HandleRollComplete; gameManager.OnScored -= HandleScored; gameManager.OnGameOver -= HandleGameOver; - diceManager.OnDieSettled -= HandleDieSettled; + diceManager.OnDiceSettled -= HandleDiceSettled; scoreCardView.OnCategorySelected -= HandleCategorySelected; dicePanelView.OnRollClicked -= HandleRollClicked; @@ -217,7 +217,7 @@ namespace YachtDice.UI UpdatePreviewScores(); } - private void HandleDieSettled(int index, int value) + private void HandleDiceSettled(int index, int value) { dicePanelView.SetDieValue(index, value); } diff --git a/Assets/Textures/TEMP.meta b/Assets/Textures/TEMP.meta new file mode 100644 index 0000000..16a741e --- /dev/null +++ b/Assets/Textures/TEMP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85733e4bdba2e184d89a1375709b1163 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: