diff --git a/backend/core/abstract/character.py b/backend/core/abstract/character.py index 0dda9685..34f0f794 100644 --- a/backend/core/abstract/character.py +++ b/backend/core/abstract/character.py @@ -100,6 +100,7 @@ class CharacterProperty(ABC): 角色类型: str 职业: str 武器选项: list[str] + 副武器选项: list[str] 输出类型选项: list[str] 防具精通属性: list[str] 输出类型: str diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index 60e0fea7..5999056c 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -142,6 +142,7 @@ class Character(CharacterProperty): 角色类型: str = '' 职业: str = '' 武器选项: list[str] = [] + 副武器选项: list[str] = [] 输出类型选项: list[str] = [] 防具精通属性: list[str] = [] @@ -417,6 +418,7 @@ class Character(CharacterProperty): info['equVersion'] = self.equVersion info['name'] = self.nameCN info['weapons'] = self.武器选项 + info['subweapons'] = self.副武器选项 skillInfo = [] skill_clothes = [] platinum = [] @@ -462,7 +464,7 @@ class Character(CharacterProperty): info['stones'] = stones key = '辅助' if self.buffer else '输出' info['enchants'] = list(filter(lambda x: key in x["categorize"], equInfos.enchants)) - info['emblems'] = list(filter(lambda x: key in x["categorize"], equInfos.emblems)) + info['emblems'] = equInfos.emblems info['avatar'] = equInfos.funs.get_dress_list(skill_clothes) info['jades'] = equInfos.jades info['sundry'] = equInfos.funs.sundryList diff --git a/backend/core/character/GF/swordman_female/vegabond.py b/backend/core/character/GF/swordman_female/vegabond.py index eb50751e..b580d60f 100644 --- a/backend/core/character/GF/swordman_female/vegabond.py +++ b/backend/core/character/GF/swordman_female/vegabond.py @@ -449,6 +449,7 @@ class classChange(Character): # 用来筛CP武器的 # self.转职 = '弹药专家(女)' self.武器选项 = ['光剑', '巨剑', '钝器', '太刀', '短剑'] + self.副武器选项 = ['光剑'] self.输出类型选项 = ['物理百分比'] self.输出类型 = '物理百分比' self.防具精通属性 = ['力量'] diff --git a/backend/core/equipment/version_0/equ.py b/backend/core/equipment/version_0/equ.py index 7491e768..f88d2428 100644 --- a/backend/core/equipment/version_0/equ.py +++ b/backend/core/equipment/version_0/equ.py @@ -2888,6 +2888,8 @@ def equ_182(char: CharacterProperty): 所有速度+15% """ + char.equ_effect.append(EquEffect(name='流星念珠', icon='/equipment/icon/weapon/priest/rosary/00196.png', cd=10,data=15000)) + char.SetStatus(SpeedM=0.15,SpeedA=0.15,SpeedR=0.15) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -2907,6 +2909,8 @@ def equ_183(char: CharacterProperty): 所有速度+20% """ + char.equ_effect.append(EquEffect(name='流星念珠', icon='/equipment/icon/weapon/priest/rosary/00197.png', cd=5,data=15000)) + char.SetStatus(SpeedM=0.15,SpeedA=0.15,SpeedR=0.15) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -2926,6 +2930,7 @@ def equ_184(char: CharacterProperty): 所有速度+30% """ + char.equ_effect.append(EquEffect(name='流星念珠', icon='/equipment/icon/weapon/priest/rosary/00198.png', cd=20,data=340200)) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -3021,6 +3026,7 @@ def equ_190(char: CharacterProperty): -行星破坏伤害量:113400% -冷却时间:40秒 """ + char.equ_effect.append(EquEffect(name='行星破坏', icon='/equipment/skill/40.png', cd=40,data=340200)) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -3041,6 +3047,7 @@ def equ_191(char: CharacterProperty): -行星破坏伤害量:226800% -冷却时间:40秒 """ + char.equ_effect.append(EquEffect(name='行星破坏', icon='/equipment/skill/40.png', cd=40,data=340200)) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -3061,6 +3068,7 @@ def equ_192(char: CharacterProperty): -行星破坏伤害量:340200% -冷却时间:40秒 """ + char.equ_effect.append(EquEffect(name='行星破坏', icon='/equipment/skill/40.png', cd=40,data=340200)) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -3149,6 +3157,8 @@ def equ_198(char: CharacterProperty): 攻击时,向前方施放怒击。(冷却时间1秒) -怒击伤害量:6000% """ + char.SetSkillCD(1,100,0.2) + char.equ_effect.append(EquEffect(name='威严怒击', icon='/equipment/icon/weapon/priest/totem/00280.png', cd=1,data=6000)) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -3171,6 +3181,9 @@ def equ_199(char: CharacterProperty): 施放技能时,向前方施放猛烈的连击。(冷却时间5秒) -猛烈连击伤害量:32400% """ + char.equ_effect.append(EquEffect(name='威严怒击', icon='/equipment/icon/weapon/priest/totem/00281.png', cd=1,data=6000)) + char.equ_effect.append(EquEffect(name='威严猛击', icon='/equipment/icon/weapon/priest/totem/00281.png', cd=5,data=32400)) + char.SetSkillCD(1,100,0.2) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 @@ -3197,6 +3210,10 @@ def equ_200(char: CharacterProperty): 施放无色小晶块技能时,发动威严痛击。(冷却时间10秒) -威严痛击伤害量:90000% """ + char.equ_effect.append(EquEffect(name='威严怒击', icon='/equipment/icon/weapon/priest/totem/00282.png', cd=1,data=6000)) + char.equ_effect.append(EquEffect(name='威严猛击', icon='/equipment/icon/weapon/priest/totem/00282.png', cd=5,data=32400)) + char.equ_effect.append(EquEffect(name='威严痛击', icon='/equipment/icon/weapon/priest/totem/00282.png', cd=5,data=90000)) + char.SetSkillCD(1,100,0.2) if char.buffer: char.AddSkillLv(1,100,2) char.BuffSkill.lv += 3 diff --git a/backend/core/equipment/version_0/jade.py b/backend/core/equipment/version_0/jade.py index 102308c0..fdc830b8 100644 --- a/backend/core/equipment/version_0/jade.py +++ b/backend/core/equipment/version_0/jade.py @@ -74,7 +74,7 @@ def jade_14(char: CharacterProperty = {}, value=0): def jade_15(char: CharacterProperty = {}, value=0): char.BuffSkill.ATKPLUS += value - char.SetStatus(Buffer=value/1000) + char.SetStatus(BufferP=value/200) def jade_16(char: CharacterProperty = {}, value=0): char.BuffSkill.ATKRatio *= 1 + value/100 diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 998388dd..571632fb 100644 Binary files a/backend/dataFiles/dcalc_0.db and b/backend/dataFiles/dcalc_0.db differ diff --git a/frontend/src/api/info/type.ts b/frontend/src/api/info/type.ts index f028480b..c5036e0c 100644 --- a/frontend/src/api/info/type.ts +++ b/frontend/src/api/info/type.ts @@ -30,6 +30,7 @@ export interface ICharacterInfo { enchants: IEnchantingInfo[] emblems: IEnchantingInfo[] weapons: string[] + subweapons: string[] skills: ISkill[] suits: ISuit[] avatar: Record diff --git a/frontend/src/components/dnf/Equipment/PartSelect/index.vue b/frontend/src/components/dnf/Equipment/PartSelect/index.vue new file mode 100644 index 00000000..89cd3f97 --- /dev/null +++ b/frontend/src/components/dnf/Equipment/PartSelect/index.vue @@ -0,0 +1,124 @@ + + + diff --git a/frontend/src/pages/Character/EquipmentDictionary/Dictionary/Index.vue b/frontend/src/pages/Character/EquipmentDictionary/Dictionary/Index.vue new file mode 100644 index 00000000..6242516a --- /dev/null +++ b/frontend/src/pages/Character/EquipmentDictionary/Dictionary/Index.vue @@ -0,0 +1,2 @@ + + diff --git a/frontend/src/pages/Character/EquipmentDictionary/Equipment/Index.vue b/frontend/src/pages/Character/EquipmentDictionary/Equipment/Index.vue new file mode 100644 index 00000000..035daabb --- /dev/null +++ b/frontend/src/pages/Character/EquipmentDictionary/Equipment/Index.vue @@ -0,0 +1,18 @@ + + diff --git a/frontend/src/pages/Character/EquipmentDictionary/Index.vue b/frontend/src/pages/Character/EquipmentDictionary/Index.vue new file mode 100644 index 00000000..cf1b43f6 --- /dev/null +++ b/frontend/src/pages/Character/EquipmentDictionary/Index.vue @@ -0,0 +1,265 @@ + + + + diff --git a/frontend/src/pages/Character/Index.vue b/frontend/src/pages/Character/Index.vue index 45c24a84..5e56caa2 100644 --- a/frontend/src/pages/Character/Index.vue +++ b/frontend/src/pages/Character/Index.vue @@ -2,6 +2,7 @@
+ 装备设置 装备设置 技能设置 打造设置 diff --git a/frontend/src/pages/Home/Index.vue b/frontend/src/pages/Home/Index.vue index e0ede938..b7e887fb 100644 --- a/frontend/src/pages/Home/Index.vue +++ b/frontend/src/pages/Home/Index.vue @@ -13,13 +13,6 @@ function job_icon(child: IAlterInfo) { export default defineComponent(async () => { const ignores = ['empty'] - const zoom = computed(() => - /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test( - navigator.userAgent || navigator.vendor || (window as any).opera, - ) - ? 1 - : Math.max(Math.min((window.innerHeight * 0.8) / 750, (window.innerWidth * 0.85) / 1100), 1), - ) // 获取角色相关信息,判定是否开放 function choose_job(child: IAlterInfo) { @@ -51,7 +44,7 @@ export default defineComponent(async () => { return () => ( -
+
{renderList(adventure, (job) => (
{
import('@/pages/Character/Index.vue')), children: [ + { + path: '/character/EquipmentDictionary/:alter', + name: 'EquipmentDictionary', + props: true, + component: (() => import('@/pages/Character/EquipmentDictionary/Index.vue')), + }, { path: '/character/equipment/:alter', name: 'equipment', diff --git a/frontend/src/style/app.scss b/frontend/src/style/app.scss index 816aae0e..43ee6b2c 100644 --- a/frontend/src/style/app.scss +++ b/frontend/src/style/app.scss @@ -39,7 +39,7 @@ body, * { // font-family: "ArkPixel", "Consola", sans-serif; - font-family: "dcalc", "SimHei"; + font-family: "dcalc", "SimSun"; // font-family: "STSong"; font-size: 12px; text-shadow: 0 0 1px #000, 0 0 1px #000, 0 0 1px #000, 0 0 1px #000, diff --git a/images/equipment/suit/little/-1.PNG b/images/equipment/suit/little/-1.PNG new file mode 100644 index 00000000..475dda31 Binary files /dev/null and b/images/equipment/suit/little/-1.PNG differ diff --git a/images/equipment/suit/little/0.png b/images/equipment/suit/little/0.png new file mode 100644 index 00000000..5c91a37c Binary files /dev/null and b/images/equipment/suit/little/0.png differ diff --git a/images/equipment/suit/little/1.PNG b/images/equipment/suit/little/1.PNG new file mode 100644 index 00000000..422e8c30 Binary files /dev/null and b/images/equipment/suit/little/1.PNG differ diff --git a/images/equipment/suit/little/10.PNG b/images/equipment/suit/little/10.PNG new file mode 100644 index 00000000..5404d93d Binary files /dev/null and b/images/equipment/suit/little/10.PNG differ diff --git a/images/equipment/suit/little/11.PNG b/images/equipment/suit/little/11.PNG new file mode 100644 index 00000000..8696979a Binary files /dev/null and b/images/equipment/suit/little/11.PNG differ diff --git a/images/equipment/suit/little/2.PNG b/images/equipment/suit/little/2.PNG new file mode 100644 index 00000000..bb66527e Binary files /dev/null and b/images/equipment/suit/little/2.PNG differ diff --git a/images/equipment/suit/little/3.PNG b/images/equipment/suit/little/3.PNG new file mode 100644 index 00000000..490ec64f Binary files /dev/null and b/images/equipment/suit/little/3.PNG differ diff --git a/images/equipment/suit/little/4.PNG b/images/equipment/suit/little/4.PNG new file mode 100644 index 00000000..271e6eca Binary files /dev/null and b/images/equipment/suit/little/4.PNG differ diff --git a/images/equipment/suit/little/5.PNG b/images/equipment/suit/little/5.PNG new file mode 100644 index 00000000..6b2b41ae Binary files /dev/null and b/images/equipment/suit/little/5.PNG differ diff --git a/images/equipment/suit/little/6.PNG b/images/equipment/suit/little/6.PNG new file mode 100644 index 00000000..5719160b Binary files /dev/null and b/images/equipment/suit/little/6.PNG differ diff --git a/images/equipment/suit/little/7.PNG b/images/equipment/suit/little/7.PNG new file mode 100644 index 00000000..c9f03079 Binary files /dev/null and b/images/equipment/suit/little/7.PNG differ diff --git a/images/equipment/suit/little/8.PNG b/images/equipment/suit/little/8.PNG new file mode 100644 index 00000000..63ee9e44 Binary files /dev/null and b/images/equipment/suit/little/8.PNG differ diff --git a/images/equipment/suit/little/9.PNG b/images/equipment/suit/little/9.PNG new file mode 100644 index 00000000..edbabef7 Binary files /dev/null and b/images/equipment/suit/little/9.PNG differ