@quenty/colorpalette 10.22.0-canary.559.b31717d.0 → 10.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/package.json +14 -14
- package/src/Shared/ColorPalette.lua +1 -1
- package/src/Shared/ColorPalette.story.lua +125 -116
- package/src/Shared/Font/FontPalette.lua +1 -1
- package/src/Shared/Grade/ColorGradePalette.lua +15 -15
- package/src/Shared/Grade/ColorGradePalette.story.lua +118 -107
- package/src/Shared/Grade/ColorGradeUtils.lua +3 -3
- package/src/Shared/Swatch/ColorSwatch.lua +1 -1
- package/src/Shared/Swatch/ColorSwatch.story.lua +57 -55
package/CHANGELOG.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [10.22.0
|
|
6
|
+
# [10.22.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpalette@10.21.3...@quenty/colorpalette@10.22.0) (2025-05-10)
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quenty/colorpalette",
|
|
3
|
-
"version": "10.22.0
|
|
3
|
+
"version": "10.22.0",
|
|
4
4
|
"description": "Color palette system for Roblox",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Roblox",
|
|
@@ -28,18 +28,18 @@
|
|
|
28
28
|
"access": "public"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@quenty/baseobject": "10.
|
|
32
|
-
"@quenty/blend": "12.19.0
|
|
33
|
-
"@quenty/color3utils": "11.19.0
|
|
34
|
-
"@quenty/colorpicker": "10.20.0
|
|
35
|
-
"@quenty/loader": "10.
|
|
36
|
-
"@quenty/maid": "3.
|
|
37
|
-
"@quenty/math": "2.7.3",
|
|
38
|
-
"@quenty/observablecollection": "12.21.0
|
|
39
|
-
"@quenty/rx": "13.18.0
|
|
40
|
-
"@quenty/signal": "7.
|
|
41
|
-
"@quenty/table": "3.
|
|
42
|
-
"@quenty/valueobject": "13.18.0
|
|
31
|
+
"@quenty/baseobject": "^10.9.0",
|
|
32
|
+
"@quenty/blend": "^12.19.0",
|
|
33
|
+
"@quenty/color3utils": "^11.19.0",
|
|
34
|
+
"@quenty/colorpicker": "^10.20.0",
|
|
35
|
+
"@quenty/loader": "^10.9.0",
|
|
36
|
+
"@quenty/maid": "^3.5.0",
|
|
37
|
+
"@quenty/math": "^2.7.3",
|
|
38
|
+
"@quenty/observablecollection": "^12.21.0",
|
|
39
|
+
"@quenty/rx": "^13.18.0",
|
|
40
|
+
"@quenty/signal": "^7.11.0",
|
|
41
|
+
"@quenty/table": "^3.8.0",
|
|
42
|
+
"@quenty/valueobject": "^13.18.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "20cff952c2cf06b959f2f11d2293bdef38acc604"
|
|
45
45
|
}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
@class ColorPalette.story
|
|
3
3
|
]]
|
|
4
4
|
|
|
5
|
-
local require =
|
|
5
|
+
local require =
|
|
6
|
+
require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
|
|
6
7
|
|
|
7
|
-
local Maid = require("Maid")
|
|
8
8
|
local Blend = require("Blend")
|
|
9
|
-
local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
|
|
10
9
|
local ColorPalette = require("ColorPalette")
|
|
10
|
+
local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
|
|
11
|
+
local Maid = require("Maid")
|
|
11
12
|
local ValueObject = require("ValueObject")
|
|
12
13
|
|
|
13
14
|
local DARK_MODE_ENABLED = true
|
|
@@ -70,174 +71,182 @@ return function(target)
|
|
|
70
71
|
local percentMouseOver = Blend.Spring(mouseOver, 60)
|
|
71
72
|
|
|
72
73
|
return Blend.New "Frame" {
|
|
73
|
-
BackgroundColor3 = palette:ObserveColor("surface")
|
|
74
|
-
Size = UDim2.new(0, 250, 0, 100)
|
|
74
|
+
BackgroundColor3 = palette:ObserveColor("surface"),
|
|
75
|
+
Size = UDim2.new(0, 250, 0, 100),
|
|
75
76
|
|
|
76
77
|
[Blend.Children] = {
|
|
77
78
|
Blend.New "TextLabel" {
|
|
78
|
-
TextColor3 = palette:ObserveColor("text")
|
|
79
|
-
Text = labelText
|
|
80
|
-
Font = Enum.Font.FredokaOne
|
|
81
|
-
Size = UDim2.new(1, 0, 1, 0)
|
|
82
|
-
BackgroundTransparency = 1
|
|
83
|
-
TextScaled = true
|
|
84
|
-
ZIndex = 2
|
|
85
|
-
}
|
|
79
|
+
TextColor3 = palette:ObserveColor("text"),
|
|
80
|
+
Text = labelText,
|
|
81
|
+
Font = Enum.Font.FredokaOne,
|
|
82
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
83
|
+
BackgroundTransparency = 1,
|
|
84
|
+
TextScaled = true,
|
|
85
|
+
ZIndex = 2,
|
|
86
|
+
},
|
|
86
87
|
|
|
87
88
|
Blend.New "UIPadding" {
|
|
88
|
-
PaddingTop = UDim.new(0, 10)
|
|
89
|
-
PaddingBottom = UDim.new(0, 10)
|
|
90
|
-
PaddingLeft = UDim.new(0, 10)
|
|
91
|
-
PaddingRight = UDim.new(0, 10)
|
|
92
|
-
}
|
|
89
|
+
PaddingTop = UDim.new(0, 10),
|
|
90
|
+
PaddingBottom = UDim.new(0, 10),
|
|
91
|
+
PaddingLeft = UDim.new(0, 10),
|
|
92
|
+
PaddingRight = UDim.new(0, 10),
|
|
93
|
+
},
|
|
93
94
|
|
|
94
95
|
Blend.New "UIStroke" {
|
|
95
|
-
Color = palette:ObserveColor("surface", "border")
|
|
96
|
-
Thickness = 5
|
|
97
|
-
}
|
|
96
|
+
Color = palette:ObserveColor("surface", "border"),
|
|
97
|
+
Thickness = 5,
|
|
98
|
+
},
|
|
98
99
|
|
|
99
100
|
Blend.New "UICorner" {
|
|
100
|
-
CornerRadius = UDim.new(0, 10)
|
|
101
|
-
}
|
|
101
|
+
CornerRadius = UDim.new(0, 10),
|
|
102
|
+
},
|
|
102
103
|
|
|
103
104
|
Blend.New "Frame" {
|
|
104
|
-
Name = "Highlight"
|
|
105
|
-
Size = UDim2.new(0.8, 0, 0, 20)
|
|
106
|
-
Position = UDim2.fromScale(0.5, 0.75)
|
|
107
|
-
AnchorPoint = Vector2.new(0.5, 0.5)
|
|
108
|
-
BackgroundColor3 = palette:ObserveColor("accent", "highlight")
|
|
105
|
+
Name = "Highlight",
|
|
106
|
+
Size = UDim2.new(0.8, 0, 0, 20),
|
|
107
|
+
Position = UDim2.fromScale(0.5, 0.75),
|
|
108
|
+
AnchorPoint = Vector2.new(0.5, 0.5),
|
|
109
|
+
BackgroundColor3 = palette:ObserveColor("accent", "highlight"),
|
|
109
110
|
[Blend.Children] = {
|
|
110
111
|
Blend.New "UICorner" {
|
|
111
|
-
CornerRadius = UDim.new(0, 10)
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
112
|
+
CornerRadius = UDim.new(0, 10),
|
|
113
|
+
},
|
|
114
|
+
},
|
|
115
|
+
},
|
|
115
116
|
|
|
116
117
|
Blend.New "Frame" {
|
|
117
|
-
Name ="Button"
|
|
118
|
-
Size = UDim2.new(0.5, 0, 0, 40)
|
|
119
|
-
AnchorPoint = Vector2.new(1, 1)
|
|
118
|
+
Name = "Button",
|
|
119
|
+
Size = UDim2.new(0.5, 0, 0, 40),
|
|
120
|
+
AnchorPoint = Vector2.new(1, 1),
|
|
120
121
|
BackgroundColor3 = palette:GetSwatch("action"):ObserveGraded(
|
|
121
|
-
palette:ObserveModifiedGrade("action", "mouseOver", percentMouseOver)
|
|
122
|
-
|
|
123
|
-
|
|
122
|
+
palette:ObserveModifiedGrade("action", "mouseOver", percentMouseOver)
|
|
123
|
+
),
|
|
124
|
+
Position = UDim2.new(1, 30, 1, 40),
|
|
125
|
+
ZIndex = 2,
|
|
124
126
|
|
|
125
127
|
[Blend.OnEvent "MouseEnter"] = function()
|
|
126
128
|
mouseOver.Value = 1
|
|
127
|
-
end
|
|
129
|
+
end,
|
|
128
130
|
|
|
129
131
|
[Blend.OnEvent "MouseLeave"] = function()
|
|
130
132
|
mouseOver.Value = 0
|
|
131
|
-
end
|
|
133
|
+
end,
|
|
132
134
|
|
|
133
135
|
[Blend.Children] = {
|
|
134
136
|
Blend.New "UICorner" {
|
|
135
|
-
CornerRadius = UDim.new(0, 10)
|
|
136
|
-
}
|
|
137
|
+
CornerRadius = UDim.new(0, 10),
|
|
138
|
+
},
|
|
137
139
|
|
|
138
140
|
Blend.New "TextLabel" {
|
|
139
|
-
TextColor3 = palette:ObserveColor(
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
141
|
+
TextColor3 = palette:ObserveColor(
|
|
142
|
+
"action",
|
|
143
|
+
palette:ObserveModifiedGrade(
|
|
144
|
+
palette:ObserveGradeOn("text", "action"),
|
|
145
|
+
"mouseOver",
|
|
146
|
+
percentMouseOver
|
|
147
|
+
)
|
|
148
|
+
),
|
|
149
|
+
Text = "Action",
|
|
150
|
+
TextScaled = true,
|
|
151
|
+
Font = Enum.Font.FredokaOne,
|
|
152
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
153
|
+
BackgroundTransparency = 1,
|
|
154
|
+
ZIndex = 2,
|
|
155
|
+
},
|
|
150
156
|
|
|
151
157
|
[Blend.Children] = {
|
|
152
158
|
Blend.New "UIStroke" {
|
|
153
|
-
Color = palette:ObserveColor(
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
159
|
+
Color = palette:ObserveColor(
|
|
160
|
+
"action",
|
|
161
|
+
palette:ObserveModifiedGrade(
|
|
162
|
+
palette:ObserveGradeOn("border", "action"),
|
|
163
|
+
"mouseOver",
|
|
164
|
+
percentMouseOver
|
|
165
|
+
)
|
|
166
|
+
),
|
|
167
|
+
Thickness = 5,
|
|
168
|
+
},
|
|
169
|
+
},
|
|
160
170
|
|
|
161
171
|
Blend.New "Frame" {
|
|
162
|
-
Name = "Highlight"
|
|
163
|
-
Size = UDim2.new(0.9, 0, 0, 10)
|
|
164
|
-
Position = UDim2.fromScale(0.5, 0.75)
|
|
165
|
-
AnchorPoint = Vector2.new(0.5, 0.5)
|
|
166
|
-
BackgroundColor3 = palette:ObserveColor(
|
|
172
|
+
Name = "Highlight",
|
|
173
|
+
Size = UDim2.new(0.9, 0, 0, 10),
|
|
174
|
+
Position = UDim2.fromScale(0.5, 0.75),
|
|
175
|
+
AnchorPoint = Vector2.new(0.5, 0.5),
|
|
176
|
+
BackgroundColor3 = palette:ObserveColor(
|
|
177
|
+
"accent",
|
|
178
|
+
palette:ObserveGradeOn("highlight", "action")
|
|
179
|
+
),
|
|
167
180
|
[Blend.Children] = {
|
|
168
181
|
Blend.New "UICorner" {
|
|
169
|
-
CornerRadius = UDim.new(0, 10)
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
|
|
182
|
+
CornerRadius = UDim.new(0, 10),
|
|
183
|
+
},
|
|
184
|
+
},
|
|
185
|
+
},
|
|
174
186
|
|
|
175
187
|
Blend.New "UIPadding" {
|
|
176
|
-
PaddingTop = UDim.new(0, 5)
|
|
177
|
-
PaddingBottom = UDim.new(0, 5)
|
|
178
|
-
PaddingLeft = UDim.new(0, 5)
|
|
179
|
-
PaddingRight = UDim.new(0, 5)
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
}
|
|
188
|
+
PaddingTop = UDim.new(0, 5),
|
|
189
|
+
PaddingBottom = UDim.new(0, 5),
|
|
190
|
+
PaddingLeft = UDim.new(0, 5),
|
|
191
|
+
PaddingRight = UDim.new(0, 5),
|
|
192
|
+
},
|
|
193
|
+
},
|
|
194
|
+
},
|
|
195
|
+
},
|
|
196
|
+
}
|
|
185
197
|
end
|
|
186
198
|
|
|
187
|
-
|
|
188
199
|
maid:GiveTask((Blend.New "ScrollingFrame" {
|
|
189
|
-
Size = UDim2.new(1, 0, 1, 0)
|
|
190
|
-
BackgroundColor3 = Color3.new(0, 0, 0)
|
|
191
|
-
AutomaticCanvasSize = Enum.AutomaticSize.Y
|
|
192
|
-
CanvasSize = UDim2.new(1, 0, 0, 0)
|
|
193
|
-
Parent = target
|
|
200
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
201
|
+
BackgroundColor3 = Color3.new(0, 0, 0),
|
|
202
|
+
AutomaticCanvasSize = Enum.AutomaticSize.Y,
|
|
203
|
+
CanvasSize = UDim2.new(1, 0, 0, 0),
|
|
204
|
+
Parent = target,
|
|
194
205
|
[Blend.Children] = {
|
|
195
206
|
ColorPickerStoryUtils.create(maid, function(createPicker)
|
|
196
|
-
createPicker("Surface", palette:GetColorValue("surface"))
|
|
197
|
-
createPicker("Text", palette:GetColorValue("text"))
|
|
198
|
-
createPicker("Accent", palette:GetColorValue("accent"))
|
|
199
|
-
createPicker("Action", palette:GetColorValue("action"))
|
|
200
|
-
end)
|
|
207
|
+
createPicker("Surface", palette:GetColorValue("surface"))
|
|
208
|
+
createPicker("Text", palette:GetColorValue("text"))
|
|
209
|
+
createPicker("Accent", palette:GetColorValue("accent"))
|
|
210
|
+
createPicker("Action", palette:GetColorValue("action"))
|
|
211
|
+
end),
|
|
201
212
|
|
|
202
213
|
Blend.New "Frame" {
|
|
203
|
-
Size = UDim2.new(1, 0, 0, 0)
|
|
204
|
-
BackgroundTransparency = 1
|
|
205
|
-
AutomaticSize = Enum.AutomaticSize.Y
|
|
214
|
+
Size = UDim2.new(1, 0, 0, 0),
|
|
215
|
+
BackgroundTransparency = 1,
|
|
216
|
+
AutomaticSize = Enum.AutomaticSize.Y,
|
|
206
217
|
|
|
207
218
|
[Blend.Children] = {
|
|
208
|
-
sampleGui("Light")
|
|
219
|
+
sampleGui("Light"),
|
|
209
220
|
|
|
210
221
|
Blend.New "UIListLayout" {
|
|
211
|
-
Padding = UDim.new(0, 50)
|
|
212
|
-
HorizontalAlignment = Enum.HorizontalAlignment.Center
|
|
213
|
-
VerticalAlignment = Enum.VerticalAlignment.Top
|
|
214
|
-
FillDirection = Enum.FillDirection.Vertical
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
|
|
222
|
+
Padding = UDim.new(0, 50),
|
|
223
|
+
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
224
|
+
VerticalAlignment = Enum.VerticalAlignment.Top,
|
|
225
|
+
FillDirection = Enum.FillDirection.Vertical,
|
|
226
|
+
},
|
|
227
|
+
},
|
|
228
|
+
},
|
|
219
229
|
|
|
220
230
|
Blend.New "UIListLayout" {
|
|
221
|
-
Padding = UDim.new(0, 20)
|
|
222
|
-
HorizontalAlignment = Enum.HorizontalAlignment.Center
|
|
223
|
-
VerticalAlignment = Enum.VerticalAlignment.Top
|
|
224
|
-
FillDirection = Enum.FillDirection.Vertical
|
|
225
|
-
}
|
|
231
|
+
Padding = UDim.new(0, 20),
|
|
232
|
+
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
233
|
+
VerticalAlignment = Enum.VerticalAlignment.Top,
|
|
234
|
+
FillDirection = Enum.FillDirection.Vertical,
|
|
235
|
+
},
|
|
226
236
|
|
|
227
237
|
Blend.New "UIPadding" {
|
|
228
|
-
PaddingTop = UDim.new(0, 10)
|
|
229
|
-
}
|
|
238
|
+
PaddingTop = UDim.new(0, 10),
|
|
239
|
+
},
|
|
230
240
|
|
|
231
241
|
Blend.New "Frame" {
|
|
232
|
-
Name = "TestCustomColor"
|
|
233
|
-
Size = UDim2.new(0, 30, 0, 30)
|
|
234
|
-
BackgroundColor3 = palette:ObserveColor(Color3.new(0, 0, 1), "text")
|
|
235
|
-
}
|
|
236
|
-
}
|
|
242
|
+
Name = "TestCustomColor",
|
|
243
|
+
Size = UDim2.new(0, 30, 0, 30),
|
|
244
|
+
BackgroundColor3 = palette:ObserveColor(Color3.new(0, 0, 1), "text"),
|
|
245
|
+
},
|
|
246
|
+
},
|
|
237
247
|
}):Subscribe())
|
|
238
248
|
|
|
239
|
-
|
|
240
249
|
return function()
|
|
241
250
|
maid:DoCleaning()
|
|
242
251
|
end
|
|
243
|
-
end
|
|
252
|
+
end
|
|
@@ -116,18 +116,17 @@ end
|
|
|
116
116
|
|
|
117
117
|
function ColorGradePalette:ObserveModified(gradeName, amount, multiplier)
|
|
118
118
|
return Rx.combineLatest({
|
|
119
|
-
grade = self:_observeGradeFromName(gradeName)
|
|
120
|
-
amount = self:_observeGradeFromName(amount)
|
|
121
|
-
multiplier = multiplier or 1
|
|
119
|
+
grade = self:_observeGradeFromName(gradeName),
|
|
120
|
+
amount = self:_observeGradeFromName(amount),
|
|
121
|
+
multiplier = multiplier or 1,
|
|
122
122
|
}):Pipe({
|
|
123
123
|
Rx.map(function(state)
|
|
124
124
|
assert(type(state.grade) == "number", "Bad state.grade")
|
|
125
125
|
assert(type(state.amount) == "number", "Bad state.amount")
|
|
126
126
|
assert(type(state.multiplier) == "number", "Bad state.multiplier")
|
|
127
127
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
end);
|
|
128
|
+
return state.grade + state.multiplier * state.amount
|
|
129
|
+
end),
|
|
131
130
|
})
|
|
132
131
|
end
|
|
133
132
|
|
|
@@ -141,9 +140,9 @@ function ColorGradePalette:ObserveOn(gradeName, newSurfaceName, baseSurfaceName)
|
|
|
141
140
|
end
|
|
142
141
|
|
|
143
142
|
return Rx.combineLatest({
|
|
144
|
-
grade = self:_observeGradeFromName(gradeName)
|
|
145
|
-
newSurfaceGrade = self:_observeGradeFromName(newSurfaceName)
|
|
146
|
-
baseSurfaceGrade = observeBaseSurfaceGrade
|
|
143
|
+
grade = self:_observeGradeFromName(gradeName),
|
|
144
|
+
newSurfaceGrade = self:_observeGradeFromName(newSurfaceName),
|
|
145
|
+
baseSurfaceGrade = observeBaseSurfaceGrade,
|
|
147
146
|
}):Pipe({
|
|
148
147
|
Rx.map(function(state)
|
|
149
148
|
local difference = state.grade - state.baseSurfaceGrade
|
|
@@ -162,8 +161,9 @@ function ColorGradePalette:ObserveOn(gradeName, newSurfaceName, baseSurfaceName)
|
|
|
162
161
|
end
|
|
163
162
|
|
|
164
163
|
return finalGrade
|
|
165
|
-
end)
|
|
166
|
-
}),
|
|
164
|
+
end),
|
|
165
|
+
}),
|
|
166
|
+
self._vividness[gradeName]
|
|
167
167
|
end
|
|
168
168
|
|
|
169
169
|
function ColorGradePalette:_observeGradeFromName(gradeName)
|
|
@@ -181,7 +181,7 @@ function ColorGradePalette:_observeGradeFromName(gradeName)
|
|
|
181
181
|
else
|
|
182
182
|
error("Bad grade value")
|
|
183
183
|
end
|
|
184
|
-
end)
|
|
184
|
+
end),
|
|
185
185
|
})
|
|
186
186
|
end
|
|
187
187
|
|
|
@@ -194,7 +194,7 @@ function ColorGradePalette:_observeGradeFromName(gradeName)
|
|
|
194
194
|
local colorOrObservable = Blend.toPropertyObservable(gradeName)
|
|
195
195
|
if colorOrObservable then
|
|
196
196
|
return colorOrObservable:Pipe({
|
|
197
|
-
Rx.map(ColorGradeUtils.getGrade)
|
|
197
|
+
Rx.map(ColorGradeUtils.getGrade),
|
|
198
198
|
})
|
|
199
199
|
end
|
|
200
200
|
|
|
@@ -209,8 +209,8 @@ function ColorGradePalette:ObserveDefaultSurfaceGrade()
|
|
|
209
209
|
else
|
|
210
210
|
return Rx.EMPTY
|
|
211
211
|
end
|
|
212
|
-
end)
|
|
212
|
+
end),
|
|
213
213
|
})
|
|
214
214
|
end
|
|
215
215
|
|
|
216
|
-
return ColorGradePalette
|
|
216
|
+
return ColorGradePalette
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
@class ColorGradePalette.story
|
|
3
3
|
]]
|
|
4
4
|
|
|
5
|
-
local require =
|
|
5
|
+
local require =
|
|
6
|
+
require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
|
|
6
7
|
|
|
7
|
-
local Maid = require("Maid")
|
|
8
8
|
local Blend = require("Blend")
|
|
9
9
|
local ColorGradePalette = require("ColorGradePalette")
|
|
10
|
-
local ColorSwatch = require("ColorSwatch")
|
|
11
10
|
local ColorPickerStoryUtils = require("ColorPickerStoryUtils")
|
|
11
|
+
local ColorSwatch = require("ColorSwatch")
|
|
12
|
+
local Maid = require("Maid")
|
|
12
13
|
local ValueObject = require("ValueObject")
|
|
13
14
|
|
|
14
15
|
return function(target)
|
|
@@ -59,163 +60,173 @@ return function(target)
|
|
|
59
60
|
local percentMouseOver = Blend.Spring(mouseOver, 60)
|
|
60
61
|
|
|
61
62
|
return Blend.New "Frame" {
|
|
62
|
-
BackgroundColor3 = surface:ObserveGraded(gradePalette:ObserveGrade("surface"))
|
|
63
|
-
Size = UDim2.new(0, 250, 0, 100)
|
|
63
|
+
BackgroundColor3 = surface:ObserveGraded(gradePalette:ObserveGrade("surface")),
|
|
64
|
+
Size = UDim2.new(0, 250, 0, 100),
|
|
64
65
|
|
|
65
66
|
[Blend.Children] = {
|
|
66
67
|
Blend.New "TextLabel" {
|
|
67
|
-
TextColor3 = text:ObserveGraded(gradePalette:ObserveGrade("text"))
|
|
68
|
-
Text = labelText
|
|
69
|
-
Font = Enum.Font.FredokaOne
|
|
70
|
-
Size = UDim2.new(1, 0, 1, 0)
|
|
71
|
-
BackgroundTransparency = 1
|
|
72
|
-
TextScaled = true
|
|
73
|
-
ZIndex = 2
|
|
74
|
-
}
|
|
68
|
+
TextColor3 = text:ObserveGraded(gradePalette:ObserveGrade("text")),
|
|
69
|
+
Text = labelText,
|
|
70
|
+
Font = Enum.Font.FredokaOne,
|
|
71
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
72
|
+
BackgroundTransparency = 1,
|
|
73
|
+
TextScaled = true,
|
|
74
|
+
ZIndex = 2,
|
|
75
|
+
},
|
|
75
76
|
|
|
76
77
|
Blend.New "UIPadding" {
|
|
77
|
-
PaddingTop = UDim.new(0, 10)
|
|
78
|
-
PaddingBottom = UDim.new(0, 10)
|
|
79
|
-
PaddingLeft = UDim.new(0, 10)
|
|
80
|
-
PaddingRight = UDim.new(0, 10)
|
|
81
|
-
}
|
|
78
|
+
PaddingTop = UDim.new(0, 10),
|
|
79
|
+
PaddingBottom = UDim.new(0, 10),
|
|
80
|
+
PaddingLeft = UDim.new(0, 10),
|
|
81
|
+
PaddingRight = UDim.new(0, 10),
|
|
82
|
+
},
|
|
82
83
|
|
|
83
84
|
Blend.New "UIStroke" {
|
|
84
|
-
Color = surface:ObserveGraded(gradePalette:ObserveGrade("border"))
|
|
85
|
-
Thickness = 5
|
|
86
|
-
}
|
|
85
|
+
Color = surface:ObserveGraded(gradePalette:ObserveGrade("border")),
|
|
86
|
+
Thickness = 5,
|
|
87
|
+
},
|
|
87
88
|
|
|
88
89
|
Blend.New "UICorner" {
|
|
89
|
-
CornerRadius = UDim.new(0, 10)
|
|
90
|
-
}
|
|
90
|
+
CornerRadius = UDim.new(0, 10),
|
|
91
|
+
},
|
|
91
92
|
|
|
92
93
|
Blend.New "Frame" {
|
|
93
|
-
Name = "Highlight"
|
|
94
|
-
Size = UDim2.new(0.8, 0, 0, 20)
|
|
95
|
-
Position = UDim2.fromScale(0.5, 0.75)
|
|
96
|
-
AnchorPoint = Vector2.new(0.5, 0.5)
|
|
97
|
-
BackgroundColor3 = accent:ObserveGraded(gradePalette:ObserveGrade("highlight"))
|
|
94
|
+
Name = "Highlight",
|
|
95
|
+
Size = UDim2.new(0.8, 0, 0, 20),
|
|
96
|
+
Position = UDim2.fromScale(0.5, 0.75),
|
|
97
|
+
AnchorPoint = Vector2.new(0.5, 0.5),
|
|
98
|
+
BackgroundColor3 = accent:ObserveGraded(gradePalette:ObserveGrade("highlight")),
|
|
98
99
|
[Blend.Children] = {
|
|
99
100
|
Blend.New "UICorner" {
|
|
100
|
-
CornerRadius = UDim.new(0, 10)
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
}
|
|
101
|
+
CornerRadius = UDim.new(0, 10),
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
},
|
|
104
105
|
|
|
105
106
|
Blend.New "Frame" {
|
|
106
|
-
Name ="Button"
|
|
107
|
-
Size = UDim2.new(0.5, 0, 0, 40)
|
|
108
|
-
AnchorPoint = Vector2.new(1, 1)
|
|
109
|
-
BackgroundColor3 = action:ObserveGraded(
|
|
110
|
-
|
|
111
|
-
|
|
107
|
+
Name = "Button",
|
|
108
|
+
Size = UDim2.new(0.5, 0, 0, 40),
|
|
109
|
+
AnchorPoint = Vector2.new(1, 1),
|
|
110
|
+
BackgroundColor3 = action:ObserveGraded(
|
|
111
|
+
gradePalette:ObserveModified("action", "mouseOver", percentMouseOver)
|
|
112
|
+
),
|
|
113
|
+
Position = UDim2.new(1, 30, 1, 40),
|
|
114
|
+
ZIndex = 2,
|
|
112
115
|
|
|
113
116
|
[Blend.OnEvent "MouseEnter"] = function()
|
|
114
117
|
mouseOver.Value = 1
|
|
115
|
-
end
|
|
118
|
+
end,
|
|
116
119
|
|
|
117
120
|
[Blend.OnEvent "MouseLeave"] = function()
|
|
118
121
|
mouseOver.Value = 0
|
|
119
|
-
end
|
|
122
|
+
end,
|
|
120
123
|
|
|
121
124
|
[Blend.Children] = {
|
|
122
125
|
Blend.New "UICorner" {
|
|
123
|
-
CornerRadius = UDim.new(0, 10)
|
|
124
|
-
}
|
|
126
|
+
CornerRadius = UDim.new(0, 10),
|
|
127
|
+
},
|
|
125
128
|
|
|
126
129
|
Blend.New "TextLabel" {
|
|
127
|
-
TextColor3 = action:ObserveGraded(
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
130
|
+
TextColor3 = action:ObserveGraded(
|
|
131
|
+
gradePalette:ObserveModified(
|
|
132
|
+
gradePalette:ObserveOn("text", "action"),
|
|
133
|
+
"mouseOver",
|
|
134
|
+
percentMouseOver
|
|
135
|
+
)
|
|
136
|
+
),
|
|
137
|
+
Text = "Action",
|
|
138
|
+
TextScaled = true,
|
|
139
|
+
Font = Enum.Font.FredokaOne,
|
|
140
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
141
|
+
BackgroundTransparency = 1,
|
|
142
|
+
ZIndex = 2,
|
|
143
|
+
},
|
|
135
144
|
|
|
136
145
|
[Blend.Children] = {
|
|
137
146
|
Blend.New "UIStroke" {
|
|
138
|
-
Color = action:ObserveGraded(
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
147
|
+
Color = action:ObserveGraded(
|
|
148
|
+
gradePalette:ObserveModified(
|
|
149
|
+
gradePalette:ObserveOn("border", "action"),
|
|
150
|
+
"mouseOver",
|
|
151
|
+
percentMouseOver
|
|
152
|
+
)
|
|
153
|
+
),
|
|
154
|
+
Thickness = 5,
|
|
155
|
+
},
|
|
156
|
+
},
|
|
142
157
|
|
|
143
158
|
Blend.New "Frame" {
|
|
144
|
-
Name = "Highlight"
|
|
145
|
-
Size = UDim2.new(0.9, 0, 0, 10)
|
|
146
|
-
Position = UDim2.fromScale(0.5, 0.75)
|
|
147
|
-
AnchorPoint = Vector2.new(0.5, 0.5)
|
|
148
|
-
BackgroundColor3 = accent:ObserveGraded(gradePalette:ObserveOn("highlight", "action"))
|
|
159
|
+
Name = "Highlight",
|
|
160
|
+
Size = UDim2.new(0.9, 0, 0, 10),
|
|
161
|
+
Position = UDim2.fromScale(0.5, 0.75),
|
|
162
|
+
AnchorPoint = Vector2.new(0.5, 0.5),
|
|
163
|
+
BackgroundColor3 = accent:ObserveGraded(gradePalette:ObserveOn("highlight", "action")),
|
|
149
164
|
[Blend.Children] = {
|
|
150
165
|
Blend.New "UICorner" {
|
|
151
|
-
CornerRadius = UDim.new(0, 10)
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
|
|
166
|
+
CornerRadius = UDim.new(0, 10),
|
|
167
|
+
},
|
|
168
|
+
},
|
|
169
|
+
},
|
|
156
170
|
|
|
157
171
|
Blend.New "UIPadding" {
|
|
158
|
-
PaddingTop = UDim.new(0, 5)
|
|
159
|
-
PaddingBottom = UDim.new(0, 5)
|
|
160
|
-
PaddingLeft = UDim.new(0, 5)
|
|
161
|
-
PaddingRight = UDim.new(0, 5)
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
}
|
|
172
|
+
PaddingTop = UDim.new(0, 5),
|
|
173
|
+
PaddingBottom = UDim.new(0, 5),
|
|
174
|
+
PaddingLeft = UDim.new(0, 5),
|
|
175
|
+
PaddingRight = UDim.new(0, 5),
|
|
176
|
+
},
|
|
177
|
+
},
|
|
178
|
+
},
|
|
179
|
+
},
|
|
180
|
+
}
|
|
167
181
|
end
|
|
168
182
|
|
|
169
183
|
maid:GiveTask((Blend.New "ScrollingFrame" {
|
|
170
|
-
Size = UDim2.new(1, 0, 1, 0)
|
|
171
|
-
BackgroundColor3 = Color3.new(0, 0, 0)
|
|
172
|
-
AutomaticCanvasSize = Enum.AutomaticSize.Y
|
|
173
|
-
CanvasSize = UDim2.new(1, 0, 0, 0)
|
|
174
|
-
Parent = target
|
|
184
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
185
|
+
BackgroundColor3 = Color3.new(0, 0, 0),
|
|
186
|
+
AutomaticCanvasSize = Enum.AutomaticSize.Y,
|
|
187
|
+
CanvasSize = UDim2.new(1, 0, 0, 0),
|
|
188
|
+
Parent = target,
|
|
175
189
|
|
|
176
190
|
[Blend.Children] = {
|
|
177
191
|
ColorPickerStoryUtils.create(maid, function(createPicker)
|
|
178
|
-
createPicker("Surface", surfaceColorValue)
|
|
179
|
-
createPicker("Text", textColorValue)
|
|
180
|
-
createPicker("Accent", accentColorValue)
|
|
181
|
-
createPicker("Action", actionColorValue)
|
|
182
|
-
end)
|
|
183
|
-
|
|
192
|
+
createPicker("Surface", surfaceColorValue)
|
|
193
|
+
createPicker("Text", textColorValue)
|
|
194
|
+
createPicker("Accent", accentColorValue)
|
|
195
|
+
createPicker("Action", actionColorValue)
|
|
196
|
+
end),
|
|
184
197
|
|
|
185
198
|
Blend.New "Frame" {
|
|
186
|
-
Size = UDim2.new(1, 0, 0, 0)
|
|
187
|
-
BackgroundTransparency = 1
|
|
188
|
-
AutomaticSize = Enum.AutomaticSize.Y
|
|
199
|
+
Size = UDim2.new(1, 0, 0, 0),
|
|
200
|
+
BackgroundTransparency = 1,
|
|
201
|
+
AutomaticSize = Enum.AutomaticSize.Y,
|
|
189
202
|
|
|
190
203
|
[Blend.Children] = {
|
|
191
|
-
sampleGui("Light", light)
|
|
192
|
-
sampleGui("Dark", dark)
|
|
204
|
+
sampleGui("Light", light),
|
|
205
|
+
sampleGui("Dark", dark),
|
|
193
206
|
|
|
194
207
|
Blend.New "UIListLayout" {
|
|
195
|
-
Padding = UDim.new(0, 50)
|
|
196
|
-
HorizontalAlignment = Enum.HorizontalAlignment.Center
|
|
197
|
-
VerticalAlignment = Enum.VerticalAlignment.Top
|
|
198
|
-
FillDirection = Enum.FillDirection.Vertical
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
|
|
208
|
+
Padding = UDim.new(0, 50),
|
|
209
|
+
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
210
|
+
VerticalAlignment = Enum.VerticalAlignment.Top,
|
|
211
|
+
FillDirection = Enum.FillDirection.Vertical,
|
|
212
|
+
},
|
|
213
|
+
},
|
|
214
|
+
},
|
|
203
215
|
|
|
204
216
|
Blend.New "UIListLayout" {
|
|
205
|
-
Padding = UDim.new(0, 20)
|
|
206
|
-
HorizontalAlignment = Enum.HorizontalAlignment.Center
|
|
207
|
-
VerticalAlignment = Enum.VerticalAlignment.Top
|
|
208
|
-
FillDirection = Enum.FillDirection.Vertical
|
|
209
|
-
}
|
|
217
|
+
Padding = UDim.new(0, 20),
|
|
218
|
+
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
219
|
+
VerticalAlignment = Enum.VerticalAlignment.Top,
|
|
220
|
+
FillDirection = Enum.FillDirection.Vertical,
|
|
221
|
+
},
|
|
210
222
|
|
|
211
223
|
Blend.New "UIPadding" {
|
|
212
|
-
PaddingTop = UDim.new(0, 10)
|
|
213
|
-
}
|
|
214
|
-
}
|
|
224
|
+
PaddingTop = UDim.new(0, 10),
|
|
225
|
+
},
|
|
226
|
+
},
|
|
215
227
|
}):Subscribe())
|
|
216
228
|
|
|
217
|
-
|
|
218
229
|
return function()
|
|
219
230
|
maid:DoCleaning()
|
|
220
231
|
end
|
|
221
|
-
end
|
|
232
|
+
end
|
|
@@ -126,12 +126,12 @@ function ColorGradeUtils.getGradedColor(baseColor: Color3, colorGrade: number, v
|
|
|
126
126
|
-- local towardsOffset = (colorGrade - v)/100
|
|
127
127
|
-- local scaleTowards = math.clamp(math.abs(towardsOffset), 0, 1)^vividness
|
|
128
128
|
-- u = math.clamp(Math.map(scaleTowards, 0, 1, u, 0), 0, 100)
|
|
129
|
-
u = math.clamp(vividness*u, 0, 100)
|
|
129
|
+
u = math.clamp(vividness * u, 0, 100)
|
|
130
130
|
end
|
|
131
131
|
|
|
132
132
|
v = 100 - colorGrade
|
|
133
133
|
|
|
134
|
-
return LuvColor3Utils.toColor3({l, u, v})
|
|
134
|
+
return LuvColor3Utils.toColor3({ l, u, v })
|
|
135
135
|
end
|
|
136
136
|
|
|
137
|
-
return ColorGradeUtils
|
|
137
|
+
return ColorGradeUtils
|
|
@@ -2,103 +2,105 @@
|
|
|
2
2
|
@class ColorSwatch.story
|
|
3
3
|
]]
|
|
4
4
|
|
|
5
|
-
local require =
|
|
5
|
+
local require =
|
|
6
|
+
require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
|
|
6
7
|
|
|
7
|
-
local Maid = require("Maid")
|
|
8
8
|
local Blend = require("Blend")
|
|
9
9
|
local ColorSwatch = require("ColorSwatch")
|
|
10
|
+
local Maid = require("Maid")
|
|
10
11
|
|
|
11
12
|
return function(target)
|
|
12
13
|
local maid = Maid.new()
|
|
13
14
|
|
|
14
15
|
local function entry(color, text, isBaseColor)
|
|
15
16
|
return Blend.New "Frame" {
|
|
16
|
-
Name = "Entry"
|
|
17
|
-
Size = UDim2.new(0, 25, 0, 45)
|
|
18
|
-
BackgroundTransparency = 1
|
|
17
|
+
Name = "Entry",
|
|
18
|
+
Size = UDim2.new(0, 25, 0, 45),
|
|
19
|
+
BackgroundTransparency = 1,
|
|
19
20
|
|
|
20
21
|
[Blend.Children] = {
|
|
21
22
|
Blend.New "Frame" {
|
|
22
|
-
BackgroundColor3 = color
|
|
23
|
-
Size = UDim2.new(0, 25, 0, 25)
|
|
24
|
-
}
|
|
23
|
+
BackgroundColor3 = color,
|
|
24
|
+
Size = UDim2.new(0, 25, 0, 25),
|
|
25
|
+
},
|
|
25
26
|
|
|
26
27
|
Blend.New "TextLabel" {
|
|
27
|
-
Text = tostring(text)
|
|
28
|
-
Size = UDim2.new(1, 0, 0, 15)
|
|
29
|
-
Position = UDim2.new(0, 0, 1, 0)
|
|
30
|
-
AnchorPoint = Vector2.new(0, 1)
|
|
31
|
-
Font = Enum.Font.Code
|
|
32
|
-
TextScaled = true
|
|
28
|
+
Text = tostring(text),
|
|
29
|
+
Size = UDim2.new(1, 0, 0, 15),
|
|
30
|
+
Position = UDim2.new(0, 0, 1, 0),
|
|
31
|
+
AnchorPoint = Vector2.new(0, 1),
|
|
32
|
+
Font = Enum.Font.Code,
|
|
33
|
+
TextScaled = true,
|
|
33
34
|
|
|
34
35
|
[Blend.Children] = {
|
|
35
36
|
Blend.New "UIStroke" {
|
|
36
|
-
Color = Color3.new(0.6, 1, 0.6)
|
|
37
|
-
Thickness = isBaseColor and 3 or 0
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
37
|
+
Color = Color3.new(0.6, 1, 0.6),
|
|
38
|
+
Thickness = isBaseColor and 3 or 0,
|
|
39
|
+
},
|
|
40
|
+
},
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
}
|
|
43
44
|
end
|
|
44
45
|
|
|
45
|
-
|
|
46
46
|
local function palette(color)
|
|
47
47
|
local grades = {}
|
|
48
48
|
|
|
49
49
|
local colorSwatch = ColorSwatch.new(color, 1)
|
|
50
50
|
|
|
51
|
-
for i=0, 100, 10 do
|
|
52
|
-
table.insert(
|
|
51
|
+
for i = 0, 100, 10 do
|
|
52
|
+
table.insert(
|
|
53
|
+
grades,
|
|
54
|
+
entry(colorSwatch:GetGraded(i), tostring(i), math.abs(colorSwatch:GetBaseGrade() - i) <= 5)
|
|
55
|
+
)
|
|
53
56
|
end
|
|
54
57
|
|
|
55
58
|
return Blend.New "Frame" {
|
|
56
|
-
Size = UDim2.new(1, 0, 0, 45)
|
|
59
|
+
Size = UDim2.new(1, 0, 0, 45),
|
|
57
60
|
[Blend.Children] = {
|
|
58
|
-
grades
|
|
61
|
+
grades,
|
|
59
62
|
Blend.New "UIListLayout" {
|
|
60
|
-
Padding = UDim.new(0, 0)
|
|
61
|
-
HorizontalAlignment = Enum.HorizontalAlignment.Center
|
|
62
|
-
VerticalAlignment = Enum.VerticalAlignment.Center
|
|
63
|
-
FillDirection = Enum.FillDirection.Horizontal
|
|
64
|
-
}
|
|
65
|
-
}
|
|
63
|
+
Padding = UDim.new(0, 0),
|
|
64
|
+
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
65
|
+
VerticalAlignment = Enum.VerticalAlignment.Center,
|
|
66
|
+
FillDirection = Enum.FillDirection.Horizontal,
|
|
67
|
+
},
|
|
68
|
+
},
|
|
66
69
|
}
|
|
67
70
|
end
|
|
68
71
|
|
|
69
|
-
|
|
70
72
|
maid:GiveTask((Blend.New "ScrollingFrame" {
|
|
71
|
-
Size = UDim2.new(1, 0, 1, 0)
|
|
72
|
-
Parent = target
|
|
73
|
+
Size = UDim2.new(1, 0, 1, 0),
|
|
74
|
+
Parent = target,
|
|
73
75
|
[Blend.Children] = {
|
|
74
|
-
palette(Color3.new(0, 0, 0))
|
|
76
|
+
palette(Color3.new(0, 0, 0)),
|
|
75
77
|
-- palette(Color3.new(1, 1, 1));
|
|
76
78
|
-- palette(Color3.new(0.5, 0.5, 0.5));
|
|
77
|
-
palette(Color3.fromRGB(117, 117, 117))
|
|
78
|
-
palette(Color3.fromRGB(245, 238, 214))
|
|
79
|
-
palette(Color3.fromRGB(96, 58, 58))
|
|
80
|
-
palette(Color3.fromRGB(85, 170, 127))
|
|
81
|
-
palette(Color3.new(1, 0, 0))
|
|
82
|
-
palette(Color3.new(0, 1, 0))
|
|
83
|
-
palette(Color3.new(0, 0, 1))
|
|
84
|
-
palette(Color3.new(1, 0, 1))
|
|
85
|
-
palette(Color3.new(1, 1, 0))
|
|
86
|
-
palette(Color3.new(0, 1, 1))
|
|
79
|
+
palette(Color3.fromRGB(117, 117, 117)),
|
|
80
|
+
palette(Color3.fromRGB(245, 238, 214)),
|
|
81
|
+
palette(Color3.fromRGB(96, 58, 58)),
|
|
82
|
+
palette(Color3.fromRGB(85, 170, 127)),
|
|
83
|
+
palette(Color3.new(1, 0, 0)),
|
|
84
|
+
palette(Color3.new(0, 1, 0)),
|
|
85
|
+
palette(Color3.new(0, 0, 1)),
|
|
86
|
+
palette(Color3.new(1, 0, 1)),
|
|
87
|
+
palette(Color3.new(1, 1, 0)),
|
|
88
|
+
palette(Color3.new(0, 1, 1)),
|
|
87
89
|
|
|
88
90
|
Blend.New "UIListLayout" {
|
|
89
|
-
Padding = UDim.new(0, 5)
|
|
90
|
-
HorizontalAlignment = Enum.HorizontalAlignment.Center
|
|
91
|
-
VerticalAlignment = Enum.VerticalAlignment.Top
|
|
92
|
-
FillDirection = Enum.FillDirection.Vertical
|
|
93
|
-
}
|
|
91
|
+
Padding = UDim.new(0, 5),
|
|
92
|
+
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
93
|
+
VerticalAlignment = Enum.VerticalAlignment.Top,
|
|
94
|
+
FillDirection = Enum.FillDirection.Vertical,
|
|
95
|
+
},
|
|
94
96
|
|
|
95
97
|
Blend.New "UIPadding" {
|
|
96
|
-
PaddingTop = UDim.new(0, 10)
|
|
97
|
-
}
|
|
98
|
-
}
|
|
98
|
+
PaddingTop = UDim.new(0, 10),
|
|
99
|
+
},
|
|
100
|
+
},
|
|
99
101
|
}):Subscribe())
|
|
100
102
|
|
|
101
103
|
return function()
|
|
102
104
|
maid:DoCleaning()
|
|
103
105
|
end
|
|
104
|
-
end
|
|
106
|
+
end
|