From d918a09315ca792a0affe658b413d34a02ed0e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Sat, 9 Jan 2021 10:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC1.0.3.20210?= =?UTF-8?q?109b?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug.log | 1 + src/app/working-area/model/axArrowConnector.ts | 8 +++++++- src/app/working-area/model/axImageShape.ts | 2 +- src/app/working-area/model/axPreviewImageShape.ts | 3 +++ src/app/working-area/model/multipointIcon.ts | 2 +- src/app/working-area/model/polygonIcon.ts | 2 +- src/app/working-area/working-area.component.ts | 8 +++++++- 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/debug.log b/debug.log index 666976d..de4e5cb 100644 --- a/debug.log +++ b/debug.log @@ -8,3 +8,4 @@ [0104/090356.225:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) [0108/092244.401:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) [0108/100658.746:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) +[0109/083452.962:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3) diff --git a/src/app/working-area/model/axArrowConnector.ts b/src/app/working-area/model/axArrowConnector.ts index cacc7d5..6ed0dd9 100644 --- a/src/app/working-area/model/axArrowConnector.ts +++ b/src/app/working-area/model/axArrowConnector.ts @@ -2,6 +2,7 @@ import { WorkingAreaComponent } from '../working-area.component'; import * as PIXI from 'pixi.js'; import { AxShape } from './axShape'; import { Sprite } from 'pixi.js'; +import { GameMode } from './gameMode'; /** * 杩炴帴绠ご @@ -116,11 +117,16 @@ export class AxArrowConnector extends AxShape { } // 璁剧疆缂╂斁 public setItemScale(scale: number) { - this.text.scale.set(scale); + // this.text.scale.set(scale); this.pointSprites.forEach(point => { point.scale.set(scale); }); } + public setNameVisible(value: boolean, mode: GameMode) { + if (this.assetData.GameMode === mode) { + this.text.visible = value; + } + } /** * 鍒锋柊褰㈢姸 */ diff --git a/src/app/working-area/model/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index 48b23ff..d12ae3c 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -186,7 +186,7 @@ export class AxImageShape extends AxShape { if (this.assetData.FixedSize) { this.scale.set(scale); } else { - this.text.scale.set(scale); + // this.text.scale.set(scale); this.upLeft.scale.set(scale); this.upRight.scale.set(scale); this.downLeft.scale.set(scale); diff --git a/src/app/working-area/model/axPreviewImageShape.ts b/src/app/working-area/model/axPreviewImageShape.ts index 8d0cd5d..7f66812 100644 --- a/src/app/working-area/model/axPreviewImageShape.ts +++ b/src/app/working-area/model/axPreviewImageShape.ts @@ -33,4 +33,7 @@ export class AxPreviewImageShape extends AxShape { */ public drawBorder(scale: number) { } + public refresh() { + this.angle = -this.workingArea.backgroundImage.angle; + } } diff --git a/src/app/working-area/model/multipointIcon.ts b/src/app/working-area/model/multipointIcon.ts index a8bd056..395afd1 100644 --- a/src/app/working-area/model/multipointIcon.ts +++ b/src/app/working-area/model/multipointIcon.ts @@ -185,7 +185,7 @@ export class MultipointIcon extends AxShape { } // 璁剧疆缂╂斁 public setItemScale(scale: number) { - this.text.scale.set(scale); + // this.text.scale.set(scale); this.pointsGraphics.forEach((item, index, array) => { item.scale.set(scale); }); diff --git a/src/app/working-area/model/polygonIcon.ts b/src/app/working-area/model/polygonIcon.ts index 7aa9a40..2494748 100644 --- a/src/app/working-area/model/polygonIcon.ts +++ b/src/app/working-area/model/polygonIcon.ts @@ -157,7 +157,7 @@ export class PolygonIcon extends AxShape { } // 璁剧疆缂╂斁 public setItemScale(scale: number) { - this.text.scale.set(scale); + // this.text.scale.set(scale); this.pointsGraphics.forEach(point => { point.scale.set(scale); }); diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index d7344f1..f010069 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -141,7 +141,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // Beta鐗: 璇ョ増鏈浉瀵逛簬伪鐗堝凡鏈変簡寰堝ぇ鐨勬敼杩涳紝娑堥櫎浜嗕弗閲嶇殑閿欒锛屼絾杩樻槸瀛樺湪鐫涓浜涚己闄凤紝闇瑕佺粡杩囧娆℃祴璇曟潵杩涗竴姝ユ秷闄わ紝姝ょ増鏈富瑕佺殑淇敼瀵瑰儚鏄蒋浠剁殑UI銆 // RC鐗: 璇ョ増鏈凡缁忕浉褰撴垚鐔熶簡锛屽熀鏈笂涓嶅瓨鍦ㄥ鑷撮敊璇殑BUG锛屼笌鍗冲皢鍙戣鐨勬寮忕増鐩稿樊鏃犲嚑銆 // Release鐗: 璇ョ増鏈剰鍛斥滄渶缁堢増鏈濓紝鍦ㄥ墠闈㈢増鏈殑涓绯诲垪娴嬭瘯鐗堜箣鍚庯紝缁堝綊浼氭湁涓涓寮忕増鏈紝鏄渶缁堜氦浠樼敤鎴蜂娇鐢ㄧ殑涓涓増鏈傝鐗堟湰鏈夋椂涔熺О涓烘爣鍑嗙増銆備竴鑸儏鍐典笅锛孯elease涓嶄細浠ュ崟璇嶅舰寮忓嚭鐜板湪杞欢灏侀潰涓婏紝鍙栬屼唬涔嬬殑鏄鍙仿 - public VERSION = '1.0.2.20210108_beta'; + public VERSION = '1.0.3.20210109_beta'; /** * 鏁版嵁鍒濆鍖 */ @@ -442,6 +442,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV item.setNameVisible(value, mode); } else if (item instanceof PolygonIcon) { item.setNameVisible(value, mode); + } else if (item instanceof AxArrowConnector) { + item.setNameVisible(value, mode); } }); } @@ -594,6 +596,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.backgroundImage.sortableChildren = true; this.backgroundImage .on('pointerdown', event => { + if (event.data.button !== 0) return; if (!event.currentTarget.dragging && this.selection.isMultiselection === false) { this.selection.deselectAll(); event.currentTarget.data = event.data; @@ -651,6 +654,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV if (this.paintPoints.length >= 2) { this.enterPaintEndButton.position = this.circleShadow.position; this.enterPaintEndButton.visible = true; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; } if (this.paintingIcon !== null) { @@ -708,6 +712,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.enterPaintEndButton.position = this.circleShadow.position; } else if (this.paintPoints.length >= 3) { this.enterPaintEndButton.visible = true; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; } this.paintPoints.forEach((value, index, array) => { if (index === 0) { @@ -736,6 +741,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.previewLineSegment.visible = true; this.enterPaintEndButton.position = this.circleShadow.position; this.enterPaintEndButton.visible = true; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); if (this.paintPoints.length < 2) {