From e134b449d0c90b7592f5a76e835141450a716f2b Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Thu, 20 Apr 2023 22:33:48 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EA=B8=B0=EB=B3=B8=20=EC=98=A4?= =?UTF-8?q?=EB=B8=8C=EC=A0=9D=ED=8A=B8=20=EA=B0=80=EC=A0=B8=EC=98=A4?= =?UTF-8?q?=EC=A7=80=20=EB=AA=BB=ED=95=98=EB=8A=94=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO : 오브젝트 import관련 전반적인 검토 필요 --- src/main/constants.ts | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/constants.ts b/src/main/constants.ts index 1181f1d65..deb131760 100644 --- a/src/main/constants.ts +++ b/src/main/constants.ts @@ -11,16 +11,19 @@ export default class { result = result .replace('./bower_components', '../../../node_modules') .replace('entryjs', 'entry-js'); // 과거 웹 WS 대응 + } else if (result.startsWith('/lib')) { // 신규 웹 기본 오브젝트 대응 + result = result.replace('/lib', '../../../node_modules'); } else if (result.indexOf('temp') > -1) { // 일반 오브젝트 대응 result = result.substring(result.indexOf('temp')); result = path.join(this.appPath, result) .replace(/\\/gi, '/'); } - if (fileUrl.endsWith('.svg')) { - // svg 파일의 경우 png 파일로 교체한다. - result = result.replace('.svg', '.png'); - } + // TODO: 히스토리 파악 후 완전 제거 + // if (fileUrl.endsWith('.svg')) { + // // svg 파일의 경우 png 파일로 교체한다. + // result = result.replace('.svg', '.png'); + // } result = result.replace(/.*\/\//, ''); // 외부 접속 프로토콜 스키마 보안 대응 return result; @@ -72,6 +75,27 @@ export default class { './bower_components/entryjs/images/media/entrybot2.png', './bower_components/entry-js/images/_1x1.png', './bower_components/entryjs/images/_1x1.png', + + './bower_components/entry-js/images/media/entrybot1.svg', + './bower_components/entryjs/images/media/entrybot1.svg', + './bower_components/entry-js/images/media/entrybot2.svg', + './bower_components/entryjs/images/media/entrybot2.svg', + './bower_components/entry-js/images/_1x1.svg', + './bower_components/entryjs/images/_1x1.svg', + + './lib/entry-js/images/media/entrybot1.png', + './lib/entryjs/images/media/entrybot1.png', + './lib/entry-js/images/media/entrybot2.png', + './lib/entryjs/images/media/entrybot2.png', + './lib/entry-js/images/_1x1.png', + './lib/entryjs/images/_1x1.png', + + './lib/entry-js/images/media/entrybot1.svg', + './lib/entryjs/images/media/entrybot1.svg', + './lib/entry-js/images/media/entrybot2.svg', + './lib/entryjs/images/media/entrybot2.svg', + './lib/entry-js/images/_1x1.svg', + './lib/entryjs/images/_1x1.svg', ]; } From a66874c2a39311b182dfa081376eead0a7fae654 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Thu, 20 Apr 2023 22:36:20 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore=20:=202.1.3=20=EB=B2=84=EC=A0=84?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/entryx64.nsi | 2 +- build/entryx86.nsi | 2 +- package.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/entryx64.nsi b/build/entryx64.nsi index a085c1ec1..92c2c53e8 100644 --- a/build/entryx64.nsi +++ b/build/entryx64.nsi @@ -13,7 +13,7 @@ !define MUI_UNICON "icon.ico" !define PRODUCT_NAME "Entry" !define APP_NAME "Entry.exe" -!define PRODUCT_VERSION "2.1.2" +!define PRODUCT_VERSION "2.1.3" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/build/entryx86.nsi b/build/entryx86.nsi index 4c6b24139..8815ccf8a 100644 --- a/build/entryx86.nsi +++ b/build/entryx86.nsi @@ -13,7 +13,7 @@ !define MUI_UNICON "icon.ico" !define PRODUCT_NAME "Entry" !define APP_NAME "Entry.exe" -!define PRODUCT_VERSION "2.1.2" +!define PRODUCT_VERSION "2.1.3" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/package.json b/package.json index 1380e5c59..b88d855b2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "productName": "Entry", "name": "entry", - "version": "2.1.2", + "version": "2.1.3", "description": "Entry for offline", "main": "src/main_build/main.bundle.js", "scripts": { @@ -36,8 +36,8 @@ "async-csv": "^2.1.3", "axios": "^0.19.2", "cross-spawn": "^7.0.3", - "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39_3", - "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2", + "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.40", + "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.3", "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20221024", "excel4node": "^1.7.0", "fs-extra": "^8.1.0", From 8894f7b4c94ea1ae467d47467d2ecfcf7bca41c9 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Thu, 20 Apr 2023 22:46:45 +0900 Subject: [PATCH 3/4] =?UTF-8?q?lang:=20=ED=95=98=EB=93=9C=EC=9B=A8?= =?UTF-8?q?=EC=96=B4=20=EC=97=B0=EA=B2=B0=20=EA=B4=80=EB=A0=A8=20=EB=8B=A4?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/resources/lang/ko.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/renderer/resources/lang/ko.json b/src/renderer/resources/lang/ko.json index 1463667cb..7a1664d5f 100644 --- a/src/renderer/resources/lang/ko.json +++ b/src/renderer/resources/lang/ko.json @@ -1409,6 +1409,10 @@ "hw_connection_success_desc": "하드웨어 아이콘을 더블클릭하면, 센서값만 확인할 수 있습니다.", "hw_connection_success_desc2": "하드웨어와 정상적으로 연결되었습니다.", "parameter_can_not_space": "값 블록은 빈 칸이 될 수 없습니다.", + "hw_connection_termination_title": "하드웨어 연결 해제", + "hw_connection_termination_desc": "하드웨어와 연결이 해제되었습니다.", + "hw_connection_failed_title": "하드웨어 연결 실패", + "hw_connection_failed_desc": "작품에서 사용된 하드웨어가\n연결되어 있는지 확인해 주세요.", "ai_utilize_train_pop_error": "작품에 적용된 모델이 비활성화 또는 삭제되었습니다.", "list_can_not_space": "리스트의 이름은 빈 칸이 될 수 없습니다.", "sign_can_not_space": "신호의 이름은 빈 칸이 될 수 없습니다.", From 5ce90b90c3a2b6f835e0e656b9c72bf413ea751a Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Thu, 20 Apr 2023 22:46:50 +0900 Subject: [PATCH 4/4] Update yarn.lock --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6a1b5ec6c..06e5226c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3393,9 +3393,9 @@ enquirer@^2.3.5: dependencies: crypto-js "^4.0.0" -"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.39_3": - version "1.9.39" - resolved "git+https://github.com/entrylabs/entry-hw.git#78808975e4a4d5d45dc26f2b81ede5af925e24eb" +"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.40": + version "1.9.40" + resolved "git+https://github.com/entrylabs/entry-hw.git#86d6526357e94610a1898c79158775d9e8145ac4" dependencies: cross-spawn "^7.0.0" fs-extra "^8.1.0" @@ -3410,9 +3410,9 @@ enquirer@^2.3.5: winston "^3.2.1" winston-daily-rotate-file "^4.4.2" -"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.2": +"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.3": version "0.0.0" - resolved "git+https://github.com/entrylabs/entryjs.git#8dd80bc0a615edbcb130d13b8ac85b266c1760ac" + resolved "git+https://github.com/entrylabs/entryjs.git#f70baff8c0f4b735050eccb20a122a0b44a2eab7" "entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20221024": version "0.0.0"