From 3a0925bc77a9fb8d9b5e34d04de8612d7d95b2c4 Mon Sep 17 00:00:00 2001 From: entyu Date: Sun, 15 Jan 2023 11:54:02 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=99=82=E3=81=AB=E3=80=8Cs=E3=80=8D=E3=82=B7=E3=83=BC?= =?UTF-8?q?=E3=82=AF=E3=83=AC=E3=83=83=E3=83=88=E3=82=B3=E3=83=9E=E3=83=B3?= =?UTF-8?q?=E3=83=89=E3=81=8C=E5=8A=B9=E3=81=8B=E3=81=AA=E3=81=8B=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E7=8F=BE=E8=B1=A1=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/class/chat-palette.ts | 4 ++-- src/app/class/dice-bot.ts | 2 ++ src/app/component/chat-window/chat-window.component.ts | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/class/chat-palette.ts b/src/app/class/chat-palette.ts index 3832431dd..5a05588e9 100644 --- a/src/app/class/chat-palette.ts +++ b/src/app/class/chat-palette.ts @@ -132,10 +132,10 @@ export class ChatPalette extends ObjectNode { checkTargetCharactor(text: string): boolean{ let istarget = text.match(/[tTｔＴ][{｛]\s*([^{}｛｝]+)\s*[}｝]/g) ? true : false; - if( text.match(/^[tTｔＴ][:：]([^:：]+)/g) ){ + if( text.match(/^[sSｓＳ]?[tTｔＴ][:：]([^:：]+)/g) ){ istarget = true; } - if( text.match(/\s[tTｔＴ][:：]([^:：]+)/g) ){ + if( text.match(/\s[sSｓＳ]?[tTｔＴ][:：]([^:：]+)/g) ){ istarget = true; } if( text.match(/^[tTｔＴ][&＆]([^&＆]+)/g) ){ diff --git a/src/app/class/dice-bot.ts b/src/app/class/dice-bot.ts index 192c314cd..0b32dfc6c 100644 --- a/src/app/class/dice-bot.ts +++ b/src/app/class/dice-bot.ts @@ -618,6 +618,7 @@ export class DiceBot extends GameObject { let allEditList: ResourceEdit[] = null; for (const chktxt of splitText) { + console.log('chktxt=' + chktxt); if ( chktxt.match(/^(t?[:&][^:：&＆])+/gi)){ //正常。処理無し }else{ @@ -636,6 +637,7 @@ export class DiceBot extends GameObject { } resByCharacter.resourceCommand = res; resByCharacter.object = oneMessageTargetContext.object; + console.log('テスト' + res + resByCharacter.object.name); resourceByCharacter.push(resByCharacter); } } diff --git a/src/app/component/chat-window/chat-window.component.ts b/src/app/component/chat-window/chat-window.component.ts index cb4ca6ff8..e98986884 100644 --- a/src/app/component/chat-window/chat-window.component.ts +++ b/src/app/component/chat-window/chat-window.component.ts @@ -171,10 +171,10 @@ export class ChatWindowComponent implements OnInit, OnDestroy, AfterViewInit { checkTargetCharactor(text: string): boolean{ let istarget = false; - if( text.match(/^[tTｔＴ][:：]([^:：]+)/g) ){ + if( text.match(/^[sSｓＳ]?[tTｔＴ][:：]([^:：]+)/g) ){ istarget = true; } - if( text.match(/\s[tTｔＴ][:：]([^:：]+)/g) ){ + if( text.match(/\s[sSｓＳ]?[tTｔＴ][:：]([^:：]+)/g) ){ istarget = true; } if( text.match(/^[tTｔＴ][&＆]([^&＆]+)/g) ){ From 0840d62dc5be1638a995fcd8e39bac2f2b17657e Mon Sep 17 00:00:00 2001 From: entyu Date: Sun, 15 Jan 2023 12:20:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83?= =?UTF-8?q?=E3=83=88=E6=8C=87=E5=AE=9A=E6=99=82=E3=80=81=E3=83=81=E3=83=A3?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=83=91=E3=83=AC=E3=83=83=E3=83=88=E3=81=A7?= =?UTF-8?q?^=E8=A8=98=E5=8F=B7=E3=81=AB=E3=82=88=E3=82=8B=E3=83=AA?= =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=AE=E6=9C=80=E5=A4=A7=E5=80=A4?= =?UTF-8?q?=E5=8F=82=E7=85=A7=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E8=A1=8C?= =?UTF-8?q?=E3=82=8F=E3=82=8C=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E7=8F=BE?= =?UTF-8?q?=E8=B1=A1=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/class/chat-palette.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/class/chat-palette.ts b/src/app/class/chat-palette.ts index 5a05588e9..a838cdcf3 100644 --- a/src/app/class/chat-palette.ts +++ b/src/app/class/chat-palette.ts @@ -184,8 +184,11 @@ export class ChatPalette extends ObjectNode { let element = target.rootDataElement.getFirstElementByName(name); if (element) { let targetElementText ='' - if (useMax && element.isNumberResource) targetElementText = element.value + ''; - targetElementText = element.isNumberResource ? element.currentValue + '' : element.value + ''; + if (useMax && element.isNumberResource){ + targetElementText = element.value + ''; + }else{ + targetElementText = element.isNumberResource ? element.currentValue + '' : element.value + ''; + } if ( targetElementText.match(/[{｛]\s*([^{}｛｝]+)\s*[}｝]/g)) { targetElementText = targetElementText.replace(/[{｛]/g,'t{'); } From bee7b45fa95642c6e41daad1b23e5055180dd0de Mon Sep 17 00:00:00 2001 From: entyu Date: Sun, 15 Jan 2023 12:24:27 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- package.json | 2 +- src/index.html | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5708b8193..6660e35a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "udonarium_lily", - "version": "1.10.0b0", + "version": "1.10.0b0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "udonarium_lily", - "version": "1.10.0b0", + "version": "1.10.0b0.1", "license": "MIT", "dependencies": { "@angular/animations": "^13.3.0", diff --git a/package.json b/package.json index 376a16cf7..06519e18c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "udonarium_lily", - "version": "1.10.0b0", + "version": "1.10.0b0.1", "license": "MIT", "scripts": { "ng": "ng", diff --git a/src/index.html b/src/index.html index bddf42b6f..b7c0fc71f 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,7 @@ } - UdonariumLily 1.10.0b0 + UdonariumLily 1.10.0b0.1