From 01ce6504c9b8eb2e842e4e1daca0007937c6ef11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Sun, 27 Jul 2025 10:16:28 +0800
Subject: [PATCH] dev

---
 .../core/character/GF/swordman_male/weapon_master.py   | 10 +++++-----
 .../Character/Skill/components/SkillDetail/style.scss  |  1 -
 frontend/src/style/char-face.scss                      |  2 +-
 frontend/src/style/char-img-jpg.scss                   |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/core/character/GF/swordman_male/weapon_master.py b/backend/core/character/GF/swordman_male/weapon_master.py
index c91a59c3..76fbe395 100644
--- a/backend/core/character/GF/swordman_male/weapon_master.py
+++ b/backend/core/character/GF/swordman_male/weapon_master.py
@@ -168,7 +168,7 @@ class Skill3(PassiveSkill):
     def effect(self, old, new):
         weapon = self.char.GetWeaponType()
         if weapon[0] != "光剑":
-            return
+            return None
         data = self.data0
         if weapon[1] == "传世武器":
             data = self.data16
@@ -268,7 +268,7 @@ class Skill5(PassiveSkill):
     def effect(self, old, new):
         weapon = self.char.GetWeaponType()
         if weapon[0] != "短剑":
-            return
+            return None
         data = self.data0
         if weapon[1] == "传世武器":
             data = self.data13
@@ -337,7 +337,7 @@ class Skill6(ActiveSkill):
     def effect(self, old, new):
         weapon = self.char.GetWeaponType()
         if weapon[0] != "太刀":
-            return
+            return None
         data = self.data0
         if weapon[1] == "传世武器":
             data = self.data10
@@ -409,7 +409,7 @@ class Skill7(PassiveSkill):
     def effect(self, old, new):
         weapon = self.char.GetWeaponType()
         if weapon[0] != "巨剑":
-            return
+            return None
         data = self.data0
         if weapon[1] == "传世武器":
             data = self.data9
@@ -472,7 +472,7 @@ class Skill8(PassiveSkill):
     def effect(self, old, new):
         weapon = self.char.GetWeaponType()
         if weapon[0] != "钝器":
-            return
+            return None
         data = self.data0
         if weapon[1] == "传世武器":
             data = self.data9
diff --git a/frontend/src/pages/Character/Skill/components/SkillDetail/style.scss b/frontend/src/pages/Character/Skill/components/SkillDetail/style.scss
index bc7ea6d1..3b6a2b38 100644
--- a/frontend/src/pages/Character/Skill/components/SkillDetail/style.scss
+++ b/frontend/src/pages/Character/Skill/components/SkillDetail/style.scss
@@ -92,7 +92,6 @@
   display: flex;
   align-items: center;
   margin-left:auto;
-  display: flex;
   margin-top: auto;
   color:#4AA256;
 }
diff --git a/frontend/src/style/char-face.scss b/frontend/src/style/char-face.scss
index 4ba7ae09..2b6ad54d 100644
--- a/frontend/src/style/char-face.scss
+++ b/frontend/src/style/char-face.scss
@@ -309,7 +309,7 @@
 // 皓曦·帕拉丁
 .paladin {
   background-image: url(https://bbscdn.df.nexon.com/pg/characters/img/main/mc_12_03.png);
-  background-position: -545- 265;
+  background-position: -545 -265;
 }
 
 // 皓曦·龙骑士
diff --git a/frontend/src/style/char-img-jpg.scss b/frontend/src/style/char-img-jpg.scss
index b81e0245..4c49fdfb 100644
--- a/frontend/src/style/char-img-jpg.scss
+++ b/frontend/src/style/char-img-jpg.scss
@@ -148,7 +148,7 @@
 }
 // 神启·圣骑士
 .crusader_male,
-crusader_male_carry {
+.crusader_male_carry {
   background: url(//cdn.df.nexon.com/img/char_info/bg/bg36_3.jpg) no-repeat;
 }
 // 神启·蓝拳圣使