This commit is contained in:
Renan LE CARO 2025-04-30 16:34:06 +02:00
parent 45f9b516fc
commit b5fafa5f3c
8 changed files with 32 additions and 25 deletions

View file

@ -29,8 +29,8 @@ android {
applicationId = "me.lecaro.breakout" applicationId = "me.lecaro.breakout"
minSdk = 21 minSdk = 21
targetSdk = 34 targetSdk = 34
versionCode = 29100127 versionCode = 29100389
versionName = "29100127" versionName = "29100389"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
useSupportLibrary = true useSupportLibrary = true

File diff suppressed because one or more lines are too long

12
dist/index.html vendored

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
// The version of the cache. // The version of the cache.
const VERSION = "29100127"; const VERSION = "29100389";
// The name of the cache // The name of the cache
const CACHE_NAME = `breakout-71-${VERSION}`; const CACHE_NAME = `breakout-71-${VERSION}`;

View file

@ -1 +1 @@
"29100127" "29100389"

View file

@ -514,14 +514,19 @@ h2.histogram-title strong {
transition: transition:
transform 0.2s, transform 0.2s,
box-shadow 0.2s; box-shadow 0.2s;
box-shadow: 0 1px 0 black inset, 0 2px #5da3ea, 0 4px white; box-shadow:
&:hover{ 0 1px 0 black inset,
0 2px #5da3ea,
0 4px white;
&:hover {
background: #5da3ea; background: #5da3ea;
} }
&:active { &:active {
transform: translate(0, 4px); transform: translate(0, 4px);
box-shadow: 0 1px 0 black inset, 0 0px #5da3ea, 0 0px white; box-shadow:
0 1px 0 black inset,
0 0px #5da3ea,
0 0px white;
} }
transition: transition:

View file

@ -44,7 +44,7 @@ export async function openUpgradesPicker(gameState: GameState) {
${icons["icon:" + medal + "_medal"]} ${icons["icon:" + medal + "_medal"]}
<p> <p>
<strong>${name}</strong><br/> <strong>${name}</strong><br/>
${{gold:t('level_up.gold'),silver:t('level_up.silver'),no:t('level_up.no'),}[medal] } ${{ gold: t("level_up.gold"), silver: t("level_up.silver"), no: t("level_up.no") }[medal]}
</p> </p>
</div>`); </div>`);
} }
@ -144,26 +144,28 @@ export async function openUpgradesPicker(gameState: GameState) {
}</button>`; }</button>`;
const lvlInfo = lvl ? upgradeLevelAndMaxDisplay(u, gameState) : ""; const lvlInfo = lvl ? upgradeLevelAndMaxDisplay(u, gameState) : "";
const help =u.help(Math.max(1, lvl)) const help = u.help(Math.max(1, lvl));
return { return {
u,button, u,
button,
html: `<div class="upgrade choice ${ html: `<div class="upgrade choice ${
(!lvl && gameState.upgrade_points && " ") || (!lvl && gameState.upgrade_points && " ") ||
(lvl && "used") || (lvl && "used") ||
"greyed-out" "greyed-out"
}" > }" >
${icons["icon:" + u.id]} ${icons["icon:" + u.id]}
<p data-tooltip="${escapeAttribute(lvl ? help: u.fullHelp(Math.max(1, lvl)))}"> <p data-tooltip="${escapeAttribute(lvl ? help : u.fullHelp(Math.max(1, lvl)))}">
<strong>${u.name}</strong> ${lvlInfo} <strong>${u.name}</strong> ${lvlInfo}
${lvl ? '':help} ${lvl ? "" : help}
</p> </p>
${button} ${button}
</div>`, </div>`,
}; };
}); });
const forcePick = gameState.upgrade_points>0 && !!actions.find(a=>a.button!=='') const forcePick =
gameState.upgrade_points > 0 && !!actions.find((a) => a.button !== "");
const upgradeId = await requiredAsyncAlert<PerkId | null>({ const upgradeId = await requiredAsyncAlert<PerkId | null>({
title: t("level_up.title", { title: t("level_up.title", {
@ -172,7 +174,7 @@ export async function openUpgradesPicker(gameState: GameState) {
}), }),
content: [ content: [
{ {
disabled:forcePick, disabled: forcePick,
text: t("level_up.go", { name: gameState.level.name }), text: t("level_up.go", { name: gameState.level.name }),
help: forcePick help: forcePick
? t("level_up.go_with_upgrades", { ? t("level_up.go_with_upgrades", {