diff --git a/Assets/Data/Categories/FirstCategoryCatalog.asset b/Assets/Data/Categories/FirstCategoryCatalog.asset new file mode 100644 index 0000000..8b80632 --- /dev/null +++ b/Assets/Data/Categories/FirstCategoryCatalog.asset @@ -0,0 +1,30 @@ +%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: e89ee3a4aac1e6d4eabd79f32b9d8d15, type: 3} + m_Name: FirstCategoryCatalog + m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.CategoryCatalog + categories: + - {fileID: 11400000, guid: ad75115a9ee3dd34598b1521d1f34a08, type: 2} + - {fileID: 11400000, guid: 5be00d38f4e40664788d28114856e446, type: 2} + - {fileID: 11400000, guid: 7474d22b4785b4b42a16be1fe12e53e3, type: 2} + - {fileID: 11400000, guid: 492827790313e6f43944e19a0f3a6a9c, type: 2} + - {fileID: 11400000, guid: 7e18f115081820946a1a4a53d56f4f0f, type: 2} + - {fileID: 11400000, guid: 4b1c9794957ddfb48a7674531139919b, type: 2} + - {fileID: 11400000, guid: 89432fbaba032e646994088d85b96c99, type: 2} + - {fileID: 11400000, guid: 9ea1413e6e9091d4996ee74dd769d671, type: 2} + - {fileID: 11400000, guid: 24c8bd19b58357749a1819c0e0c124d9, type: 2} + - {fileID: 11400000, guid: 0ed686ef060a26a48a9892d467f83bc2, type: 2} + - {fileID: 11400000, guid: e9bf7be35c88f2845a4ad5dc81c5b9d2, type: 2} + - {fileID: 11400000, guid: 3241fb265c623174fac9d0d1ca1f5f05, type: 2} + - {fileID: 11400000, guid: 0822490ecb8ce224d861379ddb7b76ab, type: 2} + upperBonusThreshold: 63 + upperBonusValue: 35 diff --git a/Assets/Data/Categories/FirstCategoryCatalog.asset.meta b/Assets/Data/Categories/FirstCategoryCatalog.asset.meta new file mode 100644 index 0000000..1297ea0 --- /dev/null +++ b/Assets/Data/Categories/FirstCategoryCatalog.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63ac73e96bbc8df47828835666adca90 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Categories/CategoryCatalog.asset b/Assets/Data/Categories/MasterCategoryCatalog.asset similarity index 97% rename from Assets/Data/Categories/CategoryCatalog.asset rename to Assets/Data/Categories/MasterCategoryCatalog.asset index 3838865..78db004 100644 --- a/Assets/Data/Categories/CategoryCatalog.asset +++ b/Assets/Data/Categories/MasterCategoryCatalog.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e89ee3a4aac1e6d4eabd79f32b9d8d15, type: 3} - m_Name: CategoryCatalog + m_Name: MasterCategoryCatalog m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.Categories.CategoryCatalog upperBonusThreshold: 63 upperBonusValue: 35 diff --git a/Assets/Data/Categories/CategoryCatalog.asset.meta b/Assets/Data/Categories/MasterCategoryCatalog.asset.meta similarity index 100% rename from Assets/Data/Categories/CategoryCatalog.asset.meta rename to Assets/Data/Categories/MasterCategoryCatalog.asset.meta diff --git a/Assets/Prefab/UI/Dice/Dice Panel View.prefab b/Assets/Prefab/UI/Dice/Dice Panel View.prefab index 1545ad8..f326b56 100644 --- a/Assets/Prefab/UI/Dice/Dice Panel View.prefab +++ b/Assets/Prefab/UI/Dice/Dice Panel View.prefab @@ -29,17 +29,18 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8365788167391910648} + - {fileID: 1635669836411748173} - {fileID: 4549448562894985602} - {fileID: 794158921372440875} - {fileID: 7307872059726101040} - {fileID: 6476199033484376798} - - {fileID: 1635669836411748173} + - {fileID: 5749095979345195783} + - {fileID: 7841237336002983789} m_Father: {fileID: 4669061385824473063} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 168.7286} m_Pivot: {x: 0.5, y: 0} --- !u!114 &5680387996861642171 @@ -56,7 +57,7 @@ MonoBehaviour: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.HorizontalLayoutGroup m_Padding: m_Left: 0 - m_Right: 50 + m_Right: 40 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 5 @@ -104,7 +105,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -622.109, y: 0} + m_AnchoredPosition: {x: -597.0664, y: 0} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2533106893686760601 @@ -239,9 +240,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: YachtDice.Runtime::YachtDice.UI.DicePanelView diceValues: - - diceButton: {fileID: 4497997615947282303} - diceValueText: {fileID: 2646135117414093251} - diceBackground: {fileID: 4045828850643474726} - diceButton: {fileID: 8455431740848911365} diceValueText: {fileID: 8035361268215616185} diceBackground: {fileID: 8295077158291397212} @@ -254,6 +252,12 @@ MonoBehaviour: - diceButton: {fileID: 1411119505971124057} diceValueText: {fileID: 666991689473765861} diceBackground: {fileID: 1575414695760656640} + - diceButton: {fileID: 413694921894518400} + diceValueText: {fileID: 2263429934281652284} + diceBackground: {fileID: 284869931652165849} + - diceButton: {fileID: 2784617428806802154} + diceValueText: {fileID: 4355013905569037398} + diceBackground: {fileID: 2372623133142348979} rollButton: {fileID: 7120388618919210326} rollButtonText: {fileID: 7975936988423491926} unlockedColor: {r: 1, g: 1, b: 1, a: 1} @@ -292,7 +296,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 75 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.y @@ -328,7 +332,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -277.48163 + value: -408.87756 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -427,7 +431,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 75 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.y @@ -463,7 +467,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -386.3211 + value: -491.722 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -562,7 +566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 75 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.y @@ -598,7 +602,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -59.802734 + value: -243.18878 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -663,6 +667,141 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} m_PrefabInstance: {fileID: 5762621988578509589} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6471675733654407884 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6356518114074074557} + m_Modifications: + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_SizeDelta.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_SizeDelta.y + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchoredPosition.x + value: -160.34439 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4409451635532805505, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_Name + value: Dice Value (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} +--- !u!114 &284869931652165849 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6495331385021938197, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 6471675733654407884} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image +--- !u!114 &413694921894518400 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6660190102382924876, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 6471675733654407884} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button +--- !u!114 &2263429934281652284 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5096196000090649328, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 6471675733654407884} + 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 &5749095979345195783 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 6471675733654407884} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6809483744564072659 PrefabInstance: m_ObjectHideFlags: 0 @@ -733,7 +872,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000030517578 + value: 0.000061035156 objectReference: {fileID: 0} - target: {fileID: 703621256034232799, guid: 0829148555ff32841afde9f6193a0b72, type: 3} propertyPath: m_AnchoredPosition.y @@ -808,141 +947,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI ---- !u!1001 &7062108881619264307 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6356518114074074557} - m_Modifications: - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_SizeDelta.y - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: -495.16055 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4409451635532805505, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - propertyPath: m_Name - value: Dice Value - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} ---- !u!114 &2646135117414093251 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5096196000090649328, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - m_PrefabInstance: {fileID: 7062108881619264307} - 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!114 &4045828850643474726 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6495331385021938197, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - m_PrefabInstance: {fileID: 7062108881619264307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image ---- !u!114 &4497997615947282303 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6660190102382924876, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - m_PrefabInstance: {fileID: 7062108881619264307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button ---- !u!224 &8365788167391910648 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} - m_PrefabInstance: {fileID: 7062108881619264307} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8318747147490706427 PrefabInstance: m_ObjectHideFlags: 0 @@ -977,7 +981,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 75 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_SizeDelta.y @@ -1013,7 +1017,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -168.64218 + value: -326.03317 objectReference: {fileID: 0} - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -1078,3 +1082,138 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} m_PrefabInstance: {fileID: 8318747147490706427} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8847687949517541030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6356518114074074557} + m_Modifications: + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_SizeDelta.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_SizeDelta.y + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchoredPosition.x + value: -77.49994 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4409451635532805505, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + propertyPath: m_Name + value: Dice Value (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} +--- !u!114 &2372623133142348979 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6495331385021938197, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 8847687949517541030} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image +--- !u!114 &2784617428806802154 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6660190102382924876, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 8847687949517541030} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button +--- !u!114 &4355013905569037398 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5096196000090649328, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 8847687949517541030} + 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 &7841237336002983789 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1592276042498947531, guid: cf273da72b2f83d46a31e53c5dd0c9fc, type: 3} + m_PrefabInstance: {fileID: 8847687949517541030} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefab/UI/Dice/Dice Value.prefab b/Assets/Prefab/UI/Dice/Dice Value.prefab index 9f18820..3cc2735 100644 --- a/Assets/Prefab/UI/Dice/Dice Value.prefab +++ b/Assets/Prefab/UI/Dice/Dice Value.prefab @@ -422,7 +422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3} propertyPath: m_text - value: 12 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3472307258458128773, guid: 0829148555ff32841afde9f6193a0b72, type: 3} propertyPath: m_fontSize diff --git a/Assets/Prefab/d6.prefab b/Assets/Prefab/d6.prefab index 8b3452e..87191ff 100644 --- a/Assets/Prefab/d6.prefab +++ b/Assets/Prefab/d6.prefab @@ -312,7 +312,7 @@ MonoBehaviour: dice: {fileID: 3052556563113756475} rb: {fileID: 1768444232422188122} k__BackingField: {fileID: 11400000, guid: b4fd0877395ff654b83ec79e811d356c, type: 2} - throwUpForce: 0.5 + throwUpForce: 2 throwScatter: 1.5 torqueMin: 15 torqueMax: 30 diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index 6d6ea84..5dcdba8 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -771,10 +771,27 @@ Transform: - {fileID: 1404733708} - {fileID: 1077005091} - {fileID: 939002737} + - {fileID: 741055164} - {fileID: 1715952347} - {fileID: 1284869688} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &741055164 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 1560234330} + m_PrefabAsset: {fileID: 0} +--- !u!114 &741055165 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7057909628855743290, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 1560234330} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b23705818517634fa50cd00f9228af9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DiceRoller --- !u!1 &819220930 GameObject: m_ObjectHideFlags: 0 @@ -863,6 +880,7 @@ MonoBehaviour: - {fileID: 1404733709} - {fileID: 1077005092} - {fileID: 939002738} + - {fileID: 741055165} --- !u!4 &822363843 Transform: m_ObjectHideFlags: 0 @@ -1254,7 +1272,7 @@ Transform: m_GameObject: {fileID: 1375693286} serializedVersion: 2 m_LocalRotation: {x: 0.46193978, y: 0.33141357, z: -0.19134171, w: 0.8001032} - m_LocalPosition: {x: -5.7, y: 24.8, z: -5.2} + m_LocalPosition: {x: -5, y: 25, z: -6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1334,7 +1352,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} propertyPath: m_LocalPosition.x - value: -4 + value: -1 objectReference: {fileID: 0} - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} propertyPath: m_LocalPosition.y @@ -1342,8 +1360,65 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000003774895 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} +--- !u!1001 &1560234330 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 678730623} + m_Modifications: + - target: {fileID: 5239586480387998843, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_Name + value: D6 (6) + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} propertyPath: m_LocalRotation.w value: 1 @@ -1517,7 +1592,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} propertyPath: m_LocalPosition.x - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6590077607741954368, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} propertyPath: m_LocalPosition.y @@ -1525,7 +1600,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