@@ -1391,7 +1393,7 @@ var formation = new Formation(teamsCount,5);
-
+
diff --git a/script-skill-parser.js b/script-skill-parser.js
index 41386fe1..d88ed880 100644
--- a/script-skill-parser.js
+++ b/script-skill-parser.js
@@ -1845,7 +1845,7 @@ function renderSkill(skill, option = {})
skills.forEach((subSkill, idx)=>{
const li = ul.appendChild(document.createElement("li"));
const details = li.appendChild(document.createElement("details"));
- details.open = true;
+ details.open = false; //随机类技能默认关闭
details.className = "skill-details";
details.appendChild(renderSkillTitle(skill.params[idx]));
details.appendChild(renderSkillEntry(subSkill));
@@ -1863,7 +1863,7 @@ function renderSkill(skill, option = {})
skills.forEach((subSkill, idx)=>{
const li = ul.appendChild(document.createElement("li"));
const details = li.appendChild(document.createElement("details"));
- details.open = true;
+ details.open = true; //进化类技能默认打开
details.className = "skill-details";
details.appendChild(renderSkillTitle(skill.params[idx], { showTurns:true }));
details.appendChild(renderSkillEntry(subSkill));
diff --git a/script.js b/script.js
index f3b10db2..6619fc4e 100644
--- a/script.js
+++ b/script.js
@@ -344,7 +344,7 @@ Formation.prototype.outObj = function() {
});
let dge = this.dungeonEnchance;
if (Object.values(dge.rate).some(rate => rate != 1)) obj.r = [
- [reflags(dge.types),reflags(dge.attrs),reflags(dge.rarities),dge.collabs.length ? dge.collabs : 0].deleteLatter(0), //类型,属性,星级
+ [reflags(dge.types),reflags(dge.attrs),reflags(dge.rarities),dge.collabs.length ? dge.collabs : 0,dge.gachas.length ? dge.gachas : 0].deleteLatter(0), //类型,属性,星级
[dge.rate.hp,dge.rate.atk,dge.rate.rcv].deleteLatter(1)
];
obj.v = dataStructure;
@@ -436,6 +436,7 @@ Formation.prototype.loadObj = function(f) {
dge.attrs = flags(effective[1] ?? 0);
dge.rarities = flags(effective[2] ?? 0);
dge.collabs = effective[3]?.length ? effective[3] : [];
+ dge.gachas = effective[4]?.length ? effective[4] : [];
dge.rate.hp = rates[0] ?? 1;
dge.rate.atk = rates[1] ?? 1;
dge.rate.rcv = rates[2] ?? 1;
@@ -2843,7 +2844,11 @@ function initialize() {
//初始化Dialog
dialogInitialing(dungeonEnchanceDialog);
const dungeonEnchanceDialogConfirm = dungeonEnchanceDialog.querySelector(".dialog-confirm");
- dungeonEnchanceDialogConfirm.onclick = function(){
+ dungeonEnchanceDialogConfirm.onclick = function(){
+ const rarities = returnCheckBoxsValues(rareDoms).map(Str2Int);
+ const attrs = returnCheckBoxsValues(attrDoms).map(Str2Int);
+ const types = returnCheckBoxsValues(typeDoms).map(Str2Int);
+
const dge = formation.dungeonEnchance;
dge.rarities = rarities;
dge.attrs = attrs;
diff --git a/solo.html b/solo.html
index 8659b658..86a6c645 100644
--- a/solo.html
+++ b/solo.html
@@ -940,55 +940,57 @@ var formation = new Formation(teamsCount,6);