diff --git a/Assets/Prefabs/PaintHudPanel.prefab b/Assets/Prefabs/PaintHudPanel.prefab index 59bddde..d7f9c9e 100644 --- a/Assets/Prefabs/PaintHudPanel.prefab +++ b/Assets/Prefabs/PaintHudPanel.prefab @@ -827,7 +827,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 0.9} + m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -949,7 +949,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 0.9} + m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2204,7 +2204,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 + m_IsOn: 1 --- !u!1 &5536196198686906629 GameObject: m_ObjectHideFlags: 0 @@ -2269,7 +2269,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 0.9} + m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2615,7 +2615,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 0.9} + m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3670,11 +3670,16 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3098102965295711989} + - {fileID: 5426747044321037415} + - {fileID: 4341305871465081261} + - {fileID: 8248322718471370911} + - {fileID: 2029822309615658438} + - {fileID: 4684466470907321105} m_Father: {fileID: 7387928529902370415} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -900, y: 20} + m_AnchoredPosition: {x: -750, y: 255} m_SizeDelta: {x: 280, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3171558510481401849 @@ -3698,7 +3703,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 0.9} + m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3907,7 +3912,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 0.9} + m_Color: {r: 0.09, g: 0.09, b: 0.11, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4051,6 +4056,148 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &201611063859136354 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3634224269323718290} + m_Modifications: + - target: {fileID: 3983135770763320344, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: Dots + objectReference: {fileID: 0} + - target: {fileID: 4562821246304388210, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Value + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MaxValue + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_WholeNumbers + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7273293964960786644, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Name + value: Slider_SprayDots + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} +--- !u!224 &5426747044321037415 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + m_PrefabInstance: {fileID: 201611063859136354} + m_PrefabAsset: {fileID: 0} --- !u!1001 &321342751622582168 PrefabInstance: m_ObjectHideFlags: 0 @@ -4197,6 +4344,152 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} m_PrefabInstance: {fileID: 321342751622582168} m_PrefabAsset: {fileID: 0} +--- !u!1001 &612904001219612692 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3634224269323718290} + m_Modifications: + - target: {fileID: 3983135770763320344, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: Dot Alpha (Max) + objectReference: {fileID: 0} + - target: {fileID: 4562821246304388210, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: 1,00 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MaxValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MinValue + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_WholeNumbers + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7273293964960786644, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Name + value: Slider_SprayDotAlphaMax + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} +--- !u!224 &4684466470907321105 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + m_PrefabInstance: {fileID: 612904001219612692} + m_PrefabAsset: {fileID: 0} --- !u!1001 &889416535110432801 PrefabInstance: m_ObjectHideFlags: 0 @@ -4477,6 +4770,152 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} m_PrefabInstance: {fileID: 1796302450561085447} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4320082688929297306 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3634224269323718290} + m_Modifications: + - target: {fileID: 3983135770763320344, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: Dot Size (Max) + objectReference: {fileID: 0} + - target: {fileID: 4562821246304388210, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: 0,18 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Value + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MaxValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MinValue + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_WholeNumbers + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7273293964960786644, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Name + value: Slider_SprayDotSizeMax + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} +--- !u!224 &8248322718471370911 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + m_PrefabInstance: {fileID: 4320082688929297306} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4383637231553397496 PrefabInstance: m_ObjectHideFlags: 0 @@ -4851,6 +5290,152 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} m_PrefabInstance: {fileID: 5344768466403301413} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6172334181636976323 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3634224269323718290} + m_Modifications: + - target: {fileID: 3983135770763320344, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: Dot Alpha (Min) + objectReference: {fileID: 0} + - target: {fileID: 4562821246304388210, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: 0,25 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Value + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MaxValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MinValue + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_WholeNumbers + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7273293964960786644, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Name + value: Slider_SprayDotAlphaMin + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} +--- !u!224 &2029822309615658438 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + m_PrefabInstance: {fileID: 6172334181636976323} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7717931987048658996 PrefabInstance: m_ObjectHideFlags: 0 @@ -4985,3 +5570,149 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} m_PrefabInstance: {fileID: 7717931987048658996} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8483800035330007720 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3634224269323718290} + m_Modifications: + - target: {fileID: 3983135770763320344, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: Dot Size (Min) + objectReference: {fileID: 0} + - target: {fileID: 4562821246304388210, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_text + value: 0,05 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5381822788309442337, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Value + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MaxValue + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_MinValue + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_WholeNumbers + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6993348405844982934, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7273293964960786644, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + propertyPath: m_Name + value: Slider_SprayDotSizeMin + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} +--- !u!224 &4341305871465081261 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} + m_PrefabInstance: {fileID: 8483800035330007720} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Slider.prefab b/Assets/Prefabs/Slider.prefab index a89043c..fb40f0b 100644 --- a/Assets/Prefabs/Slider.prefab +++ b/Assets/Prefabs/Slider.prefab @@ -58,7 +58,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.2, g: 0.2, b: 0.24, a: 1} + m_Color: {r: 0.46274513, g: 0.7843138, b: 0.9294118, a: 0.08627451} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Scripts/PaintHud.cs b/Assets/Scripts/PaintHud.cs index 517d465..dd47731 100644 --- a/Assets/Scripts/PaintHud.cs +++ b/Assets/Scripts/PaintHud.cs @@ -37,7 +37,7 @@ public class PaintHud : MonoBehaviour public GameObject layoutPrefab; // Stable widget names shared by the code-gen builder, the baked prefab and the binder. - private const string RootName = "PaintHudPanel"; + private const string PanelSpray = "Panel_Spray"; private const string PanelAlbedo = "Panel_Albedo"; private const string PanelMetallicSmoothness = "Panel_MetallicSmoothness"; private const string PanelOcclusion = "Panel_Occlusion"; @@ -47,6 +47,7 @@ public class PaintHud : MonoBehaviour private const string ToggleMetallicSmoothness = "Toggle_MetallicSmoothness"; private const string ToggleOcclusion = "Toggle_Occlusion"; private const string ToggleEmission = "Toggle_Emission"; + private const string ToggleSpray = "Toggle_Spray"; private const string PickerAlbedo = "Picker_Albedo"; private const string PickerEmission = "Picker_Emission"; private const string SliderMetallic = "Slider_Metallic"; @@ -56,18 +57,23 @@ public class PaintHud : MonoBehaviour private const string SliderOcclusionAlpha = "Slider_OcclusionAlpha"; private const string SliderEmissionIntensity = "Slider_EmissionIntensity"; private const string SliderBrushSize = "Slider_BrushSize"; + private const string SliderSprayDots = "Slider_SprayDots"; + private const string SliderSprayDotSizeMin = "Slider_SprayDotSizeMin"; + private const string SliderSprayDotSizeMax = "Slider_SprayDotSizeMax"; + private const string SliderSprayDotAlphaMin = "Slider_SprayDotAlphaMin"; + private const string SliderSprayDotAlphaMax = "Slider_SprayDotAlphaMax"; // Panels made draggable at runtime - grabbable from any non-widget surface (both prefab and code-gen paths). private static readonly string[] DraggablePanels = { - PanelAlbedo, PanelMetallicSmoothness, PanelOcclusion, PanelEmission, PanelBrushSize + PanelAlbedo, + PanelMetallicSmoothness, + PanelOcclusion, + PanelEmission, + PanelBrushSize, + PanelSpray }; - private static readonly Color PanelColor = new Color(0.09f, 0.09f, 0.11f, 0.9f); - private static readonly Color HeaderColor = new Color(0.18f, 0.18f, 0.22f, 1f); - private static readonly Color Accent = new Color(0.40f, 0.75f, 1f, 1f); - private static readonly Color BoxColor = new Color(0.20f, 0.20f, 0.24f, 1f); - private GameObject _panel; private Font _font; @@ -162,12 +168,14 @@ public class PaintHud : MonoBehaviour WireToggle(panel, ToggleMetallicSmoothness, painter && painter.paintMetallicSmoothness, v => { if (painter) painter.paintMetallicSmoothness = v; }); WireToggle(panel, ToggleOcclusion, painter && painter.paintOcclusion, v => { if (painter) painter.paintOcclusion = v; }); WireToggle(panel, ToggleEmission, painter && painter.paintEmission, v => { if (painter) painter.paintEmission = v; }); + WireToggle(panel, ToggleSpray, painter && painter.spray, v => { if (painter) painter.spray = v; }); // Dim a channel panel to 0.5 alpha while its toggle is off, full alpha while on. WirePanelFade(panel, PanelAlbedo, ToggleAlbedo); WirePanelFade(panel, PanelMetallicSmoothness, ToggleMetallicSmoothness); WirePanelFade(panel, PanelOcclusion, ToggleOcclusion); WirePanelFade(panel, PanelEmission, ToggleEmission); + WirePanelFade(panel, PanelSpray, ToggleSpray); WirePicker(panel, PickerAlbedo, painter ? painter.brushColor : Color.red, c => { if (painter) painter.brushColor = c; }); @@ -184,6 +192,12 @@ public class PaintHud : MonoBehaviour WireSlider(panel, SliderBrushSize, painter ? painter.brushSize : 16f, v => { if (painter) painter.brushSize = Mathf.RoundToInt(v); }); + WireSlider(panel, SliderSprayDots, painter ? painter.sprayDots : 24f, v => { if (painter) painter.sprayDots = Mathf.RoundToInt(v); }); + WireSlider(panel, SliderSprayDotSizeMin, painter ? painter.sprayDotSizeMin : .05f, v => { if (painter) painter.sprayDotSizeMin = v; }); + WireSlider(panel, SliderSprayDotSizeMax, painter ? painter.sprayDotSizeMax : .18f, v => { if (painter) painter.sprayDotSizeMax = v; }); + WireSlider(panel, SliderSprayDotAlphaMin, painter ? painter.sprayDotAlphaMin : .25f, v => { if (painter) painter.sprayDotAlphaMin = v; }); + WireSlider(panel, SliderSprayDotAlphaMax, painter ? painter.sprayDotAlphaMax : 1f, v => { if (painter) painter.sprayDotAlphaMax = v; }); + foreach (var name in DraggablePanels) MakeDraggable(panel, name); }