第二章二区准备

src/plugin/settings.ts

@@ -1,5 +1,4 @@
 import { ref, watch } from 'vue';
-import { has } from './utils';
 
 /**
  * 打开和关闭ui时是否展示动画
@@ -21,6 +20,16 @@ export const autoSkill = ref(true);
  */
 export const autoScale = ref(true);
 
+/**
+ * 是否在地图上展示范围光环
+ */
+export const showHalo = ref(true);
+
+/**
+ * 是否展示已学习的技能
+ */
+export const showStudied = ref(true);
+
 watch(transition, n => {
     core.plugin.transition.value = n;
     core.setLocalStorage('transition', n);
@@ -41,6 +50,14 @@ watch(autoScale, n => {
     core.setLocalStorage('autoScale', n);
 });
 
+watch(showStudied, n => {
+    core.setLocalStorage('showStudied', n);
+});
+
+watch(showHalo, n => {
+    core.setLocalStorage('showHalo', n);
+});
+
 /**
  * 重置设置信息，从localStorage读取即可
  */
@@ -49,6 +66,8 @@ function reset() {
     transition.value = t;
     core.plugin.transition.value = transition.value;
     autoScale.value = core.getLocalStorage('autoScale', true);
+    showStudied.value = core.getLocalStorage('showStudied', true);
+    showHalo.value = core.getLocalStorage('showHalo', true);
 }
 
 function resetFlag() {

src/plugin/ui/equipbox.tsx

@@ -21,11 +21,10 @@ export function getAddStatus(equip: Equip) {
     return (
         <div class="equip-add-detail">
             {keys.map(v => {
-                const value =
-                    (equip.value[v] ?? 0) +
-                    Math.floor(
+                const value = Math.floor(
+                    (equip.value[v] ?? 0) * core.getBuff(v) +
                         (core.status.hero[v] * (equip.percentage[v] ?? 0)) / 100
-                    );
+                );
 
                 return (
                     <span style="display: flex">
@@ -72,7 +71,9 @@ export function getNowStatus(nowEquip?: Equip, onCol: boolean = false) {
 
                 let add = 0;
                 if (has(nowEquip)) {
-                    add += nowEquip.value[v] ?? 0;
+                    add += Math.floor(
+                        (nowEquip.value[v] ?? 0) * core.getBuff(v)
+                    );
                     const per = Math.floor(
                         (nowEquip.percentage[v] * core.getStatus(v)) / 100
                     );

src/plugin/uiController.ts

@@ -18,6 +18,7 @@ export const descOpened = ref(false);
 export const skillOpened = ref(false);
 export const skillTreeOpened = ref(false);
 export const flyOpened = ref(false);
+export const showStudiedSkill = ref(false);
 
 export const transition = ref(true);
 export const noClosePanel = ref(false);
@@ -67,7 +68,8 @@ export default function init() {
         descOpened,
         skillOpened,
         skillTreeOpened,
-        flyOpened
+        flyOpened,
+        showStudiedSkill
     };
 }