This commit is contained in:
libccy 2015-05-11 11:43:37 +08:00
parent 5269962beb
commit 55b77af5cd
8 changed files with 37 additions and 11 deletions

18
.jshintrc Normal file
View File

@ -0,0 +1,18 @@
{
"camelcase": true,
"eqeqeq": true,
"globalstrict": true,
"esnext": true,
"strict": true,
"newcap": false,
"browser": true,
"unused": true,
"loopfunc": true,
"noyield": true,
"quotmark": "single",
"devel": true,
"node":true,
"globals": {
}
}

View File

@ -418,7 +418,7 @@ character.mountain={
player.judge(function(card){ player.judge(function(card){
if(get.suit(card)=='heart') return -1; if(get.suit(card)=='heart') return -1;
return 1; return 1;
}); },ui.special);
"step 1" "step 1"
if(result.bool){ if(result.bool){
result.card.goto(ui.special); result.card.goto(ui.special);

View File

@ -43,9 +43,10 @@ character.sp={
}, },
content:function(){ content:function(){
"step 0" "step 0"
trigger.source.judge(); trigger.source.judge(ui.special);
"step 1" "step 1"
if(result.color=='black'){ if(result.color=='black'){
result.card.goto(ui.discardPile);
trigger.num++; trigger.num++;
} }
else{ else{

View File

@ -6,7 +6,7 @@ window.config={
'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan'], 'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan'],
forbidversus:['swd_kangnalishi'], forbidversus:['swd_kangnalishi'],
forbidstone:['zhugedan','pal_xuanxiao'], forbidstone:['zhugedan','pal_xuanxiao'],
forbidchess:['hetaihou'], forbidchess:['hetaihou','swd_kangnalishi'],
forbiddouble:['zhugedan','swd_kangnalishi','swd_nicole','dongzhuo','jg_simayi'], forbiddouble:['zhugedan','swd_kangnalishi','swd_nicole','dongzhuo','jg_simayi'],
all:{ all:{
mode:['identity','guozhan','versus','boss','chess','stone'], mode:['identity','guozhan','versus','boss','chess','stone'],

View File

@ -1828,7 +1828,7 @@ window.play={};
game.dead.push(player); game.dead.push(player);
if(player.dieAfter) player.dieAfter(source); if(player.dieAfter) player.dieAfter(source);
if(lib.config.background_speak){ if(lib.config.background_speak){
if(lib.character[player.name]&&lib.character[player.name][4]&& if(lib.character[player.name]&&
lib.character[player.name][4].contains('die_audio')){ lib.character[player.name][4].contains('die_audio')){
game.playAudio('die',player.name); game.playAudio('die',player.name);
} }
@ -1988,7 +1988,7 @@ window.play={};
var info=lib.character[character]; var info=lib.character[character];
var skills=info[3]; var skills=info[3];
this.skills.length=0; this.skills.length=0;
if(!game.minskin&&lib.config.layout=='newlayout'&&info[4]&&info[4].contains('fullskin')){ if(!game.minskin&&lib.config.layout=='newlayout'&&info[4].contains('fullskin')){
this.classList.remove('minskin'); this.classList.remove('minskin');
this.classList.add('fullskin'); this.classList.add('fullskin');
this.node.avatar.style.backgroundImage='url("image/character/fullskin/'+character+'.jpg")'; this.node.avatar.style.backgroundImage='url("image/character/fullskin/'+character+'.jpg")';
@ -1997,7 +1997,7 @@ window.play={};
else{ else{
this.node.avatar.setBackground(character,'character'); this.node.avatar.setBackground(character,'character');
this.classList.remove('fullskin'); this.classList.remove('fullskin');
if(info[4]&&info[4].contains('minskin')){ if(info[4].contains('minskin')){
this.classList.add('minskin'); this.classList.add('minskin');
} }
else if(game.minskin){ else if(game.minskin){
@ -6577,7 +6577,7 @@ window.play={};
} }
else{ else{
for(var i in lib.character){ for(var i in lib.character){
if(lib.character[i][4]&&lib.character[i][4].contains('minskin')) continue; if(lib.character[i][4].contains('minskin')) continue;
if(filter&&filter(i)) continue; if(filter&&filter(i)) continue;
list.push(i); list.push(i);
if(namecapt.indexOf(getCapt(i))==-1){ if(namecapt.indexOf(getCapt(i))==-1){
@ -11535,8 +11535,10 @@ window.play={};
if(j=='character'&&!lib.config.characters.contains(i)) continue; if(j=='character'&&!lib.config.characters.contains(i)) continue;
for(k in character[i][j]){ for(k in character[i][j]){
if(j=='character'){ if(j=='character'){
if(!character[i][j][k][4]){
character[i][j][k][4]=[];
}
if(lib.config.only_fullskin&&lib.config.layout=='newlayout'&&lib.config.mode!='chess'){ if(lib.config.only_fullskin&&lib.config.layout=='newlayout'&&lib.config.mode!='chess'){
if(!character[i][j][k][4]) continue;
if(!character[i][j][k][4].contains('fullskin')&&!character[i][j][k][4].contains('minskin')){ if(!character[i][j][k][4].contains('fullskin')&&!character[i][j][k][4].contains('minskin')){
continue; continue;
} }

0
layout/mode/boss.css Normal file
View File

View File

@ -27,7 +27,7 @@ mode.mowang={
inherit:'biyue' inherit:'biyue'
}, },
baonu:{ baonu:{
trigger:{player:'damageEnd'}, trigger:{player:'changeHp'},
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
return player.hp<=4 return player.hp<=4
@ -535,4 +535,4 @@ mode.mowang={
versus:6, versus:6,
}, },
], ],
} }

View File

@ -5,6 +5,7 @@ mode.boss={
var next=game.createEvent('game',false); var next=game.createEvent('game',false);
next.content=function(){ next.content=function(){
"step 0" "step 0"
lib.init.css('layout/mode','boss')
ui.create.arena(); ui.create.arena();
var dialog=ui.create.dialog('还没完工~'); var dialog=ui.create.dialog('还没完工~');
dialog.style.height='52px'; dialog.style.height='52px';
@ -17,5 +18,9 @@ mode.boss={
console.log(1); console.log(1);
} }
} }
} },
character:{
boss_zuiqiangshenhua:['male','qun',8,['mashu','wushuang','baonu'],['boss']],
boss_baonuzhanshen:['male','qun',4,['mashu','wushuang','xiuluo','shenwei','shenji'],['boss']],
},
} }