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

3

This commit is contained in:
libccy 2016-06-12 20:12:02 +08:00
parent 213d5cdeb7
commit 4d0da69bbe
3 changed files with 113 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
character/sp.js
View File

@ -3105,11 +3105,6 @@ character.sp={
audio:2, audio:2,
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
direct:true, direct:true,
check:function(event,player){
if(player.hp>2) return true;
if(player.hp==2&&player.num('h')==0) return true;
return false;
},
content:function(){ content:function(){
"step 0" "step 0"
if(player.storage.kunfen|| if(player.storage.kunfen||

217
game/game.js
View File

@ -22557,9 +22557,11 @@
var packsource; var packsource;
var clickCapt=function(e){ var clickCapt=function(e){
if(_status.dragged) return; if(_status.dragged) return;
newlined2.style.display='none'; if(newlined2){
packsource.innerHTML='武将包'; newlined2.style.display='none';
packsource.classList.remove('thundertext'); packsource.innerHTML='武将包';
packsource.classList.remove('thundertext');
}
if(this.classList.contains('thundertext')){ if(this.classList.contains('thundertext')){
dialog.currentcapt=null; dialog.currentcapt=null;
dialog.currentcaptnode=null; dialog.currentcaptnode=null;
@ -22649,118 +22651,121 @@
node.appendChild(span); node.appendChild(span);
} }
} }
var groups=['wei','shu','wu','qun']; if(!thisiscard){
var natures=['water','soil','wood','metal']; var groups=['wei','shu','wu','qun'];
var span=document.createElement('span'); var natures=['water','soil','wood','metal'];
newlined.appendChild(span);
span.style.margin='8px';
var clickGroup=function(){
if(_status.dragged) return;
var node=this,link=this.link;
if(node.classList.contains('thundertext')){
dialog.currentgroup=null;
dialog.currentgroupnode=null;
node.classList.remove('thundertext');
// node.dataset.nature='';
for(var i=0;i<dialog.buttons.length;i++){
if(dialog.currentcapt&&dialog.buttons[i].capt!=dialog.getCurrentCapt(dialog.buttons[i].link,dialog.buttons[i].capt)){
dialog.buttons[i].classList.add('nodisplay');
}
else{
dialog.buttons[i].classList.remove('nodisplay');
}
}
}
else{
if(dialog.currentgroupnode){
dialog.currentgroupnode.classList.remove('thundertext');
// dialog.currentgroupnode.dataset.nature='';
}
dialog.currentgroup=link;
dialog.currentgroupnode=node;
node.classList.add('thundertext');
// node.dataset.nature=node._nature;
for(var i=0;i<dialog.buttons.length;i++){
if(dialog.buttons[i].group!=link||
(dialog.currentcapt&&dialog.buttons[i].capt!=dialog.getCurrentCapt(dialog.buttons[i].link,dialog.buttons[i].capt))){
dialog.buttons[i].classList.add('nodisplay');
}
else{
dialog.buttons[i].classList.remove('nodisplay');
}
}
}
};
for(var i=0;i<groups.length;i++){
var span=document.createElement('span'); var span=document.createElement('span');
span.style.margin='3px';
newlined.appendChild(span); newlined.appendChild(span);
span.innerHTML=get.translation(groups[i]); span.style.margin='8px';
span.link=groups[i]; var clickGroup=function(){
span._nature=natures[i]; if(_status.dragged) return;
span.addEventListener(lib.config.touchscreen?'touchend':'click',clickGroup); var node=this,link=this.link;
} if(node.classList.contains('thundertext')){
dialog.currentgroup=null;
var span=document.createElement('span'); dialog.currentgroupnode=null;
newlined.appendChild(span); node.classList.remove('thundertext');
span.style.margin='8px'; // node.dataset.nature='';
for(var i=0;i<dialog.buttons.length;i++){
packsource=document.createElement('span'); if(dialog.currentcapt&&dialog.buttons[i].capt!=dialog.getCurrentCapt(dialog.buttons[i].link,dialog.buttons[i].capt)){
packsource.style.margin='3px'; dialog.buttons[i].classList.add('nodisplay');
newlined.appendChild(packsource); }
packsource.innerHTML='武将包'; else{
dialog.buttons[i].classList.remove('nodisplay');
newlined2=document.createElement('div'); }
newlined2.style.marginTop='5px'; }
newlined2.style.display='none'; }
newlined2.style.fontFamily='xinwei'; else{
if(lib.config.layout=='phone'){ if(dialog.currentgroupnode){
newlined2.style.fontSize='32px'; dialog.currentgroupnode.classList.remove('thundertext');
} // dialog.currentgroupnode.dataset.nature='';
else{ }
newlined2.style.fontSize='22px'; dialog.currentgroup=link;
} dialog.currentgroupnode=node;
newlined2.style.textAlign='center'; node.classList.add('thundertext');
node.appendChild(newlined2); // node.dataset.nature=node._nature;
for(var i=0;i<dialog.buttons.length;i++){
packsource.addEventListener(lib.config.touchscreen?'touchend':'click',function(){ if(dialog.buttons[i].group!=link||
if(_status.dragged) return; (dialog.currentcapt&&dialog.buttons[i].capt!=dialog.getCurrentCapt(dialog.buttons[i].link,dialog.buttons[i].capt))){
if(newlined2.style.display=='none'){ dialog.buttons[i].classList.add('nodisplay');
newlined2.style.display='block'; }
else{
dialog.buttons[i].classList.remove('nodisplay');
}
}
}
};
for(var i=0;i<groups.length;i++){
var span=document.createElement('span');
span.style.margin='3px';
newlined.appendChild(span);
span.innerHTML=get.translation(groups[i]);
span.link=groups[i];
span._nature=natures[i];
span.addEventListener(lib.config.touchscreen?'touchend':'click',clickGroup);
} }
else{
newlined2.style.display='none'; var span=document.createElement('span');
} newlined.appendChild(span);
}); span.style.margin='8px';
for(var i=0;i<lib.config.all.characters.length;i++){
if(!lib.config.characters.contains(lib.config.all.characters[i])) continue; packsource=document.createElement('span');
var span=document.createElement('div'); packsource.style.margin='3px';
span.style.display='inline-block'; newlined.appendChild(packsource);
span.style.width='auto'; packsource.innerHTML='武将包';
span.style.margin='5px';
newlined2=document.createElement('div');
newlined2.style.marginTop='5px';
newlined2.style.display='none';
newlined2.style.fontFamily='xinwei';
if(lib.config.layout=='phone'){ if(lib.config.layout=='phone'){
span.style.fontSize='32px'; newlined2.style.fontSize='32px';
} }
else{ else{
span.style.fontSize='22px'; newlined2.style.fontSize='22px';
}
newlined2.style.textAlign='center';
node.appendChild(newlined2);
packsource.addEventListener(lib.config.touchscreen?'touchend':'click',function(){
if(_status.dragged) return;
if(newlined2.style.display=='none'){
newlined2.style.display='block';
}
else{
newlined2.style.display='none';
}
});
for(var i=0;i<lib.config.all.characters.length;i++){
if(!lib.config.characters.contains(lib.config.all.characters[i])) continue;
var span=document.createElement('div');
span.style.display='inline-block';
span.style.width='auto';
span.style.margin='5px';
if(lib.config.layout=='phone'){
span.style.fontSize='32px';
}
else{
span.style.fontSize='22px';
}
span.innerHTML=lib.translate[lib.config.all.characters[i]+'_character_config'];
span.link=lib.config.all.characters[i];
span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
newlined2.appendChild(span);
}
if(lib.customCharacters.length){
var span=document.createElement('div');
span.style.display='inline-block';
span.style.width='auto';
span.style.margin='5px';
// span.style.fontSize='20px';
span.innerHTML='自定义';
span.link='自定义';
span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
newlined2.appendChild(span);
} }
span.innerHTML=lib.translate[lib.config.all.characters[i]+'_character_config'];
span.link=lib.config.all.characters[i];
span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
newlined2.appendChild(span);
}
if(lib.customCharacters.length){
var span=document.createElement('div');
span.style.display='inline-block';
span.style.width='auto';
span.style.margin='5px';
// span.style.fontSize='20px';
span.innerHTML='自定义';
span.link='自定义';
span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
newlined2.appendChild(span);
} }
var groupSort; var groupSort;
if(thisiscard){ if(thisiscard){
groupSort=function(name){ groupSort=function(name){

18
game/update.js
View File

@ -1,27 +1,13 @@
window.noname_update={ window.noname_update={
version:'1.8.15.2', version:'1.8.15.3',
changeLog:[ changeLog:[
'修bug', '修bug',
], ],
files:{ files:{
global:[ global:[
'character/rank.js', 'character/sp.js',
'character/ow.js',
'character/yijiang.js',
'mode/identity.js',
'mode/guozhan.js',
'mode/versus.js',
'mode/stone.js',
'mode/boss.js',
'mode/chess.js',
'game/game.js', 'game/game.js',
'game/config.js',
'card/swd.js',
'card/standard.js',
'layout/default/layout.css',
], ],
'1.8.15':[],
'1.8.15.1':[],
'1.8.15.2':[] '1.8.15.2':[]
} }
} }