fix: 怪物手册

This commit is contained in:
AncTe committed 2024-04-26 22:13:44 +08:00
1 parent 32f57cafec
commit 8cea9ba7f4
9 files changed
+34 -41

No files matched your search

+8 -8
View File
@@ -801,7 +801,7 @@ export class DamageEnemy<T extends EnemyIds = EnemyIds> {
res.push({
damage: dam,
atkDelta: Math.ceil(v - hero.atk!),
delta: dam - ori
delta: -(dam - origin.damage)
});
start = v;
@@ -863,7 +863,7 @@ export class DamageEnemy<T extends EnemyIds = EnemyIds> {
return {
damage: damage.damage,
info: damage,
delta: finite ? damage.damage - origin.damage : Infinity
delta: -(finite ? damage.damage - origin.damage : Infinity)
};
}
@@ -947,7 +947,7 @@ export function calDamageWith(
// 饥渴
if (special.includes(7)) {
const delta = Math.floor((atk * enemy.hungry!) / 100);
const delta = Math.floor((atk * info.hungry!) / 100);
atk -= delta;
monAtk += delta;
}
@@ -970,7 +970,7 @@ export function calDamageWith(
// 霜冻
if (special.includes(20) && !core.hasEquip('I589')) {
heroPerDamage *= 1 - enemy.ice! / 100;
heroPerDamage *= 1 - info.ice! / 100;
}
heroPerDamage *= 1 - info.damageDecline / 100;
@@ -997,7 +997,7 @@ export function calDamageWith(
// 苍蓝刻
if (special.includes(28)) {
heroPerDamage *= 1 - enemy.paleShield! / 100;
heroPerDamage *= 1 - info.paleShield! / 100;
}
let turn = Math.ceil(monHp / heroPerDamage);
@@ -1005,17 +1005,17 @@ export function calDamageWith(
// 致命一击
if (special.includes(1)) {
const times = Math.floor(turn / 5);
damage += ((times * (enemy.crit! - 100)) / 100) * enemyPerDamage;
damage += ((times * (info.crit! - 100)) / 100) * enemyPerDamage;
}
// 勇气之刃
if (turn > 1 && special.includes(10)) {
damage += (enemy.courage! / 100 - 1) * enemyPerDamage;
damage += (info.courage! / 100 - 1) * enemyPerDamage;
}
// 勇气冲锋
if (special.includes(11)) {
damage += (enemy.charge! / 100) * enemyPerDamage;
damage += (info.charge! / 100) * enemyPerDamage;
turn += 5;
}
+1 -1
View File
@@ -225,7 +225,7 @@ export const specials: SpecialDeclaration[] = [
)}<br />`;
});
return (
`怪物周围九宫格${enemy.haloRange}格范围内所有怪物获得以下特殊属性(包括自身),` +
`怪物周围方形${enemy.haloRange}格范围内所有怪物获得以下特殊属性(包括自身),` +
`特殊属性数值间为${
enemy.specialMultiply ? '相乘' : '相加'
}关系:<br />` +
+2 -2
View File
@@ -18,8 +18,8 @@ export function getDetailedEnemy(
const dam = enemy.calDamage().damage;
const cri = enemy.calCritical(1)[0];
const critical = core.formatBigNumber(cri?.atkDelta);
const criticalDam = core.formatBigNumber(-cri?.delta);
const defDam = core.formatBigNumber(-enemy.calDefDamage(ratio).delta);
const criticalDam = core.formatBigNumber(cri?.delta);
const defDam = core.formatBigNumber(enemy.calDefDamage(ratio).delta);
const damage = core.formatBigNumber(dam);
const fromFunc = (
+1 -6
View File
@@ -71,6 +71,7 @@ const scroll = ref(0);
const drag = ref(false);
const detail = ref(false);
const selected = ref(0);
let detailClosing = false;
const settingScale = mainSetting.getValue('ui.bookScale', 100) / 100;
const scale = isMobile
@@ -100,8 +101,6 @@ function select(enemy: ToShowEnemy, index: number) {
*/
async function hide() {
const div = document.getElementById('book') as HTMLDivElement;
div.style.opacity = '0';
await sleep(600);
div.style.display = 'none';
}
@@ -110,7 +109,6 @@ async function hide() {
*/
async function closeDetail() {
show();
await sleep(600);
detail.value = false;
}
@@ -120,8 +118,6 @@ async function closeDetail() {
async function show() {
const div = document.getElementById('book') as HTMLDivElement;
div.style.display = 'flex';
await sleep(50);
div.style.opacity = '1';
}
/**
@@ -203,7 +199,6 @@ onUnmounted(() => {
width: 80%;
height: 100%;
overflow: hidden;
transition: opacity 0.6s linear;
display: flex;
flex-direction: column;
justify-content: space-between;
-3
View File
@@ -132,8 +132,6 @@ onMounted(async () => {
let moved = false;
let pos = [0, 0];
await sleep(600);
useDrag(
detail,
(x, y) => {
@@ -178,7 +176,6 @@ onUnmounted(() => {
align-items: center;
width: 72%;
height: 100%;
transition: all 0.6s ease;
user-select: none;
}
+6 -6
View File
@@ -32,7 +32,7 @@
import { onMounted, onUpdated, ref, watch } from 'vue';
import Box from '../components/box.vue';
import { GameUi } from '@/core/main/custom/ui';
import type { DamageEnemy } from '@/game/enemy/damage';
import type { DamageEnemy, EnemyInfo } from '@/game/enemy/damage';
import { nextFrame } from '@/plugin/utils';
const props = defineProps<{
@@ -68,23 +68,23 @@ const detail = ((): [number, string, string][] => {
[enemy.enemy.money, '金币', 'lightyellow'],
[enemy.enemy.exp, '经验', 'lawgreen'],
[data?.atkDelta ?? 0, '临界', 'lightsalmon'],
[-data?.delta ?? 0, '临界减伤', 'lightpink'],
[-enemy.calDefDamage(ratio).delta, `${ratio}防`, 'cyan']
[data?.delta ?? 0, '临界减伤', 'lightpink'],
[enemy.calDefDamage(ratio).delta, `${ratio}防`, 'cyan']
];
})();
const special = (() => {
const s = enemy.info.special;
const fromFunc = (
func: string | ((enemy: Enemy) => string),
enemy: Enemy
func: string | ((enemy: EnemyInfo) => string),
enemy: EnemyInfo
) => {
return typeof func === 'string' ? func : func(enemy);
};
const show = s.slice(0, 2).map(v => {
const s = Mota.require('var', 'enemySpecials')[v];
return [fromFunc(s.name, enemy.enemy), s.color];
return [fromFunc(s.name, enemy.info), s.color];
});
if (s.length > 2) show.push(['...', 'white']);
return show;