dev

backend/core/basic/character.py

@@ -946,6 +946,7 @@ class Character(CharacterProperty):
                                 'cd': temp[2],
                                 'mode': mode,
                                 'learnLv': i.learnLv,
+                                'type': i.type,
                             }
                         )
         ratios = self.calc_damage_ration(DSB,BUFF)
@@ -1051,6 +1052,7 @@ class Character(CharacterProperty):
                         "lv": i.lv,
                         # 对自己的加成 三攻 力智 伤害直接加成
                         "buff":[value, value1, value2, value3],
+                        "type":i.type
                     })
         return skillInfos
 

backend/core/basic/formula.py

@@ -411,7 +411,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '暗殿骑士-鬼剑士(女)': (3.5, 3.5, 5.5, 5.5),
     '契魔者-鬼剑士(女)': (5.5, 5.5, 3.5, 3.5),
     '流浪武士-鬼剑士(女)': (5.5, 5.5, 3.5, 3.5),
-    '圣骑士-圣职者(男)': (3.5, 5.5, 3.5, 5.5),
+    '圣骑士-圣职者(男)': (3.5, 5.5, 4.5, 5.5),
     '蓝拳圣使-圣职者(男)': (5.2, 5, 3.9, 3.9),
     '驱魔师-圣职者(男)': (5, 4, 5, 4),
     '复仇者-圣职者(男)': (3.5, 3.5, 5.5, 5.5),
@@ -423,7 +423,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '缪斯-弓箭手': (3.5, 5.5, 3.5, 5.5),
     '旅人-弓箭手': (5.5, 5.5, 3.5, 3.5),
     '猎人-弓箭手': (5.5, 5.5, 3.5, 3.5),
-    '妖护使-弓箭手': (5.5, 5.5, 3.5, 3.5),
+    '妖护使-弓箭手': (5.5, 5.5, 5.5, 3.5),
     '奇美拉-弓箭手': (5.5, 5.5, 3.5, 3.5),
 }
 

backend/core/basic/property.py

@@ -24,6 +24,12 @@ class CharacterInfo(enum.Enum):
     INT = '智力', '/ui/UI_ProfileIcon_003.png', lambda x: round(x, 0)
     """智力"""
 
+    Spirit = '精神', '/ui/UI_ProfileIcon_002.png', lambda x: round(x, 0)
+    """精神"""
+
+    Vitality = '体力', '/ui/UI_ProfileIcon_003.png', lambda x: round(x, 0)
+    """体力"""
+
     AtkP = '物理攻击', '/ui/UI_ProfileIcon_006.png', lambda x: round(x, 0)
     """物理攻击力"""
 

backend/core/character/GF/archer/chimera.py

@@ -57,7 +57,7 @@ class Skill2(PassiveSkill):
     """
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 1
     rangeLv = 1

backend/core/character/GF/gunblader/agent.py

@@ -72,7 +72,7 @@ class Skill3(PassiveSkill):
     """
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 1 #TODO
     rangeLv = 1

backend/core/character/GF/gunblader/hitman.py

@@ -65,7 +65,7 @@ class Skill4(PassiveSkill):
     """
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 1 #TODO
     rangeLv = 1

backend/core/character/GF/gunblader/specialist.py

@@ -81,7 +81,7 @@ class Skill4(PassiveSkill):
     """
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 1 #TODO
     rangeLv = 1

backend/core/character/GF/gunner_female/mechanic_female.py

@@ -62,7 +62,7 @@ class Skill2(ActiveSkill):
 class Skill3(PassiveSkill):
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 1 #TODO
     rangeLv = 1

backend/core/character/GF/gunner_male/assault.py

@@ -58,7 +58,7 @@ class Skill2(ActiveSkill):
 class Skill3(PassiveSkill):
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 1 #TODO
     rangeLv = 1

backend/core/character/GF/swordman_female/sword_master.py

@@ -49,6 +49,8 @@ class Skill1(ActiveSkill):
     rangeLv = 1
     mp = [6, 6]
     uuid = "b89c9ab317bc0a443f6497b7cca2f6a8"
