diff --git a/public/project/data.js b/public/project/data.js index ed109b8..018478b 100644 --- a/public/project/data.js +++ b/public/project/data.js @@ -165,7 +165,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = }, "firstData": { "title": "魔塔样板", - "name": "template", + "name": "templateV2A", "author": "Annoymous", "version": "Ver 2.A", "floorId": "sample0", diff --git a/src/core/main/setting.ts b/src/core/main/setting.ts index 5bca1b4..741de99 100644 --- a/src/core/main/setting.ts +++ b/src/core/main/setting.ts @@ -425,7 +425,7 @@ mainSetting .register('itemDetail', '宝石血瓶显伤', true, COM.Boolean) .register('transition', '界面动画', false, COM.Boolean) .register('antiAlias', '抗锯齿', false, COM.Boolean) - .register('fontSize', '字体大小', 16, COM.Number, [8, 28, 1]) + .register('fontSize', '字体大小', isMobile ? 12 : 16, COM.Number, [8, 28, 1]) .register('fontSizeStatus', '状态栏字体', 100, COM.Number, [20, 300, 10]) .register('smoothView', '平滑镜头', true, COM.Boolean) .register('criticalGem', '临界显示方式', false, COM.Boolean) @@ -484,7 +484,7 @@ loading.once('coreInit', () => { 'screen.itemDetail': !!storage.getValue('screen.itemDetail', true), 'screen.transition': !!storage.getValue('screen.transition', false), 'screen.antiAlias': !!storage.getValue('screen.antiAlias', false), - 'screen.fontSize': storage.getValue('screen.fontSize', 16), + 'screen.fontSize': storage.getValue('screen.fontSize', isMobile ? 12 : 16), 'screen.fontSizeStatus': storage.getValue('screen.fontSizeStatus', 100), 'screen.smoothView': !!storage.getValue('screen.smoothView', true), 'screen.criticalGem': !!storage.getValue('screen.criticalGem', false), diff --git a/src/panel/enemyCritical.vue b/src/panel/enemyCritical.vue index 99e4142..1f14dad 100644 --- a/src/panel/enemyCritical.vue +++ b/src/panel/enemyCritical.vue @@ -273,8 +273,6 @@ onMounted(() => { @media screen and (max-width: 600px) { #now-damage { - font-size: 100%; - div { display: flex; flex-direction: column; diff --git a/src/panel/enemySpecial.vue b/src/panel/enemySpecial.vue index 51a3d43..72d880f 100644 --- a/src/panel/enemySpecial.vue +++ b/src/panel/enemySpecial.vue @@ -80,15 +80,6 @@ const format = core.formatBigNumber; } @media screen and (max-width: 600px) { - #critical-des, - .critical { - font-size: 70%; - } - - #special { - font-size: 70%; - } - #special-main { top: 25vh; width: 90vw; diff --git a/src/panel/enemyTarget.vue b/src/panel/enemyTarget.vue index ee4e9d5..019e805 100644 --- a/src/panel/enemyTarget.vue +++ b/src/panel/enemyTarget.vue @@ -74,12 +74,5 @@ function mark() { } @media screen and (max-width: 600px) { - #enemy-desc { - font-size: 70%; - } - - #mark-target { - font-size: 100%; - } } diff --git a/src/ui/equipbox.vue b/src/ui/equipbox.vue index d495489..abe0d2b 100644 --- a/src/ui/equipbox.vue +++ b/src/ui/equipbox.vue @@ -699,7 +699,7 @@ onUnmounted(() => { @media screen and (max-width: 600px) { #equipbox-main { flex-direction: column-reverse; - font-size: 100%; + font-size: 225%; } #equip-now-div { diff --git a/src/ui/fly.vue b/src/ui/fly.vue index 915c45a..955ca3c 100644 --- a/src/ui/fly.vue +++ b/src/ui/fly.vue @@ -771,7 +771,7 @@ onUnmounted(() => { @media screen and (max-width: 600px) { #fly { padding: 5%; - font-size: 100%; + font-size: 225%; } #fly-main { diff --git a/src/ui/settings.vue b/src/ui/settings.vue index 8bb9a73..6055880 100644 --- a/src/ui/settings.vue +++ b/src/ui/settings.vue @@ -317,7 +317,7 @@ onUnmounted(() => { } .setting-main { - font-size: 120%; + font-size: 225%; .setting-container { flex-direction: column; diff --git a/src/ui/shop.vue b/src/ui/shop.vue index fcb754f..dbb2fdb 100644 --- a/src/ui/shop.vue +++ b/src/ui/shop.vue @@ -459,7 +459,7 @@ onUnmounted(() => { #shop { width: 90vw; padding-top: 5vh; - font-size: 100%; + font-size: 225%; } #item-list { diff --git a/src/ui/start.vue b/src/ui/start.vue index e8a663f..170c4c4 100644 --- a/src/ui/start.vue +++ b/src/ui/start.vue @@ -154,14 +154,14 @@ function onmove(e: MouseEvent) { const dx = (offsetX - cx) / cx; const dy = (offsetY - cy) / cy; - const matrix = new Matrix4(); + // const matrix = new Matrix4(); - matrix.scale(1.2, 1.2, 1); - matrix.rotate((dy * 10 * Math.PI) / 180, -(dx * 10 * Math.PI) / 180); - const end = Array.from(matrix.transpose()).flat().join(','); - background.style.transform = `perspective(${ - 1000 * core.domStyle.scale - }px)matrix3d(${end})`; + // matrix.scale(1.2, 1.2, 1); + // matrix.rotate((dy * 10 * Math.PI) / 180, -(dx * 10 * Math.PI) / 180); + // const end = Array.from(matrix.transpose()).flat().join(','); + // background.style.transform = `perspective(${ + // 1000 * core.domStyle.scale + // }px)matrix3d(${end})`; } function bgm() { diff --git a/src/ui/statusBar.vue b/src/ui/statusBar.vue index 885477b..ec07e09 100644 --- a/src/ui/statusBar.vue +++ b/src/ui/statusBar.vue @@ -178,7 +178,7 @@ @@ -351,7 +365,7 @@ onMounted(() => { @media screen and (max-width: 600px) { .status-item { - font-size: 100%; + font-size: v-bind(fontSize); max-width: 28vw; } } diff --git a/src/ui/toolbox.vue b/src/ui/toolbox.vue index 88e9f05..ef43ec9 100644 --- a/src/ui/toolbox.vue +++ b/src/ui/toolbox.vue @@ -390,7 +390,7 @@ onUnmounted(() => { #toolbox-main { flex-direction: column-reverse; height: 90%; - font-size: 100%; + font-size: 225%; margin-top: 10%; }