一些显示BUG修复

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 = ['战斗结束,你获胜', '战斗结束,你战败'];

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;
 };
 
 /**

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';
   }

src/views/backpack/player.vue

@@ -2,7 +2,6 @@
     <div class="player">
         <div class="attributes">
             <div class="label">
-                <!-- <div>{{ t('reborn.0') }}:</div> -->
                 <div> {{ t('lv') }}: </div>
                 <div> {{ t('coins.0') }}: </div>
                 <div v-for="attr in attrs" :key="attr">
@@ -10,10 +9,9 @@
                 </div>
             </div>
             <div class="value">
-                <!-- <div>{{ state.rebornPoints.count }}</div> -->
                 <div> {{ state.playerAttribute.lv }} </div>
-                <div> {{ coins }} </div>
-                <div v-for="attr in attrs" :key="attr">{{ attribute[attr] }}{{ attr_unitys[attr] }} </div>
+                <div> {{ formartNum(coins) }} </div>
+                <div v-for="attr in attrs" :key="attr">{{ formartNum(attribute[attr]) }}{{ attr_unitys[attr] }} </div>
             </div>
         </div>
         <div class="equips">
@@ -33,6 +31,7 @@ import { reactive, onMounted, ref, computed } from "vue";
 import { useI18n } from "vue3-i18n";
 import { EquipIcon } from "@/components"
 import { attr_unitys, playerImg2 } from "@/config";
+import { formartNum } from "@/tool";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
@@ -54,14 +53,7 @@ const attribute = computed(() => {
 
 const attrs = ['dps', 'atk', 'crit', 'critDmg', 'dmgPercent', 'hp', 'def', 'bloc', 'dmgReduc', 'critAvoid', 'critDmgReduc', 'moveSpeed'];
 const coins = computed(() => {
-    const coins = state.playerAttribute.coins;
-    if (coins > 100000000) {
-        return (coins / 1000000).toFixed(1) + 'm';
-    }
-    if (coins > 100000) {
-        return (coins / 1000).toFixed(1) + 'k';
-    }
-    return coins;
+    return state.playerAttribute.coins;
 })
 
 onMounted(() => { });

src/views/dungeon/battle.vue

@@ -123,10 +123,10 @@ watch(() => state.playerAttribute.attribute, (n) => {
 const battleWithMonster = (monster) => {
     return new Promise((resolve, reject) => {
         const battleTime = Math.ceil(player_battle_time * 100 / (100 + state.baseAttribute.battleSpeed))
-        const getMsg = (i18nName, takeDmg, sneak) => {
-            return replace(t(i18nName), [monster.lv, t('difficulty.' + props.dungeon?.difficulty) + t(monster.type), takeDmg, sneak]);
-        };
-        commit("set_sys_info", { msg: getMsg('battle', 0, 0), type: 'battle' });
+        const lvOrLayer = props.dungeon?.difficulty == 'dami' ? state.playerAttribute.layer + t('layer') : 'lv' + monster.lv;
+        const monsterName = t('difficulty.' + props.dungeon?.difficulty) + t(monster.type);
+        const msg = replace(t('battle'), [lvOrLayer, monsterName])
+        commit("set_sys_info", { msg: msg, type: 'battle' });
         const roles = createBattleRole(state.playerAttribute, monster, commit);
         const player: BattleRole = roles.player;
         battlePlayer.value = player;

src/views/dungeon/dungeonTips.vue

@@ -48,14 +48,14 @@ const rate4 = computed(() => {
         return '';
     }
     const boss = props.dungeon.monsters[4];
-    return boss.extraRate[0] * 100 + '%';
+    return boss.extraRate[0].toFixed(4) * 100 + '%';
 })
 const rate5 = computed(() => {
     if (!props.dungeon) {
         return '';
     }
     const boss = props.dungeon.monsters[4];
-    return boss.extraRate[1] * 100 + '%';
+    return boss.extraRate[1].toFixed(4) * 100 + '%';
 })
 const battle = computed(() => {
     return state.battle;

src/views/message/attribute.vue

@@ -32,7 +32,7 @@
             <div class="item">
                 <img :src="attr_icon_urls.hp">
                 <span class="value">
-                    {{ formartNum(attribute.curHp) }}/{{ (attribute.hp) }}
+                    {{ formartNum(attribute.curHp) }}/{{ formartNum(attribute.hp) }}
                 </span>
             </div>
         </Tooltip>