diff --git a/src/config/i18n/zh/index.ts b/src/config/i18n/zh/index.ts index 2f900c2..7e8e0e9 100644 --- a/src/config/i18n/zh/index.ts +++ b/src/config/i18n/zh/index.ts @@ -129,7 +129,7 @@ export default class Zh { monster = '小怪'; boss = '首领'; startDungeon = '你已进入'; - battle = '你遭遇了(lv${0}${1}),正在战斗中...'; + battle = '你遭遇了(${0}${1}),正在战斗中...'; bouts = '点击查看战斗过程'; // bout = ['回合', '你使用了【${0}】', '触发了暴击', '造成了${0}点伤害', '受到${0}点伤害', '战斗结束', '你获胜', '你战败', '偷取${0}点生命', '反弹${0}点伤害']; bout = ['战斗结束,你获胜', '战斗结束,你战败']; diff --git a/src/tool/caller/attribute.ts b/src/tool/caller/attribute.ts index 3dbf3fd..f0533b1 100644 --- a/src/tool/caller/attribute.ts +++ b/src/tool/caller/attribute.ts @@ -59,7 +59,7 @@ export const callPlayerAttribute = (player: Player, base: any) => { export const callReducPercent = (def: number, lv: number): number => { const constant = 300; const factor = def < 0 ? -1.05263 : 1.05263; - return def / (constant + factor * def) + lv * 0.0003; + return def / (constant + factor * def) + (100 - lv) * 0.0003; }; /** diff --git a/src/tool/formatter.ts b/src/tool/formatter.ts index 72dbf0a..791be89 100644 --- a/src/tool/formatter.ts +++ b/src/tool/formatter.ts @@ -1,4 +1,7 @@ export const formartNum = (num) => { + if (num > 100000000) { + return (num / 1000000).toFixed(1) + 'm'; + } if (num > 100000) { return (num / 1000).toFixed(1) + 'k'; } diff --git a/src/views/backpack/player.vue b/src/views/backpack/player.vue index 74e718e..db5bd73 100644 --- a/src/views/backpack/player.vue +++ b/src/views/backpack/player.vue @@ -2,7 +2,6 @@