Skip to content

Commit 6df91de

Browse files
xizifuxizifu
committed
调整#content.useCard中播放语音/动画/存放历史记录与玩家使用实体牌的先后顺序
1 parent e103c3c commit 6df91de

File tree

1 file changed

+76
-76
lines changed

1 file changed

+76
-76
lines changed

‎noname/library/element/content.js‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -9498,6 +9498,82 @@ player.removeVirtualEquip(card);
94989498
if (!get.info(event.card, false).noForceDie) {
94999499
event.forceDie = true;
95009500
}
9501+
//player.using=cards;
9502+
let cardaudio = true;
9503+
9504+
if (event.skill) {
9505+
if (lib.skill[event.skill].audio) {
9506+
cardaudio = false;
9507+
}
9508+
if (lib.skill[event.skill].log != false) {
9509+
player.logSkill(event.skill, false, null, null, [event, event.player]);
9510+
}
9511+
if (get.info(event.skill).popname) {
9512+
player.tryCardAnimate(event.card, event.card.name, "metal", true);
9513+
}
9514+
} else if (!event.nopopup) {
9515+
if (lib.translate[event.card.name + "_pop"]) {
9516+
player.tryCardAnimate(event.card, lib.translate[event.card.name + "_pop"], "metal");
9517+
} else {
9518+
player.tryCardAnimate(event.card, event.card.name, "metal");
9519+
}
9520+
}
9521+
if (event.audio === false) {
9522+
cardaudio = false;
9523+
}
9524+
if (cardaudio) {
9525+
game.broadcastAll(
9526+
(player, card) => {
9527+
game.playCardAudio(card, player);
9528+
},
9529+
player,
9530+
event.card
9531+
);
9532+
}
9533+
event.id = get.id();
9534+
if (!Array.isArray(event.excluded)) {
9535+
event.excluded = [];
9536+
}
9537+
if (!Array.isArray(event.directHit)) {
9538+
event.directHit = [];
9539+
}
9540+
if (typeof event.customArgs != "object" || typeof event.customArgs.default != "object") {
9541+
event.customArgs = { default: {} };
9542+
}
9543+
if (typeof event.baseDamage != "number") {
9544+
event.baseDamage = get.info(event.card, false).baseDamage || 1;
9545+
}
9546+
if (typeof event.effectCount != "number") {
9547+
event.effectCount = get.info(event.card, false).effectCount || 1;
9548+
}
9549+
event.effectedCount = 0;
9550+
if (event.oncard) {
9551+
event.oncard(event.card, event.player);
9552+
}
9553+
player.actionHistory[player.actionHistory.length - 1].useCard.push(event);
9554+
game.getGlobalHistory().useCard.push(event);
9555+
if (event.addCount !== false) {
9556+
if (player.stat[player.stat.length - 1].card[event.card.name] == undefined) {
9557+
player.stat[player.stat.length - 1].card[event.card.name] = 1;
9558+
} else {
9559+
player.stat[player.stat.length - 1].card[event.card.name]++;
9560+
}
9561+
}
9562+
if (event.skill && event.addSkillCount !== false) {
9563+
if (player.stat[player.stat.length - 1].skill[event.skill] == undefined) {
9564+
player.stat[player.stat.length - 1].skill[event.skill] = 1;
9565+
} else {
9566+
player.stat[player.stat.length - 1].skill[event.skill]++;
9567+
}
9568+
let sourceSkill = get.info(event.skill).sourceSkill;
9569+
if (sourceSkill) {
9570+
if (player.stat[player.stat.length - 1].skill[sourceSkill] == undefined) {
9571+
player.stat[player.stat.length - 1].skill[sourceSkill] = 1;
9572+
} else {
9573+
player.stat[player.stat.length - 1].skill[sourceSkill]++;
9574+
}
9575+
}
9576+
}
95019577
event.lose_map = {
95029578
noowner: [],
95039579
};
@@ -9659,82 +9735,6 @@ player.removeVirtualEquip(card);
96599735
await game.cardsGotoOrdering(directDiscard);
96609736
}
96619737
}
9662-
//player.using=cards;
9663-
let cardaudio = true;
9664-
9665-
if (event.skill) {
9666-
if (lib.skill[event.skill].audio) {
9667-
cardaudio = false;
9668-
}
9669-
if (lib.skill[event.skill].log != false) {
9670-
player.logSkill(event.skill, false, null, null, [event, event.player]);
9671-
}
9672-
if (get.info(event.skill).popname) {
9673-
player.tryCardAnimate(event.card, event.card.name, "metal", true);
9674-
}
9675-
} else if (!event.nopopup) {
9676-
if (lib.translate[event.card.name + "_pop"]) {
9677-
player.tryCardAnimate(event.card, lib.translate[event.card.name + "_pop"], "metal");
9678-
} else {
9679-
player.tryCardAnimate(event.card, event.card.name, "metal");
9680-
}
9681-
}
9682-
if (event.audio === false) {
9683-
cardaudio = false;
9684-
}
9685-
if (cardaudio) {
9686-
game.broadcastAll(
9687-
(player, card) => {
9688-
game.playCardAudio(card, player);
9689-
},
9690-
player,
9691-
event.card
9692-
);
9693-
}
9694-
event.id = get.id();
9695-
if (!Array.isArray(event.excluded)) {
9696-
event.excluded = [];
9697-
}
9698-
if (!Array.isArray(event.directHit)) {
9699-
event.directHit = [];
9700-
}
9701-
if (typeof event.customArgs != "object" || typeof event.customArgs.default != "object") {
9702-
event.customArgs = { default: {} };
9703-
}
9704-
if (typeof event.baseDamage != "number") {
9705-
event.baseDamage = get.info(event.card, false).baseDamage || 1;
9706-
}
9707-
if (typeof event.effectCount != "number") {
9708-
event.effectCount = get.info(event.card, false).effectCount || 1;
9709-
}
9710-
event.effectedCount = 0;
9711-
if (event.oncard) {
9712-
event.oncard(event.card, event.player);
9713-
}
9714-
player.actionHistory[player.actionHistory.length - 1].useCard.push(event);
9715-
game.getGlobalHistory().useCard.push(event);
9716-
if (event.addCount !== false) {
9717-
if (player.stat[player.stat.length - 1].card[event.card.name] == undefined) {
9718-
player.stat[player.stat.length - 1].card[event.card.name] = 1;
9719-
} else {
9720-
player.stat[player.stat.length - 1].card[event.card.name]++;
9721-
}
9722-
}
9723-
if (event.skill && event.addSkillCount !== false) {
9724-
if (player.stat[player.stat.length - 1].skill[event.skill] == undefined) {
9725-
player.stat[player.stat.length - 1].skill[event.skill] = 1;
9726-
} else {
9727-
player.stat[player.stat.length - 1].skill[event.skill]++;
9728-
}
9729-
let sourceSkill = get.info(event.skill).sourceSkill;
9730-
if (sourceSkill) {
9731-
if (player.stat[player.stat.length - 1].skill[sourceSkill] == undefined) {
9732-
player.stat[player.stat.length - 1].skill[sourceSkill] = 1;
9733-
} else {
9734-
player.stat[player.stat.length - 1].skill[sourceSkill]++;
9735-
}
9736-
}
9737-
}
97389738
await event.trigger("useCard0");
97399739
},
97409740
async (event, trigger, player) => {

0 commit comments

Comments
 (0)