提交 5b4b86da 编辑于 作者: yuudi's avatar yuudi
浏览文件

Merge branch 'Diving-Fish-develop' into develop

......@@ -155,6 +155,9 @@ var vm = new Vue({
}
that.allChallenges = res.data.challenges;
that.members = res.data.members;
if (that.members.filter((elem) => {return elem.qqid == that.selectingQQid}).length == 0) {
that.selectingQQid = that.members[0].qqid;
}
that.refreshData();
// }).catch(function (error) {
// thisvue.$alert(error, '获取数据失败');
......@@ -634,7 +637,7 @@ var vm = new Vue({
if (clist[i].health_ramain != 0) {
damage = clist[i].damage;
}
else if (clist[i+1]?.is_continue) {
else if (clist[i+1] && clist[i+1].is_continue) {
damage = clist[i].damage + clist[i+1].damage
i++;
}
......@@ -942,7 +945,8 @@ var vm = new Vue({
if (nowBoss && lastPosition) {
bosses.push({
gte: lastPosition,
color: this.colorList[nowBoss - 1]
color: this.colorList[nowBoss - 1],
label: `${lastCircle}周目${nowBoss}王`
});
}
return [challs.map(c => [c.challenge_time * 1000, c.health_ramain]), bosses];
......
Supports Markdown
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册