fix positioning

komsomolskinari · Dec 11, 2018 · 8deea2d · 8deea2d
1 parent 51e0213
commit 8deea2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/runtime/character.ts b/src/runtime/character.ts
@@ -27,7 +27,10 @@ export default class Character {
 
     dress: {
         [dressname: string]: {
-            [subvariant: string]: string[]
+            [subvariant: string]: {
+                name: string,
+                prefix: string
+            }
         }
     } = {};
     face: {
@@ -96,7 +99,7 @@ export default class Character {
             if (this.dress[dname] === undefined) {
                 this.dress[dname] = {};
             }
-            this.dress[dname][dno] = [dvstr, pfx];
+            this.dress[dname][dno] = { name: dvstr, prefix: pfx };
         });
         f.filter(l => l.length === 4).forEach(l => {
             const [, fno, , fvstr] = l;
@@ -281,7 +284,8 @@ export default class Character {
         if (!this.dressOpt) this.dressOpt = Object.keys(this.dress)[0];
         const i = this.dress[this.dressOpt][mainId];
         if (!i) debugger;
-        const [mainImg, pfx] = i;
+        const mainImg = i.name;
+        const pfx = i.prefix;
         const varImg = this.face[pfx][varId];
         if (varImg === undefined) return;
         // 35 50 75 100 120 140 bgexpand original
@@ -315,4 +319,4 @@ export default class Character {
         // emmmm, not now...
         return ctl;
     }
-}
+}
diff --git a/src/ui/layer.ts b/src/ui/layer.ts
@@ -174,7 +174,7 @@ class YZLayer {
                 let _width;
                 let _height;
                 // need get size
-                if (!size) [_width, _height] = await this.sublayer[name].GetSize();
+                if (!size || !size.x || !size.y) [_width, _height] = await this.sublayer[name].GetSize();
                 else {
                     size.x = _width;
                     size.y = _height;