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

修复nobracket样式错误，.skill改为弹性布局

This commit is contained in:
kuangshen04 2023-12-19 21:59:06 +08:00
parent a45ba5ef1a
commit 9fa0dc41f2
2 changed files with 174 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
game/game.js
View File

@ -62053,106 +62053,143 @@ new Promise(resolve=>{
skills.add(i); skills.add(i);
} }
} }
for(i=0;i<skills.length;i++){ skills.forEach(skill=>{
if(lib.skill[skills[i]]&&(lib.skill[skills[i]].nopop||lib.skill[skills[i]].equipSkill)) continue; if(lib.skill[skill]&&(lib.skill[skill].nopop||lib.skill[skill].equipSkill)) return;
if(lib.translate[skills[i]+'_info']){ if(!lib.translate[skill+'_info']) return;
if(lib.translate[skills[i]+'_ab']) translation=lib.translate[skills[i]+'_ab']; let translation;
if(lib.translate[skill+'_ab']) translation=lib.translate[skill+'_ab'];
else{ else{
translation=get.translation(skills[i]); translation=get.translation(skill);
if(!lib.skill[skills[i]].nobracket) translation=translation.slice(0,2); if(!lib.skill[skill].nobracket) translation=`【${translation.slice(0,2)}】`;
} }
if(node.forbiddenSkills[skills[i]]){ if(node.forbiddenSkills[skill]) uiintro.add(`
var forbidstr='<div style="opacity:0.5"><div class="skill">【'+translation+'】</div><div>'; <div style="opacity:0.5">
if(node.forbiddenSkills[skills[i]].length){ <div class="skill">${translation}</div>
forbidstr+='（与'+get.translation(node.forbiddenSkills[skills[i]])+'冲突）<br>'; <div>
} ${node.forbiddenSkills[skill].length?`（与${get.translation(node.forbiddenSkills[skill])}冲突）`:`（双将禁用）`}<br/>
else{ ${get.skillInfoTranslation(skill,node)}
forbidstr+='（双将禁用）<br>'; </div>
} </div>
forbidstr+=get.skillInfoTranslation(skills[i],node)+'</div></div>' `);
uiintro.add(forbidstr); else if(!skills2.contains(skill)){
} if(lib.skill[skill].preHidden&&get.mode()=='guozhan'){
else if(!skills2.contains(skills[i])){ uiintro.add(`
if(lib.skill[skills[i]].preHidden&&get.mode()=='guozhan'){ <div>
uiintro.add('<div><div class="skill" style="opacity:0.5">【'+translation+'】</div><div><span style="opacity:0.5">'+get.skillInfoTranslation(skills[i],node)+'</span><br><div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">预亮技能</div></div></div>'); <div class="skill" style="opacity:0.5">${translation}</div>
var underlinenode=uiintro.content.lastChild.querySelector('.underlinenode'); <div>
if(_status.prehidden_skills.contains(skills[i])){ <span style="opacity:0.5">${get.skillInfoTranslation(skill,node)}</span><br/>
<div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">预亮技能</div>
</div>
</div>
`);
const underlinenode=uiintro.content.lastChild.querySelector('.underlinenode');
if(_status.prehidden_skills.contains(skill)){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
underlinenode.link=skills[i]; underlinenode.link=skill;
underlinenode.listen(ui.click.hiddenskill); underlinenode.listen(ui.click.hiddenskill);
} }
else uiintro.add('<div style="opacity:0.5"><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i],node)+'</div></div>'); else uiintro.add(`
<div style="opacity:0.5">
<div class="skill">${translation}</div>
<div>${get.skillInfoTranslation(skill,node)}</div>
</div>
`);
} }
else if(lib.skill[skills[i]].temp||!node.skills.contains(skills[i])||lib.skill[skills[i]].thundertext){ else if(lib.skill[skill].temp||!node.skills.contains(skill)||lib.skill[skill].thundertext){
if(lib.skill[skills[i]].frequent||lib.skill[skills[i]].subfrequent){ if(lib.skill[skill].frequent||lib.skill[skill].subfrequent){
uiintro.add('<div><div class="skill thundertext thunderauto">【'+translation+'】</div><div class="thundertext thunderauto">'+get.skillInfoTranslation(skills[i],node)+'<br><div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">自动发动</div></div></div>'); uiintro.add(`
var underlinenode=uiintro.content.lastChild.querySelector('.underlinenode'); <div>
if(lib.skill[skills[i]].frequent){ <div class="skill thundertext thunderauto">${translation}</div>
if(lib.config.autoskilllist.contains(skills[i])){ <div class="thundertext thunderauto">
${get.skillInfoTranslation(skill,node)}<br/>
<div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">自动发动</div>
</div>
</div>
`);
const underlinenode=uiintro.content.lastChild.querySelector('.underlinenode');
if(lib.skill[skill].frequent){
if(lib.config.autoskilllist.contains(skill)){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
} }
if(lib.skill[skills[i]].subfrequent){ if(lib.skill[skill].subfrequent) lib.skill[skill].subfrequent.forEach(i=>{
for(var j=0;j<lib.skill[skills[i]].subfrequent.length;j++){ if(lib.config.autoskilllist.contains(skill+'_'+i)){
if(lib.config.autoskilllist.contains(skills[i]+'_'+lib.skill[skills[i]].subfrequent[j])){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
} });
} if(lib.config.autoskilllist.contains(skill)){
if(lib.config.autoskilllist.contains(skills[i])){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
underlinenode.link=skills[i]; underlinenode.link=skill;
underlinenode.listen(ui.click.autoskill2); underlinenode.listen(ui.click.autoskill2);
} }
else{ else uiintro.add(`
uiintro.add('<div><div class="skill thundertext thunderauto">【'+translation+'】</div><div class="thundertext thunderauto">'+get.skillInfoTranslation(skills[i],node)+'</div></div>'); <div>
<div class="skill thundertext thunderauto">${translation}</div>
<div class="thundertext thunderauto">${get.skillInfoTranslation(skill,node)}</div>
</div>
`);
} }
} else if(lib.skill[skill].frequent||lib.skill[skill].subfrequent){
else if(lib.skill[skills[i]].frequent||lib.skill[skills[i]].subfrequent){ uiintro.add(`
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i],node)+'<br><div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">自动发动</div></div></div>'); <div>
var underlinenode=uiintro.content.lastChild.querySelector('.underlinenode'); <div class="skill">${translation}</div>
if(lib.skill[skills[i]].frequent){ <div>
if(lib.config.autoskilllist.contains(skills[i])){ ${get.skillInfoTranslation(skill,node)}<br/>
<div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">自动发动</div>
</div>
</div>
`);
const underlinenode=uiintro.content.lastChild.querySelector('.underlinenode');
if(lib.skill[skill].frequent){
if(lib.config.autoskilllist.contains(skill)){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
} }
if(lib.skill[skills[i]].subfrequent){ if(lib.skill[skill].subfrequent) lib.skill[skill].subfrequent.forEach(i=>{
for(var j=0;j<lib.skill[skills[i]].subfrequent.length;j++){ if(lib.config.autoskilllist.contains(skill+'_'+i)){
if(lib.config.autoskilllist.contains(skills[i]+'_'+lib.skill[skills[i]].subfrequent[j])){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
} });
} if(lib.config.autoskilllist.contains(skill)){
if(lib.config.autoskilllist.contains(skills[i])){
underlinenode.classList.remove('on'); underlinenode.classList.remove('on');
} }
underlinenode.link=skills[i]; underlinenode.link=skill;
underlinenode.listen(ui.click.autoskill2); underlinenode.listen(ui.click.autoskill2);
} }
else if(lib.skill[skills[i]].clickable&&node.isIn()&&node.isUnderControl(true)){ else if(lib.skill[skill].clickable&&node.isIn()&&node.isUnderControl(true)){
var intronode=uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i],node)+'<br><div class="menubutton skillbutton" style="position:relative;margin-top:5px">点击发动</div></div></div>').querySelector('.skillbutton'); const intronode=uiintro.add(`
if(!_status.gameStarted||(lib.skill[skills[i]].clickableFilter&&!lib.skill[skills[i]].clickableFilter(node))){ <div>
<div class="skill">${translation}</div>
<div>
${get.skillInfoTranslation(skill,node)}<br/>
<div class="menubutton skillbutton" style="position:relative;margin-top:5px">点击发动</div>
</div>
</div>
`).querySelector('.skillbutton');
if(!_status.gameStarted||(lib.skill[skill].clickableFilter&&!lib.skill[skill].clickableFilter(node))){
intronode.classList.add('disabled'); intronode.classList.add('disabled');
intronode.style.opacity=0.5; intronode.style.opacity=0.5;
} }
else{ else{
intronode.link=node; intronode.link=node;
intronode.func=lib.skill[skills[i]].clickable; intronode.func=lib.skill[skill].clickable;
intronode.classList.add('pointerdiv'); intronode.classList.add('pointerdiv');
intronode.listen(ui.click.skillbutton); intronode.listen(ui.click.skillbutton);
} }
} }
else{ else uiintro.add(`
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i],node)+'</div></div>'); <div>
} <div class="skill">${translation}</div>
if(lib.translate[skills[i]+'_append']){ <div>${get.skillInfoTranslation(skill,node)}</div>
uiintro._place_text=uiintro.add('<div class="text">'+lib.translate[skills[i]+'_append']+'</div>') </div>
} `);
} if(lib.translate[skill+'_append']){
uiintro._place_text=uiintro.add(`<div class="text">${lib.translate[skill+'_append']}</div>`)
} }
});
// if(get.is.phoneLayout()){ // if(get.is.phoneLayout()){
// var storage=node.storage; // var storage=node.storage;
// for(i in storage){ // for(i in storage){
@ -62839,22 +62876,25 @@ new Promise(resolve=>{
} }
else{ else{
var infoitem=get.character(character); var infoitem=get.character(character);
var skills=infoitem[3]; var skills=infoitem[3];get.character(character,3).forEach(skill=>{
for(i=0;i<skills.length;i++){ if(!lib.translate[skill+'_info']) return;
if(lib.translate[skills[i]+'_info']){ if(lib.translate[skill+'_ab']) translation=lib.translate[skill+'_ab'];
if(lib.translate[skills[i]+'_ab']) translation=lib.translate[skills[i]+'_ab'];
else{ else{
translation=get.translation(skills[i]); translation=get.translation(skill);
if(!lib.skill[skills[i]].nobracket) translation=translation.slice(0,2); if(!lib.skill[skill].nobracket) translation=`【${translation.slice(0,2)}】`;
} }
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'</div></div>'); uiintro.add(`
<div>
<div class="skill">${translation}</div>
<div>${get.skillInfoTranslation(skill)}</div>
</div>
`);
if(lib.translate[skills[i]+'_append']){ if(lib.translate[skill+'_append']){
uiintro._place_text=uiintro.add('<div class="text">'+lib.translate[skills[i]+'_append']+'</div>') uiintro._place_text=uiintro.add(`<div class="text">${lib.translate[skill+'_append']}</div>`)
}
}
} }
});
var modepack=lib.characterPack['mode_'+get.mode()]; var modepack=lib.characterPack['mode_'+get.mode()];
if(lib.config.show_favourite&& if(lib.config.show_favourite&&
lib.character[node.link]&&(!modepack||!modepack[node.link])&&(!simple||get.is.phoneLayout())){ lib.character[node.link]&&(!modepack||!modepack[node.link])&&(!simple||get.is.phoneLayout())){

14
layout/default/layout.css
View File

@ -1935,10 +1935,20 @@ div:not(.handcards)>.card>.info>span,
padding: 0; padding: 0;
} }
div:has(>div.skill):only-child {
display: flex;
flex-wrap: nowrap;
}
.skill { .skill {
left: 0 !important; left: 0 !important;
width: 70px !important; flex: 0 0 70px !important;
white-space: nowrap; word-break: break-word;
/* width: 70px !important;
white-space: nowrap; */
}
.skill+div {
flex: 1;
word-break: break-word;
} }
.skilln { .skilln {
left: 0 !important; left: 0 !important;