Merge pull request TK11235#135 from entyu/v1.09.0b2

V1.09.0b2
usaturn · Nov 7, 2022 · 5ce5b36 · 5ce5b36
2 parents ffcafd1 + 6edb9dc
commit 5ce5b36
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 24 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.09.0b1",
+  "version": "1.09.0b2",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -62,6 +62,10 @@ import { AlarmWindowComponent } from 'component/alarm-window/alarm-window.compon
 export class AppComponent implements AfterViewInit, OnDestroy {
 
   @ViewChild('modalLayer', { read: ViewContainerRef, static: true }) modalLayerViewContainerRef: ViewContainerRef;
+
+  get reloadCheck(): ReloadCheck { return ObjectStore.instance.get<ReloadCheck>('ReloadCheck'); }
+  networkService = Network;
+
   private immediateUpdateTimer: NodeJS.Timer = null;
   private lazyUpdateTimer: NodeJS.Timer = null;
   private openPanelCount = 0;
@@ -416,6 +420,9 @@ export class AppComponent implements AfterViewInit, OnDestroy {
   handleFileSelect(event: Event) {
     let input = <HTMLInputElement> event.target;
     let files = input.files;
+
+    this.reloadCheck.reloadCheckStart(this.networkService.peerContext.roomName != '');
+
     if (files.length) FileArchiver.instance.load(files);
     input.value = '';
   }

diff --git a/src/app/class/core/file-storage/file-archiver.ts b/src/app/class/core/file-storage/file-archiver.ts
@@ -24,7 +24,6 @@ export class FileArchiver {
   }
 
   networkService = Network;
-
   get reloadCheck(): ReloadCheck { return ObjectStore.instance.get<ReloadCheck>('ReloadCheck'); }
 
   private maxImageSize = 2 * MEGA_BYTE;

diff --git a/src/app/class/reload-check.ts b/src/app/class/reload-check.ts
@@ -5,7 +5,7 @@ import { TabletopObject } from './tabletop-object';
 @SyncObject('reload-check')
 export class ReloadCheck extends TabletopObject {
 
-  private reloadOK : boolean = false;
+  private reloadOK : boolean = true;
   private isAnswer : boolean = false;
 
   reloadCheckStart(isOnline: boolean){
@@ -27,6 +27,7 @@ export class ReloadCheck extends TabletopObject {
   }
 
   isLoadOk(): boolean{
+    console.log('isLoadOk :' + this.reloadOK);
     return this.reloadOK;
   }
 

diff --git a/src/app/component/chat-color-setting/chat-color-setting.component.html b/src/app/component/chat-color-setting/chat-color-setting.component.html
@@ -3,30 +3,32 @@
     <div class="table-cell">
       <div>第1色</div>
       <input type="color" name="color01" list="color-list_01" (change)="changeColor($event.target.value,0)" value="{{this.chatColorCode(0)}}">
+<!-- クローム側の更新都合による現象でリスト設定の値が正常に入らなくなったため一時的にリスト設定を辞める
       <datalist id="color-list_01">
-        <option value="#000000">
-        <option value="#FF0000">
-        <option value="#999999">
-        <option value="#990000">
-        <option value="#FF6633">
+        <option value="000000">
+        <option value="FF0000">
+        <option value="999999">
+        <option value="990000">
+        <option value="FF6633">
 
-        <option value="#669933">
-        <option value="#00CC33">
-        <option value="#009966">
-        <option value="#33CCFF">
-        <option value="#0099FF">
+        <option value="669933">
+        <option value="00CC33">
+        <option value="009966">
+        <option value="33CCFF">
+        <option value="0099FF">
 
-        <option value="#3366FF">
-        <option value="#003399">
-        <option value="#9933CC">
-        <option value="#663366">
-        <option value="#FF66FF">
+        <option value="3366FF">
+        <option value="003399">
+        <option value="9933CC">
+        <option value="663366">
+        <option value="FF66FF">
       </datalist>
+-->
     </div>
-
     <div class="table-cell">
       <div>第2色</div>
       <input type="color" name="color02" list="color-list_02"  (change)="changeColor($event.target.value,1)" value="{{this.chatColorCode(1)}}">
+<!--
       <datalist id="color-list_02">
         <option value="#000000">
         <option value="#FF0000">
@@ -46,11 +48,13 @@
         <option value="#663366">
         <option value="#FF66FF">
       </datalist>
+-->
     </div>
 
     <div class="table-cell">
       <div>第3色</div>
       <input type="color" name="color03" list="color-list_03" (change)="changeColor($event.target.value,2)" value="{{this.chatColorCode(2)}}">
+<!--
       <datalist id="color-list_03">
         <option value="#000000">
         <option value="#FF0000">
@@ -70,6 +74,7 @@
         <option value="#663366">
         <option value="#FF66FF">
       </datalist>
+-->
     </div>
 
   </div>

diff --git a/src/app/component/game-character-sheet/game-character-sheet.component.html b/src/app/component/game-character-sheet/game-character-sheet.component.html
@@ -167,6 +167,7 @@
     <div>
       境界線
       <input type="color" name="color01" list="color-list_01" (change)="changeRangeColor($event.target.value)" value="{{tabletopObject.rangeColor}}">
+<!-- クローム側の更新都合による現象でリスト設定の値が正常に入らなくなったため一時的にリスト設定を辞める
       <datalist id="color-list_01">
         <option value="#000000">
         <option value="#FF0000">
@@ -186,9 +187,10 @@
         <option value="#663366">
         <option value="#FF66FF">
       </datalist>
-      
+-->
       塗りつぶし
       <input type="color" name="color02" list="color-list_02" (change)="changeGridColor($event.target.value)" value="{{tabletopObject.gridColor}}">
+<!-- クローム側の更新都合による現象でリスト設定の値が正常に入らなくなったため一時的にリスト設定を辞める
       <datalist id="color-list_02">
         <option value="#000000">
         <option value="#FF0000">
@@ -208,6 +210,7 @@
         <option value="#663366">
         <option value="#FF66FF">
       </datalist>
+-->
     </div>
     <div *ngIf="tabletopObject.type != 'CIRCLE'">
       回転角度のスナップを細かくする:<input type="checkbox" value="noSnapPolygonal"

diff --git a/src/app/component/game-table-setting/game-table-setting.component.html b/src/app/component/game-table-setting/game-table-setting.component.html
@@ -50,10 +50,12 @@
         グリッド色:
         <input type="color" [(ngModel)]="tableGridColor" name="tableGridColor"
                list="table-grid-color-list" [attr.disabled]="!isEditable ? '' : null">
+<!-- クローム側の更新都合による現象でリスト設定の値が正常に入らなくなったため一時的にリスト設定を辞める
         <datalist id="table-grid-color-list">
           <option value="#000000">
           <option value="#dddddd">
         </datalist>
+-->
       </div>
       <div>
         背景フィルタ

diff --git a/src/app/directive/rotable.directive.ts b/src/app/directive/rotable.directive.ts
@@ -174,7 +174,7 @@ export class RotableDirective implements AfterViewInit, OnDestroy {
 
   snapToPolygonal(polygonal: number = 24) {
     if (polygonal <= 1) return;
-    if (this.tabletopObject.aliasName == 'range'){
+    if ( this.tabletopObject instanceof RangeArea) {
       let range = <RangeArea>this.tabletopObject;
       if (range.subDivisionSnapPolygonal) polygonal = 240;
     }

diff --git a/src/index.html b/src/index.html
@@ -9,7 +9,7 @@
     }
 </script>
 
-  <title>UdonariumLily 1.09.0b1</title>
+  <title>UdonariumLily 1.09.0b2</title>
 <!--
 
 0.02.0 立ち絵表示を12ポジションに、アクティブを手前に、他を薄く
@@ -312,6 +312,12 @@
 1.09.0b1
 ・BCDice-jsを4.03-(3.7.0)に更新
 
+1.09.0b2
+・ZIP読み込みボタンでデータをロードした際、画像等が読み込まれないケースがある不具合を修正
+・クローム最新版(ver107系統)で色選択時に選択色が透明になってしまう不具合を修正
+・キャラクターのコマを縦回転させたときにスナップが聞かなくなっていた不具合を修正
+・BCDice-jsの取り扱いを本家に沿う形に修正
+
 -->
   <base href="./">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ export class FileArchiver { @@
       }
       networkService = Network;
       get reloadCheck(): ReloadCheck { return ObjectStore.instance.get<ReloadCheck>('ReloadCheck'); }
       private maxImageSize = 2 * MEGA_BYTE;
@@ Expand Down @@