Merge pull request #3 from ChisatoNishikigi73/main

review: Complete review of issue #2
Yue-plus · Sep 29, 2024 · ef64cd3 · ef64cd3
2 parents 468aa9e + 0cf7e8b
commit ef64cd3
Show file tree

Hide file tree

Showing 5 changed files with 502 additions and 437 deletions.
diff --git a/arknights.config.tsx b/arknights.config.tsx
@@ -116,5 +116,15 @@ export default {
                 ],
             },
         },
+        WORLD: {
+            items: [
+                {title: "源石", subTitle: "ORIGINIUMS", imageUrl: "/images/03-world/originiums.png", description: '大地被起因不明的天灾四处肆虐，经由天灾卷过的土地上出现了大量的神秘矿物——"源石"。依赖于技术的进步，源石蕴含的能量投入工业后使得文明顺利迈入现代，与此同时，源石本身也催生出"感染者"的存在。'},
+                {title: "源石技艺", subTitle: "ORIGINIUM ARTS", imageUrl: "/images/03-world/originium_arts.png", description: "源石技艺的描述..."},
+                {title: "整合运动", subTitle: "REUNION", imageUrl: "/images/03-world/reunion.png", description: "整合运动的描述..."},
+                {title: "感染者", subTitle: "INFECTED", imageUrl: "/images/03-world/infected.png", description: "感染者的描述..."},
+                {title: "移动城邦", subTitle: "NOMADIC CITY", imageUrl: "/images/03-world/nomadic_city.png", description: "移动城邦的描述..."},
+                {title: "罗德岛", subTitle: "RHODES ISLAND", imageUrl: "/images/03-world/rhodes_island.png", description: "罗德岛的描述..."},
+            ],
+        },
     },
 } as ArknightsConfig
diff --git a/src/components/Init.tsx b/src/components/Init.tsx
@@ -86,20 +86,20 @@ export function Init() {
     }, [incrementProgress, loadedResources, stopObserving, isObserving]);
 
     useEffect(() => {
-        let interval: NodeJS.Timeout;
+        let interval: number;
         if ($isInitialized && progress < 100) {
-            interval = setInterval(() => {
+            interval = window.setInterval(() => {
                 setProgress(prevProgress => {
                     const newProgress = prevProgress + 100;
                     if (newProgress >= 100) {
-                        clearInterval(interval);
+                        window.clearInterval(interval);
                         return 100;
                     }
                     return newProgress;
                 });
             }, 50);
         }
-        return () => clearInterval(interval);
+        return () => window.clearInterval(interval);
     }, [$isInitialized, progress]);
 
     useEffect(() => {
@@ -139,8 +139,7 @@ export function Init() {
 
                 <div className="flex items-center justify-center mb-[2vw]">
                     <TitleArknights
-                        className="w-[13vw] h-[17vw] max-w-full"
-                        color={commonColor}
+                        className={`w-[13vw] h-[17vw] max-w-full text-[${commonColor}]`}
                     />
                 </div>
 

diff --git a/src/components/SvgIcons.tsx b/src/components/SvgIcons.tsx