dev

backend/api/routes/info.py

@@ -81,8 +81,9 @@ async def get_skill_info(
                 if detail and len(detail) > 0:
                     skill_info['levelInfo'].update(detail[0])
                     skill_info['levelInfo']['detail'] = skill_info['levelInfo'].get('optionDesc', '')
-                    for key in skill_info['levelInfo']['optionValue'].keys():
-                        skill_info['levelInfo']['detail'] = skill_info['levelInfo']['detail'].replace(f'{{{key}}}', str(skill_info['levelInfo']['optionValue'][key]))
+                    if skill_info['levelInfo']['optionValue'] is not None:
+                        for key in skill_info['levelInfo']['optionValue'].keys():
+                            skill_info['levelInfo']['detail'] = skill_info['levelInfo']['detail'].replace(f'{{{key}}}', str(skill_info['levelInfo']['optionValue'][key]))
                     del skill_info['levelInfo']['rows']
                     skill_info['attribute'] = {}
                     skill_info['attribute'].update(skill_info['levelInfo'])

backend/core/basic/formula.py

@@ -173,6 +173,7 @@ def 勋章计算(装备等级, 品质, 强化等级):
     '玄机弓': (1.108, 1.09),
     '强攻弩': (1.12, 1.09),
     '妖影弓': (1.095, 1.1),
+    '嵌合弓': (1.1, 1.085),
 }
 
 
@@ -348,7 +349,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '圣职者(男)': (4.7, 4.8, 4, 4.5, 6.5, 6.5, 4.5, 6.5),
     '圣职者(女)': (4.7, 4.8, 4, 4.5, 6.5, 6.5, 4.5, 6.5),
     # todo
-    '弓箭手': (4.6, 4.6, 4.4, 4.4, 7, 7, 5, 5),
+    '弓箭手': (4.6, 4.6, 4.4, 4.4, 6.5, 6.5, 5.5, 5.5),
 }
 
 # 力量 体力 智力 精神
@@ -373,6 +374,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '枪炮师-神枪手(女)': (5.5, 5.5, 3.5, 3.5),
     '机械师-神枪手(女)': (3.5, 3.5, 5.5, 5.5),
     '弹药专家-神枪手(女)': (4.7, 4.3, 4.7, 4.3),
+    '协战师-神枪手(女)': (3.5, 5.5, 3.5, 5.5),
     '漫游枪手-神枪手(男)': (5.5, 5.5, 3.5, 3.5),
     '枪炮师-神枪手(男)': (5.5, 5.5, 3.5, 3.5),
     '机械师-神枪手(男)': (3.5, 3.5, 5.5, 5.5),
@@ -421,6 +423,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '旅人-弓箭手': (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, 3.5, 3.5),
 }
 
 # 火抗 冰抗 光抗 暗抗
@@ -446,6 +449,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '枪炮师-神枪手(女)': (23, 23, 23, 23),
     '机械师-神枪手(女)': (23, 23, 23, 23),
     '弹药专家-神枪手(女)': (23, 23, 23, 23),
+    '协战师-神枪手(女)': (23, 23, 23, 23),
     '漫游枪手-神枪手(男)': (23, 23, 23, 23),
     '枪炮师-神枪手(男)': (23, 23, 23, 23),
     '机械师-神枪手(男)': (23, 23, 23, 23),
@@ -494,6 +498,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '旅人-弓箭手': (23, 23, 23, 23),
     '猎人-弓箭手': (23, 23, 23, 23),
     '妖护使-弓箭手': (23, 23, 23, 23),
+    '奇美拉-弓箭手': (23, 23, 23, 23),
 }
 
 # 出血 中毒 灼伤 感电 冰冻 减速 眩晕 诅咒 失明 石化 睡眠 混乱 束缚
@@ -516,6 +521,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '源能专家-枪剑士': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '漫游枪手-神枪手(女)': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '枪炮师-神枪手(女)': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+    '协战师-神枪手(女)': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '机械师-神枪手(女)': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '弹药专家-神枪手(女)': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '漫游枪手-神枪手(男)': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
@@ -566,6 +572,7 @@ def 精通计算(装备等级, 品质, 强化等级, 部位, 甲类,属性='',ca
     '旅人-弓箭手': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '猎人-弓箭手': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     '妖护使-弓箭手': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+    '奇美拉-弓箭手': (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
 }
 
 

backend/core/character/adventure.py

@@ -198,7 +198,7 @@ adv = [
             {'id': 1, 'name': 'traveler', 'title': '聆风·旅人', 'open': False},
             {'id': 2, 'name': 'hunter', 'title': '聆风·猎人', 'open': False},
             {'id': 3, 'name': 'vigilante', 'title': '聆风·妖护使', 'open': False},
-            {'id': 4, 'name': 'chimera', 'title': '聆风·奇美拉', 'open': False, 'class': 'GF.archer.chimera'},
+            {'id': 4, 'name': 'chimera', 'title': '聆风·奇美拉', 'open': True, 'class': 'GF.archer.chimera'},
         ],
     },
     {