From 4890fa946ee13e3f7640b5dae6f3440f70f8919d Mon Sep 17 00:00:00 2001 From: Konstantin Dyachenko Date: Mon, 2 Mar 2026 08:43:49 +0700 Subject: [PATCH] [Fix] Add PlaceHolder --- .../BasePack/10_StraightCategory_small.asset | 2 +- .../BasePack/11_StraightCategory_large.asset | 2 +- .../BasePack/12_NOfAKindCategory_yacht.asset | 8 ++--- .../BasePack/13_SumAllCategory.asset | 2 +- .../BasePack/1_SumOfValueCategory1.asset | 2 +- .../BasePack/2_SumOfValueCategory2.asset | 2 +- .../BasePack/3_SumOfValueCategory3.asset | 2 +- .../BasePack/4_SumOfValueCategory4.asset | 2 +- .../BasePack/5_SumOfValueCategory5.asset | 2 +- .../BasePack/6_SumOfValueCategory6.asset | 2 +- .../BasePack/7_NOfAKindCategory_3.asset | 2 +- .../BasePack/8_NOfAKindCategory_4.asset | 2 +- .../BasePack/9_FullHouseCategory.asset | 2 +- .../Modifiers/01_Mod_Flat5.asset | 2 +- .../Modifiers/02_Mod_Flat15.asset | 2 +- .../Modifiers/03_Mod_SixesHunter.asset | 2 +- .../Modifiers/04_Mod_LuckyOnes.asset | 2 +- .../Modifiers/05_Mod_Mult15.asset | 2 +- .../Modifiers/06_Mod_HighScoreDouble.asset | 2 +- .../Modifiers/07_Mod_Post13.asset | 2 +- .../Modifiers/08_Mod_Cashback.asset | 2 +- .../Modifiers/09_Mod_FullHouseFeast.asset | 2 +- .../Modifiers/10_Mod_YachtJackpot.asset | 2 +- .../Modifiers/11_Mod_TripleThreat.asset | 2 +- .../Modifiers/12_Mod_DoubleOrNothing.asset | 2 +- Assets/Prefab/d6.prefab | 25 ++++++++------- Assets/Scenes/Scene.unity | 31 ++++++++++++++++++- Assets/Scripts/Dice/DiceRoller.cs | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 +-- 29 files changed, 74 insertions(+), 44 deletions(-) diff --git a/Assets/Data/Categories/BasePack/10_StraightCategory_small.asset b/Assets/Data/Categories/BasePack/10_StraightCategory_small.asset index 7183beb..618bd3b 100644 --- a/Assets/Data/Categories/BasePack/10_StraightCategory_small.asset +++ b/Assets/Data/Categories/BasePack/10_StraightCategory_small.asset @@ -16,7 +16,7 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 runLength: 4 fixedScore: 30 diff --git a/Assets/Data/Categories/BasePack/11_StraightCategory_large.asset b/Assets/Data/Categories/BasePack/11_StraightCategory_large.asset index 9f65513..fb39c6b 100644 --- a/Assets/Data/Categories/BasePack/11_StraightCategory_large.asset +++ b/Assets/Data/Categories/BasePack/11_StraightCategory_large.asset @@ -16,7 +16,7 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 runLength: 5 fixedScore: 40 diff --git a/Assets/Data/Categories/BasePack/12_NOfAKindCategory_yacht.asset b/Assets/Data/Categories/BasePack/12_NOfAKindCategory_yacht.asset index 88c61eb..805549f 100644 --- a/Assets/Data/Categories/BasePack/12_NOfAKindCategory_yacht.asset +++ b/Assets/Data/Categories/BasePack/12_NOfAKindCategory_yacht.asset @@ -12,10 +12,10 @@ MonoBehaviour: 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: yacht + k__BackingField: "\u042F\u0445\u0442\u0430" + k__BackingField: "\u042F\u0445\u0442\u0430 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435" + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 requiredCount: 5 useFixedScore: 1 diff --git a/Assets/Data/Categories/BasePack/13_SumAllCategory.asset b/Assets/Data/Categories/BasePack/13_SumAllCategory.asset index f8ab897..d3c4d69 100644 --- a/Assets/Data/Categories/BasePack/13_SumAllCategory.asset +++ b/Assets/Data/Categories/BasePack/13_SumAllCategory.asset @@ -15,5 +15,5 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 diff --git a/Assets/Data/Categories/BasePack/1_SumOfValueCategory1.asset b/Assets/Data/Categories/BasePack/1_SumOfValueCategory1.asset index ba34201..c54ef57 100644 --- a/Assets/Data/Categories/BasePack/1_SumOfValueCategory1.asset +++ b/Assets/Data/Categories/BasePack/1_SumOfValueCategory1.asset @@ -15,6 +15,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 1 diff --git a/Assets/Data/Categories/BasePack/2_SumOfValueCategory2.asset b/Assets/Data/Categories/BasePack/2_SumOfValueCategory2.asset index 0088a26..d8bf01a 100644 --- a/Assets/Data/Categories/BasePack/2_SumOfValueCategory2.asset +++ b/Assets/Data/Categories/BasePack/2_SumOfValueCategory2.asset @@ -15,6 +15,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 2 diff --git a/Assets/Data/Categories/BasePack/3_SumOfValueCategory3.asset b/Assets/Data/Categories/BasePack/3_SumOfValueCategory3.asset index a088ea4..668a7ba 100644 --- a/Assets/Data/Categories/BasePack/3_SumOfValueCategory3.asset +++ b/Assets/Data/Categories/BasePack/3_SumOfValueCategory3.asset @@ -15,6 +15,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 3 diff --git a/Assets/Data/Categories/BasePack/4_SumOfValueCategory4.asset b/Assets/Data/Categories/BasePack/4_SumOfValueCategory4.asset index d6e3f0d..d3ab866 100644 --- a/Assets/Data/Categories/BasePack/4_SumOfValueCategory4.asset +++ b/Assets/Data/Categories/BasePack/4_SumOfValueCategory4.asset @@ -16,6 +16,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 4 diff --git a/Assets/Data/Categories/BasePack/5_SumOfValueCategory5.asset b/Assets/Data/Categories/BasePack/5_SumOfValueCategory5.asset index aff2163..8e5cc62 100644 --- a/Assets/Data/Categories/BasePack/5_SumOfValueCategory5.asset +++ b/Assets/Data/Categories/BasePack/5_SumOfValueCategory5.asset @@ -15,6 +15,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 5 diff --git a/Assets/Data/Categories/BasePack/6_SumOfValueCategory6.asset b/Assets/Data/Categories/BasePack/6_SumOfValueCategory6.asset index cae05c7..954c407 100644 --- a/Assets/Data/Categories/BasePack/6_SumOfValueCategory6.asset +++ b/Assets/Data/Categories/BasePack/6_SumOfValueCategory6.asset @@ -16,6 +16,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 6 diff --git a/Assets/Data/Categories/BasePack/7_NOfAKindCategory_3.asset b/Assets/Data/Categories/BasePack/7_NOfAKindCategory_3.asset index a2db81c..8500325 100644 --- a/Assets/Data/Categories/BasePack/7_NOfAKindCategory_3.asset +++ b/Assets/Data/Categories/BasePack/7_NOfAKindCategory_3.asset @@ -16,7 +16,7 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 requiredCount: 3 useFixedScore: 1 diff --git a/Assets/Data/Categories/BasePack/8_NOfAKindCategory_4.asset b/Assets/Data/Categories/BasePack/8_NOfAKindCategory_4.asset index d7ecf4d..0c0e708 100644 --- a/Assets/Data/Categories/BasePack/8_NOfAKindCategory_4.asset +++ b/Assets/Data/Categories/BasePack/8_NOfAKindCategory_4.asset @@ -16,7 +16,7 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 requiredCount: 4 useFixedScore: 1 diff --git a/Assets/Data/Categories/BasePack/9_FullHouseCategory.asset b/Assets/Data/Categories/BasePack/9_FullHouseCategory.asset index 757e77c..22896ca 100644 --- a/Assets/Data/Categories/BasePack/9_FullHouseCategory.asset +++ b/Assets/Data/Categories/BasePack/9_FullHouseCategory.asset @@ -16,6 +16,6 @@ MonoBehaviour: 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: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 fixedScore: 25 diff --git a/Assets/Data/ModifierCatalog/Modifiers/01_Mod_Flat5.asset b/Assets/Data/ModifierCatalog/Modifiers/01_Mod_Flat5.asset index 7a57106..72964d4 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/01_Mod_Flat5.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/01_Mod_Flat5.asset @@ -18,7 +18,7 @@ MonoBehaviour: k__BackingField: "\u0414\u0430\u0435\u0442 \u0441\u0442\u0430\u0431\u0438\u043B\u044C\u043D\u044B\u0435 +5 \u043E\u0447\u043A\u043E\u0432 \u0432 \u043A\u0430\u0436\u0434\u043E\u0439 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 80 k__BackingField: 40 diff --git a/Assets/Data/ModifierCatalog/Modifiers/02_Mod_Flat15.asset b/Assets/Data/ModifierCatalog/Modifiers/02_Mod_Flat15.asset index d16aa75..3b444d6 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/02_Mod_Flat15.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/02_Mod_Flat15.asset @@ -18,7 +18,7 @@ MonoBehaviour: k__BackingField: "\u0421\u0438\u043B\u044C\u043D\u044B\u0439 \u043F\u043B\u043E\u0441\u043A\u0438\u0439 \u0431\u043E\u043D\u0443\u0441 \u0434\u043B\u044F \u043A\u0430\u0436\u0434\u043E\u0439 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 1 k__BackingField: 170 k__BackingField: 85 diff --git a/Assets/Data/ModifierCatalog/Modifiers/03_Mod_SixesHunter.asset b/Assets/Data/ModifierCatalog/Modifiers/03_Mod_SixesHunter.asset index f806263..d58964a 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/03_Mod_SixesHunter.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/03_Mod_SixesHunter.asset @@ -19,7 +19,7 @@ MonoBehaviour: \u043E\u0447\u043A\u0438 \u0437\u0430 \u043A\u0430\u0436\u0434\u0443\u044E \u0448\u0435\u0441\u0442\u0435\u0440\u043A\u0443, \u0435\u0441\u043B\u0438 \u0432\u044B\u043F\u0430\u043B\u043E \u0445\u043E\u0442\u044F \u0431\u044B \u0442\u0440\u0438." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 1 k__BackingField: 220 k__BackingField: 110 diff --git a/Assets/Data/ModifierCatalog/Modifiers/04_Mod_LuckyOnes.asset b/Assets/Data/ModifierCatalog/Modifiers/04_Mod_LuckyOnes.asset index 9f1470a..e9b669c 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/04_Mod_LuckyOnes.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/04_Mod_LuckyOnes.asset @@ -17,7 +17,7 @@ MonoBehaviour: k__BackingField: "\u0414\u0430\u0435\u0442 \u043E\u0447\u043A\u0438 \u0437\u0430 \u043A\u0430\u0436\u0434\u044B\u0439 \u0438\u0433\u0440\u0430\u043B\u044C\u043D\u044B\u0439 \u043A\u0443\u0431\u0438\u043A \u0441 \u0435\u0434\u0438\u043D\u0438\u0446\u0435\u0439." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 130 k__BackingField: 65 diff --git a/Assets/Data/ModifierCatalog/Modifiers/05_Mod_Mult15.asset b/Assets/Data/ModifierCatalog/Modifiers/05_Mod_Mult15.asset index b47a494..18059f7 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/05_Mod_Mult15.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/05_Mod_Mult15.asset @@ -18,7 +18,7 @@ MonoBehaviour: k__BackingField: "\u0423\u043C\u043D\u043E\u0436\u0430\u0435\u0442 \u0438\u0442\u043E\u0433\u043E\u0432\u044B\u0439 \u0441\u0447\u0435\u0442 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438 \u043D\u0430 1.5." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 1 k__BackingField: 260 k__BackingField: 130 diff --git a/Assets/Data/ModifierCatalog/Modifiers/06_Mod_HighScoreDouble.asset b/Assets/Data/ModifierCatalog/Modifiers/06_Mod_HighScoreDouble.asset index 0d3e2c6..e3587a5 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/06_Mod_HighScoreDouble.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/06_Mod_HighScoreDouble.asset @@ -19,7 +19,7 @@ MonoBehaviour: \u0441\u0447\u0435\u0442 \u0442\u043E\u043B\u044C\u043A\u043E \u0435\u0441\u043B\u0438 \u0431\u0430\u0437\u043E\u0432\u044B\u0439 \u0441\u0447\u0435\u0442 20 \u0438\u043B\u0438 \u0432\u044B\u0448\u0435." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 2 k__BackingField: 320 k__BackingField: 160 diff --git a/Assets/Data/ModifierCatalog/Modifiers/07_Mod_Post13.asset b/Assets/Data/ModifierCatalog/Modifiers/07_Mod_Post13.asset index b077792..cd34f5b 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/07_Mod_Post13.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/07_Mod_Post13.asset @@ -19,7 +19,7 @@ MonoBehaviour: \u043F\u043E\u0441\u0442-\u043C\u043D\u043E\u0436\u0438\u0442\u0435\u043B\u044C \u043A \u0438\u0442\u043E\u0433\u043E\u0432\u043E\u043C\u0443 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0443 \u0441\u0447\u0435\u0442\u0430." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 1 k__BackingField: 240 k__BackingField: 120 diff --git a/Assets/Data/ModifierCatalog/Modifiers/08_Mod_Cashback.asset b/Assets/Data/ModifierCatalog/Modifiers/08_Mod_Cashback.asset index 7ccf12e..31f38a3 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/08_Mod_Cashback.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/08_Mod_Cashback.asset @@ -17,7 +17,7 @@ MonoBehaviour: k__BackingField: "\u0412\u044B\u043F\u043B\u0430\u0447\u0438\u0432\u0430\u0435\u0442 25 \u0432\u0430\u043B\u044E\u0442\u044B \u043F\u0440\u0438 \u043A\u0430\u0436\u0434\u043E\u0439 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 0 k__BackingField: 140 k__BackingField: 70 diff --git a/Assets/Data/ModifierCatalog/Modifiers/09_Mod_FullHouseFeast.asset b/Assets/Data/ModifierCatalog/Modifiers/09_Mod_FullHouseFeast.asset index f848c6f..8fb72a0 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/09_Mod_FullHouseFeast.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/09_Mod_FullHouseFeast.asset @@ -18,7 +18,7 @@ MonoBehaviour: \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u043E\u0447\u043A\u0438 \u0438 \u0431\u043E\u043D\u0443\u0441\u043D\u0443\u044E \u0432\u0430\u043B\u044E\u0442\u0443." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 2 k__BackingField: 330 k__BackingField: 165 diff --git a/Assets/Data/ModifierCatalog/Modifiers/10_Mod_YachtJackpot.asset b/Assets/Data/ModifierCatalog/Modifiers/10_Mod_YachtJackpot.asset index 2ffc237..8fdbec6 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/10_Mod_YachtJackpot.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/10_Mod_YachtJackpot.asset @@ -17,7 +17,7 @@ MonoBehaviour: k__BackingField: "\u041C\u043E\u0449\u043D\u044B\u0439 \u043A\u043E\u043C\u0431\u043E-\u043C\u043D\u043E\u0436\u0438\u0442\u0435\u043B\u044C, \u0441\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u044E\u0449\u0438\u0439 \u0442\u043E\u043B\u044C\u043A\u043E \u043D\u0430 \u042F\u0445\u0442\u0435." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 3 k__BackingField: 500 k__BackingField: 250 diff --git a/Assets/Data/ModifierCatalog/Modifiers/11_Mod_TripleThreat.asset b/Assets/Data/ModifierCatalog/Modifiers/11_Mod_TripleThreat.asset index 39dd5ee..ad8ebad 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/11_Mod_TripleThreat.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/11_Mod_TripleThreat.asset @@ -17,7 +17,7 @@ MonoBehaviour: k__BackingField: "\u0423\u043C\u043D\u043E\u0436\u0430\u0435\u0442 \u0441\u0447\u0435\u0442 \u0437\u0430 \u0442\u0440\u043E\u0439\u043A\u0438, \u0435\u0441\u043B\u0438 \u0432\u044B\u043F\u0430\u043B\u043E \u0445\u043E\u0442\u044F \u0431\u044B \u0434\u0432\u0435." - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 2 k__BackingField: 280 k__BackingField: 140 diff --git a/Assets/Data/ModifierCatalog/Modifiers/12_Mod_DoubleOrNothing.asset b/Assets/Data/ModifierCatalog/Modifiers/12_Mod_DoubleOrNothing.asset index d54b753..109d527 100644 --- a/Assets/Data/ModifierCatalog/Modifiers/12_Mod_DoubleOrNothing.asset +++ b/Assets/Data/ModifierCatalog/Modifiers/12_Mod_DoubleOrNothing.asset @@ -15,7 +15,7 @@ MonoBehaviour: k__BackingField: mod_multiplier_2x_limited k__BackingField: Double or Nothing k__BackingField: Doubles score but consumes one charge each activation. - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3} k__BackingField: 3 k__BackingField: 360 k__BackingField: 180 diff --git a/Assets/Prefab/d6.prefab b/Assets/Prefab/d6.prefab index 16e078a..32a7d09 100644 --- a/Assets/Prefab/d6.prefab +++ b/Assets/Prefab/d6.prefab @@ -285,18 +285,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Dice entries: - - value: 1 - point: {fileID: 8257018589491636815} - - value: 2 - point: {fileID: 7143848973463151283} - - value: 3 - point: {fileID: 6683254519850474317} - - value: 4 - point: {fileID: 1383292768601898025} - - value: 5 - point: {fileID: 2155176178137894512} - - value: 6 - point: {fileID: 9203577157931439520} + - k__BackingField: 1 + k__BackingField: {fileID: 8257018589491636815} + - k__BackingField: 2 + k__BackingField: {fileID: 7143848973463151283} + - k__BackingField: 3 + k__BackingField: {fileID: 6683254519850474317} + - k__BackingField: 4 + k__BackingField: {fileID: 1383292768601898025} + - k__BackingField: 5 + k__BackingField: {fileID: 2155176178137894512} + - k__BackingField: 6 + k__BackingField: {fileID: 9203577157931439520} --- !u!114 &7057909628855743290 MonoBehaviour: m_ObjectHideFlags: 0 @@ -311,6 +311,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::DiceRoller dice: {fileID: 3052556563113756475} rb: {fileID: 1768444232422188122} + k__BackingField: {fileID: 0} throwUpForce: 0.5 throwScatter: 1.5 torqueMin: 15 diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index d4ada14..251efb8 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -129,6 +129,7 @@ GameObject: m_Component: - component: {fileID: 21499163} - component: {fileID: 21499162} + - component: {fileID: 21499164} m_Layer: 0 m_Name: GameLifetimeScope m_TagString: Untagged @@ -154,7 +155,7 @@ MonoBehaviour: autoInjectGameObjects: [] modifierCatalog: {fileID: 11400000, guid: 1386f6ebccbca674eb47e12a0bb34180, type: 2} categoryCatalog: {fileID: 11400000, guid: 4a72801517dbe4d48a74ea0f2ea9fc23, type: 2} - diceCatalog: {fileID: 0} + diceCatalog: {fileID: 11400000, guid: f6997a13e7ae71e4db4b0c2420fb21cc, type: 2} shopCatalog: {fileID: 11400000, guid: 7efc21139c0b2234194047239dcf8a71, type: 2} scoringSystem: {fileID: 0} currencyBank: {fileID: 0} @@ -179,6 +180,34 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &21499164 +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!1 &82204378 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dice/DiceRoller.cs b/Assets/Scripts/Dice/DiceRoller.cs index 6c8eecf..33b665e 100644 --- a/Assets/Scripts/Dice/DiceRoller.cs +++ b/Assets/Scripts/Dice/DiceRoller.cs @@ -15,7 +15,7 @@ namespace YachtDice.Dice [SerializeField] private Dice dice; [SerializeField] private Rigidbody rb; - /// Определение типа дайса (назначается в инспекторе). + [Tooltip("Определение типа дайса")] [field: SerializeField] public DiceDefinition Definition { get; private set; } [Header("Throw Settings")] diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d057ba3..d035d80 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 99c9720ab356a0642a771bea13969a05 + path: Assets/Scenes/Scene.unity + guid: ef129a95f37dd24408b2a79a2fcfd9c6 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} m_UseUCBPForAssetBundles: 0