Merge branch 'master' into themes/pdd

# Conflicts: # src/App.tsx
2025-05-23 20:00:23 +08:00 · 2022-09-22 12:47:05 +08:00 · 2022-09-22 12:47:05 +08:00 · a5e1ea1004
commit a5e1ea1004
parent dc3033d0d2 85954f72b2
84 changed files with 97 additions and 46 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -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.

+### [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)


--- a/dist/assets/bgm.51dcb053.mp3
+++ b/dist/assets/bgm.51dcb053.mp3
--- a/dist/assets/bgm.dd360222.mp3
+++ b/dist/assets/bgm.dd360222.mp3
--- a/dist/assets/index.5f4c499f.js
+++ b/dist/assets/index.5f4c499f.js
--- a/dist/assets/index.872e09a8.js
+++ b/dist/assets/index.872e09a8.js
--- a/dist/assets/kun.58737ed3.png
+++ b/dist/assets/kun.58737ed3.png
--- a/dist/assets/music.23baa7eb.mp3
+++ b/dist/assets/music.23baa7eb.mp3
--- a/dist/assets/music.8bb6ee96.mp3
+++ b/dist/assets/music.8bb6ee96.mp3
--- a/dist/assets/sound-button-click.b3bf15c1.mp3
+++ b/dist/assets/sound-button-click.b3bf15c1.mp3
--- a/dist/assets/sound-button-click.cad3ef43.mp3
+++ b/dist/assets/sound-button-click.cad3ef43.mp3
--- a/dist/assets/sound-triple.33b9817c.mp3
+++ b/dist/assets/sound-triple.33b9817c.mp3
--- a/dist/assets/sound-triple.75a32003.mp3
+++ b/dist/assets/sound-triple.75a32003.mp3
--- a/dist/assets/个人练习生.76f7889a.mp3
+++ b/dist/assets/个人练习生.76f7889a.mp3
--- a/dist/assets/中指.03b1d304.png
+++ b/dist/assets/中指.03b1d304.png
--- a/dist/assets/中指.251bd01b.mp3
+++ b/dist/assets/中指.251bd01b.mp3
--- a/dist/assets/中指.96683709.mp3
+++ b/dist/assets/中指.96683709.mp3
--- a/dist/assets/你干嘛哎呦.288ae93f.mp3
+++ b/dist/assets/你干嘛哎呦.288ae93f.mp3
--- a/dist/assets/你干嘛哎呦.f4670ca7.mp3
+++ b/dist/assets/你干嘛哎呦.f4670ca7.mp3
--- a/dist/assets/全民制作人大家好.27c566d0.mp3
+++ b/dist/assets/全民制作人大家好.27c566d0.mp3
--- a/dist/assets/全民制作人大家好.459ff524.mp3
+++ b/dist/assets/全民制作人大家好.459ff524.mp3
--- a/dist/assets/坤舞1.5ee36559.png
+++ b/dist/assets/坤舞1.5ee36559.png
--- a/dist/assets/坤舞2.3338c265.png
+++ b/dist/assets/坤舞2.3338c265.png
--- a/dist/assets/坤舞3.962c62e3.png
+++ b/dist/assets/坤舞3.962c62e3.png
--- a/dist/assets/坤舞4.e2402ecb.png
+++ b/dist/assets/坤舞4.e2402ecb.png
--- a/dist/assets/坤舞5.02215bdb.png
+++ b/dist/assets/坤舞5.02215bdb.png
--- a/dist/assets/坤舞6.14624190.png
+++ b/dist/assets/坤舞6.14624190.png
--- a/dist/assets/坤舞7.06e0481b.png
+++ b/dist/assets/坤舞7.06e0481b.png
--- a/dist/assets/我黑切呢.76282a71.png
+++ b/dist/assets/我黑切呢.76282a71.png
--- a/dist/assets/我黑切呢.8094b7d4.mp3
+++ b/dist/assets/我黑切呢.8094b7d4.mp3
--- a/dist/assets/我黑切呢.92a2fbde.mp3
+++ b/dist/assets/我黑切呢.92a2fbde.mp3
--- a/dist/assets/笑1.2520b27e.png
+++ b/dist/assets/笑1.2520b27e.png
--- a/dist/assets/笑1.2f0dc33e.mp3
+++ b/dist/assets/笑1.2f0dc33e.mp3
--- a/dist/assets/笑1.6323c5e3.mp3
+++ b/dist/assets/笑1.6323c5e3.mp3
--- a/dist/assets/笑2.9f4d1f70.mp3
+++ b/dist/assets/笑2.9f4d1f70.mp3
--- a/dist/assets/笑2.a603447c.png
+++ b/dist/assets/笑2.a603447c.png
--- a/dist/assets/笑2.d9fa6094.mp3
+++ b/dist/assets/笑2.d9fa6094.mp3
--- a/dist/assets/笑3.5d1ad598.png
+++ b/dist/assets/笑3.5d1ad598.png
--- a/dist/assets/笑3.b0a821eb.mp3
+++ b/dist/assets/笑3.b0a821eb.mp3
--- a/dist/assets/笑3.e03da4c2.mp3
+++ b/dist/assets/笑3.e03da4c2.mp3
--- a/dist/assets/笑4.51c9403a.png
+++ b/dist/assets/笑4.51c9403a.png
--- a/dist/assets/笑4.e266b69a.mp3
+++ b/dist/assets/笑4.e266b69a.mp3
--- a/dist/assets/笑4.fd9df169.mp3
+++ b/dist/assets/笑4.fd9df169.mp3
--- a/dist/assets/篮球.1d845155.png
+++ b/dist/assets/篮球.1d845155.png
--- a/dist/assets/篮球击地.0d1c8136.mp3
+++ b/dist/assets/篮球击地.0d1c8136.mp3
--- a/dist/assets/篮球击地.50053395.mp3
+++ b/dist/assets/篮球击地.50053395.mp3
--- a/dist/assets/肌肉金轮1.47f18038.mp3
+++ b/dist/assets/肌肉金轮1.47f18038.mp3
--- a/dist/assets/肌肉金轮1.a3ae73bf.png
+++ b/dist/assets/肌肉金轮1.a3ae73bf.png
--- a/dist/assets/肌肉金轮1.bb1c1f03.mp3
+++ b/dist/assets/肌肉金轮1.bb1c1f03.mp3
--- a/dist/assets/肌肉金轮2.184f3d14.mp3
+++ b/dist/assets/肌肉金轮2.184f3d14.mp3
--- a/dist/assets/肌肉金轮2.6c0fd0a7.mp3
+++ b/dist/assets/肌肉金轮2.6c0fd0a7.mp3
--- a/dist/assets/肌肉金轮2.d954099d.png
+++ b/dist/assets/肌肉金轮2.d954099d.png
--- a/dist/assets/肌肉金轮3.796a2d78.png
+++ b/dist/assets/肌肉金轮3.796a2d78.png
--- a/dist/assets/肌肉金轮3.8034e543.mp3
+++ b/dist/assets/肌肉金轮3.8034e543.mp3
--- a/dist/assets/肌肉金轮3.cbc5b4cc.mp3
+++ b/dist/assets/肌肉金轮3.cbc5b4cc.mp3
--- a/dist/assets/韩委员.62b2bee5.png
+++ b/dist/assets/韩委员.62b2bee5.png
--- a/dist/assets/韩委员.7b1b4b3f.mp3
+++ b/dist/assets/韩委员.7b1b4b3f.mp3
--- a/dist/assets/韩委员.880571c2.mp3
+++ b/dist/assets/韩委员.880571c2.mp3
--- a/dist/assets/鸡你太美.66fdae33.mp3
+++ b/dist/assets/鸡你太美.66fdae33.mp3
--- a/dist/assets/鸡你太美.7a0a1f8b.mp3
+++ b/dist/assets/鸡你太美.7a0a1f8b.mp3
--- a/dist/index.html
+++ b/dist/index.html
@ -19,7 +19,7 @@
                s.parentNode.insertBefore(hm, s);
            })();
        </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">
    </head>
    <body>