+    hasVP = False
+    hasUP = False
 
     # 巨剑 180.53+205.90+127.83
     data0 = [int(i) for i in [0, 514.25]]
@@ -128,7 +130,7 @@ class Skill3(ActiveSkill):
         return super().getSkillCD()
 
 
-# 武器熟练
+# 兵刃奥义
 # swordman_female/sword_master/4224f9b0b8c7c903e9a1e0f9d9f6d04d
 # 1645c45aabb008c98406b3a16447040d/4224f9b0b8c7c903e9a1e0f9d9f6d04d
 class Skill4(PassiveSkill):
@@ -138,7 +140,7 @@ class Skill4(PassiveSkill):
     首次学习时， 可使所有武器精通各提升2级； 以后技能每提升1级时， 武器精通提升1级。\n
     可以使用驭剑士专属的基础攻击动作。
     """
-    name = "武器熟练"
+    name = "兵刃奥义"
     learnLv = 15
     masterLv = 20
     maxLv = 30
@@ -160,6 +162,8 @@ class Skill5(PassiveSkill):
     position = 6
     rangeLv = 2
     uuid = "78bd107acd474518b606be1e4fd38239"
+    hasVP = False
+    hasUP = False
 
     damage = False
 
@@ -183,6 +187,7 @@ class Skill6(ActiveSkill):
     cd = 5
     mp = [94, 1029]
     uuid = "ade01c1d6afc8a05055225045e89fe49"
+    hasVP = False
     hasUP = False
     # 火属性效果触发几率 : {value0}%
     data0 = get_data(f'{prefix}/{uuid}', 0, lambda x = None: x)
@@ -436,6 +441,8 @@ class Skill12(ActiveSkill):
     cd = 30
     mp = [60, 420]
     uuid = "45442bbbe33540b4deeec29437dae70c"
+    hasVP = False
+    hasUP = False
 
     # 触发几率 : {value0}%
     data0 = get_data(f'{prefix}/{uuid}', 0, lambda x = None: x)
@@ -460,6 +467,8 @@ class Skill13(ActiveSkill):
     cd = 7
     mp = [20, 210]
     uuid = "8f73f243041c2d27739fe7696f02bf9b"
+    hasVP = False
+    hasUP = True
 
     # 斩击攻击力 : {value0}%
     data0 = get_data(f'{prefix}/{uuid}', 0, lambda x = None: x)

backend/core/character/GF/thief/rogue.py

@@ -54,7 +54,7 @@ class Skill0(ActiveSkill):
 class Skill3(PassiveSkill):
     name = "基础精通"
     learnLv = 1
-    masterLv = 190
+    masterLv = 115
     maxLv = 200
     position = 0
     rangeLv = 1

backend/core/character/adventure.py

@@ -71,7 +71,7 @@ adv = [
             {'id': 1, 'name': 'launcher_female', 'title': '重霄·枪炮师', 'open': True,'class':'GF.gunner_female.launcher_female'},
             {'id': 2, 'name': 'mechanic_female', 'title': '重霄·机械师', 'open': False,'class': 'GF.gunner_female.mechanic_female'},
             {'id': 3, 'name': 'spitfire_female', 'title': '重霄·弹药专家', 'open': True, 'class': 'GF.gunner_female.spitfire_female'},
-            {'id': 4, 'name': 'paramedic', 'title': '重霄·协战师', 'open': False, 'class': 'GF.gunner_female.paramedic'},
+            {'id': 4, 'name': 'paramedic', 'title': '重霄·协战师', 'open': True, 'class': 'GF.gunner_female.paramedic'},
         ],
     },
     {

backend/core/equipment/version_0/equ.py

@@ -1327,6 +1327,11 @@ def equ_81(char: CharacterProperty):
     魔法值-10%
     物理暴击率+2%
     """
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1342,6 +1347,11 @@ def equ_82(char: CharacterProperty):
     魔法值-10%
     物理暴击率+2%
     """
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1357,6 +1367,11 @@ def equ_83(char: CharacterProperty):
     魔法值-10%
     物理暴击率+2%
     """
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1372,6 +1387,11 @@ def equ_84(char: CharacterProperty):
     魔法值-10%
     物理暴击率+2%
     """
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1387,6 +1407,11 @@ def equ_85(char: CharacterProperty):
     魔法值-10%
     物理暴击率+2%
     """
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1672,6 +1697,11 @@ def equ_102(char: CharacterProperty):
             skill.skillRation *= 1.15
         if skill.damage and skill.cube > 0:
             skill.skillDamage *= 1.25
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1696,6 +1726,11 @@ def equ_103(char: CharacterProperty):
             skill.skillDamage *= 1.25
         if skill.damage and skill.cube == 0:
             skill.skillDamage *= 1.10
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1723,6 +1758,11 @@ def equ_104(char: CharacterProperty):
         if skill.damage and skill.cube == 0:
             skill.skillDamage *= 1.25
     char.equ_effect.append(EquEffect(name='燃烧', icon='/equipment/icon/weapon/gunner/musket/00234.png', cd=0.2, data=480))
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1807,6 +1847,11 @@ def equ_110(char: CharacterProperty):
     -技能冷却时间-20%（觉醒技能除外）
     """
     char.SetSkillCD(1, 100, 0.2)
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetStatus(SkillAttack=0.123)
     pass
 
 
@@ -1829,6 +1874,11 @@ def equ_111(char: CharacterProperty):
     """
     char.SetSkillCD(1, 100, 0.2)
     char.equ_effect.append(EquEffect(name='自动爆炸', icon='/equipment/skill/33.png', cd=10, data=47647))
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetStatus(SkillAttack=0.123)
     pass
 
 
