ctome
/
paimon-moe-fork
mirror of https://github.com/CrimsonTome/paimon-moe-fork.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/MadeBaruna/paimon-moe into main

pull/1/head
Made Baruna 2022-12-17 13:53:59 +08:00
parent cbd641e194 5cc477ad2b
commit ffab9a9ee1
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/TodoDeleteModal.svelte
View File

@ -17,7 +17,7 @@
src={`/images/weapons/${todo.weapon ? todo.weapon.id : 'any_weapon_1'}.png`}
alt={todo.weapon ? todo.weapon.name : `Weapon Level ${todo.level.from}-${todo.level.to}`} />
<div class="flex-1">
<p class="font-bold">{todo.weapon ? todo.weapon.name : 'Weapon'}</p>
<p class="font-bold">{todo.weapon ? $t(todo.weapon.name) : 'Weapon'}</p>
<p class="text-gray-500">Level {`${todo.level.from}-${todo.level.to}`}</p>
</div>
{:else if todo.type === 'character'}
@ -26,7 +26,7 @@
src={`/images/characters/${todo.character ? todo.character.id : 'characters'}.png`}
alt={todo.character ? todo.character.name : `Character Level ${todo.level.from}-${todo.level.to}`} />
<div class="flex-1">
<p class="font-bold">{todo.character ? todo.character.name : 'Character'}</p>
<p class="font-bold">{todo.character ? $t(todo.character.name) : 'Character'}</p>
<p class="text-gray-500">Level {`${todo.level.from}-${todo.level.to}`}</p>
</div>
{/if}

6
src/routes/calculator/_character.svelte
View File

@ -542,7 +542,7 @@
<img class="h-6 inline-block mr-1" src={res.image} alt={res.label} />
</span>
{/if}
{res.label}
{$t(res.label)}
</span>
</Checkbox>
</div>
@ -649,7 +649,7 @@
<img class="h-6 inline-block mr-1" src={res.image} alt={res.label} />
</span>
{/if}
{res.label}
{$t(res.label)}
</span>
</td>
</tr>
@ -669,7 +669,7 @@
<span class="w-6 inline-block">
<img class="h-6 inline-block mr-1" src={`/images/items/${id}.png`} alt={item.name} />
</span>
{item.name}
{$t(item.name)}
</span>
</td>
</tr>

6
src/routes/calculator/_weapon.svelte
View File

@ -412,7 +412,7 @@
<img class="h-6 inline-block mr-1" src={res.image} alt={res.label} />
</span>
{/if}
{res.label}
{$t(res.label)}
</span>
</Checkbox>
</div>
@ -457,7 +457,7 @@
<img class="h-6 inline-block mr-1" src={res.image} alt={res.label} />
</span>
{/if}
{res.label}
{$t(res.label)}
</span>
</td>
</tr>
@ -477,7 +477,7 @@
<span class="w-6 inline-block">
<img class="h-6 inline-block mr-1" src={`/images/items/${id}.png`} alt={item.name} />
</span>
{item.name}
{$t(item.name)}
</span>
</td>
</tr>

6
src/routes/calendar/index.svelte
View File

@ -504,11 +504,11 @@
<table class="text-white">
<tr>
<td class="text-white font-semibold py-1" />
<td class="text-white font-semibold py-1 px-4">Name</td>
<td class="text-white font-semibold py-1 px-4">{$t('wish.detail.name')}</td>
<td class="text-white font-semibold py-1 px-4 text-center">
<Tooltip title={$t('calendar.bannerHover')}>Banner</Tooltip>
<Tooltip title={$t('calendar.bannerHover')}>{$t('wish.detail.banner')}</Tooltip>
</td>
<td class="text-white font-semibold py-1">Time</td>
<td class="text-white font-semibold py-1">{$t('wish.detail.time')}</td>
</tr>
{#each sortedRare as [char, val]}
<tr on:click={() => goToBannerTime(lastBannerStart[char])}>

14
src/routes/todo.svelte
View File

@ -322,7 +322,7 @@
alt={itemList[id].name}
/>
</span>
{itemList[id].name}
{$t(itemList[id].name)}
</span>
</td>
</tr>
@ -362,7 +362,7 @@
alt={itemList[id].name}
/>
</span>
{itemGroup[id].name}
{$t(itemGroup[id].name)}
</span>
</td>
</tr>
@ -401,7 +401,7 @@
alt={itemList[id].name}
/>
</span>
{itemList[id].name}
{$t(itemList[id].name)}
</span>
{#if id === 'mora'}
<Button size="sm" disabled={amount === 0 && !adding} on:click={() => decrease(id, 1000)}>
@ -439,7 +439,7 @@
alt={todo.weapon ? todo.weapon.name : `Weapon Level ${todo.level.from}-${todo.level.to}`}
/>
<div class="flex-1">
<p class="font-bold">{todo.weapon ? todo.weapon.name : 'Weapon'}</p>
<p class="font-bold">{todo.weapon ? $t(todo.weapon.name) : 'Weapon'}</p>
<p class="text-gray-500">Level {`${todo.level.from}-${todo.level.to}`}</p>
</div>
{:else if todo.type === 'character'}
@ -449,7 +449,7 @@
alt={todo.character ? todo.character.name : `Character Level ${todo.level.from}-${todo.level.to}`}
/>
<div class="flex-1">
<p class="font-bold">{todo.character ? todo.character.name : 'Character'}</p>
<p class="font-bold">{todo.character ? $t(todo.character.name) : 'Character'}</p>
<p class="text-gray-500">Level {`${todo.level.from}-${todo.level.to}`}</p>
</div>
{:else if todo.type === 'item'}
@ -490,7 +490,7 @@
alt={itemList[id].name}
/>
</span>
{itemList[id].name}
{$t(itemList[id].name)}
</span>
</td>
</tr>
@ -500,7 +500,7 @@
<p class="flex-1 text-gray-400"># {i + 1}</p>
<Button on:click={() => askDeleteTodo(i)} size="sm" className="px-2">
<Icon path={mdiClose} color="white" size={0.8} />
Delete
{$t('todo.delete.delete')}
</Button>
</div>
</div>

4
src/routes/wish/_counter.svelte
View File

@ -461,7 +461,7 @@
: characters[pull.id].rarity === 4
? 'text-rare-from'
: 'text-primary'
}`}>{characters[pull.id].name}</td
}`}>{$t(characters[pull.id].name)}</td
>
{:else if pull.type === 'weapon'}
<td
@ -471,7 +471,7 @@
: weaponList[pull.id].rarity === 4
? 'text-rare-from'
: 'text-primary'
}`}>{weaponList[pull.id].name}</td
}`}>{$t(weaponList[pull.id].name)}</td
>
{:else if pull.type === 'unknown_3_star'}
<td class="border-b border-gray-700 py-1 pl-2 font-semibold text-primary">Unknown</td>