@ -29,5 +29,22 @@
            async
            src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"
        ></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>
 </html>
--- a/dist/sound-disco.mp3
+++ b/dist/sound-disco.mp3
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "solvable-sheep-game",
    "private": false,
-    "version": "0.0.2",
+    "version": "0.0.3",
    "type": "module",
    "scripts": {
        "dev": "vite",
--- a/public/sound-disco.mp3
+++ b/public/sound-disco.mp3
--- a/src/App.tsx
+++ b/src/App.tsx
@ -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>
--- a/src/themes/BeiAn.tsx
+++ b/src/themes/BeiAn.tsx
@ -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>
+    );
+};
--- a/src/themes/default/sounds/sound-button-click.mp3
+++ b/src/themes/default/sounds/sound-button-click.mp3
--- a/src/themes/default/sounds/sound-triple.mp3
+++ b/src/themes/default/sounds/sound-triple.mp3
--- a/src/themes/ikun/sounds/bgm.mp3
+++ b/src/themes/ikun/sounds/bgm.mp3
--- a/src/themes/ikun/sounds/music.mp3
+++ b/src/themes/ikun/sounds/music.mp3
--- a/src/themes/ikun/sounds/个人练习生.mp3
+++ b/src/themes/ikun/sounds/个人练习生.mp3
--- a/src/themes/ikun/sounds/你干嘛哎呦.mp3
+++ b/src/themes/ikun/sounds/你干嘛哎呦.mp3
--- a/src/themes/ikun/sounds/全民制作人大家好.mp3
+++ b/src/themes/ikun/sounds/全民制作人大家好.mp3
--- a/src/themes/ikun/sounds/篮球击地.mp3
+++ b/src/themes/ikun/sounds/篮球击地.mp3
--- a/src/themes/ikun/sounds/鸡你太美.mp3
+++ b/src/themes/ikun/sounds/鸡你太美.mp3
--- a/src/themes/jinlun/sounds/中指.mp3
+++ b/src/themes/jinlun/sounds/中指.mp3
--- a/src/themes/jinlun/sounds/我黑切呢.mp3
+++ b/src/themes/jinlun/sounds/我黑切呢.mp3
--- a/src/themes/jinlun/sounds/笑1.mp3
+++ b/src/themes/jinlun/sounds/笑1.mp3
--- a/src/themes/jinlun/sounds/笑2.mp3
+++ b/src/themes/jinlun/sounds/笑2.mp3
--- a/src/themes/jinlun/sounds/笑3.mp3
+++ b/src/themes/jinlun/sounds/笑3.mp3
--- a/src/themes/jinlun/sounds/笑4.mp3
+++ b/src/themes/jinlun/sounds/笑4.mp3
--- a/src/themes/jinlun/sounds/肌肉金轮1.mp3
+++ b/src/themes/jinlun/sounds/肌肉金轮1.mp3
--- a/src/themes/jinlun/sounds/肌肉金轮2.mp3
+++ b/src/themes/jinlun/sounds/肌肉金轮2.mp3
--- a/src/themes/jinlun/sounds/肌肉金轮3.mp3
+++ b/src/themes/jinlun/sounds/肌肉金轮3.mp3
--- a/src/themes/jinlun/sounds/韩委员.mp3
+++ b/src/themes/jinlun/sounds/韩委员.mp3