diff --git a/image/card/mougong_enemy.jpg b/image/card/mougong_enemy.jpg index 516cd07b8..5b8af85a4 100644 Binary files a/image/card/mougong_enemy.jpg and b/image/card/mougong_enemy.jpg differ diff --git a/image/card/mougong_fan.jpg b/image/card/mougong_fan.jpg index 7e8ac5809..a54df041e 100644 Binary files a/image/card/mougong_fan.jpg and b/image/card/mougong_fan.jpg differ diff --git a/image/card/mougong_friend.jpg b/image/card/mougong_friend.jpg index 0f535d125..4e0ecf2aa 100644 Binary files a/image/card/mougong_friend.jpg and b/image/card/mougong_friend.jpg differ diff --git a/image/card/mougong_nei.jpg b/image/card/mougong_nei.jpg index 0f0976374..55ee83016 100644 Binary files a/image/card/mougong_nei.jpg and b/image/card/mougong_nei.jpg differ diff --git a/image/card/mougong_zhong.jpg b/image/card/mougong_zhong.jpg index 24a806a04..20a300ed0 100644 Binary files a/image/card/mougong_zhong.jpg and b/image/card/mougong_zhong.jpg differ diff --git a/image/card/mougong_zhu.jpg b/image/card/mougong_zhu.jpg index d3f688910..585503763 100644 Binary files a/image/card/mougong_zhu.jpg and b/image/card/mougong_zhu.jpg differ diff --git a/mode/identity.js b/mode/identity.js index d995408dd..38c61eb1b 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -1290,15 +1290,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ for(var i=0;i{ - var name=skill,info; - if(player.marks[name]) player.updateMarks(); - if(lib.skill[name]) info=lib.skill[name].intro; - if(!info) return; - if(player.marks[name]) player.marks[name].info=info; - else player.marks[name]=player.mark(name,info); - player.updateMarks(); - } game.players.forEach(current=>{ current.storage.zhibi=[]; current.storage.zhibi_for=[]; @@ -1506,10 +1497,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ table.style.position='relative'; var listi; if(event.zhongmode){ - listi=['random','zhu','mingzhong','zhong','nei','fan']; + listi=['random','zhu','mingzhong','zhong','fan','nei']; } else{ - listi=['random','zhu','zhong','nei','fan']; + listi=['random','zhu','zhong','fan','nei']; } for(var i=0;i{ var str=get.translation(target)+'是'+get.translation(res+'2')+'
'; var dialog=ui.create.dialog(str,'forcebutton'); + var card=ui.create.card(); + card.classList.add('fullskin'); + var buttons=ui.create.div('.buttons',dialog.content); + buttons.appendChild(card); new Promise((resolve)=>{ var imageName=`mougong_${res}`; resolve(`${lib.assetURL}image/card/${imageName}.jpg`); - }).then(pth=>new Promise((resolve,reject)=>{ - var image=new Image(); - image.onload=()=>resolve(pth); - image.onerror=reject; - image.src=pth; - })).then(image=>{ - var img=document.createElement('img'); - dialog.content.appendChild(img); - img.setAttribute('src',image); - img.setAttribute('width','106'); - img.setAttribute('height','150'); - img.setAttribute('draggable',false); - img.style.transition='all 2s'; - setTimeout(function(){ - img.style.transform='rotateY(360deg)'; - },100); + }).then(pth=>{ + return new Promise((resolve,reject)=>{ + var image=new Image(); + image.onload=()=>resolve(pth); + image.onerror=reject; + image.src=pth; + }).then(image=>{ + card.node.image.setBackgroundImage(image); + }).catch(()=>{ + card.node.background.innerHTML=get.transition(res)[0]; + }); + }).then(()=>{ + if(lib.config.cardback_style!='default'){ + card.style.transitionProperty='none'; + ui.refresh(card); + card.classList.add('infohidden'); + ui.refresh(card); + card.style.transitionProperty=''; + } + else{ + card.classList.add('infohidden'); + } + buttons.appendChild(card); + card.style.transition='all 0s'; + card.style.transform='perspective(600px) rotateY(180deg) translateX(0)'; dialog.open(); - }).catch(()=>{}); + var onEnd01=function(){ + setTimeout(function(){ + card.style.transition='all ease-in 0.3s'; + card.style.transform='perspective(600px) rotateY(270deg) translateX(52px)'; + var onEnd=function(){ + card.classList.remove('infohidden'); + card.style.transition='all 0s'; + ui.refresh(card); + card.style.transform='perspective(600px) rotateY(-90deg) translateX(52px)'; + ui.refresh(card); + card.style.transition=''; + ui.refresh(card); + card.style.transform=''; + } + card.listenTransition(onEnd); + },300); + }; + onEnd01(); + }); var control=ui.create.control('ok',()=>{ dialog.close(); control.close(); @@ -3082,27 +3104,58 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ var str=get.translation(target)+'是反贼
'; event.videoId=lib.status.videoId++; var dialog=ui.create.dialog(str,'forcebutton'); + var card=ui.create.card(); + var buttons=ui.create.div('.buttons',dialog.content); + buttons.appendChild(card) + card.classList.add('fullskin'); new Promise((resolve)=>{ var imageName=`mougong_fan`; resolve(`${lib.assetURL}image/card/${imageName}.jpg`); - }).then(pth=>new Promise((resolve,reject)=>{ - var image=new Image(); - image.onload=()=>resolve(pth); - image.onerror=reject; - image.src=pth; - })).then(image=>{ - var img=document.createElement('img'); - dialog.content.appendChild(img); - img.setAttribute('src',image); - img.setAttribute('width','106'); - img.setAttribute('height','150'); - img.setAttribute('draggable',false); - img.style.transition='all 2s'; - setTimeout(function(){ - img.style.transform='rotateY(360deg)'; - },300); + }).then(pth=>{ + return new Promise((resolve,reject)=>{ + var image=new Image(); + image.onload=()=>resolve(pth); + image.onerror=reject; + image.src=pth; + }).then(image=>{ + card.node.image.setBackgroundImage(image); + }).catch(()=>{ + card.node.background.innerHTML='反'; + }); + }).then(()=>{ + if(lib.config.cardback_style!='default'){ + card.style.transitionProperty='none'; + ui.refresh(card); + card.classList.add('infohidden'); + ui.refresh(card); + card.style.transitionProperty=''; + } + else{ + card.classList.add('infohidden'); + } + buttons.appendChild(card); dialog.open(); - }).catch(()=>{}); + card.style.transition='all 0s'; + card.style.transform='perspective(600px) rotateY(180deg) translateX(0)'; + var onEnd01=function(){ + setTimeout(function(){ + card.style.transition='all ease-in 0.3s'; + card.style.transform='perspective(600px) rotateY(270deg) translateX(52px)'; + var onEnd=function(){ + card.classList.remove('infohidden'); + card.style.transition='all 0s'; + ui.refresh(card); + card.style.transform='perspective(600px) rotateY(-90deg) translateX(52px)'; + ui.refresh(card); + card.style.transition=''; + ui.refresh(card); + card.style.transform=''; + } + card.listenTransition(onEnd); + },300); + }; + onEnd01(); + }); dialog.videoId=event.videoId; game.me.chooseControl('ok').set('dialog',dialog); } @@ -3123,27 +3176,58 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ if(!game.me.storage.zhibi.contains(target)) game.me.storage.zhibi.push(target); var str=get.translation(target)+'是反贼
'; var dialog=ui.create.dialog(str,'forcebutton'); + var card=ui.create.card(); + var buttons=ui.create.div('.buttons',dialog.content); + buttons.appendChild(card) + card.classList.add('fullskin'); new Promise((resolve)=>{ var imageName=`mougong_fan`; resolve(`${lib.assetURL}image/card/${imageName}.jpg`); - }).then(pth=>new Promise((resolve,reject)=>{ - var image=new Image(); - image.onload=()=>resolve(pth); - image.onerror=reject; - image.src=pth; - })).then(image=>{ - var img=document.createElement('img'); - dialog.content.appendChild(img); - img.setAttribute('src',image); - img.setAttribute('width','106'); - img.setAttribute('height','150'); - img.setAttribute('draggable',false); - img.style.transition='all 2s'; - setTimeout(function(){ - img.style.transform='rotateY(360deg)'; - },300); + }).then(pth=>{ + return new Promise((resolve,reject)=>{ + var image=new Image(); + image.onload=()=>resolve(pth); + image.onerror=reject; + image.src=pth; + }).then(image=>{ + card.node.image.setBackgroundImage(image); + }).catch(()=>{ + card.node.background.innerHTML='反'; + }); + }).then(()=>{ + if(lib.config.cardback_style!='default'){ + card.style.transitionProperty='none'; + ui.refresh(card); + card.classList.add('infohidden'); + ui.refresh(card); + card.style.transitionProperty=''; + } + else{ + card.classList.add('infohidden'); + } + buttons.appendChild(card); dialog.open(); - }).catch(()=>{}); + card.style.transition='all 0s'; + card.style.transform='perspective(600px) rotateY(180deg) translateX(0)'; + var onEnd01=function(){ + setTimeout(function(){ + card.style.transition='all ease-in 0.3s'; + card.style.transform='perspective(600px) rotateY(270deg) translateX(52px)'; + var onEnd=function(){ + card.classList.remove('infohidden'); + card.style.transition='all 0s'; + ui.refresh(card); + card.style.transform='perspective(600px) rotateY(-90deg) translateX(52px)'; + ui.refresh(card); + card.style.transition=''; + ui.refresh(card); + card.style.transform=''; + } + card.listenTransition(onEnd); + },300); + }; + onEnd01(); + }); dialog.videoId=id; game.me.chooseControl('ok').set('dialog',dialog); }