From 331b96c8f0717bbb7912984b38cfde8622ea9bc6 Mon Sep 17 00:00:00 2001 From: streakingman Date: Wed, 19 Oct 2022 23:49:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E5=85=B3=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=8C=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=90=8E=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Game.tsx | 24 +++++++++++++++--------- src/components/WxQrCode.tsx | 2 +- src/themes/default/index.ts | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/Game.tsx b/src/components/Game.tsx index 7964ea3..cc3618c 100644 --- a/src/components/Game.tsx +++ b/src/components/Game.tsx @@ -171,6 +171,7 @@ const Game: FC<{ Record >({}); const [finished, setFinished] = useState(false); + const [success, setSuccess] = useState(false); const [animating, setAnimating] = useState(false); // 音效 @@ -326,6 +327,7 @@ const Game: FC<{ // 重开 const restart = () => { setFinished(false); + setSuccess(false); setScore(0); setLevel(1); setQueue([]); @@ -395,21 +397,25 @@ const Game: FC<{ // 输了 if (updateQueue.length === 7) { setFinished(true); + setSuccess(false); } if (!updateScene.find((s) => s.status !== 2)) { - // 胜利 + // 队列清空了 if (level === maxLevel) { + // 胜利 setFinished(true); - return; + setSuccess(true); + } else { + // 升级 + // 通关奖励关卡对应数值分数 + setScore(score + level); + setLevel(level + 1); + setQueue([]); + checkCover(makeScene(level + 1, theme.icons)); } - // 升级 - // 通关奖励关卡对应数值分数 - setScore(score + level); - setLevel(level + 1); - setQueue([]); - checkCover(makeScene(level + 1, theme.icons)); } else { + // 更新队列 setQueue(updateQueue); checkCover(updateScene); } @@ -496,7 +502,7 @@ const Game: FC<{ level={level} time={usedTime} score={score} - success={level === maxLevel} + success={success} pure={theme.pure} restartMethod={restart} /> diff --git a/src/components/WxQrCode.tsx b/src/components/WxQrCode.tsx index a31ddf6..2b80bd6 100644 --- a/src/components/WxQrCode.tsx +++ b/src/components/WxQrCode.tsx @@ -2,7 +2,7 @@ import React, { FC, MouseEventHandler, useState } from 'react'; import style from './WxQrCode.module.scss'; import classNames from 'classnames'; const WxQrCode: FC<{ title?: string; onClick?: MouseEventHandler }> = ({ - title = '【广告位招租中】同时如果您喜欢这个项目的话,可以点击扫描下方收款码分摊后台相关费用,感谢~😘', + title = '如果您喜欢这个项目的话,可以点击扫描下方收款码分担后台相关费用(或请我喝杯咖啡),感谢~😘', onClick, }) => { const [fullScreen, setFullScreen] = useState>({ diff --git a/src/themes/default/index.ts b/src/themes/default/index.ts index 451a3ee..5b73025 100644 --- a/src/themes/default/index.ts +++ b/src/themes/default/index.ts @@ -25,7 +25,7 @@ export const getDefaultTheme: () => Theme = () => { title: '有解的羊了个羊', desc: '真的可以通关~', dark: true, - maxLevel: 20, + maxLevel: 5, backgroundColor: '#8dac85', icons: icons.map((icon) => ({ name: icon,