Merge branch 'master' into themes/pdd
# Conflicts: # src/App.tsx
@@ -2,6 +2,19 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||||
|
|
||||||
|
### [0.0.3](https://github.com/StreakingMan/solvable-sheep-game/compare/v0.0.2...v0.0.3) (2022-09-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* 优化洗牌算法为O(n)的洗牌算法 ([8b3960e](https://github.com/StreakingMan/solvable-sheep-game/commit/8b3960e9762441246de2320252aceca505076e2c))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* bgm加载时机调整 ([f0e2caf](https://github.com/StreakingMan/solvable-sheep-game/commit/f0e2caf7a7124981eef6bc4ff9ed7b459893c102))
|
||||||
|
* host判断 ([d1d7c6b](https://github.com/StreakingMan/solvable-sheep-game/commit/d1d7c6b2f06e3d67a4edf6cabc14a3fa419d5d93))
|
||||||
|
|
||||||
### [0.0.2](https://github.com/StreakingMan/solvable-sheep-game/compare/v0.0.1...v0.0.2) (2022-09-20)
|
### [0.0.2](https://github.com/StreakingMan/solvable-sheep-game/compare/v0.0.1...v0.0.2) (2022-09-20)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 82 KiB |
|
Before Width: | Height: | Size: 225 KiB |
|
Before Width: | Height: | Size: 638 KiB |
|
Before Width: | Height: | Size: 288 KiB |
|
Before Width: | Height: | Size: 636 KiB |
|
Before Width: | Height: | Size: 261 KiB |
|
Before Width: | Height: | Size: 231 KiB |
|
Before Width: | Height: | Size: 295 KiB |
|
Before Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 38 KiB |
@@ -19,7 +19,7 @@
|
|||||||
s.parentNode.insertBefore(hm, s);
|
s.parentNode.insertBefore(hm, s);
|
||||||
})();
|
})();
|
||||||
</script>
|
</script>
|
||||||
<script type="module" crossorigin src="/assets/index.872e09a8.js"></script>
|
<script type="module" crossorigin src="/assets/index.5f4c499f.js"></script>
|
||||||
<link rel="stylesheet" href="/assets/index.15f870d5.css">
|
<link rel="stylesheet" href="/assets/index.15f870d5.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -29,5 +29,22 @@
|
|||||||
async
|
async
|
||||||
src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"
|
src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"
|
||||||
></script>
|
></script>
|
||||||
|
<script async>
|
||||||
|
// 如果您基于此项目二创,可以删除以下代码
|
||||||
|
// 否则请标明原仓库地址
|
||||||
|
setTimeout(()=>{
|
||||||
|
const {hostname} = location
|
||||||
|
if(hostname!=='localhost'&&!hostname.endsWith('streakingman.com')){
|
||||||
|
const a = document.createElement('a')
|
||||||
|
a.setAttribute('href','https://github.com/StreakingMan/solvable-sheep-game')
|
||||||
|
a.setAttribute('target','_blank')
|
||||||
|
a.innerText='本项目仅供交流,禁止商业用途,点击查看原github仓库'
|
||||||
|
const p = document.createElement('p')
|
||||||
|
p.style.textAlign = 'center'
|
||||||
|
p.append(a)
|
||||||
|
document.body.prepend(p)
|
||||||
|
}
|
||||||
|
},5000)
|
||||||
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "solvable-sheep-game",
|
"name": "solvable-sheep-game",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "0.0.2",
|
"version": "0.0.3",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { fishermanTheme } from './themes/fisherman';
|
|||||||
import { jinlunTheme } from './themes/jinlun';
|
import { jinlunTheme } from './themes/jinlun';
|
||||||
import { ikunTheme } from './themes/ikun';
|
import { ikunTheme } from './themes/ikun';
|
||||||
import { pddTheme } from './themes/pdd';
|
import { pddTheme } from './themes/pdd';
|
||||||
|
import { BeiAn } from './themes/BeiAn';
|
||||||
|
|
||||||
// 主题
|
// 主题
|
||||||
const themes = [defaultTheme, fishermanTheme, jinlunTheme, ikunTheme, pddTheme];
|
const themes = [defaultTheme, fishermanTheme, jinlunTheme, ikunTheme, pddTheme];
|
||||||
@@ -186,11 +187,14 @@ const App: FC = () => {
|
|||||||
|
|
||||||
// 主题切换
|
// 主题切换
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
// 初始化时不加载bgm
|
||||||
|
if (once) {
|
||||||
setBgmOn(false);
|
setBgmOn(false);
|
||||||
restart();
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setBgmOn(true);
|
setBgmOn(true);
|
||||||
}, 300);
|
}, 300);
|
||||||
|
}
|
||||||
|
restart();
|
||||||
}, [curTheme]);
|
}, [curTheme]);
|
||||||
|
|
||||||
// 队列区排序
|
// 队列区排序
|
||||||
@@ -445,6 +449,8 @@ const App: FC = () => {
|
|||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<BeiAn />
|
||||||
|
|
||||||
{finished && (
|
{finished && (
|
||||||
<div className="modal">
|
<div className="modal">
|
||||||
<h1>{tipText}</h1>
|
<h1>{tipText}</h1>
|
||||||
|
|||||||
@@ -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>
|
||||||
|
);
|
||||||
|
};
|
||||||