diff --git a/backend/core/basic/character/calc_equip.py b/backend/core/basic/character/calc_equip.py index 011fb250..b7e58d4a 100644 --- a/backend/core/basic/character/calc_equip.py +++ b/backend/core/basic/character/calc_equip.py @@ -284,23 +284,25 @@ class CalcEquipMixin(CharacterBase): def calc_oath_upgrade(self): """计算装备基础效果""" - for item in self.charOathInfo: + for index,item in enumerate(self.charOathInfo): # 誓约升级效果 if item.oathInfo and item.oathInfo.itemDetailType == '誓约': for upgrade in item.upgrade: - if upgrade == 1: - self.SetStatus(SkillAttack=0.04,Buffer=800) - pass - elif upgrade == 2: - self.SetSkillCD(cd=0.08) - self.SetStatus(EquEffectRatio=0.04,Buffer=800) - elif upgrade == 3: - # 誓约积分 +25 - item.oathInfo.Point += 25 - elif upgrade == 4: - self.SetStatus(SpeedA=0.04, SpeedM=0.04, SpeedR=0.04, SkillAttack=0.04, Buffer=800) - elif upgrade == 5 or upgrade == 6: - self.SetStatus(SkillAttack=0.04,Buffer=800) + if index <= 3: + if upgrade == 1: + self.SetStatus(SkillAttack=0.04,Buffer=800) + pass + elif upgrade == 2: + self.SetSkillCD(cd=0.08) + self.SetStatus(EquEffectRatio=0.04,Buffer=800) + elif upgrade == 3: + # 誓约积分 +25 + item.oathInfo.Point += 25 + else: + if upgrade == 1: + self.SetStatus(SpeedA=0.04, SpeedM=0.04, SpeedR=0.04, SkillAttack=0.04, Buffer=800) + elif upgrade == 2 or upgrade == 3: + self.SetStatus(SkillAttack=0.04,Buffer=800) pass pass diff --git a/backend/core/character/GF/extra/creator.py b/backend/core/character/GF/extra/creator.py index 7793bb46..ff238437 100644 --- a/backend/core/character/GF/extra/creator.py +++ b/backend/core/character/GF/extra/creator.py @@ -18,7 +18,6 @@ class CreatorActiveSkill(ActiveSkill): # 烈火燎原 # extra/creator/527cdc3ecca985e18ef819d456532b26 # b522a95d819a5559b775deb9a490e49a/527cdc3ecca985e18ef819d456532b26 -# TOCHEK-STONE:技能集合:Stone 独有「觉醒之心」,核对是否属于 dcalc 的伤害计算范围。 class Skill0(CreatorActiveSkill): """ 从地表生成火焰攻击敌人。\n diff --git a/backend/core/character/GF/extra/dark_knight.py b/backend/core/character/GF/extra/dark_knight.py index bdfd867d..d8ed3105 100644 --- a/backend/core/character/GF/extra/dark_knight.py +++ b/backend/core/character/GF/extra/dark_knight.py @@ -41,7 +41,6 @@ class DarkKnightSkill(ActiveSkill): # 暗影斩 # extra/dark_knight/eb71e1d82d92c7e1d40500a0dcd77aa6 # 17e417b31686389eebff6d754c3401ea/eb71e1d82d92c7e1d40500a0dcd77aa6 -# TOCHEK-STONE:职业计算口径:Stone 仅单技能冷却并固定页面物理上下文;dcalc 有连招排列,需统一比较场景。 class Skill0(DarkKnightSkill): """ 凝聚力量并对前方敌人发出强力的暗属性斩击。\n diff --git a/backend/core/character/GF/imperialknight/breaker.py b/backend/core/character/GF/imperialknight/breaker.py index c348a38b..1683aaad 100644 --- a/backend/core/character/GF/imperialknight/breaker.py +++ b/backend/core/character/GF/imperialknight/breaker.py @@ -1025,6 +1025,7 @@ class Skill30(ActiveSkill): [目标技能]\n [舰炮飞踢]、 [无畏登舰]、 [枪锚踢击]、 [怒海冲击]、 [战栗轰击]\n """ + # 游戏内存在bug ... # 气卷万涛 diff --git a/backend/core/character/GF/mage_female/battle_mage.py b/backend/core/character/GF/mage_female/battle_mage.py index 9a5410d0..59fa53b1 100644 --- a/backend/core/character/GF/mage_female/battle_mage.py +++ b/backend/core/character/GF/mage_female/battle_mage.py @@ -622,7 +622,6 @@ class Skill19(ActiveSkill): # 实战型替身草人 # mage_female/battle_mage/fc30c667a58e1dd54b5d214e04f4f23c # 3909d0b188e9c95311399f776e331da5/fc30c667a58e1dd54b5d214e04f4f23c -# TOCHEK-STONE:基础类:Stone 为 ActiveSkill,dcalc 为 PassiveSkill;确认面板、关联与计算行为是否等价。 class Skill20(PassiveSkill): """ 克服无数次危机后总结出的独门替身草人使用方法。\n diff --git a/frontend/src/stores/info.ts b/frontend/src/stores/info.ts index a78ac5b7..74e1ef89 100644 --- a/frontend/src/stores/info.ts +++ b/frontend/src/stores/info.ts @@ -152,8 +152,8 @@ export const useInfoStore = defineStore('infoStore', () => { '下装', '鞋', '宠物', - '宠物装备-红', '宠物装备-绿', + '宠物装备-红', '宠物装备-蓝', ]