@@ -1851,6 +1901,11 @@ def equ_112(char: CharacterProperty):
     """
     char.SetSkillCD(1, 100, 0.2)
     char.equ_effect.append(EquEffect(name='自动爆炸', icon='/equipment/skill/33.png', cd=10, data=95294))
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetStatus(SkillAttack=0.123)
     pass
 
 
@@ -1937,6 +1992,11 @@ def equ_118(char: CharacterProperty):
     -冷却时间：40秒
     """
     char.equ_effect.append(EquEffect(name='发射巨炮', icon='/equipment/skill/41.png', cd=40, data=113400))
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1954,6 +2014,11 @@ def equ_119(char: CharacterProperty):
     -冷却时间：40秒
     """
     char.equ_effect.append(EquEffect(name='发射巨炮', icon='/equipment/skill/41.png', cd=40, data=226800))
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -1971,6 +2036,11 @@ def equ_120(char: CharacterProperty):
     -冷却时间：40秒
     """
     char.equ_effect.append(EquEffect(name='发射巨炮', icon='/equipment/skill/41.png', cd=40, data=340200))
+    if char.buffer:
+        char.AddSkillLv(1, 100, 2)
+        char.BuffSkill.lv += 3
+        char.AwakeSkill.lv += 4
+        char.SetSkillCD(cd=0.2)
     pass
 
 
@@ -12589,25 +12659,26 @@ def equ_876(char: CharacterProperty):
     equ_414(char)
     pass
 
-@register
-def equ_877(char: CharacterProperty):
-    ...
 
 @register
-def equ_878(char: CharacterProperty):
-    ...
+def equ_877(char: CharacterProperty): ...
+
 
 @register
-def equ_879(char: CharacterProperty):
-    ...
+def equ_878(char: CharacterProperty): ...
+
 
 @register
-def equ_880(char: CharacterProperty):
-    ...
+def equ_879(char: CharacterProperty): ...
+
 
 @register
-def equ_881(char: CharacterProperty):
-    ...
+def equ_880(char: CharacterProperty): ...
+
+
+@register
+def equ_881(char: CharacterProperty): ...
+
 
 @register
 def equ_882(char: CharacterProperty):
@@ -12617,6 +12688,7 @@ def equ_882(char: CharacterProperty):
         char.SetSkillCD(cd=0.2)
     ...
 
