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/app/class/chat-palette.ts b/src/app/class/chat-palette.ts index 3832431dd..a838cdcf3 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(/[tTtT][{{]\s*([^{}{}]+)\s*[}}]/g) ? true : false; - if( text.match(/^[tTtT][::]([^::]+)/g) ){ + if( text.match(/^[sSsS]?[tTtT][::]([^::]+)/g) ){ istarget = true; } - if( text.match(/\s[tTtT][::]([^::]+)/g) ){ + if( text.match(/\s[sSsS]?[tTtT][::]([^::]+)/g) ){ istarget = true; } if( text.match(/^[tTtT][&&]([^&&]+)/g) ){ @@ -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{'); } 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(/^[tTtT][::]([^::]+)/g) ){ + if( text.match(/^[sSsS]?[tTtT][::]([^::]+)/g) ){ istarget = true; } - if( text.match(/\s[tTtT][::]([^::]+)/g) ){ + if( text.match(/\s[sSsS]?[tTtT][::]([^::]+)/g) ){ istarget = true; } if( text.match(/^[tTtT][&&]([^&&]+)/g) ){ 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