From fbabd02f0d508161eb4306705652e376c643b6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Thu, 17 Apr 2025 00:59:29 +0800 Subject: [PATCH] dev --- backend/core/character/adventure.py | 7 +- backend/core/equipment/version_0/__init__.py | 14 +- backend/core/equipment/version_0/enchant.py | 202 +++++++++++++----- backend/core/equipment/version_0/equ.py | 148 +++++++++++-- backend/core/equipment/version_0/register.py | 1 - backend/dataFiles/dcalc_0.db | Bin 1007616 -> 1007616 bytes .../Character/Result/components/Info.vue | 6 +- images/equipment/icon/creature/cn/00456.png | Bin 68 -> 1245 bytes images/equipment/icon/creature/cn/00458.png | Bin 0 -> 1115 bytes images/equipment/icon/creature/cn/00459.png | Bin 0 -> 1167 bytes images/equipment/icon/creature/cn/00460.png | Bin 0 -> 1122 bytes .../equipment/icon/special/earrring/00214.png | Bin 0 -> 1724 bytes .../equipment/icon/special/earrring/00215.png | Bin 0 -> 1696 bytes .../equipment/icon/special/earrring/00216.png | Bin 0 -> 1767 bytes .../equipment/icon/special/earrring/00217.png | Bin 0 -> 1834 bytes .../equipment/icon/special/earrring/00218.png | Bin 0 -> 1685 bytes images/equipment/icon/title/cn/00573.png | Bin 0 -> 1699 bytes images/equipment/icon/title/cn/00575.png | Bin 0 -> 1517 bytes images/equipment/icon/title/cn/00576.png | Bin 0 -> 1544 bytes images/equipment/icon/title/cn/00577.png | Bin 0 -> 1485 bytes images/equipment/icon/title/cn/00578.png | Bin 0 -> 1610 bytes 21 files changed, 301 insertions(+), 77 deletions(-) create mode 100644 images/equipment/icon/creature/cn/00458.png create mode 100644 images/equipment/icon/creature/cn/00459.png create mode 100644 images/equipment/icon/creature/cn/00460.png create mode 100644 images/equipment/icon/special/earrring/00214.png create mode 100644 images/equipment/icon/special/earrring/00215.png create mode 100644 images/equipment/icon/special/earrring/00216.png create mode 100644 images/equipment/icon/special/earrring/00217.png create mode 100644 images/equipment/icon/special/earrring/00218.png create mode 100644 images/equipment/icon/title/cn/00573.png create mode 100644 images/equipment/icon/title/cn/00575.png create mode 100644 images/equipment/icon/title/cn/00576.png create mode 100644 images/equipment/icon/title/cn/00577.png create mode 100644 images/equipment/icon/title/cn/00578.png diff --git a/backend/core/character/adventure.py b/backend/core/character/adventure.py index 83e24107..98227e82 100644 --- a/backend/core/character/adventure.py +++ b/backend/core/character/adventure.py @@ -1,5 +1,5 @@ import base64 -from functools import cache +from copy import deepcopy adv = [ { @@ -217,7 +217,8 @@ adv = [ def get_adv_list(): - for parent in adv: + temp = deepcopy(adv) + for parent in temp: parent_id = f'{parent["id"]:02}' for child in parent['children']: child_id = f'{child.get("id", 0):02}' @@ -228,7 +229,7 @@ def get_adv_list(): else: child['value'] = base64.b64encode(f'{parent_id}{child_id}00'.encode()).decode() child.pop('class', None) - return adv + return temp def get_adv_info(value): diff --git a/backend/core/equipment/version_0/__init__.py b/backend/core/equipment/version_0/__init__.py index 6966cff0..5abd6bf4 100644 --- a/backend/core/equipment/version_0/__init__.py +++ b/backend/core/equipment/version_0/__init__.py @@ -1,11 +1,11 @@ from .avatar import get_dress_list,calc_dress_effect -import core.equipment.version_0.equ as equ -import core.equipment.version_0.stone as stone -import core.equipment.version_0.jade as jade -import core.equipment.version_0.emblem as emblem -import core.equipment.version_0.enchant as enchant -import core.equipment.version_0.sundry as sundry -import core.equipment.version_0.suit as suit +from . import equ +from . import stone +from . import jade +from . import emblem +from . import enchant +from . import sundry +from . import suit from .register import execture diff --git a/backend/core/equipment/version_0/enchant.py b/backend/core/equipment/version_0/enchant.py index 1637c5ad..5421a640 100644 --- a/backend/core/equipment/version_0/enchant.py +++ b/backend/core/equipment/version_0/enchant.py @@ -221,6 +221,22 @@ def enchant_202(char: CharacterProperty): char.SetStatus(三攻=110, 力智=90, 技攻=0.02) pass +@register +def enchant_203(char: CharacterProperty): + """ + 三攻(90)|力智(60) + """ + char.SetStatus(三攻=90, 力智=60) + pass + +@register +def enchant_204(char: CharacterProperty): + """ + 四维(100) + """ + char.SetStatus(四维=100) + pass + # endregion # region 腰带 @@ -259,10 +275,44 @@ def enchant_303(char: CharacterProperty): """ 三攻(36)|技能伤害(5%)|暴击率(3%) """ - char.SetStatus(三攻=36, 技能伤害=0.05) + char.SetStatus(三攻=36, 技攻=0.05) pass +@register +def enchant_304(char: CharacterProperty): + """ + 四维(50)|三攻(15)|技能伤害(3%)|暴击率(3%) + """ + char.SetStatus(四维=50, 三攻=15, 技攻=0.03) + pass +@register +def enchant_305(char: CharacterProperty): + """ + 四维(120)|奶系Lv15被动+3|暴击率(7%) + """ + char.SetStatus(四维=120) + if char.buffer: + char.AddSkillLv(15, 15, 3, 0) + pass + +@register +def enchant_306(char: CharacterProperty): + """ + 三攻(10)|四维(40)|技攻(1%) + """ + char.SetStatus(三攻=10, 四维=40, 技攻=0.01) + pass + +@register +def enchant_307(char: CharacterProperty): + """ + 四维(100)|奶系Lv15被动+1 + """ + char.SetStatus(四维=100) + if char.buffer: + char.AddSkillLv(15, 15, 1, 0) + pass # endregion # region 武器 @@ -336,7 +386,7 @@ def enchant_506(char: CharacterProperty): @register def enchant_507(char: CharacterProperty): """ - 所有属性强化(13) + 全属强(13) """ char.AddElementDB('火', 15) char.AddElementDB('冰', 15) @@ -413,7 +463,7 @@ def enchant_512(char: CharacterProperty): @register def enchant_600(char: CharacterProperty): """ - 所有属性强化(30) + 全属强(30) """ char.AddElementDB('火', 30) char.AddElementDB('冰', 30) @@ -425,7 +475,7 @@ def enchant_600(char: CharacterProperty): @register def enchant_601(char: CharacterProperty): """ - 所有属性强化(28) + 全属强(28) """ char.AddElementDB('火', 28) char.AddElementDB('冰', 28) @@ -446,7 +496,7 @@ def enchant_602(char: CharacterProperty): @register def enchant_603(char: CharacterProperty): """ - 所有属性强化(33) + 全属强(33) """ char.AddElementDB('火', 33) char.AddElementDB('冰', 33) @@ -507,6 +557,27 @@ def enchant_608(char: CharacterProperty): char.SetStatus(技攻=0.01) pass +@register +def enchant_609(char: CharacterProperty): + """ + 全属强(35)|技攻(2%) + """ + char.AddElementDB('火', 35) + char.AddElementDB('冰', 35) + char.AddElementDB('光', 35) + char.AddElementDB('暗', 35) + char.SetStatus(技攻=0.02) + pass + +@register +def enchant_610(char: CharacterProperty): + """ + 四维(120)|奶系Lv15被动+1 + """ + char.SetStatus(四维=120) + if char.buffer: + char.AddSkillLv(15, 15, 1, 0) + pass # endregion # region 辅助装备 @@ -533,7 +604,7 @@ def enchant_901(char: CharacterProperty): @register def enchant_902(char: CharacterProperty): """ - 攻强(3%)|所有属性强化(11)|暴击率(3%) + 攻强(3%)|全属强(11)|暴击率(3%) """ char.SetStatus(攻击强化P=0.03) char.AddElementDB('火', 11) @@ -557,7 +628,7 @@ def enchant_903(char: CharacterProperty): @register def enchant_904(char: CharacterProperty): """ - 技攻(5%)|所有属性强化(15)|暴击率(5%) + 技攻(5%)|全属强(15)|暴击率(5%) """ char.SetStatus(技攻=0.05) char.AddElementDB('火', 15) @@ -570,7 +641,7 @@ def enchant_904(char: CharacterProperty): @register def enchant_905(char: CharacterProperty): """ - 技攻(7%)|所有属性强化(15)|暴击率(5%) + 技攻(7%)|全属强(15)|暴击率(5%) """ char.SetStatus(技攻=0.07) char.AddElementDB('火', 15) @@ -579,6 +650,29 @@ def enchant_905(char: CharacterProperty): char.AddElementDB('暗', 15) pass +@register +def enchant_906(char: CharacterProperty): + """ + 攻击强化(1%)|全属强(8)|暴击率(3%) + """ + char.SetStatus(攻击强化P=0.01) + char.AddElementDB('火', 8) + char.AddElementDB('冰', 8) + char.AddElementDB('光', 8) + char.AddElementDB('暗', 8) + pass + +@register +def enchant_907(char: CharacterProperty): + """ + 攻击强化(3%)|全属强(12)|暴击率(3%) + """ + char.SetStatus(攻击强化P=0.03) + char.AddElementDB('火', 12) + char.AddElementDB('冰', 12) + char.AddElementDB('光', 12) + char.AddElementDB('暗', 12) + pass # endregion # region 魔法石 @@ -587,7 +681,7 @@ def enchant_905(char: CharacterProperty): @register def enchant_1000(char: CharacterProperty): """ - 所有属性强化(30) + 全属强(30) """ char.AddElementDB('火', 30) char.AddElementDB('冰', 30) @@ -599,7 +693,7 @@ def enchant_1000(char: CharacterProperty): @register def enchant_1001(char: CharacterProperty): """ - 所有属性强化(35) + 全属强(35) """ char.AddElementDB('火', 35) char.AddElementDB('冰', 35) @@ -622,7 +716,7 @@ def enchant_1002(char: CharacterProperty): @register def enchant_1003(char: CharacterProperty): """ - 所有属性强化(40) + 全属强(40) """ char.AddElementDB('火', 40) char.AddElementDB('冰', 40) @@ -649,7 +743,7 @@ def enchant_1004(char: CharacterProperty): @register def enchant_1100(char: CharacterProperty): """ - 四维(50)|所有属性强化(11) + 四维(50)|全属强(11) """ char.SetStatus(四维=50) char.AddElementDB('火', 11) @@ -671,7 +765,7 @@ def enchant_1101(char: CharacterProperty): @register def enchant_1102(char: CharacterProperty): """ - 四维(70)|所有属性强化(15) + 四维(70)|全属强(15) """ char.SetStatus(四维=70) char.AddElementDB('火', 15) @@ -689,6 +783,24 @@ def enchant_1103(char: CharacterProperty): char.SetStatus(四维=200) pass +@register +def enchant_1104(char: CharacterProperty): + """ + 全属强(40) + """ + char.AddElementDB('火', 40) + char.AddElementDB('冰', 40) + char.AddElementDB('光', 40) + char.AddElementDB('暗', 40) + pass + +@register +def enchant_1105(char: CharacterProperty): + """ + 四维(250) + """ + char.SetStatus(四维=250) + pass # endregion # region 称号 @@ -697,7 +809,7 @@ def enchant_1103(char: CharacterProperty): @register def enchant_1200(char: CharacterProperty): """ - 三攻(40)|所有属性强化(15)|Lv1~50主动+1 + 三攻(40)|全属强(15)|Lv1~50主动+1 """ char.SetStatus(三攻=40) char.AddElementDB('火', 15) @@ -711,7 +823,7 @@ def enchant_1200(char: CharacterProperty): @register def enchant_1201(char: CharacterProperty): """ - 三攻(40)|所有属性强化(15)|技攻(3%) + 三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -724,7 +836,7 @@ def enchant_1201(char: CharacterProperty): @register def enchant_1202(char: CharacterProperty): """ - Lv40主动+2|三攻(40)|所有属性强化(15)|技攻(3%) + Lv40主动+2|三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -738,7 +850,7 @@ def enchant_1202(char: CharacterProperty): @register def enchant_1203(char: CharacterProperty): """ - Lv45主动+2|三攻(40)|所有属性强化(15)|技攻(3%) + Lv45主动+2|三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -752,7 +864,7 @@ def enchant_1203(char: CharacterProperty): @register def enchant_1204(char: CharacterProperty): """ - Lv60主动+2|三攻(40)|所有属性强化(15)|技攻(3%) + Lv60主动+2|三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -766,7 +878,7 @@ def enchant_1204(char: CharacterProperty): @register def enchant_1205(char: CharacterProperty): """ - Lv70主动+2|三攻(40)|所有属性强化(15)|技攻(3%) + Lv70主动+2|三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -780,7 +892,7 @@ def enchant_1205(char: CharacterProperty): @register def enchant_1206(char: CharacterProperty): """ - Lv75主动+2|三攻(40)|所有属性强化(15)|技攻(3%) + Lv75主动+2|三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -794,7 +906,7 @@ def enchant_1206(char: CharacterProperty): @register def enchant_1207(char: CharacterProperty): """ - Lv80主动+2|三攻(40)|所有属性强化(15)|技攻(3%) + Lv80主动+2|三攻(40)|全属强(15)|技攻(3%) """ char.SetStatus(三攻=40, 技攻=0.03) char.AddElementDB('火', 15) @@ -888,7 +1000,7 @@ def enchant_1303(char: CharacterProperty): @register def enchant_1304(char: CharacterProperty): """ - 所有属性强化(23) + 全属强(23) """ char.AddElementDB('火', 23) char.AddElementDB('冰', 23) @@ -999,7 +1111,7 @@ def enchant_1315(char: CharacterProperty): @register def enchant_1316(char: CharacterProperty): """ - 所有属性强化(14) + 全属强(14) """ char.AddElementDB('火', 14) char.AddElementDB('冰', 14) @@ -1113,7 +1225,7 @@ def enchant_2105(char: CharacterProperty): @register def enchant_2200(char: CharacterProperty): """ - Lv40主动+1|所有属性强化(12)|四维(55) + Lv40主动+1|全属强(12)|四维(55) """ char.AddSkillLv(40, 40, 1, 1) char.SetStatus(四维=55) @@ -1127,7 +1239,7 @@ def enchant_2200(char: CharacterProperty): @register def enchant_2201(char: CharacterProperty): """ - Lv45主动+1|所有属性强化(12)|四维(55) + Lv45主动+1|全属强(12)|四维(55) """ char.AddSkillLv(45, 45, 1, 1) char.SetStatus(四维=55) @@ -1141,7 +1253,7 @@ def enchant_2201(char: CharacterProperty): @register def enchant_2202(char: CharacterProperty): """ - Lv60主动+1|所有属性强化(12)|四维(55) + Lv60主动+1|全属强(12)|四维(55) """ char.AddSkillLv(60, 60, 1, 1) char.SetStatus(四维=55) @@ -1155,7 +1267,7 @@ def enchant_2202(char: CharacterProperty): @register def enchant_2203(char: CharacterProperty): """ - Lv70主动+1|所有属性强化(12)|四维(55) + Lv70主动+1|全属强(12)|四维(55) """ char.AddSkillLv(70, 70, 1, 1) char.SetStatus(四维=55) @@ -1169,7 +1281,7 @@ def enchant_2203(char: CharacterProperty): @register def enchant_2204(char: CharacterProperty): """ - Lv75主动+1|所有属性强化(12)|四维(55) + Lv75主动+1|全属强(12)|四维(55) """ char.AddSkillLv(75, 75, 1, 1) char.SetStatus(四维=55) @@ -1183,7 +1295,7 @@ def enchant_2204(char: CharacterProperty): @register def enchant_2205(char: CharacterProperty): """ - Lv80主动+1|所有属性强化(12)|四维(55) + Lv80主动+1|全属强(12)|四维(55) """ char.AddSkillLv(80, 80, 1, 1) char.SetStatus(四维=55) @@ -1197,7 +1309,7 @@ def enchant_2205(char: CharacterProperty): @register def enchant_2206(char: CharacterProperty): """ - 所有属性强化(6) + 全属强(6) """ char.AddElementDB('火', 6) char.AddElementDB('冰', 6) @@ -1231,7 +1343,7 @@ def enchant_2501(char: CharacterProperty): @register def enchant_2502(char: CharacterProperty): """ - 攻击强化(4%)|所有属性强化(6) + 攻击强化(4%)|全属强(6) """ char.SetStatus(攻击强化P=0.04) char.AddElementDB('火', 6) @@ -1244,7 +1356,7 @@ def enchant_2502(char: CharacterProperty): @register def enchant_2503(char: CharacterProperty): """ - 攻击强化(4%)|所有属性强化(4)|光强(4) + 攻击强化(4%)|全属强(4)|光强(4) """ char.SetStatus(攻击强化P=0.04) char.AddElementDB('火', 4) @@ -1257,7 +1369,7 @@ def enchant_2503(char: CharacterProperty): @register def enchant_2504(char: CharacterProperty): """ - 攻击强化(4%)|所有属性强化(4)|火强(4) + 攻击强化(4%)|全属强(4)|火强(4) """ char.SetStatus(攻击强化P=0.04) char.AddElementDB('火', 8) @@ -1270,7 +1382,7 @@ def enchant_2504(char: CharacterProperty): @register def enchant_2505(char: CharacterProperty): """ - 攻击强化(4%)|所有属性强化(4)|冰强(4) + 攻击强化(4%)|全属强(4)|冰强(4) """ char.SetStatus(攻击强化P=0.04) char.AddElementDB('火', 6) @@ -1283,7 +1395,7 @@ def enchant_2505(char: CharacterProperty): @register def enchant_2506(char: CharacterProperty): """ - 攻击强化(4%)|所有属性强化(4)|暗强(4) + 攻击强化(4%)|全属强(4)|暗强(4) """ char.SetStatus(攻击强化P=0.04) char.AddElementDB('火', 4) @@ -1327,7 +1439,7 @@ def enchant_2509(char: CharacterProperty): @register def enchant_2600(char: CharacterProperty): """ - 三攻(40)|所有属性强化(30) + 三攻(40)|全属强(30) """ char.SetStatus(三攻=40) char.AddElementDB('火', 30) @@ -1340,7 +1452,7 @@ def enchant_2600(char: CharacterProperty): @register def enchant_2601(char: CharacterProperty): """ - 三攻(40)|所有属性强化(20) + 三攻(40)|全属强(20) """ char.SetStatus(三攻=40) char.AddElementDB('火', 20) @@ -1353,7 +1465,7 @@ def enchant_2601(char: CharacterProperty): @register def enchant_2602(char: CharacterProperty): """ - 四维(50)|所有属性强化(20) + 四维(50)|全属强(20) """ char.SetStatus(四维=50) char.AddElementDB('火', 20) @@ -1366,7 +1478,7 @@ def enchant_2602(char: CharacterProperty): @register def enchant_2603(char: CharacterProperty): """ - 四维(30)|所有属性强化(20) + 四维(30)|全属强(20) """ char.SetStatus(四维=30) char.AddElementDB('火', 20) @@ -1549,19 +1661,11 @@ def enchant_2708(char: CharacterProperty): @register def enchant_2709(char: CharacterProperty): """ - 三攻(50)|三速(5%)|增益量(3%) + 三攻(50)|四维(100)|三速(5%)|攻击强化(15%)|增益量(3%) """ - char.SetStatus(三攻=50, 三速=0.05, 增益量P=0.03) + char.SetStatus(三攻=50, 四维=100, 三速=0.05, 攻击强化P=0.15, 增益量P=0.03) pass -@register -def enchant_2710(char: CharacterProperty): - """ - 四维(100)|三速(5%)|增益量(3%) - """ - char.SetStatus(四维=100, 三速=0.05, 增益量P=0.03) - pass - # endregion diff --git a/backend/core/equipment/version_0/equ.py b/backend/core/equipment/version_0/equ.py index d28a5c62..14f76467 100644 --- a/backend/core/equipment/version_0/equ.py +++ b/backend/core/equipment/version_0/equ.py @@ -12553,17 +12553,58 @@ def equ_2000(char: CharacterProperty): if char.max_point >= 2550: char.SetStatus(SkillAttack=0.487,Buffer=12180) pass - skillAttack = [0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2,2.1,2.2,2.3,2.4,2.9,3,3.1,3.2,3.3,3.4,3.5,3.6,3.7,3.8,3.9,4,4.1,4.2,4.3,4.4,4.5,4.6,4.7,4.8,4.9,5,5.1,5.2,5.3,5.9,6,6.1,6.2,6.3,6.4,6.5,6.6,6.7,6.8,6.9,7,7.1,7.2,7.3,7.4,7.5,7.6,7.7,7.8,7.9,8,8.1,8.2,8.3,8.9,9,9.1,9.2,9.3,9.4,9.5,9.6,9.7,9.8,9.9,10,10.1,10.2,10.3,10.4,10.5,10.6,10.7,10.8,10.9,11,11.1,11.2,11.3,13.1] - buffer = [0,30,60,90,120,150,180,210,240,270,300,330,360,390,420,450,480,510,540,570,600,630,660,690,720,1110,1140,1170,1200,1230,1260,1290,1320,1350,1380,1410,1440,1470,1500,1530,1560,1590,1620,1650,1680,1710,1740,1770,1800,1830,2250,2280,2310,2340,2370,2400,2430,2460,2490,2520,2550,2580,2610,2640,2670,2700,2730,2760,2790,2820,2850,2880,2910,2940,2970,3390,3420,3450,3480,3510,3540,3570,3600,3630,3660,3690,3720,3750,3780,3810,3840,3870,3900,3930,3960,3990,4020,4050,4080,4110,4650] - # fame = [0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100,105,110,115,120,220,225,230,235,240,245,250,255,260,265,270,275,280,285,290,295,300,305,310,315,320,325,330,335,340,440,445,450,455,460,465,470,475,480,485,490,495,500,505,510,515,520,525,530,535,540,545,550,555,560,660,665,670,675,680,685,690,695,700,705,710,715,720,725,730,735,740,745,750,755,760,765,770,775,780,1000] - equEffect = [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.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5,1.5] point = char.charEquipInfo['魔法石'].precision - char.SetStatus(SkillAttack=skillAttack[point]/100,Buffer=buffer[point]) - effect = equEffect[point] + skillAttack = 0.1 * point - (point // 25) * 0.1 + (0.5 if point >= 25 else 0) + (0.6 if point >=50 else 0) + (0.6 if point >=75 else 0) + (1.8 if point >=100 else 0) + buffer = 30 * point - (point // 25) * 30 + (390 if point >= 25 else 0) + (420 if point >=50 else 0) + (420 if point >=75 else 0) + (540 if point >=100 else 0) + char.SetStatus(SkillAttack=skillAttack/100,Buffer=buffer) + effect = (point // 25) * 0.5 if effect > 0: char.equ_effect.append(EquEffect(name='地震波', icon='/equipment/icon/special/magicstone/00417.png', cd=30, data=45900*effect)) pass +@register +def equ_2001(char: CharacterProperty): + """ + 灿烂的天气立方体 + 太初 辅助装备 耳环 + + <奈雅丽的记忆> + 穿戴的最高套装积分达到2100点以上时,才能发挥能力。 + 套装积分达到2550以上时,会发动更强的效果。 + 技能伤害+49.4% + 增益量12180 + + 技能冷却时间减少4% + + 精度 + 精度100%时,技能伤害+13.1%,增益量4650,cd 16% + + [不确定性] + 通过神权之审判,每1~11秒有1%的几率初始化所有技能冷却时间 + *每当2个以上技能冷却时间生效时适用 + *组队挑战时,辅助职业的觉醒技能不会初始化 + + [天气重组] + 精度达到100%时,在城镇中使用普通聊天输入“天气重组”时,出现特效。(冷却时间600秒) + + + """ + if 2100 <= char.max_point < 2550: + char.SetStatus(SkillAttack=0.384,Buffer=11220) + pass + if char.max_point >= 2550: + char.SetStatus(SkillAttack=0.494,Buffer=12180) + pass + point = char.charEquipInfo['耳环'].precision + skillAttack = 0.1 * point - (point // 25) * 0.1 + (0.5 if point >= 25 else 0) + (0.6 if point >=50 else 0) + (0.6 if point >=75 else 0) + (1.8 if point >=100 else 0) + buffer = 30 * point - (point // 25) * 30 + (390 if point >= 25 else 0) + (420 if point >=50 else 0) + (420 if point >=75 else 0) + (540 if point >=100 else 0) + char.SetStatus(SkillAttack=skillAttack/100,Buffer=buffer) + char.SetSkillCD(cd=0.04) + cd = (point // 25) * 0.04 + if cd > 0: + char.SetSkillCD(cd=cd) + pass + # endregion # region 春节 @@ -12831,15 +12872,54 @@ def equ_3013(char: CharacterProperty): Lv15~35所有技能+1 所有属性强化+15 所有速度+3% + 攻击强化 +20% """ char.AddSkillLv(15,35,1) char.AddElementDB('火',15) char.AddElementDB('冰',15) char.AddElementDB('光',15) char.AddElementDB('暗',15) - char.SetStatus(SpeedM=0.03,SpeedA=0.03,SpeedR=0.03) + char.SetStatus(SpeedM=0.03,SpeedA=0.03,SpeedR=0.03,AttackP=0.2) pass +@register +def equ_3015(char: CharacterProperty): + """ + 夙世今生的缘分 + 稀有 称号 2025 + + Lv15~35所有技能+1 + 所有属性强化+15 + 攻击强化 +20% + 所有速度+3% + """ + char.AddSkillLv(15,35,1) + char.AddElementDB('火',15) + char.AddElementDB('冰',15) + char.AddElementDB('光',15) + char.AddElementDB('暗',15) + char.SetStatus(SpeedM=0.03,SpeedA=0.03,SpeedR=0.03,AttackP=0.2) + pass + +@register +def equ_3016(char: CharacterProperty): + """ + 铁碎牙 + 稀有 称号 2025 + + 三觉被动Lv+1 + 所有属性强化+20 + 攻击强化增幅+22% + 暴击率+12% + 所有速度+3% + """ + char.AddSkillLv(95,95,1,0) + char.AddElementDB('火',20) + char.AddElementDB('冰',20) + char.AddElementDB('光',20) + char.AddElementDB('暗',20) + char.SetStatus(SpeedM=0.03,SpeedA=0.03,SpeedR=0.03,AttackP=0.22) + pass # endregion # region 白嫖 @@ -13171,7 +13251,7 @@ def equ_4014(char: CharacterProperty): Lv1~75所有技能+1 所有属性强化+25 - 攻击强化增幅+15% + 攻击强化增幅+25% 增益量增幅+5% 暴击率+10% 所有速度+5% @@ -13181,7 +13261,7 @@ def equ_4014(char: CharacterProperty): char.AddElementDB('冰',25) char.AddElementDB('光',25) char.AddElementDB('暗',25) - char.SetStatus(AttackP=0.15,SpeedM=0.05,SpeedA=0.05,SpeedR=0.05,BufferP=0.05) + char.SetStatus(AttackP=0.25,SpeedM=0.05,SpeedA=0.05,SpeedR=0.05,BufferP=0.05) pass @@ -13193,7 +13273,7 @@ def equ_4015(char: CharacterProperty): Lv1~50所有技能+1 所有属性强化+15 - 攻击强化增幅+12% + 攻击强化增幅+25% 增益量增幅+2% 暴击率+5% 所有速度+4% @@ -13203,7 +13283,7 @@ def equ_4015(char: CharacterProperty): char.AddElementDB('冰',15) char.AddElementDB('光',15) char.AddElementDB('暗',15) - char.SetStatus(AttackP=0.12,SpeedM=0.04,SpeedA=0.04,SpeedR=0.04,BufferP=0.02) + char.SetStatus(AttackP=0.25,SpeedM=0.04,SpeedA=0.04,SpeedR=0.04,BufferP=0.02) pass @@ -13225,14 +13305,14 @@ def equ_4016(char: CharacterProperty): char.AddElementDB('冰',25) char.AddElementDB('光',25) char.AddElementDB('暗',25) - char.SetStatus(AttackP=0.15,SpeedM=0.05,SpeedA=0.05,SpeedR=0.05,BufferP=0.05) + char.SetStatus(AttackP=0.25,SpeedM=0.05,SpeedA=0.05,SpeedR=0.05,BufferP=0.05) pass @register def equ_4017(char: CharacterProperty): """ - 迷你麻宫雅典娜 + 迷你七宝 稀有 宠物 2024 Lv1~50所有技能+1 @@ -13247,7 +13327,47 @@ def equ_4017(char: CharacterProperty): char.AddElementDB('冰',15) char.AddElementDB('光',15) char.AddElementDB('暗',15) - char.SetStatus(AttackP=0.12,SpeedM=0.04,SpeedA=0.04,SpeedR=0.04,BufferP=0.02) + char.SetStatus(AttackP=0.25,SpeedM=0.04,SpeedA=0.04,SpeedR=0.04,BufferP=0.02) pass +@register +def equ_4018(char: CharacterProperty): + """ + 迷你邪见 + 稀有 宠物 2025 + + Lv1~75所有技能+1 + 所有属性强化+25 + 攻击强化增幅+35% + 增益量增幅+8% + 暴击率+10% + 所有速度+5% + """ + char.AddSkillLv(1,75,1) + char.AddElementDB('火',25) + char.AddElementDB('冰',25) + char.AddElementDB('光',25) + char.AddElementDB('暗',25) + char.SetStatus(AttackP=0.35,SpeedM=0.05,SpeedA=0.05,SpeedR=0.05,BufferP=0.08) + pass + +@register +def equ_4019(char: CharacterProperty): + """ + 迷你麻宫雅典娜 + 稀有 宠物 2024 + + Lv1~50所有技能+1 + 所有属性强化+15 + 攻击强化增幅+35% + 增益量增幅+3% + 暴击率+5% + 所有速度+4% + """ + char.AddSkillLv(1,50,1) + char.AddElementDB('火',15) + char.AddElementDB('冰',15) + char.AddElementDB('光',15) + char.AddElementDB('暗',15) + char.SetStatus(AttackP=0.35,SpeedM=0.04,SpeedA=0.04,SpeedR=0.04,BufferP=0.03) # endregion diff --git a/backend/core/equipment/version_0/register.py b/backend/core/equipment/version_0/register.py index 17fa701a..0abc294a 100644 --- a/backend/core/equipment/version_0/register.py +++ b/backend/core/equipment/version_0/register.py @@ -8,5 +8,4 @@ def execture(name): if name in registry: return registry[name] else: - print(f"Function {name} not found in registry.") return None diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 70f3ff74ae8ab43c7063451b795daabc6e2dedf8..59bd9672a9680aa02ac1fbd86c802940615d5290 100644 GIT binary patch delta 5064 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 PkmB^C5~$bKm!tm&C5lB+ delta 4405 zcma)93w%@69lq!0-gDn4Euqk~DQ#&((|6KWsLIk(d6iOH+~gswQN|{MgUJMc$fHS9 zVrqZWuD}_CwJIVLD-S!lj0!`iBFy=Y}MdQLz0rxxb$8`+xWU z|DW%io>RSJNcD~(&&MijD2lpBKAXsAMuWu;*0`LtPEhNlYn{4UCsXTW-*m#i{7c_h zMi`HKS%o}oYzyXg!1OZdUh%59O?*;(K(vW^;TvIx&?x*?7|egix9|)2az2vV$F1O| zbD8ivs6sC+fh_wu+rn0{Nz8u6$4p>SbZ2zibROMkb+G*VK9>jdHr;4LS z8T0Y;AHjHF!wYx9SkR8W@55K(3q22URG~4SraFDqovVEQO--HEYyEF+_17=AbSJc#3Oy6=$i&-s!UV#Ya7TuEZYLZ8OzAaGYZPNouTy`y3nqf(q3&#ssxl_h z)QK&=&ZTXZ+=A2vopse;)oeTQ*316&t(JT6MfOgm} zJHE_B4>Hk>u0@_KoVbGT4>&CEfk$M=k;{h$e&Tl$ATtEOy&7;hJEnR2++7672m;IZ z!6TyM&~GN0T6mjl9zMDc8i~%8eXv7zbPjuQ_l}xAu6dp`tX~y)!8iLg!0%Y_O~a#e z2#^{Aj&{I~WXFlZ2@#Ks+2c;|Sc1u?ljIkMl8++EuibM1f@H^+$40F0JO3DArreSF z?Pm~(j$>cf4%kw8+70lzgMs9vL-3gBIC|lo=O$Y&x*HKE5=t;t}R|iUoI08?J4u7CkL){|2dL+Q__XRxF*U@$9qtE(z(^+Er zQdCa9sbg3^3LDiIkHU3ILj{j3&%kKq%VslyHseC_t$OF4f$H2dTs_Fhpb(WoF&>af zW$0>Xw_ZYuqL(8jgBT?w@fI$V&Y&|iS=U1BxWH*WpLl^gEQiW+J?*jK#A{q%CNSY^ z&vA!j$8l{|i+yYj^{>}$Y9&8uLY-SGHOsi>Ujah~D0xC2F#8kUIs)$p<>z_1X| zENMV+*%RRY5U@qofM5$rRVAUSK2b$N25@N=q#3N!0pHHZrmoOdZyJFTjRG z-k%&c=VP9PZcP0x%)SHp-8UC~6h1nT4{THe`3pA}y#b#~3Jgoh{Q2U`;K5)t_bnoZ6gJB+eoog z1&=M`r4-Qird8TI)+AF;0rZiwN`6er7QW~I$vq3Fu-V`;$f2Gho|~Y0*GO&a5WFT7^e#j}s!>_j2`s-d*tDRC89bvNAmH@~0&Cr8v|HlD(A1Twbvv0h_vd=zS-Z8`YAQRpN& z6WAh=0q^dIz6g#LVh%V*VsQmRkke z;c&K$snX4)=K?R)M2eivxTZCmvBQLnYNP?R0p9gQa}uf7fg|EklzI-LRvrFULiLfZ z;dmGU9x_H5^+u}FrNa&ut-uEql&B6@&{mpvjmJfVF$7!nB=nE#qwdb6;2781TQ&8eb2Av$MJyM$W`e#=ojh7=uPNrvfCcQW6F=2W^ zZ|KG_J+C*(MBk*}Rek*+v?;ILSHMw=wL^H>+;FKm3xdb(JZn!L#gP^i2g`l=Bod!a zL8d;pw?4oj>Um-HaH+ji&(+iySnjG$91+YtFH~x8)KiLmHjbL6RsFMtnk)%rJ}WW3 z=AOH=t5VUpl!9l74ieJQ@D z`x1UB4V5p>@=m`a!;+hy`qlPEzjy1&*Ozv-F6(M;r4DC#AH7R}^|pZaQm?>KGmK`E zLtV9YA+vYe#l)uYbrJt39hoharC$D4dVV+ht?WVgwSU9=QcArr6hSsivJ2++9D&}2 zgG}jl$#=d%He{feK~{PlSq_CgUotH@xxotk>tE>dy$TMgQ?pPRAl9~P=DVJDXY*~g zB9IU%y+|2_4}iQ&UZUTopQ9g$Efpvkii+@oe3cw<>IK8lW&JqnSH|?PA8c0KFa<>~ zPeCj$nSu;`Kt}PhD2{qSS9es~g!2@`0Lp;k^pHab(=`-+xYG|Oa$xR##Rs3jL~ zn2d~IySi&K@&hmvZ}>HulR9E)I*Cpp(Ls0S_Gmau4hB^yIq<>}OVe%*>Di+ -
+