v1.9.38.0

This commit is contained in:
libccy 2017-09-17 22:32:08 +08:00
parent dded772ae2
commit 0e82bc616d
6 changed files with 23 additions and 12 deletions

View File

@ -315,6 +315,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
filterTarget:function(card,player,target){ filterTarget:function(card,player,target){
return target!=player; return target!=player;
}, },
selectTarget:[1,2],
content:function(){ content:function(){
target.addTempSkill('diaohulishan'); target.addTempSkill('diaohulishan');
}, },

View File

@ -107,6 +107,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(player.isUnderControl(true)){ if(player.isUnderControl(true)){
if(_status.gameStarted&&player.storage.gwjingtian>0&&!player.hasSkill('gwjingtian2')){ if(_status.gameStarted&&player.storage.gwjingtian>0&&!player.hasSkill('gwjingtian2')){
dialog.add(ui.create.div('.menubutton.pointerdiv','点击发动',function(){ dialog.add(ui.create.div('.menubutton.pointerdiv','点击发动',function(){
this.remove();
lib.skill.gwjingtian.clickable(player); lib.skill.gwjingtian.clickable(player);
})); }));
} }

View File

@ -4,7 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
name:'ow', name:'ow',
character:{ character:{
ow_liekong:['female','shu',3,['shanxian','shanhui']], ow_liekong:['female','shu',3,['shanxian','shanhui']],
ow_sishen:['male','shu',3,['xiandan','yihun','shouge']], ow_sishen:['male','shu',4,['xiandan','yihun','shouge']],
ow_tianshi:['female','qun',3,['shouhu','ziyu','feiying']], ow_tianshi:['female','qun',3,['shouhu','ziyu','feiying']],
ow_falaozhiying:['female','shu',3,['feidan','huoyu','feiying']], ow_falaozhiying:['female','shu',3,['feidan','huoyu','feiying']],
ow_zhixuzhiguang:['female','qun',3,['guangshu']], ow_zhixuzhiguang:['female','qun',3,['guangshu']],

View File

@ -6892,6 +6892,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.countCards('he')>=num; return player.countCards('he')>=num;
}, },
check:function(card){ check:function(card){
if(ui.selected.cards.length>=2){
return 4-get.value(card);
}
return 6-get.value(card); return 6-get.value(card);
}, },
selectCard:function(card){ selectCard:function(card){

View File

@ -9023,13 +9023,16 @@
event.bool=false; event.bool=false;
return; return;
} }
_status.imchoosing=true;
game.pause(); game.pause();
"step 3" "step 3"
_status.imchoosing=false;
if(event.bool){ if(event.bool){
if(game.changeCoin){ if(game.changeCoin){
game.changeCoin(-3); game.changeCoin(-3);
} }
var hs=game.me.getCards('h'); var hs=game.me.getCards('h');
game.addVideo('lose',game.me,[get.cardsInfo(hs),[],[]]);
for(var i=0;i<hs.length;i++){ for(var i=0;i<hs.length;i++){
hs[i].discard(false); hs[i].discard(false);
} }
@ -25015,6 +25018,9 @@
ui.control.show(); ui.control.show();
ui.clear(); ui.clear();
game.stopCountChoose(); game.stopCountChoose();
if(ui.time3){
clearInterval(ui.time3.interval);
}
if(game.layout=='long2'&&!game.chess){ if(game.layout=='long2'&&!game.chess){
ui.arena.classList.add('choose-character'); ui.arena.classList.add('choose-character');
ui.me.hide(); ui.me.hide();
@ -43106,15 +43112,15 @@
} }
else if(lib.skill[skills[i]].clickable&&node.isIn()&&node.isUnderControl(true)){ else if(lib.skill[skills[i]].clickable&&node.isIn()&&node.isUnderControl(true)){
var intronode=uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'<br><div class="menubutton skillbutton" style="position:relative;margin-top:5px">点击发动</div></div></div>').querySelector('.skillbutton'); var intronode=uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'<br><div class="menubutton skillbutton" style="position:relative;margin-top:5px">点击发动</div></div></div>').querySelector('.skillbutton');
intronode.link=node;
intronode.func=lib.skill[skills[i]].clickable;
intronode.listen(ui.click.skillbutton);
if(!_status.gameStarted||(lib.skill[skills[i]].clickableFilter&&!lib.skill[skills[i]].clickableFilter(node))){ if(!_status.gameStarted||(lib.skill[skills[i]].clickableFilter&&!lib.skill[skills[i]].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.func=lib.skill[skills[i]].clickable;
intronode.classList.add('pointerdiv'); intronode.classList.add('pointerdiv');
intronode.listen(ui.click.skillbutton);
} }
} }
else if(lib.skill[skills[i]].nobracket){ else if(lib.skill[skills[i]].nobracket){

View File

@ -1,6 +1,6 @@
window.noname_update={ window.noname_update={
version:'1.9.38', version:'1.9.38.0',
update:'1.9.37.2', update:'1.9.38',
changeLog:[ changeLog:[
'bug修复' 'bug修复'
], ],
@ -10,11 +10,11 @@ window.noname_update={
// 'game/config.js', // 'game/config.js',
// 'game/source.js', // 'game/source.js',
// 'game/pressure.js', // 'game/pressure.js',
'game/asset.js', // 'game/asset.js',
// 'card/*', // 'card/*',
// 'card/standard.js', // 'card/standard.js',
// 'card/gwent.js', // 'card/gwent.js',
// 'card/gujian.js', 'card/guozhan.js',
// 'character/*', // 'character/*',
// 'character/hearth.js', // 'character/hearth.js',
'character/gwent.js', 'character/gwent.js',
@ -22,13 +22,13 @@ window.noname_update={
// 'character/standard.js', // 'character/standard.js',
// 'character/sp.js', // 'character/sp.js',
// 'character/swd.js', // 'character/swd.js',
'character/rank.js', // 'character/rank.js',
// 'character/yijiang.js', // 'character/yijiang.js',
// 'character/xianjian.js', // 'character/xianjian.js',
// 'mode/identity.js', // 'mode/identity.js',
'mode/boss.js', // 'mode/boss.js',
// 'mode/guozhan.js', // 'mode/guozhan.js',
'mode/versus.js', // 'mode/versus.js',
// 'mode/connect.js', // 'mode/connect.js',
// 'mode/chess.js', // 'mode/chess.js',
// 'mode/tafang.js', // 'mode/tafang.js',
@ -46,6 +46,6 @@ window.noname_update={
// 'layout/mobile/layout.css', // 'layout/mobile/layout.css',
// 'layout/newlayout/global.css', // 'layout/newlayout/global.css',
// 'layout/mode/chess.css', // 'layout/mode/chess.css',
'extension/boss/extension.js', // 'extension/boss/extension.js',
] ]
} }