diff --git a/Paimon_Info/__init__.py b/Paimon_Info/__init__.py index 34c5b26..47079a4 100644 --- a/Paimon_Info/__init__.py +++ b/Paimon_Info/__init__.py @@ -571,7 +571,7 @@ async def _(event: MessageEvent, state: T_State, msg: Message = CommandArg()): uid = await get_last_query(str(event.user_id)) if uid: state['uid'] = uid - msg = msg.extract_plain_text().replace(state['uid'], '').strip() + msg = msg.extract_plain_text().replace(state['uid'] if 'uid' in state else 'ysd', '').strip() if not msg: await role_info.finish('请把要查询角色名给派蒙哦~') if msg.startswith(('a', '全部', '所有', '查看')): diff --git a/Paimon_Info/damage_cal/damage.py b/Paimon_Info/damage_cal/damage.py index a53b02f..6360803 100644 --- a/Paimon_Info/damage_cal/damage.py +++ b/Paimon_Info/damage_cal/damage.py @@ -71,7 +71,7 @@ def get_role_dmg(data: dict): dmg_data['旋火轮'] = udc(dm['旋火轮'] * attack, (cr + vq['暴击率'], cd), db[1] + vq['增伤'], level_role, rcd=rcd) dmg_data['旋火轮蒸发'] = udc(dm['旋火轮'] * attack, (cr + vq['暴击率'], cd), db[1] + vq['增伤'], level_role, rcd=rcd, r=zf) elif data['名称'] == '魈': - va['下落攻击增伤'] += dm['靖妖傩舞'] + va['下落攻击增伤'] += dm['B:靖妖傩舞'] dmg_data = get_dmg_data(dm, attack, cr, cd, db[5], level_role, va, ve, vq) elif data['名称'] == '申鹤': dmg_data['冰翎加成'] = str(int(dm['冰翎'] * attack))