dev

backend/core/basic/character.py

@@ -366,16 +366,15 @@ class Character(CharacterProperty):
     def SetSkillCD(self, min=1, max=100, cd=0, exclude=[50, 85, 100]) -> None:
         """
         设置技能CD
-        type: -1 全部, 0 被动, 1 主动
         """
         for skill in self.skills:
-            if min <= skill.learnLv <= max and skill.damage and skill.learnLv not in exclude:
+            if min <= skill.learnLv <= max and (skill.type == 'active' or skill.damage) and skill.learnLv not in exclude:
                 skill.cdReduce *= 1 - cd
 
     def SetSkillCDRecover(self, min=1, max=100, cd=0, exclude=[50, 85, 100]) -> None:
         """设置技能CD恢复"""
         for skill in self.skills:
-            if min <= skill.learnLv <= max and skill.damage and skill.learnLv not in exclude:
+            if min <= skill.learnLv <= max and (skill.type == 'active' or skill.damage) and skill.learnLv not in exclude:
                 skill.cdRecover += cd
 
     def SetSkillRation(self, min=1, max=100, ratio=0, type=0) -> None:

backend/core/character/GF/priest_female/crusader_female.py

@@ -12,7 +12,7 @@ class Skill0(PassiveBufferSkill):
     position = 3 #TODO
     rangeLv = 1
 
-    CarryRatio = [0, 4.5 * 3]# noqa: E501
+    CarryRatio = [0, (1.045 ** 3) * 100 - 100]# noqa: E501
 
 
 # 启示 : 惩戒 계시 : 크루세이드