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

[Rem] Upper sum Text & upper bonus text | previewText & recordedScoreText (move to scoreText)

Browse Source
This commit is contained in:
Konstantin Dyachenko
2026-03-08 00:34:45 +07:00
parent dc82e93322
commit 9236d66022
43 changed files with 1418 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Data/Categories/BasePack/10_StraightCategory_small.asset
-1
View File
@@ -17,6 +17,5 @@ MonoBehaviour:
<Description>k__BackingField: "\u041C\u0430\u043B\u044B\u0439 \u0444\u0443\u043B\u043B
\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
runLength: 4
fixedScore: 30
Assets/Data/Categories/BasePack/11_StraightCategory_large.asset
-1
View File
@@ -17,6 +17,5 @@ MonoBehaviour:
<Description>k__BackingField: "\u0411\u043E\u043B\u044C\u0448\u043E\u0439 \u0444\u0443\u043B\u043B
\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
runLength: 5
fixedScore: 40
Assets/Data/Categories/BasePack/12_NOfAKindCategory_yacht.asset
-1
View File
@@ -16,7 +16,6 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u042F\u0445\u0442\u0430"
<Description>k__BackingField: "\u042F\u0445\u0442\u0430 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
requiredCount: 5
useFixedScore: 1
fixedScore: 60
Assets/Data/Categories/BasePack/13_SumAllCategory.asset
-1
View File
@@ -16,4 +16,3 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0428\u0430\u043D\u0441"
<Description>k__BackingField: "\u0428\u0430\u043D\u0441 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
Assets/Data/Categories/BasePack/1_SumOfValueCategory1.asset
-1
View File
@@ -16,5 +16,4 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0415\u0434\u0438\u043D\u0438\u0446\u044B"
<Description>k__BackingField: "\u0415\u0434\u0438\u043D\u0438\u0446\u044B \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
<TargetValue>k__BackingField: 1
Assets/Data/Categories/BasePack/2_SumOfValueCategory2.asset
-1
View File
@@ -16,5 +16,4 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0414\u0432\u043E\u0439\u043A\u0438"
<Description>k__BackingField: "\u0414\u0432\u043E\u0439\u043A\u0438 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
<TargetValue>k__BackingField: 2
Assets/Data/Categories/BasePack/3_SumOfValueCategory3.asset
-1
View File
@@ -16,5 +16,4 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0422\u0440\u043E\u0439\u043A\u0438"
<Description>k__BackingField: "\u0422\u0440\u043E\u0439\u043A\u0438 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
<TargetValue>k__BackingField: 3
Assets/Data/Categories/BasePack/4_SumOfValueCategory4.asset
-1
View File
@@ -17,5 +17,4 @@ MonoBehaviour:
<Description>k__BackingField: "\u0427\u0435\u0442\u0432\u0435\u0440\u043A\u0438
\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
<TargetValue>k__BackingField: 4
Assets/Data/Categories/BasePack/5_SumOfValueCategory5.asset
-1
View File
@@ -16,5 +16,4 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u041F\u044F\u0442\u0435\u0440\u043A\u0438"
<Description>k__BackingField: "\u041F\u044F\u0442\u0435\u0440\u043A\u0438 \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
<TargetValue>k__BackingField: 5
Assets/Data/Categories/BasePack/6_SumOfValueCategory6.asset
-1
View File
@@ -17,5 +17,4 @@ MonoBehaviour:
<Description>k__BackingField: "\u0428\u0435\u0441\u0442\u0435\u0440\u043A\u0438
\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
<TargetValue>k__BackingField: 6
Assets/Data/Categories/BasePack/7_NOfAKindCategory_3.asset
-1
View File
@@ -17,7 +17,6 @@ MonoBehaviour:
<Description>k__BackingField: "\u0422\u0440\u0438 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0435
\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
requiredCount: 3
useFixedScore: 1
fixedScore: 30
Assets/Data/Categories/BasePack/8_NOfAKindCategory_4.asset
-1
View File
@@ -17,7 +17,6 @@ MonoBehaviour:
<Description>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"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
requiredCount: 4
useFixedScore: 1
fixedScore: 40
Assets/Data/Categories/BasePack/9_FullHouseCategory.asset
-1
View File
@@ -17,5 +17,4 @@ MonoBehaviour:
<Description>k__BackingField: "\u0424\u0443\u043B\u043B \u0425\u0430\u0443\u0441
\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
fixedScore: 25
Assets/Data/Categories/FirstCategoryCatalog.asset
-2
View File
@@ -26,5 +26,3 @@ MonoBehaviour:
- {fileID: 11400000, guid: e9bf7be35c88f2845a4ad5dc81c5b9d2, type: 2}
- {fileID: 11400000, guid: 3241fb265c623174fac9d0d1ca1f5f05, type: 2}
- {fileID: 11400000, guid: 0822490ecb8ce224d861379ddb7b76ab, type: 2}
upperBonusThreshold: 63
upperBonusValue: 35
Assets/Data/Categories/Master/10_MasterKindCategory_4.asset
-1
View File
@@ -16,7 +16,6 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u041A\u0430\u0440\u0435"
<Description>k__BackingField: "\u0427\u0435\u0442\u044B\u0440\u0435 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0445: \u0441\u0443\u043C\u043C\u0430 \u0433\u0440\u0443\u043F\u043F\u044B + n"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
requiredCount: 4
valueBonusMultiplier: 1
flatBonus: 0
Assets/Data/Categories/Master/11_MasterKindCategory_5.asset
-1
View File
@@ -16,7 +16,6 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u041F\u043E\u043A\u0435\u0440"
<Description>k__BackingField: "\u041F\u044F\u0442\u044C \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0445: \u0441\u0443\u043C\u043C\u0430 \u0433\u0440\u0443\u043F\u043F\u044B + n * 2"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
requiredCount: 5
valueBonusMultiplier: 2
flatBonus: 0
Assets/Data/Categories/Master/12_MasterKindCategory_6.asset
-1
View File
@@ -16,7 +16,6 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u041C\u0430\u0441\u0442\u0435\u0440"
<Description>k__BackingField: "\u0428\u0435\u0441\u0442\u044C \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\u0445: \u0441\u0443\u043C\u043C\u0430 \u0433\u0440\u0443\u043F\u043F\u044B + n * 3"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
requiredCount: 6
valueBonusMultiplier: 3
flatBonus: 0
Assets/Data/Categories/Master/13_SumAllCategory.asset
-1
View File
@@ -16,4 +16,3 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0428\u0430\u043D\u0441"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u043A\u0443\u0431\u0438\u043A\u043E\u0432 \u0432 \u043B\u044E\u0431\u043E\u0439 \u043C\u043E\u043C\u0435\u043D\u0442"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
Assets/Data/Categories/Master/1_MasterValueCategory1.asset
-1
View File
@@ -16,6 +16,5 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0415\u0434\u0438\u043D\u0438\u0446\u044B"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u0435\u0434\u0438\u043D\u0438\u0446 + 1 \u0431\u043E\u043D\u0443\u0441 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 1
<TargetValue>k__BackingField: 1
<CategoryBonus>k__BackingField: 1
Assets/Data/Categories/Master/2_MasterValueCategory2.asset
-1
View File
@@ -16,6 +16,5 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0414\u0432\u043E\u0439\u043A\u0438"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u0434\u0432\u043E\u0435\u043A + 2 \u0431\u043E\u043D\u0443\u0441 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 1
<TargetValue>k__BackingField: 2
<CategoryBonus>k__BackingField: 2
Assets/Data/Categories/Master/3_MasterValueCategory3.asset
-1
View File
@@ -16,6 +16,5 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0422\u0440\u043E\u0439\u043A\u0438"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u0442\u0440\u043E\u0435\u043A + 3 \u0431\u043E\u043D\u0443\u0441 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 1
<TargetValue>k__BackingField: 3
<CategoryBonus>k__BackingField: 3
Assets/Data/Categories/Master/4_MasterValueCategory4.asset
-1
View File
@@ -16,6 +16,5 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0427\u0435\u0442\u0432\u0435\u0440\u043A\u0438"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u0447\u0435\u0442\u0432\u0435\u0440\u043E\u043A + 4 \u0431\u043E\u043D\u0443\u0441 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 1
<TargetValue>k__BackingField: 4
<CategoryBonus>k__BackingField: 4
Assets/Data/Categories/Master/5_MasterValueCategory5.asset
-1
View File
@@ -16,6 +16,5 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u041F\u044F\u0442\u0435\u0440\u043A\u0438"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u043F\u044F\u0442\u0435\u0440\u043E\u043A + 5 \u0431\u043E\u043D\u0443\u0441 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 1
<TargetValue>k__BackingField: 5
<CategoryBonus>k__BackingField: 5
Assets/Data/Categories/Master/6_MasterValueCategory6.asset
-1
View File
@@ -16,6 +16,5 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0428\u0435\u0441\u0442\u0435\u0440\u043A\u0438"
<Description>k__BackingField: "\u0421\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u0448\u0435\u0441\u0442\u0435\u0440\u043E\u043A + 6 \u0431\u043E\u043D\u0443\u0441 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u0438"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 1
<TargetValue>k__BackingField: 6
<CategoryBonus>k__BackingField: 6
Assets/Data/Categories/Master/7_MasterStraightCategory.asset
-1
View File
@@ -16,5 +16,4 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0421\u0442\u0440\u0438\u0442"
<Description>k__BackingField: "1-2-3-4-5-6: \u0441\u0443\u043C\u043C\u0430 \u0432\u0441\u0435\u0445 \u043A\u0443\u0431\u0438\u043A\u043E\u0432 + 20"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
flatBonus: 20
Assets/Data/Categories/Master/8_MasterGroupedSetsCategory_smallfull.asset
-1
View File
@@ -16,7 +16,6 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u041C\u0430\u043B\u044B\u0439 \u0444\u0443\u043B"
<Description>k__BackingField: "\u0422\u0440\u0438 \u043F\u0430\u0440\u044B: \u0441\u0443\u043C\u043C\u0430 \u043F\u0430\u0440 + 10"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
groupSize: 2
requiredGroups: 3
flatBonus: 10
Assets/Data/Categories/Master/9_MasterGroupedSetsCategory_bigfull.asset
-1
View File
@@ -16,7 +16,6 @@ MonoBehaviour:
<DisplayName>k__BackingField: "\u0411\u043E\u043B\u044C\u0448\u043E\u0439 \u0444\u0443\u043B"
<Description>k__BackingField: "\u0414\u0432\u0435 \u0442\u0440\u043E\u0439\u043A\u0438: \u0441\u0443\u043C\u043C\u0430 \u0433\u0440\u0443\u043F\u043F + 10"
<Icon>k__BackingField: {fileID: 21300000, guid: 8188071e2bba56c438a87b21f8d55641, type: 3}
<IsUpperSection>k__BackingField: 0
groupSize: 3
requiredGroups: 2
flatBonus: 10
Assets/Data/Categories/MasterCategoryCatalog.asset
-2
View File
@@ -12,8 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e89ee3a4aac1e6d4eabd79f32b9d8d15, type: 3}
m_Name: MasterCategoryCatalog
m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.CategoryCatalog
upperBonusThreshold: 63
upperBonusValue: 35
categories:
- {fileID: 11400000, guid: 8b91a7af0ef2405ab2cf880b4ee6d201, type: 2}
- {fileID: 11400000, guid: 8b91a7af0ef2405ab2cf880b4ee6d202, type: 2}
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+1249 -9
View File
File diff suppressed because one or more lines are too long
Assets/Prefab/UI/Category/Catrgory Row View.prefab
+6 -149
View File
@@ -33,7 +33,6 @@ RectTransform:
m_Children:
- {fileID: 2042745343872255674}
- {fileID: 8383748116765615224}
- {fileID: 5359117891688844032}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -92,8 +91,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.UI.CategoryRowView
categoryNameText: {fileID: 2092022643538768826}
previewText: {fileID: 5596515003019021346}
recordedScoreText: {fileID: 8335238857690719066}
scoreText: {fileID: 5596515003019021346}
selectButton: {fileID: 8031075129311694024}
background: {fileID: 4848789735952785536}
normalColor: {r: 0.95, g: 0.95, b: 0.95, a: 1}
@@ -135,9 +133,9 @@ RectTransform:
m_Father: {fileID: 1166299357833103787}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 83.847, y: 0}
m_SizeDelta: {x: 172.69, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -26.24901, y: 0}
m_SizeDelta: {x: -47.502, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8516723703924838521
CanvasRenderer:
@@ -362,147 +360,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 3258431911761801791}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4871956474468262623
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1166299357833103787}
m_Modifications:
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.x
value: 50
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000015258789
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_text
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontSize
value: 18.4
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontSizeBase
value: 18.4
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor32.rgba
value: 4278190080
objectReference: {fileID: 0}
- target: {fileID: 5645542518666077773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Name
value: Recorded Score Text
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
--- !u!224 &5359117891688844032 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 4871956474468262623}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8335238857690719066 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 4871956474468262623}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
--- !u!1001 &9050772572731313575
PrefabInstance:
m_ObjectHideFlags: 0
@@ -573,7 +430,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.x
value: -50
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -621,7 +478,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5645542518666077773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Name
value: Preview Text
value: Score Text
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Assets/Prefab/UI/Category/Score Card View.prefab
+35 -325
View File
@@ -31,15 +31,13 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9151910535898870085}
- {fileID: 5545233470393960107}
- {fileID: 4147194730293014657}
- {fileID: 8088002544395628384}
m_Father: {fileID: 6800447213512243019}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 0, y: 8.000006}
m_SizeDelta: {x: 315, y: 530}
m_SizeDelta: {x: 250, y: 530}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3540910137812304549
CanvasRenderer:
@@ -142,8 +140,6 @@ MonoBehaviour:
- {fileID: 4482513224620842307}
- {fileID: 1809648189613999071}
- {fileID: 685086537223322952}
upperSumText: {fileID: 8432848147462336241}
upperBonusText: {fileID: 35489359666960603}
totalScoreText: {fileID: 5318053753135679290}
--- !u!1 &4778751183007948516
GameObject:
@@ -212,11 +208,11 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_Spacing: 7
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
@@ -258,11 +254,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -375,11 +371,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -492,11 +488,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -609,11 +605,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -688,147 +684,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e30ef9bed5fcbb64da43aa6c1913fa69, type: 3}
m_Name:
m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.UI.CategoryRowView
--- !u!1001 &3480728837105981790
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3685558458478613493}
m_Modifications:
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.x
value: 110
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.y
value: 35
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_text
value: 1234
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontSize
value: 22
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontSizeBase
value: 22
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor32.rgba
value: 4278190080
objectReference: {fileID: 0}
- target: {fileID: 5645542518666077773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Name
value: Upper Bonus Text
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
--- !u!114 &35489359666960603 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 3480728837105981790}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
--- !u!224 &4147194730293014657 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 3480728837105981790}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3637049120839980982
PrefabInstance:
m_ObjectHideFlags: 0
@@ -867,11 +722,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -984,11 +839,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1101,11 +956,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1218,11 +1073,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1335,11 +1190,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1414,151 +1269,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
m_PrefabInstance: {fileID: 4807365793667931528}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4987564771191943028
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3685558458478613493}
m_Modifications:
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.x
value: 110
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.y
value: 35
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_text
value: 1234
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontSize
value: 22
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontSizeBase
value: 22
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_fontColor32.rgba
value: 4278190080
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_HorizontalAlignment
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5645542518666077773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Name
value: Upper Sum Text
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
--- !u!224 &5545233470393960107 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 4987564771191943028}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8432848147462336241 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
m_PrefabInstance: {fileID: 4987564771191943028}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
--- !u!1001 &5921092610603541279
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1597,11 +1307,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1714,11 +1424,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1831,11 +1541,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1920,7 +1630,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Pivot.y
@@ -1936,7 +1646,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.x
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchorMin.y
@@ -1944,7 +1654,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.x
value: 110
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_SizeDelta.y
@@ -1980,7 +1690,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 0.000030517578
objectReference: {fileID: 0}
- target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -2028,7 +1738,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_HorizontalAlignment
value: 4
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5645542518666077773, guid: 0829148555ff32841afde9f6193a0b72, type: 3}
propertyPath: m_Name
@@ -2093,11 +1803,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.x
value: 270.1932
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_SizeDelta.y
value: 25
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1166299357833103787, guid: 67e4465e1aa96104a81dff21aed99ec7, type: 3}
propertyPath: m_LocalPosition.x
Assets/Scenes/Scene.unity
+106 -2
View File
@@ -1535,7 +1535,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3}
propertyPath: m_LocalPosition.x
value: -0.01
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3}
propertyPath: m_LocalPosition.y
@@ -1543,7 +1543,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -2
objectReference: {fileID: 0}
- target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3}
propertyPath: m_LocalRotation.w
@@ -2367,6 +2367,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670845647064153198, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670845647064153198, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1670845647064153198, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2383,6 +2391,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2474415673325444637, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2474415673325444637, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2474415673325444637, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2399,6 +2415,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2731857693459813700, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2731857693459813700, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2731857693459813700, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2415,6 +2439,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3331969014930894174, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3331969014930894174, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3331969014930894174, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2431,6 +2463,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3950255194373208560, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3950255194373208560, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3950255194373208560, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2447,6 +2487,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4391806977592397240, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4391806977592397240, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4391806977592397240, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2463,6 +2511,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4511202064335526936, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4511202064335526936, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4511202064335526936, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2479,6 +2535,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4757056082203798196, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4757056082203798196, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4757056082203798196, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2495,6 +2559,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5951707766708524067, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5951707766708524067, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5951707766708524067, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2511,6 +2583,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5956186723772896343, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5956186723772896343, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5956186723772896343, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2607,6 +2687,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7290283509850403880, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7290283509850403880, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7290283509850403880, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2623,6 +2711,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455454773250163354, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455454773250163354, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7455454773250163354, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -2639,6 +2735,14 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8016417439116995410, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8016417439116995410, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8016417439116995410, guid: 04eac8e387d29ca4a8f4d5693c6b0167, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
Assets/Scripts/Categories/Definition/CategoryCatalog.cs
+1 -7
View File
@@ -12,13 +12,9 @@ namespace YachtDice.Categories
public class CategoryCatalog : ScriptableObject
{
[SerializeField] private List<CategoryDefinition> categories = new();
[SerializeField] private int upperBonusThreshold = 63;
[SerializeField] private int upperBonusValue = 35;
public IReadOnlyList<CategoryDefinition> All => categories;
public int Count => categories.Count;
public int UpperBonusThreshold => upperBonusThreshold;
public int UpperBonusValue => upperBonusValue;
public CategoryDefinition FindById(string id)
{
@@ -42,12 +38,10 @@ namespace YachtDice.Categories
}
#if UNITY_EDITOR
public static CategoryCatalog CreateForTest(List<CategoryDefinition> defs, int upperBonusThreshold = 63, int upperBonusValue = 35)
public static CategoryCatalog CreateForTest(List<CategoryDefinition> defs)
{
var catalog = CreateInstance<CategoryCatalog>();
catalog.categories = defs ?? new List<CategoryDefinition>();
catalog.upperBonusThreshold = upperBonusThreshold;
catalog.upperBonusValue = upperBonusValue;
return catalog;
}
#endif
Assets/Scripts/Categories/Definition/CategoryDefinition.cs
+1 -5
View File
@@ -16,20 +16,16 @@ namespace YachtDice.Categories
[field: SerializeField, TextArea] public string Description { get; private set; }
[field: SerializeField] public Sprite Icon { get; private set; }
[field: Header("Section")]
[field: SerializeField] public bool IsUpperSection { get; private set; }
/// <summary>
/// Вычисляет очки для данного набора дайсов.
/// </summary>
public abstract int Calculate(IReadOnlyList<IDice> dice);
#if UNITY_EDITOR
public void SetTestData(string testId, string testDisplayName, bool upperSection = false)
public void SetTestData(string testId, string testDisplayName)
{
Id = testId;
DisplayName = testDisplayName;
IsUpperSection = upperSection;
}
#endif
}
Assets/Scripts/Categories/Definition/MasterValueCategory.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace YachtDice.Categories
public static MasterValueCategory CreateForTest(string id, string displayName, int targetValue, int categoryBonus = 0)
{
var so = CreateInstance<MasterValueCategory>();
so.SetTestData(id, displayName, upperSection: true);
so.SetTestData(id, displayName);
so.TargetValue = targetValue;
so.CategoryBonus = categoryBonus;
return so;
Assets/Scripts/Categories/Definition/SumOfValueCategory.cs
+2 -2
View File
@@ -5,7 +5,7 @@ using YachtDice.Dice;
namespace YachtDice.Categories
{
/// <summary>
/// Категория верхней секции: суммирует все дайсы с заданным значением.
/// Категория, которая суммирует все дайсы с заданным значением.
/// Используется для Единиц (1), Двоек (2), ... Шестёрок (6).
/// </summary>
[CreateAssetMenu(fileName = "SumOfValueCategory", menuName = "YachtDice/Categories/Sum Of Value")]
@@ -29,7 +29,7 @@ namespace YachtDice.Categories
public static SumOfValueCategory CreateForTest(string id, string displayName, int target)
{
var so = CreateInstance<SumOfValueCategory>();
so.SetTestData(id, displayName, upperSection: true);
so.SetTestData(id, displayName);
so.TargetValue = target;
return so;
}
Assets/Scripts/Dice/DiceRoller.cs
-3
View File
@@ -176,9 +176,6 @@ namespace YachtDice.Dice
stillTimer = isSlow ? stillTimer + Time.fixedDeltaTime : 0f;
}
if (didTimeout)
Debug.LogWarning($"DiceRoller: бросок принудительно завершён по таймауту ({maxDuration:0.##} c).", this);
// ── 5. Замораживаем физику и читаем верхнюю грань ───────────
rb.linearVelocity = Vector3.zero;
rb.angularVelocity = Vector3.zero;
Assets/Scripts/Tests/Editor/MasterCategoryTests.cs
+4 -6
View File
@@ -126,11 +126,11 @@ namespace YachtDice.Tests
}
[Test]
public void ScoreSummaryService_UsesCatalogConfiguredUpperBonus()
public void ScoreSummaryService_ReturnsCurrentScoringTotal()
{
var ones = MasterValueCategory.CreateForTest("ones", "Единицы", 1, categoryBonus: 1);
var twos = MasterValueCategory.CreateForTest("twos", "Двойки", 2, categoryBonus: 2);
var catalog = CategoryCatalog.CreateForTest(new List<CategoryDefinition> { ones, twos }, upperBonusThreshold: 15, upperBonusValue: 50);
var catalog = CategoryCatalog.CreateForTest(new List<CategoryDefinition> { ones, twos });
_createdAssets.Add(ones);
_createdAssets.Add(twos);
_createdAssets.Add(catalog);
@@ -142,12 +142,10 @@ namespace YachtDice.Tests
scoringSystem.ScoreCategory(CreateDice(1, 1, 1, 1, 2, 3), ones);
scoringSystem.ScoreCategory(CreateDice(2, 2, 2, 2, 5, 6), twos);
var summaryService = new ScoreSummaryService(scoringSystem, catalog);
var summaryService = new ScoreSummaryService(scoringSystem);
var summary = summaryService.Calculate();
Assert.AreEqual(16, summary.UpperSum);
Assert.IsTrue(summary.HasUpperBonus);
Assert.AreEqual(66, summary.DisplayTotal);
Assert.AreEqual(scoringSystem.TotalScore, summary.DisplayTotal);
}
}
}
Assets/Scripts/UI/CategoryRowView.cs
+6 -10
View File
@@ -10,8 +10,7 @@ namespace YachtDice.UI
{
[Header("UI Elements")]
[SerializeField] private TMP_Text categoryNameText;
[SerializeField] private TMP_Text previewText;
[SerializeField] private TMP_Text recordedScoreText;
[SerializeField] private TMP_Text scoreText;
[SerializeField] private Button selectButton;
[SerializeField] private Image background;
@@ -31,8 +30,7 @@ namespace YachtDice.UI
_category = categoryDef;
_isUsed = false;
categoryNameText.text = categoryDef.DisplayName;
previewText.text = "";
recordedScoreText.text = "-";
scoreText.text = "-";
selectButton.onClick.AddListener(HandleClick);
SetInteractable(false);
background.color = normalColor;
@@ -41,22 +39,21 @@ namespace YachtDice.UI
public void ShowPreview(int previewScore)
{
if (_isUsed) return;
previewText.text = previewScore.ToString();
scoreText.text = previewScore.ToString();
background.color = previewScore > 0 ? previewPositiveColor : previewZeroColor;
}
public void HidePreview()
{
if (_isUsed) return;
previewText.text = "";
scoreText.text = "-";
background.color = normalColor;
}
public void SetRecordedScore(int score)
{
_isUsed = true;
recordedScoreText.text = score.ToString();
previewText.text = "";
scoreText.text = score.ToString();
SetInteractable(false);
background.color = usedColor;
}
@@ -74,8 +71,7 @@ namespace YachtDice.UI
public void ResetRow()
{
_isUsed = false;
previewText.text = "";
recordedScoreText.text = "-";
scoreText.text = "-";
SetInteractable(false);
background.color = normalColor;
}
Assets/Scripts/UI/Presentation/ScoreCardPresenter.cs
+1 -1
View File
@@ -74,7 +74,7 @@ namespace YachtDice.UI.Presentation
public void UpdateTotalDisplay(ScoreSummary summary)
{
_view.UpdateTotalDisplay(summary.DisplayTotal, summary.UpperSum, summary.HasUpperBonus);
_view.UpdateTotalDisplay(summary.DisplayTotal);
}
public void ResetAll()
Assets/Scripts/UI/Presentation/ScoreSummary.cs
+1 -5
View File
@@ -3,14 +3,10 @@ namespace YachtDice.UI.Presentation
public readonly struct ScoreSummary
{
public int DisplayTotal { get; }
public int UpperSum { get; }
public bool HasUpperBonus { get; }
public ScoreSummary(int displayTotal, int upperSum, bool hasUpperBonus)
public ScoreSummary(int displayTotal)
{
DisplayTotal = displayTotal;
UpperSum = upperSum;
HasUpperBonus = hasUpperBonus;
}
}
}
Assets/Scripts/UI/Presentation/ScoreSummaryService.cs
+2 -31
View File
@@ -1,4 +1,3 @@
using YachtDice.Categories;
using YachtDice.Scoring;
namespace YachtDice.UI.Presentation
@@ -6,43 +5,15 @@ namespace YachtDice.UI.Presentation
public sealed class ScoreSummaryService : IScoreSummaryService
{
private readonly ScoringSystem _scoringSystem;
private readonly CategoryCatalog _categoryCatalog;
public ScoreSummaryService(ScoringSystem scoringSystem, CategoryCatalog categoryCatalog)
public ScoreSummaryService(ScoringSystem scoringSystem)
{
_scoringSystem = scoringSystem;
_categoryCatalog = categoryCatalog;
}
public ScoreSummary Calculate()
{
var upperSum = CalculateUpperSum();
var hasUpperBonus = upperSum >= _categoryCatalog.UpperBonusThreshold;
var total = _scoringSystem.TotalScore;
if (hasUpperBonus)
total += _categoryCatalog.UpperBonusValue;
return new ScoreSummary(total, upperSum, hasUpperBonus);
}
private int CalculateUpperSum()
{
var upperSum = 0;
var allCategories = _categoryCatalog.All;
for (var i = 0; i < allCategories.Count; i++)
{
var category = allCategories[i];
if (!category.IsUpperSection)
continue;
var categoryScore = _scoringSystem.GetCategoryScore(category);
if (categoryScore >= 0)
upperSum += categoryScore;
}
return upperSum;
return new ScoreSummary(_scoringSystem.TotalScore);
}
}
}
Assets/Scripts/UI/ScoreCardView.cs
+3 -10
View File
@@ -12,8 +12,6 @@ namespace YachtDice.UI
[SerializeField] private List<CategoryRowView> categoryRows = new();
[Header("Summary")]
[SerializeField] private TMP_Text upperSumText;
[SerializeField] private TMP_Text upperBonusText;
[SerializeField] private TMP_Text totalScoreText;
public event Action<CategoryDefinition> OnCategorySelected;
@@ -40,7 +38,7 @@ namespace YachtDice.UI
_categoryToRowIndex[all[i]] = i;
}
UpdateTotalDisplay(0, 0, false);
UpdateTotalDisplay(0);
}
public void UpdatePreviews(Dictionary<CategoryDefinition, int> previews)
@@ -76,14 +74,9 @@ namespace YachtDice.UI
t.SetInteractable(interactable);
}
public void UpdateTotalDisplay(int totalScore, int upperSum, bool hasUpperBonus)
public void UpdateTotalDisplay(int totalScore)
{
var threshold = _catalog != null ? _catalog.UpperBonusThreshold : 63;
var bonusValue = _catalog != null ? _catalog.UpperBonusValue : 35;
totalScoreText.text = totalScore.ToString();
upperSumText.text = $"{upperSum} / {threshold}";
upperBonusText.text = hasUpperBonus ? $"+{bonusValue}" : "---";
}
public void ResetAll()
@@ -91,7 +84,7 @@ namespace YachtDice.UI
foreach (var t in categoryRows)
t.ResetRow();
UpdateTotalDisplay(0, 0, false);
UpdateTotalDisplay(0);
}
private void HandleCategorySelected(CategoryDefinition category)