diff --git a/character/rank.js b/character/rank.js index bed979bf6..8cc67e6ba 100644 --- a/character/rank.js +++ b/character/rank.js @@ -370,6 +370,7 @@ window.characterRank={ 're_yuanshu', 'yuanshu', 're_guojia', + 'cuiyan', ], b:[ 'diy_liufu', @@ -384,7 +385,6 @@ window.characterRank={ 'weiyan', 'sp_xiahoudun', 'jsp_huangyueying', - 'cuiyan', 'sp_zhangfei', 'hs_nozdormu', 'yxs_lishimin', diff --git a/character/yijiang.js b/character/yijiang.js index 9501551e4..8ea772f6d 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -4607,7 +4607,7 @@ character.yijiang={ player.showHandcards(); "step 1" var num=player.num('h'); - player.chooseTarget('选择至多'+num+'名角色各摸一张牌',[1,num],function(card,player,target){ + player.chooseTarget('选择至多'+get.cnNumber(num)+'名角色各摸一张牌',[1,num],function(card,player,target){ return true; }).set('ai',function(target){ return ai.get.attitude(_status.event.player,target); @@ -5422,7 +5422,6 @@ character.yijiang={ content:function(){ "step 0" targets[0].gain(cards,player); - game.delay(); "step 1" targets[0].chooseControl('draw_card','出杀',function(){ var player=_status.event.player; diff --git a/game/game.js b/game/game.js index 40e7f4051..6cc0cf012 100644 --- a/game/game.js +++ b/game/game.js @@ -21073,6 +21073,448 @@ else next.num=num; next.setContent('gameDraw'); }, + chooseCharacterDouble:function(config,list){ + var next=game.createEvent('chooseCharacter',false); + if(Array.isArray(config)||typeof config=='function'||!config){ + list=config; + config={}; + } + config.width=config.width||8; + config.height=4; + config.size=config.width*config.height; + config.num=config.num||3; + config.ratio=config.ratio||1.2; + if(!config.hasOwnProperty('first')){ + config.first='rand'; + } + if(!Array.isArray(list)){ + var func=list; + list=[]; + for(var i in lib.character){ + if(typeof func=='function'){ + if(!func(i)) continue; + } + else{ + if(lib.filter.characterDisabled(i)) continue; + } + list.push(i); + } + } + next.config=config; + next.list=list; + next.setContent(function(){ + 'step 0' + event.nodes=[]; + event.avatars=[]; + event.friend=[]; + event.enemy=[]; + event.blank=[]; + for(var i=0;i3){ + event.side=0; + } + event.goto(2); + } + else{ + event.promptbar.hide(); + event.side++; + if(event.side>3){ + event.side=0; + } + if(event.side>=2){ + game.delay() + } + } + 'step 4' + if(event.checkredo()) return; + if(event.replacenode) event.replacenode.delete(); + if(event.reselectnode) event.reselectnode.delete(); + if(event.freechoosenode) event.freechoosenode.delete(); + for(var i=0;i.intro{opacity: 1;} #window[data-radius_size='default'] .shadowed.reduce_radius{ border-radius:4px; } + +#window>.choosedouble{ + left: 50%; + top: 50%; +} +#window>.choosedouble:not(.character){ + transition-duration:0.2s; +} +#window>.choosedouble.character{ + transform-origin: top left; +} +#window>.choosedouble.character>.name{ + left: 6%; + top: 8%; +} + .underline,.underlinenode{ padding:3px; width:auto; diff --git a/mode/versus.js b/mode/versus.js index 17001a1b2..8c2a4d248 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -54,8 +54,6 @@ mode.versus={ } ui.create.cards(); game.finishCards(); - ui.auto.hide(); - ui.wuxie.hide(); } else{ if(lib.storage.choice==undefined) game.save('choice',20); @@ -1079,435 +1077,28 @@ mode.versus={ event.enemylist=lib.config.continue_name_versus_three.enemy; _status.color=lib.config.continue_name_versus_three.color; game.additionaldead=[]; - event.goto(7); game.saveConfig('continue_name_versus_three'); - return; - } - event.nodes=[]; - event.avatars=[]; - event.list=[]; - event.friend=[]; - event.enemy=[]; - event.blank=[]; - for(var i in lib.character){ - if(lib.filter.characterDisabled(i)) continue; - if(lib.choiceThree.contains(i)){ - event.list.push(i); - } - else if(get.config('enable_all_three')&&!lib.filter.characterDisabled(i)){ - event.list.push(i); - } - } - for(var i=0;i<32;i++){ - event.nodes.push(ui.create.div('.shadowed.reduce_radius')); - event.nodes[i].style.left='50%'; - event.nodes[i].style.top='50%'; - event.nodes[i].style.transitionDuration='0.2s'; - event.nodes[i].animate('start'); - } - event.moveAvatar=function(node,i){ - if(!node.moved){ - event.blank.push(node.index); - } - event.nodes[node.index].show(); - event.moveNode(node,i); - setTimeout(function(){ - event.nodes[node.index].hide(); - },400); - }; - event.aiMove=function(){ - var list=[]; - for(var i=0;i3){ - event.side=0; - } event.goto(2); } else{ - event.side++; - if(event.side>3){ - event.side=0; - } - if(event.side>=2){ - game.delay(event.fast?1:2) - } - } - 'step 4' - if(event.checkredo()) return; - if(event.replacenode) event.replacenode.delete(); - if(event.reselectnode) event.reselectnode.delete(); - if(event.freechoosenode) event.freechoosenode.delete(); - for(var i=0;i