From 6da112fb9748d3b0954ab553f74a8e9b59a3aeb5 Mon Sep 17 00:00:00 2001 From: Konstantin Dyachenko Date: Thu, 26 Feb 2026 16:06:30 +0700 Subject: [PATCH] [Add] Dice to Scene --- Assets/Material/Dice.mat | 10 +- Assets/Prefab.meta | 8 + Assets/Prefab/d6.prefab | 406 +++++++++++++ Assets/Prefab/d6.prefab.meta | 7 + Assets/Scenes/SampleScene.unity | 806 +++++++++++++++++-------- Assets/Scripts/Dice/DiceRoller.cs | 31 +- Assets/Scripts/Dice/DiceRoller.cs.meta | 2 + 7 files changed, 985 insertions(+), 285 deletions(-) create mode 100644 Assets/Prefab.meta create mode 100644 Assets/Prefab/d6.prefab create mode 100644 Assets/Prefab/d6.prefab.meta create mode 100644 Assets/Scripts/Dice/DiceRoller.cs.meta diff --git a/Assets/Material/Dice.mat b/Assets/Material/Dice.mat index 94ecbc3..db98d90 100644 --- a/Assets/Material/Dice.mat +++ b/Assets/Material/Dice.mat @@ -22,7 +22,7 @@ Material: - _FOG_ON - _GREYSCALESTAGE_BEFORELIGHTING - _HEIGHTGRADIENTPOSITIONSPACE_LOCAL - - _LIGHTMODEL_TOON + - _LIGHTMODEL_NONE - _MATCAPBLENDMODE_MULTIPLY - _OUTLINETYPE_NONE - _RECEIVEDSHADOWSTYPE_CLASSIC @@ -155,7 +155,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _VertexDistortionNoiseTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fcb69fdadf254834880fe3c443965278, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _VertexExtrudeNoiseTex: @@ -202,8 +202,8 @@ Material: - _CustomAmbientLightOn: 1 - _CustomShadowColorOn: 0 - _DepthColoringOn: 0 - - _DepthGlowColorIntensity: 25 - - _DepthGlowDist: 0.2 + - _DepthGlowColorIntensity: -77.79 + - _DepthGlowDist: 10 - _DepthGlowGlobalIntensity: 2 - _DepthGlowPower: 25 - _DistortAmount: 0.3 @@ -276,7 +276,7 @@ Material: - _IntersectionFadeFactor: 1 - _IntersectionFadeOn: 0 - _IntersectionGlowOn: 0 - - _LightModel: 2 + - _LightModel: 0 - _LightmapColorCorrection: 0 - _LineSize: 0.298 - _Matcap: 0 diff --git a/Assets/Prefab.meta b/Assets/Prefab.meta new file mode 100644 index 0000000..bbf9513 --- /dev/null +++ b/Assets/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0580589be0a4fb48a5afd5bc521111a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/d6.prefab b/Assets/Prefab/d6.prefab new file mode 100644 index 0000000..9b86162 --- /dev/null +++ b/Assets/Prefab/d6.prefab @@ -0,0 +1,406 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2059476882705348421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1773547393705138433} + - component: {fileID: 282085384116541902} + - component: {fileID: 8305874556669787871} + - component: {fileID: 8151562594763574270} + - component: {fileID: 7605914988159836042} + - component: {fileID: 3860044579474353696} + - component: {fileID: 8948534700326006438} + m_Layer: 0 + m_Name: d6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1773547393705138433 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.02, y: 1.49, z: -3.98} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2619116936689465289} + - {fileID: 1246214946247784443} + - {fileID: 7239899742232799087} + - {fileID: 6811902284707113128} + - {fileID: 5118907032501814386} + - {fileID: 3482775417741736230} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &282085384116541902 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + m_Mesh: {fileID: -2432090755550338912, guid: c33910c44aba8b140aca137d90926049, type: 3} +--- !u!23 &8305874556669787871 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 90f88e19853dc9c47a7a5bc64b8e333a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8151562594763574270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e12f7bca8b531b14ab2ee524b885e784, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Dice + entries: + - value: 1 + point: {fileID: 2619116936689465289} + - value: 2 + point: {fileID: 1246214946247784443} + - value: 3 + point: {fileID: 7239899742232799087} + - value: 4 + point: {fileID: 6811902284707113128} + - value: 5 + point: {fileID: 5118907032501814386} + - value: 6 + point: {fileID: 3482775417741736230} +--- !u!65 &7605914988159836042 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &3860044579474353696 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &8948534700326006438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059476882705348421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b23705818517634fa50cd00f9228af9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DiceRoller + dice: {fileID: 8151562594763574270} + rb: {fileID: 3860044579474353696} + throwUpForce: 0.5 + throwScatter: 1 + torqueMin: 20 + torqueMax: 30 + settleSpeed: 0.05 + settleDelay: 0.3 + snapDuration: 0.15 + snapCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &3569582697960493106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2619116936689465289} + m_Layer: 0 + m_Name: 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2619116936689465289 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3569582697960493106} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} + m_LocalPosition: {x: 0, y: -0.5, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1773547393705138433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5724856373900057761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5118907032501814386} + m_Layer: 0 + m_Name: 5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5118907032501814386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5724856373900057761} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1773547393705138433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!1 &5819850332770392160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246214946247784443} + m_Layer: 0 + m_Name: 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1246214946247784443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5819850332770392160} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1773547393705138433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!1 &6970281656104809350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6811902284707113128} + m_Layer: 0 + m_Name: 4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6811902284707113128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6970281656104809350} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1773547393705138433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7084015970996967951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7239899742232799087} + m_Layer: 0 + m_Name: 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7239899742232799087 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7084015970996967951} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1773547393705138433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8582402654542417768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3482775417741736230} + m_Layer: 0 + m_Name: 6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3482775417741736230 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8582402654542417768} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1773547393705138433} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefab/d6.prefab.meta b/Assets/Prefab/d6.prefab.meta new file mode 100644 index 0000000..d70215b --- /dev/null +++ b/Assets/Prefab/d6.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b59e9f48ded300a44bdf1f3f3a43e1ae +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 0bd0da0..282a745 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -119,6 +119,17 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &236264319 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8948534700326006438, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 1944897031} + 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 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -205,13 +216,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.16337968, y: -0.63713616, z: 0.14481805, w: 0.7391835} - m_LocalPosition: {x: 7.13, y: 4.58, z: -5.3} + m_LocalRotation: {x: 0.35355338, y: -0.35355338, z: 0.1464466, w: 0.8535535} + m_LocalPosition: {x: 3.36, y: 7.59, z: -8.47} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 25.219, y: -81.435, z: 0.374} + m_LocalEulerAnglesHint: {x: 45, y: -45, z: 0} --- !u!114 &330585547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -383,7 +394,7 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 ---- !u!1 &457657407 +--- !u!1 &446542594 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -391,29 +402,161 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 457657408} + - component: {fileID: 446542595} + - component: {fileID: 446542596} m_Layer: 0 - m_Name: 1 + m_Name: Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &457657408 +--- !u!4 &446542595 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 457657407} + m_GameObject: {fileID: 446542594} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} - m_LocalPosition: {x: 0, y: -0.5, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.29095, y: 0.26879, z: 6} + m_LocalScale: {x: 5, y: 5, z: 12} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4124338948993836951} + m_Father: {fileID: 1436946385} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &446542596 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446542594} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &481950447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 481950448} + - component: {fileID: 481950449} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &481950448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481950447} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.21905, y: 0.26879, z: 6} + m_LocalScale: {x: 5, y: 5, z: 12} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1436946385} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &481950449 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481950447} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &576545583 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.x + value: -3.02 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.z + value: -2.13 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2059476882705348421, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_Name + value: d6 (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} --- !u!1 &653932192 GameObject: m_ObjectHideFlags: 0 @@ -497,9 +640,57 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 5155134012520133805} - m_TargetAssemblyTypeName: Dice, Assembly-CSharp - m_MethodName: Test + - m_Target: {fileID: 5155134012520133808} + m_TargetAssemblyTypeName: DiceRoller, Assembly-CSharp + m_MethodName: Roll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1961155190} + m_TargetAssemblyTypeName: DiceRoller, Assembly-CSharp + m_MethodName: Roll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1978369641} + m_TargetAssemblyTypeName: DiceRoller, Assembly-CSharp + m_MethodName: Roll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 236264319} + m_TargetAssemblyTypeName: DiceRoller, Assembly-CSharp + m_MethodName: Roll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1396152982} + m_TargetAssemblyTypeName: DiceRoller, Assembly-CSharp + m_MethodName: Roll m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -659,37 +850,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &824657469 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 824657470} - m_Layer: 0 - m_Name: 6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &824657470 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 824657469} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4124338948993836951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -930,37 +1090,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1346713034 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1346713035} - m_Layer: 0 - m_Name: 3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1346713035 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1346713034} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4124338948993836951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1361185695 GameObject: m_ObjectHideFlags: 0 @@ -1074,7 +1203,75 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1512263578 +--- !u!1001 &1380813488 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.x + value: -3.02 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.z + value: -0.34 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2059476882705348421, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_Name + value: d6 (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} +--- !u!114 &1396152982 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8948534700326006438, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 576545583} + 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 &1436946384 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1082,60 +1279,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1512263579} + - component: {fileID: 1436946385} m_Layer: 0 - m_Name: 5 + m_Name: SafeZone m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1512263579 +--- !u!4 &1436946385 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1512263578} + m_GameObject: {fileID: 1436946384} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.43095, y: 2.39121, z: -10.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4124338948993836951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} ---- !u!1 &1532532561 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1532532562} - m_Layer: 0 - m_Name: 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1532532562 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1532532561} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4124338948993836951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_Children: + - {fileID: 446542595} + - {fileID: 2132863930} + - {fileID: 1594796966} + - {fileID: 481950448} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1540995164 GameObject: m_ObjectHideFlags: 0 @@ -1238,7 +1408,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1856885474 +--- !u!1 &1594796965 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1246,29 +1416,130 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1856885475} + - component: {fileID: 1594796966} + - component: {fileID: 1594796967} m_Layer: 0 - m_Name: 4 + m_Name: Cube (5) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1856885475 +--- !u!4 &1594796966 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1856885474} + m_GameObject: {fileID: 1594796965} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0.5} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.52, y: 0.26879, z: 13.47} + m_LocalScale: {x: 5, y: 5, z: 5} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4124338948993836951} + m_Father: {fileID: 1436946385} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1594796967 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594796965} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &1944897031 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.x + value: -3.02 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.z + value: -6.15 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2059476882705348421, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_Name + value: d6 (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} +--- !u!114 &1961155190 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8948534700326006438, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 1380813488} + 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!114 &1978369641 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8948534700326006438, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 2116346237} + 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 &2085737242 GameObject: m_ObjectHideFlags: 0 @@ -1406,85 +1677,64 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2085737242} m_CullTransparentMesh: 1 ---- !u!33 &1291327137092460253 -MeshFilter: +--- !u!1001 &2116346237 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5155134012520133804} - m_Mesh: {fileID: -2432090755550338912, guid: c33910c44aba8b140aca137d90926049, type: 3} ---- !u!23 &2363841222853065289 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5155134012520133804} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 90f88e19853dc9c47a7a5bc64b8e333a, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!4 &4124338948993836951 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5155134012520133804} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.02, y: 1.49, z: -3.98} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 457657408} - - {fileID: 1532532562} - - {fileID: 1346713035} - - {fileID: 1856885475} - - {fileID: 1512263579} - - {fileID: 824657470} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5155134012520133804 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.x + value: -3.02 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.z + value: -7.92 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2059476882705348421, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_Name + value: d6 (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} +--- !u!1 &2132863929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1492,78 +1742,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4124338948993836951} - - component: {fileID: 1291327137092460253} - - component: {fileID: 2363841222853065289} - - component: {fileID: 5155134012520133805} - - component: {fileID: 5155134012520133807} - - component: {fileID: 5155134012520133806} + - component: {fileID: 2132863930} + - component: {fileID: 2132863931} m_Layer: 0 - m_Name: d6 + m_Name: Cube (4) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &5155134012520133805 -MonoBehaviour: +--- !u!4 &2132863930 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5155134012520133804} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e12f7bca8b531b14ab2ee524b885e784, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Dice - entries: - - value: 1 - point: {fileID: 457657408} - - value: 2 - point: {fileID: 1532532562} - - value: 3 - point: {fileID: 1346713035} - - value: 4 - point: {fileID: 1856885475} - - value: 5 - point: {fileID: 1512263579} - - value: 6 - point: {fileID: 824657470} ---- !u!54 &5155134012520133806 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5155134012520133804} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &5155134012520133807 + m_GameObject: {fileID: 2132863929} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.52, y: 0.26879, z: -1.53} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1436946385} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2132863931 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5155134012520133804} + m_GameObject: {fileID: 2132863929} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -1578,6 +1787,74 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5155134012520133808 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8948534700326006438, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + m_PrefabInstance: {fileID: 7248980437686601321} + 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!1001 &7248980437686601321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.x + value: -3.02 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalPosition.z + value: -3.98 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1773547393705138433, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2059476882705348421, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} + propertyPath: m_Name + value: d6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b59e9f48ded300a44bdf1f3f3a43e1ae, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1585,9 +1862,14 @@ SceneRoots: - {fileID: 330585546} - {fileID: 410087041} - {fileID: 832575519} - - {fileID: 4124338948993836951} + - {fileID: 7248980437686601321} + - {fileID: 1380813488} + - {fileID: 2116346237} + - {fileID: 1944897031} + - {fileID: 576545583} - {fileID: 1361185699} - {fileID: 1540995168} - {fileID: 915945193} - {fileID: 1274676169} - {fileID: 774983478} + - {fileID: 1436946385} diff --git a/Assets/Scripts/Dice/DiceRoller.cs b/Assets/Scripts/Dice/DiceRoller.cs index 9e38bff..887210c 100644 --- a/Assets/Scripts/Dice/DiceRoller.cs +++ b/Assets/Scripts/Dice/DiceRoller.cs @@ -9,8 +9,6 @@ using Random = UnityEngine.Random; /// public sealed class DiceRoller : MonoBehaviour { - // ─────────────────────────── Inspector ─────────────────────────── - [Header("References")] [SerializeField] private Dice dice; [SerializeField] private Rigidbody rb; @@ -41,30 +39,29 @@ public sealed class DiceRoller : MonoBehaviour [SerializeField] private AnimationCurve snapCurve = AnimationCurve.EaseInOut(0f, 0f, 1f, 1f); - - // ─────────────────────────── Events ────────────────────────────── - - /// Вызывается когда кубик полностью остановился. Аргумент — выпавшее значение. + + /// + /// Вызывается когда кубик полностью остановился. Аргумент — выпавшее значение. + /// public event Action OnRollFinished; - - // ─────────────────────────── State ─────────────────────────────── - - /// Идёт ли сейчас бросок. + + /// + /// Идёт ли сейчас бросок. + /// public bool IsRolling { get; private set; } private Coroutine rollRoutine; - // ─────────────────────────── Unity ─────────────────────────────── - private void Reset() { dice = GetComponent(); rb = GetComponent(); } - // ─────────────────────────── Public API ────────────────────────── - /// Бросить кубик. Повторный вызов во время броска игнорируется. + /// + /// Бросить кубик. Повторный вызов во время броска игнорируется. + /// public void Roll() { if (IsRolling) return; @@ -74,9 +71,7 @@ public sealed class DiceRoller : MonoBehaviour rollRoutine = StartCoroutine(RollSequence()); } - - // ─────────────────────────── Core ──────────────────────────────── - + private IEnumerator RollSequence() { IsRolling = true; @@ -152,6 +147,6 @@ public sealed class DiceRoller : MonoBehaviour IsRolling = false; OnRollFinished?.Invoke(topValue); - Debug.Log($"🎲 Выпало: {topValue}"); + Debug.Log($"{gameObject.name} | Выпало: {topValue}"); } } diff --git a/Assets/Scripts/Dice/DiceRoller.cs.meta b/Assets/Scripts/Dice/DiceRoller.cs.meta new file mode 100644 index 0000000..863f5b9 --- /dev/null +++ b/Assets/Scripts/Dice/DiceRoller.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0b23705818517634fa50cd00f9228af9 \ No newline at end of file