+
 @register
 def equ_883(char: CharacterProperty):
     if char.equ_options.get('6', 0) == 0:
@@ -12625,6 +12697,7 @@ def equ_883(char: CharacterProperty):
         char.SetSkillCD(cd=0.2)
     ...
 
+
 @register
 def equ_884(char: CharacterProperty):
     if char.equ_options.get('6', 0) == 0:
@@ -12633,6 +12706,7 @@ def equ_884(char: CharacterProperty):
         char.SetSkillCD(cd=0.2)
     ...
 
+
 # endregion
 # region 秘宝装备
 @register
@@ -12679,6 +12753,7 @@ def equ_2000(char: CharacterProperty):
         char.AwakeSkill.lv += 2
     pass
 
+
 @register
 def equ_2001(char: CharacterProperty):
     """
@@ -13002,6 +13077,7 @@ def equ_3013(char: CharacterProperty):
     char.SetStatus(SpeedM=0.03, SpeedA=0.03, SpeedR=0.03, AttackP=0.2)
     pass
 
+
 @register
 def equ_3015(char: CharacterProperty):
     """
@@ -13021,6 +13097,7 @@ def equ_3015(char: CharacterProperty):
     char.SetStatus(SpeedM=0.03, SpeedA=0.03, SpeedR=0.03, AttackP=0.2)
     pass
 
+
 @register
 def equ_3016(char: CharacterProperty):
     """
@@ -13041,6 +13118,7 @@ def equ_3016(char: CharacterProperty):
     char.SetStatus(SpeedM=0.03, SpeedA=0.03, SpeedR=0.03, AttackP=0.22)
     pass
 
+
 # endregion
 # region 白嫖
 
@@ -13450,6 +13528,7 @@ def equ_4017(char: CharacterProperty):
     char.SetStatus(AttackP=0.25, SpeedM=0.04, SpeedA=0.04, SpeedR=0.04, BufferP=0.02)
     pass
 
+
 @register
 def equ_4018(char: CharacterProperty):
     """
@@ -13471,6 +13550,7 @@ def equ_4018(char: CharacterProperty):
     char.SetStatus(AttackP=0.35, SpeedM=0.05, SpeedA=0.05, SpeedR=0.05, BufferP=0.08)
     pass
 
+
 @register
 def equ_4019(char: CharacterProperty):
     """
@@ -13490,4 +13570,6 @@ def equ_4019(char: CharacterProperty):
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
     char.SetStatus(AttackP=0.35, SpeedM=0.04, SpeedA=0.04, SpeedR=0.04, BufferP=0.03)
+
+
 # endregion

frontend/src/api/calc/type.ts

@@ -17,6 +17,7 @@ export interface IResultSkill {
   mode: string
   buff: number[]
   learnLv: number
+  type: string
 }
 
 export interface IResultUserInfo {

frontend/src/pages/Character/Result/components/BufferSkill.vue

@@ -4,7 +4,7 @@
       <div class="flex px-1px gap-1px">
         <div
           v-for="(header, key) in [
-            { label: '技能', width: 120, sortKey: 'name' },
+            { label: '技能', width: 180, sortKey: 'name' },
             { label: 'CD', width: 50 },
             { label: '适用加成', width: 80, sortKey: 'MAIN' },
             { label: '三攻', width: 80, sortKey: 'ATK' },
@@ -24,9 +24,9 @@
       </div>
       <div class="overflow-y-auto max-h-600px">
         <div class="flex px-1px gap-1px h-8.5" v-for="(skill, _) in data" :key="_">
-          <div class="flex w-120px items-center gap-10px">
+          <div class="flex w-180px items-center gap-10px">
             <div class="w-28px h-28px relative">
-              <img :src="getImageURL(skill.icon)" alt="" class="w-28px h-28px" />
+              <img :src="getImageURL(skill.icon)" alt="" :class="['h-28px w-28px', skill.type === 'passive' ? 'passive' : '']" />
               <div v-if="skill.lv" class="skill-lv-min" :data-text="`${skill.lv}`">
                 {{ skill.lv }}
               </div>