Skip to content

Commit

Permalink
Merge pull request #1751 from mengxinzxz/PR-Branch
Browse files Browse the repository at this point in the history
bugfix;素材补充
  • Loading branch information
nonameShijian authored Aug 20, 2024
2 parents 4a75062 + 6079256 commit 50a1ca8
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion card/extra.js
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ game.import("card", function () {
if (result.bool) {
var card = player.getVEquip("muniu");
result.targets[0].equip(card);
player.$give(card, result.targets[0]);
player.$give(card.cards, result.targets[0]);
player.line(result.targets, "green");
game.delay();
} else {
Expand Down
2 changes: 1 addition & 1 deletion character/sp/skill.js
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ const skills = {
return [cards];
});
const result = await next.forResult();
if (!result || result.bool) return;
if (!result || !result.bool) return;
let hs = result.moved[0].reverse();
game.addVideo("lose", player, [get.cardsInfo(hs), [], [], []]);
hs.forEach(i => i.goto(ui.special));
Expand Down
Binary file modified image/character/liuhui.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/character/mb_simazhou.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/character/mb_wenqin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/character/mb_zhangfen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/character/shen_dianwei.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/character/shen_machao.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 50a1ca8

Please sign in to comment.