diff --git a/src/routes/characters/[id].svelte b/src/routes/characters/[id].svelte index 75629483..97567bee 100644 --- a/src/routes/characters/[id].svelte +++ b/src/routes/characters/[id].svelte @@ -18,7 +18,7 @@ import { onMount } from 'svelte'; import { t, locale } from 'svelte-i18n'; - import { mdiChevronRight, mdiCircle, mdiContentSave, mdiMinus, mdiPencil, mdiPlus, mdiStar } from '@mdi/js'; + import { mdiChevronRight, mdiCircle, mdiClose, mdiContentSave, mdiMinus, mdiPencil, mdiPlus, mdiStar } from '@mdi/js'; import Icon from '../../components/Icon.svelte'; import Button from '../../components/Button.svelte'; import Tooltip from '../../components/TooltipRelative.svelte'; @@ -99,6 +99,7 @@ const book = itemGroup[bookId]; const materials = character.ascension[1].items; const bossItem = character.material.boss; + const ascMaterials = character.ascension; let chars = {}; let constellationCount = -1; @@ -228,13 +229,13 @@
-
+
{character.name} -
+

{$t(character.name)} @@ -337,70 +338,97 @@

-
+
- - - - - - - {#if data.statGrow !== 'critRate' && data.statGrow !== 'critDamage'} - {/if} + {#each showedIndex as index, i} {#if i % 2 === 0} - + {/if} - - - - + + + + {#if data.statGrow === 'critRate'} - {:else} - + {/if} {#if data.statGrow === 'critDamage'} - {:else} - + {/if} {#if data.statGrow !== 'critRate' && data.statGrow !== 'critDamage' && data.statGrow !== 'em'} - {:else if data.statGrow === 'em'} - {/if} + {#if i % 2 === 0} + + {/if} {/each}
+ {$t('characters.asc')} + {$t('characters.lvl')} + {$t('characters.hp')} + {$t('characters.atk')} + {$t('characters.def')} {$t('characters.critRate')} + + {$t('characters.critRate')} {$t('characters.critDamage')} + + {$t('characters.critDamage')} + {$t(`characters.${data.statGrow}`)} + {$t('characters.ascensionMaterial')} +
{ascen[i]}{ascen[i]}{level[i]}{Math.round(data.hp[index])}{Math.round(data.atk[index])}{Math.round(data.def[index])}{level[i]}{Math.round(data.hp[index])}{Math.round(data.atk[index])}{Math.round(data.def[index])} + {numberFormat.format(data.critRate[index] * 100)}% 5%5% + {numberFormat.format(data.critDamage[index] * 100)}% 50%50% + {numberFormat.format(data[data.statGrow][index] * 100)}% + {numberFormat.format(data[data.statGrow][index])} + + {#if ascen[i] > 0} + {#each ascMaterials[ascen[i - 1]].items as obj} + {#if obj.item.id !== 'none'} + + + + {obj.item} + + {obj.amount} + + + {/if} + {/each} + + mora + {numberFormat.format(ascMaterials[ascen[i - 1]].mora)} + + {/if} + +
@@ -420,7 +448,7 @@
-
+
{#if builds.length > 1}
{#each builds as item, i} @@ -700,7 +728,7 @@ -
+
{$t('characters.talents')} @@ -708,7 +736,7 @@
-
+

{$t('characters.passiveTalents')}

{#each data.passives as passive, i} @@ -717,7 +745,7 @@ -
+
{$t('characters.constellations')} @@ -790,10 +818,6 @@ } } - td:not(:last-child) { - @apply border-r; - } - .popup { @apply relative; @@ -815,4 +839,19 @@ } } } + + @screen lg { + ::-webkit-scrollbar { + height: 8px; + } + + ::-webkit-scrollbar-track { + @apply bg-transparent; + } + + ::-webkit-scrollbar-thumb { + background: rgba(0, 0, 0, 0.35); + @apply rounded-xl; + } + } diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 5e14e14d..d8065cbc 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -7,6 +7,7 @@ module.exports = { md: '768px', lg: '1024px', xl: '1280px', + '2xl': '1536px', }, fontFamily: { display: ['Catamaran', 'sans-serif'],