YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

随从调遣bugfix 

修复在有原武将的前提下调遣随从不能继承前缀/直译且没有初始transBin的bug
This commit is contained in:
mengxinzxz 2024-05-22 08:29:18 +08:00
parent 842ac8232b
commit b0dab87a9d
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
noname/game/index.js
View File

@ -2788,10 +2788,13 @@ export class Game {
},
addSubPlayer: function (player, content) {
if (player && content && content[0] && content[1] && content[2] && content[3] && content[4]) {
var skill = content[0];
var skill = content[0],
list = content[3];
lib.skill[skill] = content[1];
lib.character[skill] = content[2];
lib.translate[skill] = content[3];
for (let i = 0; i < list.length; i++) {
lib.translate[skill + ["", "_prefix", "_ab"][i]] = list[i];
}
player.storage[skill] = content[4];
}
},

12
noname/library/element/player.js
View File

@ -7315,9 +7315,10 @@ export class Player extends HTMLDivElement {
cfg.source = this.name;
}
}
const list = cfg.caption ? [cfg.caption] : ["", "_prefix", "_ab"].map(str => "name" + str).filter(str => lib.translate[str]);
game.broadcastAll(
//TODO: 这里直接修改trashBin部分，后续需要修改为新写法
function (player, skill, cfg) {
function (player, skill, list, cfg) {
lib.skill[skill] = {
intro: {
content: cfg.intro || "",
@ -7328,7 +7329,7 @@ export class Player extends HTMLDivElement {
subplayer: true,
},
};
lib.character[skill] = [cfg.sex, cfg.group, parseFloat(cfg.hp) + "/" + parseFloat(cfg.maxHp) + "/" + parseFloat(cfg.hujia), cfg.skills, []];
lib.character[skill] = [cfg.sex, cfg.group, parseFloat(cfg.hp) + "/" + parseFloat(cfg.maxHp) + "/" + parseFloat(cfg.hujia), cfg.skills, lib.character[cfg.name].trashBin || []];
if (Array.isArray(cfg.image)) {
cfg.image.forEach(image => lib.character[skill][4].push(image));
} else if (typeof cfg.image == "string") {
@ -7336,14 +7337,17 @@ export class Player extends HTMLDivElement {
} else {
lib.character[skill].trashBin.push("character:" + cfg.name);
}
lib.translate[skill] = cfg.caption || get.rawName(cfg.name);
for (let i = 0; i < list.length; i++) {
lib.translate[skill + ["", "_prefix", "_ab"][i]] = list[i];
}
player.storage[skill] = cfg;
},
this,
skill,
list,
cfg
);
game.addVideo("addSubPlayer", this, [skill, lib.skill[skill], lib.character[skill], lib.translate[skill], { name: cfg.name }]);
game.addVideo("addSubPlayer", this, [skill, lib.skill[skill], lib.character[skill], list, { name: cfg.name }]);
this.addSkill(skill);
return skill;
}