Merge pull request TK11235#105 from entyu/v1.07.0b4_

V1.07.0b4
usaturn · Jun 10, 2022 · a614bd4 · a614bd4
2 parents b16af5d + bd76a6a
commit a614bd4
Show file tree

Hide file tree

Showing 21 changed files with 150 additions and 98 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "udonarium_lily",
-  "version": "1.07.0b3",
+  "version": "1.07.0b4",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -25,7 +25,7 @@
     "@angular/youtube-player": "^13.3.0",
     "@ng-select/ng-select": "^8.1.1",
     "autolinker": "^3.15.0",
-    "bcdice": "^3.5.1",
+    "bcdice": "^3.6.0",
     "crypto-js": "^4.1.1",
     "file-saver": "^2.0.5",
     "hammerjs": "^2.0.8",

diff --git a/src/app/class/vote.ts b/src/app/class/vote.ts
@@ -98,7 +98,7 @@ export class Vote extends GameObject {
           text_ += ' 棄権：' + this.votedNumByIndex(-2);
         }
       }else{
-        text_ = '投票終了';
+        text_ = '投票終了(' + this.voteTitle + ') ';
         for (let cho of this.choices){
           text_ += ' ' + cho + '：' + this.votedNumByChoice(cho);
         }

diff --git a/src/app/component/card-stack/card-stack.component.css b/src/app/component/card-stack/card-stack.component.css
@@ -20,6 +20,10 @@
   transform-style: preserve-3d;
 }
 
+.will-change {
+  will-change: opacity;
+}
+
 .is-pointer-events-none {
   pointer-events: none;
 }

diff --git a/src/app/component/card-stack/card-stack.component.html b/src/app/component/card-stack/card-stack.component.html
@@ -5,29 +5,29 @@
     appRotable [rotable.option]="rotableOption" (rotable.ondragstart)="onMove()" (rotable.ondragend)="onMoved()">
     <div *ngIf="topCard && imageFile" (@shuffle.start)="animationShuffleStarted($event)" (@shuffle.done)="animationShuffleDone($event)"
       [@shuffle]="animeState">
-      <img class="card-image" [ngStyle]="{'transform': 'rotateZ(' + topCard.rotate +'deg)'}" [src]="imageFile.url | safe: 'resourceUrl'">
+      <img class="card-image will-change" [ngStyle]="{'transform': 'rotateZ(' + topCard.rotate +'deg)'}" [src]="imageFile.url | safe: 'resourceUrl'">
     </div>
     <ng-container *ngIf="!isIconHidden && !isLock">
-      <div class="rotate-grab of-left-top is-3d">
+      <div class="rotate-grab of-left-top is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="rotate-grab of-left-bottom is-3d">
+      <div class="rotate-grab of-left-bottom is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="rotate-grab of-right-bottom is-3d">
+      <div class="rotate-grab of-right-bottom is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="rotate-grab of-right-top is-3d">
+      <div class="rotate-grab of-right-top is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
     </ng-container>
