FIX: Monster bar
All checks were successful
Gitea Auto Deploy / Deploy-Container (push) Successful in 1m38s
BIN
public/ff-sranalysis.ico
Normal file
|
After Width: | Height: | Size: 244 KiB |
BIN
public/ff-sranalysis.png
Normal file
|
After Width: | Height: | Size: 1.3 MiB |
@@ -1 +0,0 @@
|
||||
<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
|
||||
|
Before Width: | Height: | Size: 391 B |
@@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB |
@@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
|
||||
|
Before Width: | Height: | Size: 128 B |
@@ -1 +0,0 @@
|
||||
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
|
||||
|
Before Width: | Height: | Size: 385 B |
|
Before Width: | Height: | Size: 195 KiB |
BIN
src/app/icon.png
|
Before Width: | Height: | Size: 390 KiB |
@@ -21,7 +21,34 @@ const geistMono = Geist_Mono({
|
||||
export const metadata: Metadata = {
|
||||
title: "Firefly Analytics",
|
||||
description: "Analytics tool for Veritas",
|
||||
};
|
||||
icons: {
|
||||
icon: "/ff-sranalysis.png",
|
||||
shortcut: "/ff-sranalysis.ico",
|
||||
apple: "/ff-sranalysis.png",
|
||||
},
|
||||
openGraph: {
|
||||
title: "Firefly Analytics",
|
||||
description: "Analytics tool for Veritas",
|
||||
url: "https://sranalysis.kain.id.vn",
|
||||
siteName: "Firefly Analytics",
|
||||
images: [
|
||||
{
|
||||
url: "https://sranalysis.kain.id.vn/ff-sranalysis.png",
|
||||
width: 1200,
|
||||
height: 630,
|
||||
alt: "Firefly Analytics Logo",
|
||||
},
|
||||
],
|
||||
locale: "en_US",
|
||||
type: "website",
|
||||
},
|
||||
twitter: {
|
||||
card: "summary_large_image",
|
||||
title: "Firefly Analytics",
|
||||
description: "Analytics tool for Veritas",
|
||||
images: ["https://sranalysis.kain.id.vn/ff-sranalysis.png"],
|
||||
},
|
||||
};
|
||||
|
||||
export default async function RootLayout({
|
||||
children,
|
||||
|
||||
@@ -3,7 +3,7 @@ import { useTranslations } from "next-intl";
|
||||
import { useEffect, useState } from "react";
|
||||
import ActionBar from "@/components/actionbar";
|
||||
import useAvatarDataStore from "@/stores/avatarDataStore";
|
||||
import { getCharacterListApi } from "@/lib/api";
|
||||
import { getCharacterListApi, getEnemyListApi } from "@/lib/api";
|
||||
import LineupBar from "@/components/lineupbar";
|
||||
import useBattleDataStore from "@/stores/battleDataStore";
|
||||
import DamagePerAvatarForAll from "@/components/chart/damagePerAvatarForAll";
|
||||
@@ -14,7 +14,7 @@ import EnemyBar from "@/components/enemybar";
|
||||
|
||||
export default function Home() {
|
||||
const transI18n = useTranslations("DataAnalysisPage");
|
||||
const { setListAvatar } = useAvatarDataStore();
|
||||
const { setListAvatar, setListEnemy } = useAvatarDataStore();
|
||||
const {
|
||||
totalAV,
|
||||
totalDamage,
|
||||
@@ -36,9 +36,11 @@ export default function Home() {
|
||||
const fetchData = async () => {
|
||||
const data = await getCharacterListApi();
|
||||
setListAvatar(data);
|
||||
const enemyData = await getEnemyListApi();
|
||||
setListEnemy(enemyData);
|
||||
};
|
||||
fetchData();
|
||||
}, [setListAvatar]);
|
||||
}, [setListAvatar, setListEnemy]);
|
||||
|
||||
useEffect(() => {
|
||||
window.dispatchEvent(new Event('resize'));
|
||||
|
||||
@@ -2,15 +2,16 @@
|
||||
|
||||
import useBattleDataStore from "@/stores/battleDataStore";
|
||||
import Image from "next/image";
|
||||
import useAvatarDataStore from "@/stores/avatarDataStore";
|
||||
import { getNameEnemy } from "@/helper/getNameChar";
|
||||
|
||||
function formatEnemyIdForURL(id?: number): string {
|
||||
const n = id ?? 0;
|
||||
const adjusted = n.toString().length === 9 ? n / 100 : n;
|
||||
return adjusted.toFixed(0);
|
||||
}
|
||||
import useLocaleStore from "@/stores/localeStore";
|
||||
import NameAvatar from "../nameAvatar";
|
||||
|
||||
export default function EnemyBar() {
|
||||
const { enemyDetail } = useBattleDataStore()
|
||||
const { listEnemy } = useAvatarDataStore()
|
||||
const { locale } = useLocaleStore()
|
||||
|
||||
return (
|
||||
<div className="p-3 w-full">
|
||||
@@ -21,16 +22,18 @@ export default function EnemyBar() {
|
||||
<div className="flex items-center justify-between mb-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<Image
|
||||
src={`https://api.hakush.in/hsr/UI/monstermiddleicon/Monster_${formatEnemyIdForURL(enemy.id)}.webp`}
|
||||
src={`https://api.hakush.in/hsr/UI/monstermiddleicon/${listEnemy.find((monster) => monster.child.includes(enemy.id))?.icon?.split("/")?.pop()?.replace(".png", "")}.webp`}
|
||||
alt={enemy.name}
|
||||
width={40}
|
||||
height={40}
|
||||
className="object-cover w-10 h-10 rounded-lg"
|
||||
/>
|
||||
<div className="flex-1 min-w-0">
|
||||
<h3 className="text-base font-semibold leading-tight truncate overflow-hidden" title={enemy.name}>
|
||||
{enemy.name}
|
||||
</h3>
|
||||
<NameAvatar
|
||||
text={getNameEnemy(locale, listEnemy.find((monster) => monster.child.includes(enemy.id)))}
|
||||
locale={locale}
|
||||
className="text-base font-semibold leading-tight truncate overflow-hidden"
|
||||
/>
|
||||
<p className="text-base-content/70 text-xs">Level {enemy.level || 1}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,7 @@ import { useTranslations } from "next-intl";
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useEffect, useState } from "react";
|
||||
import Image from "next/image";
|
||||
|
||||
const themes = [
|
||||
{ label: "Winter" },
|
||||
@@ -211,23 +212,28 @@ export default function Header() {
|
||||
{/* Logo */}
|
||||
|
||||
<a className="hidden sm:grid sm:grid-cols-1 items-start text-left gap-0 hover:scale-105 px-2">
|
||||
<h1 className="text-xl font-bold">
|
||||
<span className="text-emerald-500">Firefly Analy</span>
|
||||
<span className="bg-clip-text text-transparent bg-gradient-to-r from-emerald-400 via-orange-500 to-red-500">
|
||||
sis
|
||||
</span>
|
||||
</h1>
|
||||
<p className="text-sm text-gray-500">For Veritas</p>
|
||||
<div className="flex items-center justify-center">
|
||||
<Image src="/ff-sranalysis.png" alt="Logo" width={50} height={50} />
|
||||
<div className="flex flex-col justify-center items-start">
|
||||
<h1 className="text-xl font-bold">
|
||||
<span className="text-emerald-500">Firefly Analy</span>
|
||||
<span className="bg-clip-text text-transparent bg-gradient-to-r from-emerald-400 via-orange-500 to-red-500">
|
||||
sis
|
||||
</span>
|
||||
</h1>
|
||||
<p className="text-sm text-gray-500">For Veritas</p>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
{version && (
|
||||
<div className="px-2">
|
||||
<div className="inline-flex items-center space-x-2 px-3 py-1.5 bg-gradient-to-r from-blue-500 to-purple-600 rounded-full shadow-md hover:shadow-lg transition-all duration-200">
|
||||
<div className="w-1.5 h-1.5 bg-white rounded-full animate-pulse"></div>
|
||||
<div className="text-xs font-semibold text-white">
|
||||
{version}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="px-2">
|
||||
<div className="inline-flex items-center space-x-2 px-3 py-1.5 bg-gradient-to-r from-blue-500 to-purple-600 rounded-full shadow-md hover:shadow-lg transition-all duration-200">
|
||||
<div className="w-1.5 h-1.5 bg-white rounded-full animate-pulse"></div>
|
||||
<div className="text-xs font-semibold text-white">
|
||||
{version}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { listCurrentLanguage } from "@/lib/constant";
|
||||
import { AvatarHakushiType } from "@/types";
|
||||
import { AvatarHakushiType, EnemyHakushiType } from "@/types";
|
||||
|
||||
|
||||
export function getNameChar(locale: string, data: AvatarHakushiType | undefined): string {
|
||||
@@ -22,6 +22,21 @@ export function getNameChar(locale: string, data: AvatarHakushiType | undefined)
|
||||
return text
|
||||
}
|
||||
|
||||
export function getNameEnemy(locale: string, data: EnemyHakushiType | undefined): string {
|
||||
if (!data) {
|
||||
return ""
|
||||
}
|
||||
if (!listCurrentLanguage.hasOwnProperty(locale)) {
|
||||
return ""
|
||||
}
|
||||
|
||||
let text = data.lang.get(listCurrentLanguage[locale as keyof typeof listCurrentLanguage].toLowerCase()) ?? "";
|
||||
if (!text) {
|
||||
text = data.lang.get("en") ?? "";
|
||||
}
|
||||
return text
|
||||
}
|
||||
|
||||
export function parseRuby(text: string): string {
|
||||
const rubyRegex = /\{RUBY_B#(.*?)\}(.*?)\{RUBY_E#\}/gs;
|
||||
return text.replace(rubyRegex, (_match, furigana, kanji) => {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import useSocketStore from "@/stores/socketSettingStore";
|
||||
import { EnemyHakushiRawType, EnemyHakushiType } from "@/types";
|
||||
import { AvatarHakushiType, AvatarHakushiRawType } from "@/types/avatar";
|
||||
import axios from 'axios';
|
||||
|
||||
@@ -46,6 +47,29 @@ export async function getCharacterListApi(): Promise<AvatarHakushiType[]> {
|
||||
}
|
||||
}
|
||||
|
||||
export async function getEnemyListApi(): Promise<EnemyHakushiType[]> {
|
||||
try {
|
||||
const res = await axios.get<Record<string, EnemyHakushiRawType>>(
|
||||
'https://api.hakush.in/hsr/data/monster.json',
|
||||
{
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
const data = new Map(Object.entries(res.data));
|
||||
|
||||
return Array.from(data.entries()).map(([id, it]) => convertMonster(id, it));
|
||||
} catch (error: unknown) {
|
||||
if (axios.isAxiosError(error)) {
|
||||
console.log(`Error: ${error.response?.status} - ${error.message}`);
|
||||
} else {
|
||||
console.log(`Unexpected error: ${String(error)}`);
|
||||
}
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function convertAvatar(id: string, item: AvatarHakushiRawType): AvatarHakushiType {
|
||||
const lang = new Map<string, string>([
|
||||
@@ -68,3 +92,24 @@ function convertAvatar(id: string, item: AvatarHakushiRawType): AvatarHakushiTyp
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
export function convertMonster(id: string, item: EnemyHakushiRawType): EnemyHakushiType {
|
||||
const lang = new Map<string, string>([
|
||||
['en', item.en],
|
||||
['kr', item.kr],
|
||||
['cn', item.cn],
|
||||
['jp', item.jp]
|
||||
]);
|
||||
const result: EnemyHakushiType = {
|
||||
id: id,
|
||||
rank: item.rank,
|
||||
camp: item.camp,
|
||||
icon: item.icon,
|
||||
child: item.child,
|
||||
weak: item.weak,
|
||||
desc: item.desc,
|
||||
lang: lang
|
||||
};
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -1,16 +1,19 @@
|
||||
import { AvatarHakushiType } from '@/types';
|
||||
import { AvatarHakushiType, EnemyHakushiType } from '@/types';
|
||||
import { create } from 'zustand'
|
||||
|
||||
|
||||
interface AvatarDataState {
|
||||
listAvatar: AvatarHakushiType[];
|
||||
listEnemy: EnemyHakushiType[];
|
||||
setListAvatar: (list: AvatarHakushiType[]) => void;
|
||||
setListEnemy: (list: EnemyHakushiType[]) => void;
|
||||
}
|
||||
|
||||
const useAvatarDataStore = create<AvatarDataState>((set) => ({
|
||||
listAvatar: [],
|
||||
listEnemy: [],
|
||||
setListAvatar: (list: AvatarHakushiType[]) => set({ listAvatar: list }),
|
||||
|
||||
setListEnemy: (list: EnemyHakushiType[]) => set({ listEnemy: list }),
|
||||
}));
|
||||
|
||||
export default useAvatarDataStore;
|
||||
@@ -1,4 +1,4 @@
|
||||
import { DamageType, AvatarAnalysisJson, UseSkillType, BattleBeginType, BattleEndType, DamageDetailType, EntityDefeatedType, SetBattleLineupType, TurnBeginType, TurnEndType, UpdateCycleType, UpdateWaveType, VersionType, StatType, StatChangeType, UpdateTeamFormationType } from '@/types';
|
||||
import { DamageType, AvatarAnalysisJson, UseSkillType, BattleBeginType, BattleEndType, DamageDetailType, EntityDefeatedType, SetBattleLineupType, TurnBeginType, TurnEndType, UpdateCycleType, UpdateWaveType, VersionType, StatChangeType, UpdateTeamFormationType } from '@/types';
|
||||
import { InitializeEnemyType } from '@/types/enemy';
|
||||
import { AvatarBattleInfo, AvatarInfo, BattleDataStateJson, EnemyInfo, SkillBattleInfo, TurnBattleInfo } from '@/types/mics';
|
||||
import { create } from 'zustand'
|
||||
|
||||
@@ -10,3 +10,27 @@ export interface EnemyType {
|
||||
export interface InitializeEnemyType {
|
||||
enemy: EnemyType
|
||||
}
|
||||
|
||||
export interface EnemyHakushiRawType {
|
||||
rank: string;
|
||||
camp: string | null;
|
||||
icon: string;
|
||||
child: number[];
|
||||
weak: string[];
|
||||
en: string;
|
||||
desc: string;
|
||||
kr: string;
|
||||
cn: string;
|
||||
jp: string;
|
||||
}
|
||||
|
||||
export interface EnemyHakushiType {
|
||||
id: string;
|
||||
rank: string;
|
||||
camp: string | null;
|
||||
icon: string;
|
||||
child: number[];
|
||||
weak: string[];
|
||||
desc: string;
|
||||
lang: Map<string, string>;
|
||||
}
|
||||
|
||||
@@ -9,3 +9,4 @@ export * from "./srtools"
|
||||
export * from "./version"
|
||||
export * from "./entity"
|
||||
export * from "./stat"
|
||||
export * from "./enemy"
|
||||
|
||||