dev

backend/core/basic/character.py

@@ -116,6 +116,8 @@ class Character(CharacterProperty):
 
     # endregion
 
+    BindAwake : int
+    """绑定觉醒等级"""
     skills: list['Skill'] = []
     # """技能列表"""
     skills_dict: dict[str, 'Skill'] = {}
@@ -405,6 +407,7 @@ class Character(CharacterProperty):
     # region 计算相关
     def SetDetail(self, info: dict[str, dict]) -> None:
         self.charEquipInfo = {}
+        self.bindAwake = info.get('bindAwake', 50)
         """打造信息导入"""
         for key in info['equips']:
             # 导入部位打造信息、装备信息、贴膜信息
@@ -940,7 +943,7 @@ class Character(CharacterProperty):
                     value1 = (info[1][0] + info[1][2])*info[1][1]*buff_ratio_old + info[1][0]*buff_ratio_new
                     value2 = (info[2][0] + info[2][2])*info[2][1]*buff_ratio_old + info[2][0]*buff_ratio_new
                 # 觉醒技能
-                elif i.buffType == 'awake':
+                elif i.buffType == 'awake' or i.buffType == 'awakeSub':
                     value1 = (info[1][0] + info[1][2])*info[1][1]*awake_ratio_old + info[1][0]*awake_ratio_new
                     value2 = (info[2][0] + info[2][2])*info[2][1]*awake_ratio_old + info[2][0]*awake_ratio_new
                 else:
@@ -948,14 +951,17 @@ class Character(CharacterProperty):
                     value2 = (info[2][0] + info[2][2])*info[2][1]
                 value3 = info[3]
                 value4 = info[4]
-                skillInfos.append({
+                if i.buffType == 'awake' and self.bindAwake == 50:
-                    "name":i.name,
+                    pass
-                    "cd":value4,
+                else:
-                    "icon":i.icon,
+                    skillInfos.append({
-                    "lv": i.lv,
+                        "name":i.name,
-                    # 对自己的加成 三攻 力智 伤害直接加成
+                        "cd":value4,
-                    "buff":[value, value1, value2, value3],
+                        "icon":i.icon,
-                })
+                        "lv": i.lv,
+                        # 对自己的加成 三攻 力智 伤害直接加成
+                        "buff":[value, value1, value2, value3],
+                    })
         return skillInfos
 
     def get_buffer_info(self):

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

@@ -591,6 +591,7 @@ class Skill31(ActiveBufferSkill):
     cube = 15
     cd = 290
     mp = [4025, 8055]
+    buffType = 'awakeSub'
 
     data0 = [0, 22510, 27730, 32950, 38170, 43390, 48610, 53829, 59049, 64269, 69489, 74709, 79929, 85149, 90368, 95588, 100808, 106028, 111248, 116468, 121688, 126907, 132127, 137347, 142567, 147787, 153007, 158227, 163446, 168666, 173886, 179106, 184326, 189546, 194766, 199985, 205205, 210425, 215645, 220865, 226085, 231305, 236524, 241744, 246964, 252184, 257404, 262624, 267844, 273063, 278283]# noqa: E501
     hit0 = 1 #TODO
@@ -598,6 +599,23 @@ class Skill31(ActiveBufferSkill):
     data2 = [0, 337659, 415956, 494254, 572552, 650851, 729149, 807447, 885745, 964042, 1042340, 1120638, 1198936, 1277234, 1355532, 1433829, 1512127, 1590425, 1668723, 1747021, 1825319, 1903616, 1981914, 2060212, 2138510, 2216808, 2295106, 2373404, 2451701, 2529999, 2608297, 2686595, 2764893, 2843190, 2921488, 2999786, 3078085, 3156382, 3234680, 3312978, 3391276, 3469574, 3547872, 3626170, 3704467, 3782766, 3861064, 3939361, 4017659, 4095957, 4174255]# noqa: E501
     hit2 = 1 #TODO
 
+    # 绑定1觉时数据
+    data3 = [0, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158]# noqa: E501
+
+    # 绑定2觉时数据
+    data4 = [0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73]# noqa: E501
+
+    def skillInfo(self):
+        """技能信息"""
+        prep = self.char.AwakeSkill.skillInfo()
+        ratio = 0
+        # 绑定一觉时，替代一觉
+        if self.char.bindAwake == 50:
+            ratio = self.data3[self.lv] / 100
+        if self.char.bindAwake == 85:
+            ratio = self.data4[self.lv] / 100
+        return prep[0] * ratio, [prep[1][0]*ratio,prep[1][1],prep[1][2]*ratio], [prep[2][0]*ratio,prep[2][1],prep[2][2]*ratio],0,self.getSkillCD()
+
 class classChange(Character):
     def __init__(self, equVersion=''):
 

frontend/src/pages/Character/EquipmentDictionary/Index.vue

@@ -21,7 +21,7 @@
     <div
       class="w-full h-1px bg-gradient-to-r from-[rgba(52,43,27,0.05)] via-[rgba(52,43,27,1)] to-[rgba(52,43,27,0.05)]"
     ></div>
-    <div class="p-1 space-y-1">
+    <div class="p-1 space-y-1 mt-10px">
       <div class="flex w-full">
         <div class="flex flex-1 items-center">
           部位：<part-select class="!max-w-25 !w-25" v-model:partList="choose_part"></part-select>
@@ -386,7 +386,7 @@ const chooseEqu = (item?: IEquipment) => {
 .active {
   color: #ccc088;
 
-  &::after {
+  &::before {
     content: '';
     position: absolute;
     width: 60px;
@@ -395,6 +395,16 @@ const chooseEqu = (item?: IEquipment) => {
     background: #bf8d20;
     filter: blur(7px);
   }
+
+  &::after {
+    content: '';
+    position: absolute;
+    background: url('@/assets/img/active.png') no-repeat;
+    width: 148px;
+    height:16px;
+    top:69px;
+    transform: translate(0, 0%);
+  }
 }
 
 .item-head {