二区 & 修复楼传bug

This commit is contained in:
AncTe committed 2023-01-09 20:36:40 +08:00
1 parent c4417977da
commit a85cef79ec
19 files changed
+492 -135

No files matched your search

+5 -2
View File
@@ -7,7 +7,7 @@
"<br>",
"<br>",
"1. <span style=\"color: yellow; font-weight: 700\">",
"本百科全书字数很多,可以选择性地阅读。</span>",
"本百科全书字数很多,可以选择性地阅读。</span>不过本条目最好可以全部阅读一遍。",
"<br>",
"<br>",
"2. 本百科全书的内容会<span style=\"color: gold\">随着游戏的推进而增加新内容</span>,",
@@ -34,7 +34,10 @@
"<br>",
"<br>",
"6. 本塔中几乎所有 ui 在打开时都会有一个0.6s的动画,如果不想要,可以在开头捡的系统设置里面关闭(默认关闭)。",
"同时,几乎所有 ui 的退出按钮都在左上角。"
"同时,几乎所有 ui 的退出按钮都在左上角。",
"<br>",
"<br>",
"7. 地图上显示的怪物临界有可能不准,当其与折线图有差异时,<span style=\"color: gold\">请以折线图为准</span>。"
]
},
"about": {
+2 -2
View File
@@ -122,7 +122,7 @@ const allDef = ref(originDef);
const addAtk = ref(0);
const addDef = ref(0);
const originDamage = core.getDamageInfo(enemy, void 0, x.value, y.value);
const originDamage = core.getDamageInfo(enemy.id, void 0, x.value, y.value);
// 转发core上的内容至当前作用域
const format = core.formatBigNumber;
@@ -130,7 +130,7 @@ const ratio = core.status.thisMap.ratio;
const nowDamage = computed(() => {
const dam = core.getDamageInfo(
enemy,
enemy.id,
{
atk: core.getStatus('atk') + addAtk.value * ratio,
def: core.getStatus('def') + addDef.value * ratio
+3
View File
@@ -210,6 +210,9 @@ export class Chase {
this.ani.ticker.destroy();
delete flags.onChase;
delete flags.chase;
delete flags.chaseTime;
delete flags.chaseHard;
delete flags.chaseIndex;
flags.__lockViewport__ = false;
core.deleteCanvas('chasePath');
}
+19 -11
View File
@@ -6,12 +6,15 @@ export const showFixed = ref(false);
let lastId: EnemyIds;
const show = debounce((ev: MouseEvent, mx: number, my: number, e: AllIds) => {
const show = debounce((ev: MouseEvent) => {
if (!window.flags) return;
if (!flags.mouseLoc) return;
flags.clientLoc = [ev.clientX, ev.clientY];
const [mx, my] = getLocFromMouseLoc(...flags.mouseLoc);
const e = core.getBlockId(mx, my);
if (e !== lastId) showFixed.value = false;
if (!e || !core.getClsFromId(e)?.startsWith('enemy')) return;
lastId = e as EnemyIds;
const enemy = core.material.enemys[e as EnemyIds];
const detail = getDetailedEnemy(enemy, mx, my);
@@ -22,14 +25,12 @@ const show = debounce((ev: MouseEvent, mx: number, my: number, e: AllIds) => {
export default function init() {
const data = core.canvas.data.canvas;
data.addEventListener('mousemove', ev => {
if (!core.isPlaying()) return;
const [x, y] = flags.mouseLoc;
const mx = Math.round(x + core.bigmap.offsetX / 32);
const my = Math.round(y + core.bigmap.offsetY / 32);
if (!core.isPlaying() || core.status.lockControl) return;
const [mx, my] = getLocFromMouseLoc(...flags.mouseLoc);
const e = core.getBlockId(mx, my);
if (e !== lastId) showFixed.value = false;
if (!e) return;
show(ev, mx, my, e);
show(ev);
});
return {
@@ -37,6 +38,12 @@ export default function init() {
};
}
export function getLocFromMouseLoc(x: number, y: number): LocArr {
const mx = Math.round(x + core.bigmap.offsetX / 32);
const my = Math.round(y + core.bigmap.offsetY / 32);
return [mx, my];
}
export function getDetailedEnemy<I extends EnemyIds>(
enemy: Enemy<I>,
x: number,
@@ -45,12 +52,13 @@ export function getDetailedEnemy<I extends EnemyIds>(
): DetailedEnemy<I> {
const ratio = core.status.maps[floorId].ratio;
const enemyInfo = Object.assign(
core.getEnemyInfo(enemy, void 0, x, y),
core.getDamageInfo(enemy, void 0, x, y) ?? {},
enemy
{},
enemy,
core.getEnemyInfo(enemy, void 0, x, y, floorId),
core.getDamageInfo(enemy, void 0, x, y, floorId) ?? {}
);
const critical = core.nextCriticals(enemy, 1, x, y);
const defDamage = core.getDefDamage(enemy, ratio, x, y);
const critical = core.nextCriticals(enemy, 1, x, y, floorId);
const defDamage = core.getDefDamage(enemy, ratio, x, y, floorId);
const specialText = core.getSpecialText(enemyInfo);
let toShowSpecial = cloneDeep(specialText);
if (toShowSpecial.length > 2) {
+7
View File
@@ -561,4 +561,11 @@ interface IdToCls {
X30121: 'tileset';
X30196: 'tileset';
X30204: 'tileset';
X70065: 'tileset';
X70112: 'tileset';
X70114: 'tileset';
X70120: 'tileset';
X70122: 'tileset';
X70128: 'tileset';
X70130: 'tileset';
}
+14
View File
@@ -561,6 +561,13 @@ interface IdToNumber {
X30121: 30121;
X30196: 30196;
X30204: 30204;
X70065: 70065;
X70112: 70112;
X70114: 70114;
X70120: 70120;
X70122: 70122;
X70128: 70128;
X70130: 70130;
}
interface NumberToId {
1: 'yellowWall';
@@ -1125,4 +1132,11 @@ interface NumberToId {
30121: 'X30121';
30196: 'X30196';
30204: 'X30204';
70065: 'X70065';
70112: 'X70112';
70114: 'X70114';
70120: 'X70120';
70122: 'X70122';
70128: 'X70128';
70130: 'X70130';
}
+1
View File
@@ -249,6 +249,7 @@ interface Utils {
* @param onMap 显示的字符数
* @returns 格式化结果
*/
formatBigNumber<T extends string>(x: T, onMap?: number): T;
formatBigNumber(x: number | string, onMap?: number): string;
/**
+1
View File
@@ -364,6 +364,7 @@ function drawRight() {
*/
function draw() {
drawedThumbnail = {};
thumbnailLoc = {};
drawMap();
drawRight();
}