Merge branch 'master' into themes/pdd

# Conflicts:
#	src/App.tsx
This commit is contained in:
streakingman
2022-09-22 12:47:05 +08:00
84 changed files with 97 additions and 46 deletions
+10 -4
View File
@@ -15,6 +15,7 @@ import { fishermanTheme } from './themes/fisherman';
import { jinlunTheme } from './themes/jinlun';
import { ikunTheme } from './themes/ikun';
import { pddTheme } from './themes/pdd';
import { BeiAn } from './themes/BeiAn';
// 主题
const themes = [defaultTheme, fishermanTheme, jinlunTheme, ikunTheme, pddTheme];
@@ -186,11 +187,14 @@ const App: FC = () => {
// 主题切换
useEffect(() => {
setBgmOn(false);
// 初始化时不加载bgm
if (once) {
setBgmOn(false);
setTimeout(() => {
setBgmOn(true);
}, 300);
}
restart();
setTimeout(() => {
setBgmOn(true);
}, 300);
}, [curTheme]);
// 队列区排序
@@ -445,6 +449,8 @@ const App: FC = () => {
</span>
</p>
<BeiAn />
{finished && (
<div className="modal">
<h1>{tipText}</h1>
+15
View File
@@ -0,0 +1,15 @@
import React, { FC } from 'react';
export const BeiAn: FC = () => {
return (
<p style={{ textAlign: 'center' }}>
<a
href="https://beian.miit.gov.cn/"
target="_blank"
rel="noopener noreferrer nofollow"
>
ICP备17007857号-2
</a>
</p>
);
};
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.