Merge remote-tracking branch 'origin/develop' into local-test
Some checks failed
local-test分支构建发布到本地服务器 / Build-Publish (push) Failing after 2m37s

This commit is contained in:
joylink_fanyuhong 2024-04-24 11:01:32 +08:00
commit b66515ebad

View File

@ -326,9 +326,9 @@ export default class Switch extends Group {
} }
this.name.getTextRect().animateStyle(true) this.name.getTextRect().animateStyle(true)
.when(0, { textFill: this.style.backgroundColor }) .when(0, { textFill: this.style.transparentColor })
.when(1000, { textFill: this.style.Switch.text.borderColor }) .when(1000, { textFill: this.style.Switch.text.borderColor })
.when(2000, { textFill: this.style.backgroundColor }) .when(2000, { textFill: this.style.transparentColor })
.start(); .start();
} }
@ -354,7 +354,7 @@ export default class Switch extends Group {
this.lockCircle && this.lockCircle.hide(); // 圆形包围框 this.lockCircle && this.lockCircle.hide(); // 圆形包围框
this.lockArc && this.lockArc.hide(); // 圆形单锁框 this.lockArc && this.lockArc.hide(); // 圆形单锁框
this.name.getNameText().stopAnimation(false); this.name.getNameText().stopAnimation(false);
this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); this.name.getTextRect().setStyle({ fill: this.style.transparentColor });
this.shapeModelC && this.shapeModelC.hide(); // 形状 C this.shapeModelC && this.shapeModelC.hide(); // 形状 C
this.shapeModelA && this.shapeModelA.hide(); // 形状 A this.shapeModelA && this.shapeModelA.hide(); // 形状 A
this.shapeModelB && this.shapeModelB.hide(); // 形状 B this.shapeModelB && this.shapeModelB.hide(); // 形状 B
@ -626,7 +626,7 @@ export default class Switch extends Group {
} }
if (this.style.Switch.core.specialCircle) { if (this.style.Switch.core.specialCircle) {
this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); this.name.getTextRect().setStyle({ fill: this.style.transparentColor });
this.setTextColor(this.style.Switch.text.guideMasterLockColor); this.setTextColor(this.style.Switch.text.guideMasterLockColor);
} else { } else {
this.setTextColor(this.style.Switch.text.monolockLocationColor); this.setTextColor(this.style.Switch.text.monolockLocationColor);
@ -911,7 +911,7 @@ export default class Switch extends Group {
this.setHasTextBorder(1, this.style.Switch.text.fpLockBorderColor); this.setHasTextBorder(1, this.style.Switch.text.fpLockBorderColor);
} }
if (this.style.Switch.core.specialCircle) { if (this.style.Switch.core.specialCircle) {
this.name.getTextRect().setStyle({ fill: this.style.backgroundColor }); this.name.getTextRect().setStyle({ fill: this.style.transparentColor });
this.setTextColor(this.style.Switch.text.fpLockColor); this.setTextColor(this.style.Switch.text.fpLockColor);
} }
} }