From 4cbb4260a6de265d3a80ebf554b9bfef084ab539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Mon, 13 Apr 2026 20:13:20 +0800
Subject: [PATCH] dev

---
 backend/core/basic/character/base.py          |   2 +-
 backend/core/basic/character/calc_equip.py    |   2 +-
 .../core/equipment/version_0/oathSuitSkill.py |  11 +++++++++--
 backend/dataFiles/dcalc_0.db                  | Bin 1150976 -> 1150976 bytes
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/backend/core/basic/character/base.py b/backend/core/basic/character/base.py
index a0eec733..d6b77be5 100644
--- a/backend/core/basic/character/base.py
+++ b/backend/core/basic/character/base.py
@@ -368,4 +368,4 @@ class CharacterBase(CharacterProperty):
             if part in ['耳环', '辅助装备', '魔法石']:
                 reinforce_2 += num
         reinforce = reinforce_0 + reinforce_1 + reinforce_2 + reinforce_3
-        return [reinforce, reinforce_0, reinforce_1, reinforce_2, reinforce_3]
+        return [reinforce, reinforce_0, reinforce_1, reinforce_2]
diff --git a/backend/core/basic/character/calc_equip.py b/backend/core/basic/character/calc_equip.py
index a4f36770..cbb6ca69 100644
--- a/backend/core/basic/character/calc_equip.py
+++ b/backend/core/basic/character/calc_equip.py
@@ -160,7 +160,7 @@ class CalcEquipMixin(CharacterBase):
         for skill in oathSkillEffect:
             func = equs.funs.execture(f'oath_skill_{skill.id}')
             if func is not None:
-                print(f'誓约技能 {skill.name} 生效')
+                print(f'誓约技能 {skill.id} 生效')
                 func(self)
         if self.max_point >= 2550:
             skillAttack = (self.max_point - 2550) // 70 * 0.01
diff --git a/backend/core/equipment/version_0/oathSuitSkill.py b/backend/core/equipment/version_0/oathSuitSkill.py
index 74ed0cf0..20822a7c 100644
--- a/backend/core/equipment/version_0/oathSuitSkill.py
+++ b/backend/core/equipment/version_0/oathSuitSkill.py
@@ -1,9 +1,15 @@
+import inspect
+
 from core.abstract.character import CharacterProperty
 from core.basic.equipment import EquEffect
 from .register import register
 
 
-def check_suit(char: CharacterProperty, suitId: int) -> bool:
+def check_suit(char: CharacterProperty) -> bool:
+    caller_frame = inspect.stack()[1]
+    fun_name = caller_frame.function
+    suitId = int(fun_name.split('_')[-1]) % 10000 + 16000
+    print(f'检查套装 {suitId}')
     return next((x for x in char.suitInfo if x.suitId == suitId), None) is not None
 
 
@@ -170,6 +176,7 @@ def oath_skill_2020503(char: CharacterProperty):
 # region 理想之黄金乡
 @register
 def oath_skill_2030101(char: CharacterProperty):
+    oath_skill_2030501(char)
     pass
 
 
@@ -250,7 +257,7 @@ def oath_skill_2030501(char: CharacterProperty):
     char.SetStatus(SpeedA=0.01 * min(reinforce_2 // 3, 12))
     char.SetStatus(SpeedM=0.01 * min(reinforce_2 // 3, 12))
     char.SetStatus(SpeedR=0.01 * min(reinforce_2 // 3, 12))
-    if check_suit(char, 16203):
+    if check_suit(char):
         print('穿戴黄金乡')
         char.SetStatus(SkillRange=0.02 * min(reinforce // 11, 12))
         # char.SetStatus(DamageReduce=0.01 * min(reinforce_0 // 5, 7))
diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db
index da5ca8c24c5d4d25bafc24f2e98949dc39414214..620c726bae4092c9a5da8b75057231219dce74dc 100644
GIT binary patch
delta 128
zcmZoz;MTCfZGtr8<cTuQjFTG^S`!#s6PUIpFfUxs&%nSS#n8jRpT&2D&z^VXc7YAd
zGkKXCg;}N>Zf6#mUa*6ijn&Y=)WD$q^j>BlW&vVWAZ7z%b|B^eVoo6D0%C3;<^f_}
QAm#&N{_Ust3YcC30A__VTL1t6

delta 127
zcmZoz;MTCfZGtr8q=_=ljFTD@S`!#s6PUIpFfUxs&%2UAilK*rKa1}QpFQvT?E)K^
zXYz70Ffgz&Ff{VANbpZD+{!G*7}0)uFEbFc05K~NvjH(X5OV-AClGT1F*gwN05LBR
P^8qpc_S1U>OfLZd2Cgz1