Commit dd63da7c authored by 李维's avatar 李维

画图板添加三种颜色

parent 0cd07a05
...@@ -114,7 +114,10 @@ export default class DrawingBoard extends cc.Component { ...@@ -114,7 +114,10 @@ export default class DrawingBoard extends cc.Component {
{ 'resName': 'color_purple', 'color': '#a282ea' }, { 'resName': 'color_purple', 'color': '#a282ea' },
{ 'resName': 'color_pink', 'color': '#ff84b3' }, { 'resName': 'color_pink', 'color': '#ff84b3' },
{ 'resName': 'color_brown', 'color': '#a45e10' }, { 'resName': 'color_brown', 'color': '#a45e10' },
{ 'resName': 'color_black', 'color': '#000000' } { 'resName': 'color_black', 'color': '#000000' },
{ 'resName': 'color_white', 'color': '#ffffff' },
{ 'resName': 'color_gray', 'color': '#b7b7b7' },
{ 'resName': 'color_cyan', 'color': '#89a6e8' }
]; ];
const paletteBtn = cc.find("ToolBox/Palette", this.node) const paletteBtn = cc.find("ToolBox/Palette", this.node)
...@@ -448,6 +451,15 @@ export default class DrawingBoard extends cc.Component { ...@@ -448,6 +451,15 @@ export default class DrawingBoard extends cc.Component {
if (curColor == '#000000' && !colorArray.includes('color_black')) { if (curColor == '#000000' && !colorArray.includes('color_black')) {
colorArray.push('color_black'); colorArray.push('color_black');
} }
if (curColor == '#ffffff' && !colorArray.includes('color_white')) {
colorArray.push('color_white');
}
if (curColor == '#b7b7b7' && !colorArray.includes('color_gray')) {
colorArray.push('color_gray');
}
if (curColor == '#89a6e8' && !colorArray.includes('color_cyan')) {
colorArray.push('color_cyan');
}
}); });
return colorArray; return colorArray;
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"premultiplyAlpha": true, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 290, "width": 360,
"height": 291, "height": 291,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
......
{
"ver": "2.3.5",
"uuid": "385511b2-f583-49a8-a318-63822bda4f0b",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 33,
"height": 33,
"platformSettings": {},
"subMetas": {
"icon_color_10": {
"ver": "1.0.4",
"uuid": "27543c86-4ae6-4e8c-868d-5a169844cae0",
"rawTextureUuid": "385511b2-f583-49a8-a318-63822bda4f0b",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 33,
"height": 33,
"rawWidth": 33,
"rawHeight": 33,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "84fb6f99-cc30-4bbb-886d-04112835d99f",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 33,
"height": 33,
"platformSettings": {},
"subMetas": {
"icon_color_11": {
"ver": "1.0.4",
"uuid": "e4687e37-8892-4b04-b607-610a63244741",
"rawTextureUuid": "84fb6f99-cc30-4bbb-886d-04112835d99f",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 33,
"height": 33,
"rawWidth": 33,
"rawHeight": 33,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "1a05a22d-02e8-4198-9606-7ba96a8337a6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 33,
"height": 33,
"platformSettings": {},
"subMetas": {
"icon_color_12": {
"ver": "1.0.4",
"uuid": "bdf445d7-df9e-46ff-9711-e5ceaa8cd234",
"rawTextureUuid": "1a05a22d-02e8-4198-9606-7ba96a8337a6",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 33,
"height": 33,
"rawWidth": 33,
"rawHeight": 33,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -609,6 +609,9 @@ ...@@ -609,6 +609,9 @@
<nz-option nzValue="color_pink" nzLabel="Pink"></nz-option> <nz-option nzValue="color_pink" nzLabel="Pink"></nz-option>
<nz-option nzValue="color_brown" nzLabel="Brown"></nz-option> <nz-option nzValue="color_brown" nzLabel="Brown"></nz-option>
<nz-option nzValue="color_black" nzLabel="Black"></nz-option> <nz-option nzValue="color_black" nzLabel="Black"></nz-option>
<nz-option nzValue="color_white" nzLabel="White"></nz-option>
<nz-option nzValue="color_gray" nzLabel="Gray"></nz-option>
<nz-option nzValue="color_cyan" nzLabel="Cyan"></nz-option>
</nz-select> </nz-select>
<label nz-checkbox [(ngModel)]="it.drawingCheckStrictEqual" (ngModelChange)="save()" style="margin-left: 10px;">颜色严格相等</label> <label nz-checkbox [(ngModel)]="it.drawingCheckStrictEqual" (ngModelChange)="save()" style="margin-left: 10px;">颜色严格相等</label>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment