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'},
         ],
     },
     {

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>