Merge branch 'release/1.7.7' into main

madonoharu · Jun 24, 2022 · 7b13c37 · 7b13c37
2 parents c571d09 + 33fad67
commit 7b13c37
Show file tree

Hide file tree

Showing 39 changed files with 858 additions and 471 deletions.
diff --git a/crates/fleethub-core/Cargo.toml b/crates/fleethub-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fleethub-core"
-version = "1.7.6"
+version = "1.7.7"
 authors = ["まどの <madonoharu@gmail.com>"]
 edition = "2021"
 description = "fleethub-core"

diff --git a/crates/fleethub-core/package.json b/crates/fleethub-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleethub-core",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "license": "UNLICENSED",
   "sideEffects": false,
   "exports": {

diff --git a/crates/fleethub-core/src/attack/fleet_cutin.rs b/crates/fleethub-core/src/attack/fleet_cutin.rs
@@ -188,13 +188,13 @@ pub fn get_fleet_cutin_mod(
             let includes_musashi_kai2 = s1_is_musashi_kai2 || is_musashi_kai2(s2);
 
             let base = if includes_musashi_kai2 {
-                if shots == 1 {
+                if shots <= 2 {
                     1.4 * 1.1
                 } else {
                     1.55 * if s1_is_musashi_kai2 { 1.25 } else { 1.2 }
                 }
             } else {
-                if shots == 1 {
+                if shots <= 2 {
                     1.4
                 } else {
                     1.55

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleethub",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "private": true,
   "license": "UNLICENSED",
   "author": "madono (https://github.com/MadonoHaru) <madonoharu@gmail.com>",
@@ -34,10 +34,10 @@
     "*.{js,jsx,ts,tsx}": "eslint --cache --ext .ts,.tsx --fix"
   },
   "devDependencies": {
-    "@fh/admin": "workspace:packages/admin",
-    "@fh/utils": "workspace:packages/utils",
+    "@fh/admin": "workspace:*",
+    "@fh/utils": "workspace:*",
     "@next/eslint-plugin-next": "^12.1.6",
-    "@swc/core": "^1.2.204",
+    "@swc/core": "^1.2.205",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
     "@types/fs-extra": "^9.0.13",
@@ -51,7 +51,7 @@
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "fleethub-core": "npm:latest",
     "fs-extra": "^10.1.0",

diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -7,7 +7,7 @@
     "build": "tsc -m esnext --outDir esm"
   },
   "dependencies": {
-    "@fh/utils": "workspace:packages/utils",
+    "@fh/utils": "workspace:*",
     "@google-cloud/asset": "^4.0.0",
     "cloudinary": "^1.30.0",
     "dequal": "^2.0.2",

diff --git a/packages/kcs/package.json b/packages/kcs/package.json
@@ -5,7 +5,7 @@
   },
   "devDependencies": {
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.2.204",
+    "@swc/core": "^1.2.205",
     "fleethub-core": "npm:latest"
   }
 }
diff --git a/packages/site/package.json b/packages/site/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fh/site",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "license": "UNLICENSED",
   "author": "madono (https://github.com/MadonoHaru)",
   "main": "index.js",
@@ -15,7 +15,8 @@
     "@emotion/react": "^11.9.3",
     "@emotion/server": "^11.4.0",
     "@emotion/styled": "^11.9.3",
-    "@fh/utils": "*",
+    "@fh/admin": "workspace:*",
+    "@fh/utils": "workspace:*",
     "@mui/icons-material": "^5.8.4",
     "@mui/lab": "^5.0.0-alpha.87",
     "@mui/material": "^5.8.5",
@@ -31,7 +32,7 @@
     "core-js": "^3.23.2",
     "equipment-bonus": "npm:latest",
     "fast-json-stable-stringify": "^2.1.0",
-    "firebase": "^9.8.3",
+    "firebase": "^9.8.4",
     "fleethub-core": "npm:latest",
     "gkcoi": "^1.3.5",
     "http-status-codes": "^2.2.0",

diff --git a/packages/site/public/locales/en/common.json b/packages/site/public/locales/en/common.json
@@ -1,4 +1,9 @@
 {
+  "meta": {
+    "title": "FleetHub",
+    "description": "FleetHub is KanColle's composition simulator that calculates CI proc rate, anti-install power, etc."
+  },
+  "Changelog": "Changelog",
   "FleetType": {
     "Main": "Main",
     "Escort": "Escort",
@@ -113,6 +118,7 @@
   },
   "AttackPower": "Attack Power",
   "BasicAttackPower": "Basic Attack Power",
+  "Damage": "Damage",
   "ScratchDamage": "Scratch",
   "hits": "Hits",
   "hit_rate": "Hit Rate",
@@ -273,6 +279,14 @@
   "Consume": "Consume",
   "Unknown": "Unknown",
   "None": "None",
+  "Settings": "Settings",
+  "Global": "Global",
+  "Download": "Download",
+  "Backup": "Backup",
+  "Restore": "Restore",
+  "AddShipConfig": "Add ship config",
+  "DeleteAllData": "Delete all data",
+  "AreYouSure": "Are you sure?",
   "RangeAbbr": {
     "Short": "S",
     "Medium": "M",

diff --git a/packages/site/public/locales/ja/common.json b/packages/site/public/locales/ja/common.json
@@ -1,4 +1,9 @@
 {
+  "meta": {
+    "title": "作戦室",
+    "description": "作戦室は艦これの編成シミュレータです。カットイン発動率や対地火力などの計算ができます。"
+  },
+  "Changelog": "変更履歴",
   "FleetType": {
     "Main": "主力",
     "Escort": "護衛",
@@ -113,6 +118,7 @@
   },
   "AttackPower": "攻撃力",
   "BasicAttackPower": "基本攻撃力",
+  "Damage": "ダメージ",
   "ScratchDamage": "割合",
   "hits": "回数",
   "hit_rate": "命中率",
@@ -273,6 +279,14 @@
   "Consume": "消費する",
   "Unknown": "不明",
   "None": "なし",
+  "Settings": "設定",
+  "Global": "全体",
+  "Download": "ダウンロード",
+  "Backup": "バックアップ",
+  "Restore": "復元",
+  "AddShipConfig": "艦娘設定を追加",
+  "DeleteAllData": "すべてのデータを削除する",
+  "AreYouSure": "よろしいですか？",
   "RangeAbbr": {
     "Short": "短",
     "Medium": "中",

diff --git a/packages/site/public/locales/ko/common.json b/packages/site/public/locales/ko/common.json
@@ -1,4 +1,9 @@
 {
+  "meta": {
+    "title": "작전실",
+    "description": "작전실은 칸코레의 편성 시뮬레이터입니다.컷인 발동률이나 대지보정 등의 계산을 할 수 있습니다."
+  },
+  "Changelog": "변경 로그",
   "FleetType": {
     "Main": "주력",
     "Escort": "호위",
@@ -113,6 +118,7 @@
   },
   "AttackPower": "공격력",
   "BasicAttackPower": "기본 공격력",
+  "Damage": "데미지",
   "ScratchDamage": "지근탄",
   "hits": "횟수",
   "hit_rate": "명중률",
@@ -239,7 +245,7 @@
   "EditMiscStats": "기타 상태를 편집합니다",
   "CreateComposition": "편성 만들기",
   "CreateFolder": "폴더 만들기",
-  "OpenFolderPage": "폴더 페이지를 열다",
+  "OpenFolderPage": "폴더화면 열기",
   "ProcRate": "발동률",
   "Proficiency": "숙련도",
   "Normal": "통상",
@@ -273,6 +279,14 @@
   "Consume": "소비하다",
   "Unknown": "알 수 없음",
   "None": "없음",
+  "Settings": "설정",
+  "Global": "글로벌",
+  "Download": "다운로드",
+  "Backup": "백업",
+  "Restore": "복원",
+  "AddShipConfig": "함선 설정 추가",
+  "DeleteAllData": "모든 데이터 삭제",
+  "AreYouSure": "확실합니까?",
   "RangeAbbr": {
     "Short": "단",
     "Medium": "중",

diff --git a/packages/site/public/locales/zh-CN/common.json b/packages/site/public/locales/zh-CN/common.json
@@ -1,4 +1,9 @@
 {
+  "meta": {
+    "title": "作战室",
+    "description": "作战室是舰Colle的编成模拟器。可以计算CI发动率、对陆攻击力等。"
+  },
+  "Changelog": "更改日志",
   "FleetType": {
     "Main": "主力",
     "Escort": "护卫",
@@ -113,6 +118,7 @@
   },
   "AttackPower": "攻击力",
   "BasicAttackPower": "基本攻击力",
+  "Damage": "伤害",
   "ScratchDamage": "擦弹",
   "hits": "回数",
   "hit_rate": "命中率",
@@ -268,11 +274,19 @@
   "Close": "关闭",
   "Help": "帮助",
   "Save": "保存",
-  "Change": "变化",
+  "Change": "更改",
   "Remove": "删除",
   "Consume": "消费",
   "Unknown": "未知",
   "None": "无",
+  "Settings": "设置",
+  "Global": "综合",
+  "Download": "下载",
+  "Backup": "备份",
+  "Restore": "恢复",
+  "AddShipConfig": "添加舰娘设置",
+  "DeleteAllData": "删除所有数据",
+  "AreYouSure": "你确定吗？",
   "RangeAbbr": {
     "Short": "短",
     "Medium": "中",

diff --git a/packages/site/public/locales/zh-TW/common.json b/packages/site/public/locales/zh-TW/common.json
@@ -1,4 +1,9 @@
 {
+  "meta": {
+    "title": "作戰室",
+    "description": "作戰室是艦Colle的編成模擬器。可以計算CI發動率、對陸攻擊力等。"
+  },
+  "Changelog": "更改日誌",
   "FleetType": {
     "Main": "主力",
     "Escort": "護衛",
@@ -113,6 +118,7 @@
   },
   "AttackPower": "攻擊力",
   "BasicAttackPower": "基本攻擊力",
+  "Damage": "傷害",
   "ScratchDamage": "擦彈",
   "hits": "回數",
   "hit_rate": "命中率",
@@ -232,14 +238,14 @@
   "Equipment": "裝備",
   "Stars": "改修值",
   "Presets": "預設",
-  "Folder": "文件夾",
+  "Folder": "資料夾",
   "Description": "描述",
   "Type": "類型",
   "BatchOperation": "批量操作",
   "EditMiscStats": "編輯雜項狀態",
   "CreateComposition": "編成",
-  "CreateFolder": "創建文件夾",
-  "OpenFolderPage": "打開文件夾頁麵",
+  "CreateFolder": "建立資料夾",
+  "OpenFolderPage": "開啟資料夾頁",
   "ProcRate": "發動率",
   "Proficiency": "熟練度",
   "Normal": "平擊",
@@ -268,11 +274,19 @@
   "Close": "關閉",
   "Help": "幫助",
   "Save": "儲存",
-  "Change": "變化",
+  "Change": "更改",
   "Remove": "刪除",
   "Consume": "消耗",
   "Unknown": "未知",
   "None": "無",
+  "Settings": "設定",
+  "Global": "全域",
+  "Download": "下載",
+  "Backup": "備份",
+  "Restore": "恢復",
+  "AddShipConfig": "新增艦娘設定",
+  "DeleteAllData": "刪除所有數據",
+  "AreYouSure": "你確定嗎？",
   "RangeAbbr": {
     "Short": "短",
     "Medium": "中",

diff --git a/packages/site/src/components/molecules/CopyTextButton/index.tsx b/packages/site/src/components/molecules/CopyTextButton/index.tsx
@@ -1,9 +1,9 @@
+import { copy } from "@fh/utils";
 import Assignment from "@mui/icons-material/Assignment";
 import { useTranslation } from "next-i18next";
 import React from "react";
 
 import { useSnackbar } from "../../../hooks";
-import { copy } from "../../../utils";
 import { withIconButton } from "../IconButtons";
 
 const AssignmentButton = withIconButton(Assignment);