update all

godismygirl · May 21, 2024 · 27f38c1 · 27f38c1
1 parent db194ad
commit 27f38c1
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 23 deletions.
diff --git a/public/font/Verdana.ttf b/public/font/Verdana.ttf
diff --git a/public/font/verdanab.ttf b/public/font/verdanab.ttf
diff --git a/src/AllyConfig/AttackRollConfig/index.jsx b/src/AllyConfig/AttackRollConfig/index.jsx
@@ -1,16 +1,11 @@
 import React from 'react';
 import { Checkbox } from 'antd';
-import { AC_MODIFIER } from '../../GlobalStore';
-import css from './css.module.css';
 
-const options = ['DARKNESS', 'HINDERING', 'CROSS_ALLY', 'FLANKING'];
+const options = ['DARKNESS', 'HINDERING', 'CROSS_ALLY'];
 
 //夹击
 
 const AttackRollConfig = () => {
-    const options = React.useMemo(() => {
-        return AC_MODIFIER.map((el) => ({ label: el.name, value: el.name }));
-    }, []);
     return <Checkbox.Group options={options}></Checkbox.Group>;
 };
 

diff --git a/src/AllyConfig/WeaponConfig/css.module.css b/src/AllyConfig/WeaponConfig/css.module.css
@@ -7,7 +7,6 @@
 
 .desc {
     font-size: 14px;
-    font-family: Verdana, Geneva, Tahoma, sans-serif;
 }
 
 .item {

diff --git a/src/AllyConfig/css.module.css b/src/AllyConfig/css.module.css
@@ -45,7 +45,6 @@
 }
 .sectionHeader .titleTag {
     font-weight: bold;
-    font-family: Verdana, Geneva, Tahoma, sans-serif;
     color: #fff;
     background: #222;
     padding: 4px 15px 4px 10px;

diff --git a/src/BattleField/css.module.css b/src/BattleField/css.module.css
@@ -43,7 +43,6 @@
 .tag {
     border-radius: 20px;
     white-space: nowrap;
-    font-family: Verdana, Geneva, Tahoma, sans-serif;
     border: 2px solid;
     font-size: 14px;
     padding: 2px 6px;

diff --git a/src/Dice/css.module.css b/src/Dice/css.module.css
@@ -45,7 +45,6 @@
     display: flex;
     transform: translate(-50%, -50%);
     font-style: normal;
-    font-family: 'Times New Roman', Times, serif;
     font-weight: bold;
     margin-top: -1%;
 }

diff --git a/src/EnemySelectPanel/css.module.css b/src/EnemySelectPanel/css.module.css
@@ -24,7 +24,6 @@
     padding: 0 2vh;
     border-radius: 0 0 8px 8px;
     cursor: pointer;
-    font-family: Verdana, Geneva, Tahoma, sans-serif;
 }
 .panel {
     display: flex;
@@ -61,7 +60,6 @@
 .action .count {
     flex-grow: 1;
     text-align: center;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
     font-size: 2.5vh;
 }
 

diff --git a/src/GlobalStore/names.js b/src/GlobalStore/names.js
@@ -19,3 +19,6 @@ export const DISCRIPLINE_NAMES = [
     'PRECISE_STRIKE',
     'MASTER_OF_THE_VESSEL',
 ];
+
+export const DEBUFF_NAMES = ['DARKNESS', 'HINDERING', 'CROSS_ALLY'];
+export const BUFF_NAMES = ['WILT', 'NEMESIS'];
diff --git a/src/global.css b/src/global.css
@@ -1,6 +1,17 @@
+@font-face {
+    font-family: 'Verdana';
+    src: url('../public/font/Verdana.ttf');
+}
+
+@font-face {
+    font-family: 'Verdana-Bold';
+    src: url('../public/font/verdanab.ttf');
+}
+
 html,
 body,
 #root {
     height: 100%;
     overflow: hidden;
+    font-family: 'DIN';
 }
diff --git a/src/index.css b/src/index.css
@@ -1,13 +1,6 @@
 body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+    margin: 0;
+    font-family: 'HELVATICA';
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
     .desc {
         font-size: 14px;
-        font-family: Verdana, Geneva, Tahoma, sans-serif;
     }
     .item {
@@ Expand Down @@