-    <div *ngIf="isLock" class="lock-icon-mark is-nowrap is-black-background is-3d" [ngStyle]="{'transform': 'translateY(0%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+    <div *ngIf="isLock" class="lock-icon-mark is-nowrap is-black-background is-3d will-change" [ngStyle]="{'transform': 'translateY(0%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
       <i class="material-icons" style="display: inline;">lock</i>
     </div>
-    <div *ngIf="isShowTotal" class="name-tag is-nowrap is-black-background is-3d" [ngStyle]="{'transform': 'translateY(-50%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+    <div *ngIf="isShowTotal" class="name-tag is-nowrap is-black-background is-3d will-change" [ngStyle]="{'transform': 'translateY(-50%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
       <span>{{cards.length}}枚</span>
     </div>
-    <div *ngIf="hasOwner" class="name-tag has-length-limit is-nowrap is-black-background is-3d" [ngStyle]="{'transform': 'translateY(50%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+    <div *ngIf="hasOwner" class="name-tag has-length-limit is-nowrap is-black-background is-3d will-change" [ngStyle]="{'transform': 'translateY(50%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
       <span>{{ownerName}} が確認中</span>
     </div>
   </div>

diff --git a/src/app/component/card/card.component.css b/src/app/component/card/card.component.css
@@ -15,6 +15,10 @@
   transform-style: preserve-3d;
 }
 
+.will-change {
+  will-change: opacity;
+}
+
 .is-transition {
   -webkit-transition: -webkit-transform 132ms linear;
   transition: transform 132ms linear;

diff --git a/src/app/component/card/card.component.html b/src/app/component/card/card.component.html
@@ -2,27 +2,27 @@
   appMovable [movable.option]="movableOption" (movable.ondragstart)="onMove()" (movable.ondragend)="onMoved()">
   <div class="component-content is-pointer-events-auto is-3d"
     appRotable [rotable.option]="rotableOption" (rotable.ondragstart)="onMove()" (rotable.ondragend)="onMoved()">
-    <img *ngIf="imageFile" class="card-image is-3d" [src]="(isFront ? frontImage.url : backImage.url) | safe: 'resourceUrl'">
-    <div *ngIf="!isFront && hasOwner && 0 < ownerName.length" class="name-tag is-nowrap has-length-limit is-black-background" [ngStyle]="{'transform': 'translateY(-75%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+    <img *ngIf="imageFile" class="card-image is-3d will-change" [src]="(isFront ? frontImage.url : backImage.url) | safe: 'resourceUrl'">
+    <div *ngIf="!isFront && hasOwner && 0 < ownerName.length" class="name-tag is-nowrap has-length-limit is-black-background will-change" [ngStyle]="{'transform': 'translateY(-75%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
       <span class="is-3d">{{ownerName}}</span>
     </div>
-    <img *ngIf="isHand && frontImage" class="card-image thumbnail-transform is-translucent is-3d" [src]="frontImage.url | safe: 'resourceUrl'">
+    <img *ngIf="isHand && frontImage" class="card-image thumbnail-transform is-translucent is-3d will-change" [src]="frontImage.url | safe: 'resourceUrl'">
     <ng-container *ngIf="!isIconHidden  && !isLock">
-      <div class="rotate-grab of-left-top is-3d">
+      <div class="rotate-grab of-left-top is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="rotate-grab of-left-bottom is-3d">
+      <div class="rotate-grab of-left-bottom is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="rotate-grab of-right-bottom is-3d">
+      <div class="rotate-grab of-right-bottom is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="rotate-grab of-right-top is-3d">
+      <div class="rotate-grab of-right-top is-3d will-change">
         <i class="material-icons">autorenew</i>
       </div>
-      <div class="border-bg is-pointer-events-none is-3d"></div>
+      <div class="border-bg is-pointer-events-none is-3d will-change"></div>
     </ng-container>
-    <div *ngIf="isLock" class="lock-icon-mark is-nowrap is-black-background is-3d" [ngStyle]="{'transform': 'translateY(0%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+    <div *ngIf="isLock" class="lock-icon-mark is-nowrap is-black-background is-3d will-change" [ngStyle]="{'transform': 'translateY(0%) translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
       <i class="material-icons" style="display: inline;">lock</i>
     </div>
   </div>

diff --git a/src/app/component/chat-palette/chat-palette.component.html b/src/app/component/chat-palette/chat-palette.component.html
@@ -26,7 +26,7 @@
     <div *ngIf="isEdit" class="edit-info"><i class="material-icons" style="vertical-align: bottom; size:0.8rem;">info_outline</i> チャットパレット編集中です</div>
     <div class="complete-box">
       <ng-container *ngIf="(autoCompleteList().length == 1 && autoCompleteList()[0] != text) || autoCompleteList().length > 1">
-        <select class="complete" id="{{_timeId}}_complete"  style="overflow-y: auto;" size="5" (input)="selectAutoComplete(text,$event.target.value)">
+        <select class="complete" id="{{_timeId}}_complete"  style="overflow-y: auto;" size="5" (input)="selectAutoComplete(text,$event.target.value)" (click)="selectAutoComplete(text,$event.target.value)">
           <option *ngFor="let palette of autoCompleteList()" value="{{palette}}">{{palette}}</option>
         </select>
       </ng-container>

diff --git a/src/app/component/dice-symbol/dice-symbol.component.css b/src/app/component/dice-symbol/dice-symbol.component.css
@@ -15,6 +15,10 @@
   transform-style: preserve-3d;
 }
 
+.will-change {
+  will-change: opacity;
+}
+
 .is-transition {
   -webkit-transition: -webkit-transform 132ms linear;
   transition: transform 132ms linear;

diff --git a/src/app/component/dice-symbol/dice-symbol.component.html b/src/app/component/dice-symbol/dice-symbol.component.html
@@ -6,7 +6,7 @@
       <div class="pedestal-inner" [ngClass]="{'is-gray-border': hasOwner}"></div>
       <div class="pedestal-outer"></div>
       <ng-container *ngIf="!isIconHidden">
-      <div *ngIf="!isLock" class="pedestal-grab rotate-grab is-3d">
+      <div *ngIf="!isLock" class="pedestal-grab rotate-grab is-3d will-change">
         <div class="pedestal-grab-border">
           <div class="material-icons of-front">autorenew</div>
           <div class="material-icons of-back">autorenew</div>
@@ -17,7 +17,7 @@
         <div class="upright-transform is-fit-width is-3d">
           <div class="rotate-frame is-3d" [style.width.px]="size * gridSize" [style.height.px]="size * gridSize">
             <div class="rotate-inner is-3d">
-              <div *ngIf="0 < name.length" class="name-tag is-nowrap is-black-background is-3d" [ngStyle]="{'transform': 'translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+              <div *ngIf="0 < name.length" class="name-tag is-nowrap is-black-background is-3d will-change" [ngStyle]="{'transform': 'translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
                 <div class="fornt-tag is-3d">{{name}}:<span *ngIf="isVisible">{{face}}</span><span *ngIf="!isVisible">???</span>
                   <ng-container *ngIf="isLock">
                     <i class="material-icons lock-icon" style="display: inline;">lock</i>
@@ -29,13 +29,13 @@
                   </ng-container>
                 </div>
               </div>
-              <div *ngIf="hasOwner && 0 < ownerName.length" class="owner-tag is-nowrap is-black-background is-3d" [ngStyle]="{'transform': 'translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
+              <div *ngIf="hasOwner && 0 < ownerName.length" class="owner-tag is-nowrap is-black-background is-3d will-change" [ngStyle]="{'transform': 'translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}">
                 <div class="fornt-tag has-length-limit is-3d">{{ownerName}}</div>
                 <div class="back-tag has-length-limit is-3d">{{ownerName}}</div>
               </div>
-              <img class="image is-3d" [ngStyle]="{'height':+ imageHeignt + 'px','transform': 'translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}" 
+              <img class="image is-3d will-change" [ngStyle]="{'height':+ imageHeignt + 'px','transform': 'translateX(-50%) translateX(' + size * gridSize / 2 +'px)'}" 
               *ngIf="(0 < imageFile.url.length) && specifyImageFlag" [src]="imageFile.url | safe: 'resourceUrl'" [ngClass]="{'is-black-mask': !isVisible, 'is-harf-black-mask': isMine}">
-              <img class="image is-3d" [ngStyle]="{'width':'100%'}" *ngIf="(0 < imageFile.url.length) && !specifyImageFlag" [src]="imageFile.url | safe: 'resourceUrl'" [ngClass]="{'is-black-mask': !isVisible, 'is-harf-black-mask': isMine}">
+              <img class="image is-3d will-change" [ngStyle]="{'width':'100%'}" *ngIf="(0 < imageFile.url.length) && !specifyImageFlag" [src]="imageFile.url | safe: 'resourceUrl'" [ngClass]="{'is-black-mask': !isVisible, 'is-harf-black-mask': isMine}">
             </div>
           </div>
         </div>

diff --git a/src/app/component/game-character/game-character.component.css b/src/app/component/game-character/game-character.component.css
@@ -15,6 +15,10 @@
   transform-style: preserve-3d;
 }
 
+.will-change {
+  will-change: opacity;
+}
+
 .is-transition {
   -webkit-transition: -webkit-transform 132ms linear;
   transition: transform 132ms linear;