From f68b0f910dd5197b77b2aad947b1e7bf36fb3648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Thu, 19 Jun 2025 23:54:02 +0800
Subject: [PATCH] dev

---
 backend/core/basic/character.py               |   2 ++
 backend/core/basic/skill.py                   |   4 ----
 .../GF/swordman_male/weapon_master.py         |   2 ++
 backend/dataFiles/dcalc_0.db                  | Bin 1007616 -> 1007616 bytes
 .../Skill/components/SkillDetail/index.tsx    |   6 +++---
 frontend/src/pages/IndexView.vue              |   2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py
index a35323fa..bca12c58 100644
--- a/backend/core/basic/character.py
+++ b/backend/core/basic/character.py
@@ -1025,6 +1025,8 @@ class Character(CharacterProperty):
         awake_ratio_new = ((main + 5250) / 750 + 1) *(buffer_power + 5000) * 0.000025 if buffer_power > 0 else 0
         awake_ratio_old = main / 750 + 1
         for i in self.skills:
+            if i.lv > 0 and i.hasUP and i.up is not None and i.up > 0:
+                self.SetStatus(四维=40)
             if i.buffer and i.lv > 0:
                 info = i.skillInfo()
                 # 奶自己的面板加成
diff --git a/backend/core/basic/skill.py b/backend/core/basic/skill.py
index 40d87ffc..66610832 100644
--- a/backend/core/basic/skill.py
+++ b/backend/core/basic/skill.py
@@ -270,8 +270,6 @@ class ActiveSkill(Skill):
     def setUP(self):
         if not self.hasUP:
             return
-        if self.char.buffer:
-            self.char.SetStatus(四维=40)
         if self.up == 1:
             if self.learnLv < 35:
                 self.skillRation *= 1.6
@@ -428,8 +426,6 @@ class BuffSkill(Skill):
     def setUP(self):
         if not self.hasUP:
             return
-        if self.char.buffer and self.up > 0:
-            self.char.SetStatus(四维=40)
         if self.up == 1:
             ...
         elif self.up == 2:
diff --git a/backend/core/character/GF/swordman_male/weapon_master.py b/backend/core/character/GF/swordman_male/weapon_master.py
index 6534946c..fc511ed1 100644
--- a/backend/core/character/GF/swordman_male/weapon_master.py
+++ b/backend/core/character/GF/swordman_male/weapon_master.py
@@ -1150,6 +1150,8 @@ class Skill23(ActiveSkill):
     hit1 = 1
     # 上斩攻击力 : {value2}%
     data2 = get_data(f"{prefix}/{uuid}", 2, lambda x = None: x)
+    # 韩服接口数据有问题 后续再确认
+    power2 = 2
     hit2 = 1
     # 上斩浮空力 : {value3}
     data3 = get_data(f"{prefix}/{uuid}", 3, lambda x = None: x)
diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db
index e6c978f0bd4f35a028d6a63fe8bf780a48fe5709..1fa3405ece8130daeccede21b0489d38b8aaf12f 100644
GIT binary patch
delta 2371
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
X+#Jc3Za$gIk<URsr*<+oqp|5fLnTPK

delta 2397
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
bpZEuaCs_A7VOxh^WS_)7hu-0Lj;Z?(+89^!

diff --git a/frontend/src/pages/Character/Skill/components/SkillDetail/index.tsx b/frontend/src/pages/Character/Skill/components/SkillDetail/index.tsx
index 373273fe..3eb45e75 100644
--- a/frontend/src/pages/Character/Skill/components/SkillDetail/index.tsx
+++ b/frontend/src/pages/Character/Skill/components/SkillDetail/index.tsx
@@ -100,7 +100,7 @@ export default defineComponent({
           )}
         </div>
         <div class="skill_title">技能描述</div>
-        <div class="h-auto max-h-250px">
+        <div class="h-auto max-h-200px">
           <div class="h-full overflow-y-auto bg-#161816 p-2px">
             {desc.value?.map((item) =>
               // item.startsWith('[') || item.startsWith('-') || item.startsWith('<') ? (
@@ -138,8 +138,8 @@ export default defineComponent({
                 <div class="flex flex-col gap-2px">
                   <div class="skill_vp_title">{item.name}</div>
                   <div class="skill_title">技能描述</div>
-                  <div class="h-auto max-h-200px">
-                    <div class="h-full bg-#161816 p-2px" style="white-space: pre-wrap;">
+                  <div class="h-auto bg-#161816 max-h-300px overflow-y-auto">
+                    <div class="h-auto  p-2px" style="white-space: pre-wrap;">
                       {item.descDetail}
                     </div>
                   </div>
diff --git a/frontend/src/pages/IndexView.vue b/frontend/src/pages/IndexView.vue
index 1500d8e5..3cc7f557 100644
--- a/frontend/src/pages/IndexView.vue
+++ b/frontend/src/pages/IndexView.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts" name="index" setup>
 const zoom = computed(() => {
-  const DPI = Math.max(0.85,Math.min(/macintosh|mac os x/i.test(navigator.userAgent.toLowerCase()) ? 1 : window.devicePixelRatio || 1,2)) * 0.85
+  const DPI = Math.max(0.85,Math.min(/macintosh|mac os x/i.test(navigator.userAgent.toLowerCase()) ? 1 : window.devicePixelRatio || 1,2)) * 1.0
   return /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent || navigator.vendor || (window as any).opera) ? 1 :(window.screen.width / 1800 / DPI).toFixed(2)
 })
 import { useDialog } from '@/components/hooks/dialog'