diff --git a/CHANGELOG.MD b/CHANGELOG.MD index cef9d785f..c238512c7 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,3 +2,5 @@ 低性能模式优化 双击换肤 新手向导 +录像声音 +bug修复 diff --git a/audio/skill/qianxun1.mp3 b/audio/skill/reqianxun1.mp3 similarity index 100% rename from audio/skill/qianxun1.mp3 rename to audio/skill/reqianxun1.mp3 diff --git a/audio/skill/qianxun2.mp3 b/audio/skill/reqianxun2.mp3 similarity index 100% rename from audio/skill/qianxun2.mp3 rename to audio/skill/reqianxun2.mp3 diff --git a/card/extra.js b/card/extra.js index 6d57653fe..335628369 100755 --- a/card/extra.js +++ b/card/extra.js @@ -360,6 +360,7 @@ card.extra={ }, forced:true, popup:false, + audio:false, content:function(){ player.removeSkill('jiu'); if(player.node.jiu){ diff --git a/character/gujian.js b/character/gujian.js index 93c6cb7a2..348248202 100755 --- a/character/gujian.js +++ b/character/gujian.js @@ -344,6 +344,7 @@ character.gujian={ trigger:{source:'damageEnd'}, forced:true, popup:false, + audio:false, filter:function(event,player){ return player.storage.mingkong?true:false; }, diff --git a/character/mountain.js b/character/mountain.js index 6a800425f..d32fe9df1 100755 --- a/character/mountain.js +++ b/character/mountain.js @@ -136,6 +136,7 @@ character.mountain={ trigger:{player:'phaseEnd'}, forced:true, popup:false, + audio:false, content:function(){ "step 0" player.chooseToDiscard(true); @@ -161,6 +162,7 @@ character.mountain={ trigger:{player:'phaseAfter'}, forced:true, popup:false, + audio:false, content:function(){ if(player.marks.fangquan){ player.marks.fangquan.delete(); diff --git a/character/refresh.js b/character/refresh.js index abe3d8fcd..a9098318d 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -384,6 +384,7 @@ character.refresh={ init:function(player){ player.storage.reqianxun2=[]; }, + audio:2, trigger:{target:'useCardToBegin',player:'judgeBefore'}, filter:function(event,player){ if(player.num('h')==0) return false; @@ -412,6 +413,7 @@ character.refresh={ reqianxun2:{ trigger:{global:'phaseAfter'}, forced:true, + audio:false, content:function(){ player.gain(player.storage.reqianxun2); player.removeSkill('reqianxun2'); @@ -687,6 +689,7 @@ character.refresh={ forced:true, mark:true, popup:'遗计拿牌', + audio:false, content:function(){ player.$draw(player.storage.reyiji2.length); player.gain(player.storage.reyiji2); diff --git a/character/sp.js b/character/sp.js index e6c60d1e2..481935ca9 100755 --- a/character/sp.js +++ b/character/sp.js @@ -758,6 +758,7 @@ character.sp={ trigger:{global:'phaseAfter'}, forced:true, priority:10, + audio:2, mod:{ cardEnabled:function(){ return false; @@ -1224,6 +1225,7 @@ character.sp={ kuiwei2:{ trigger:{player:'phaseDrawBegin'}, forced:true, + audio:false, content:function(){ var num=0; for(var i=0;i.avatar.hidden, .player>.avatar2.hidden{ @@ -357,7 +359,10 @@ margin-bottom: 5px; filter:grayscale(1); -webkit-filter:grayscale(1); } -.player>.name{left: 16px;top:36px;font-family: 'huangcao';font-size:20px} +.player>.name{left: 16px;top:24px;font-family: 'xinwei';font-size:20px} +.button.character>.name{ + font-family: 'xinwei' +} .player>.intro{top:87px;left: 18px;} .player>.damage{ font-family: 'huangcao'; @@ -814,6 +819,10 @@ div[data-nature='metalm']{ text-shadow: black 0 0 1px,rgba(255, 203, 0,1) 0 0 2px,rgba(255, 203, 0,1) 0 0 5px,rgba(255, 203, 0,1) 0 0 5px, rgba(255, 203, 0,1) 0 0 5px,black 0 0 1px; } +div[data-nature='metalmm']{ + text-shadow: black 0 0 1px,rgba(255, 203, 0,1) 0 0 2px,rgba(255, 203, 0,1) 0 0 2px,rgba(255, 203, 0,1) 0 0 2px, + rgba(255, 203, 0,1) 0 0 2px,black 0 0 1px; +} .player .identity[data-color="nei"], .player .identity[data-color="ye"], div[data-nature='thunder']{ @@ -830,6 +839,14 @@ div[data-nature='wood']{ text-shadow: rgba(57, 123, 4,1) 0 0 2px,rgba(57, 123, 4,1) 0 0 5px,rgba(57, 123, 4,1) 0 0 10px, rgba(57, 123, 4,1) 0 0 10px,rgba(57, 123, 4,1) 0 0 20px,rgba(57, 123, 4,1) 0 0 20px,black 0 0 1px; } +div[data-nature='woodm']{ + text-shadow: rgba(57, 123, 4,1) 0 0 2px,rgba(57, 123, 4,1) 0 0 5px,rgba(57, 123, 4,1) 0 0 5px, + rgba(57, 123, 4,1) 0 0 5px,black 0 0 1px; +} +div[data-nature='woodmm']{ + text-shadow: rgba(57, 123, 4,1) 0 0 2px,rgba(57, 123, 4,1) 0 0 2px,rgba(57, 123, 4,1) 0 0 2px, + rgba(57, 123, 4,1) 0 0 2px,black 0 0 1px; +} .player .identity[data-color="cai"], .player .identity[data-color="wei"], div[data-nature='water']{ @@ -839,6 +856,9 @@ div[data-nature='water']{ div[data-nature='waterm']{ text-shadow: rgba(78, 117, 140,1) 0 0 2px,rgba(78, 117, 140,1) 0 0 5px,rgba(78, 117, 140,1) 0 0 5px, rgba(78, 117, 140,1) 0 0 5px,black 0 0 1px; +}div[data-nature='watermm']{ + text-shadow: rgba(78, 117, 140,1) 0 0 2px,rgba(78, 117, 140,1) 0 0 2px,rgba(78, 117, 140,1) 0 0 2px, + rgba(78, 117, 140,1) 0 0 2px,black 0 0 1px; } .player .identity[data-color="shu"], div[data-nature='soil']{ @@ -849,6 +869,10 @@ div[data-nature='soilm']{ text-shadow: rgba(128, 59, 2,1) 0 0 2px,rgba(128, 59, 2,1) 0 0 5px,rgba(128, 59, 2,1) 0 0 5px, rgba(128, 59, 2,1) 0 0 5px,black 0 0 1px; } +div[data-nature='soilmm']{ + text-shadow: rgba(128, 59, 2,1) 0 0 2px,rgba(128, 59, 2,1) 0 0 2px,rgba(128, 59, 2,1) 0 0 2px, + rgba(128, 59, 2,1) 0 0 2px,black 0 0 1px; +} .player .identity[data-color="unknownx"], div[data-nature='black']{ text-shadow: rgba(0,0,0,0.5) 0 0 2px,rgba(0,0,0,0.5) 0 0 5px,rgba(0,0,0,0.5) 0 0 10px, diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css index 1900e8e47..f4dc77359 100644 --- a/layout/mobile/layout.css +++ b/layout/mobile/layout.css @@ -91,6 +91,7 @@ #arena:not(.chess) .player[data-position='0']>.name{ left:4px; + top:10px; } #arena:not(.chess) .player[data-position='0']>.identity{ left: 106px; diff --git a/layout/mode/stone.css b/layout/mode/stone.css index 40b4894a6..05714af8c 100755 --- a/layout/mode/stone.css +++ b/layout/mode/stone.css @@ -23,3 +23,9 @@ #arena.stone>.player.minskin[data-position='8']{top:30px;left:0;} #arena.stone>.card[data-position='8']{top:38px;left:8px;} #arena.stone>.popup[data-position='8']{top:160px;left:8px;} +#arena:not(.chess).mobile>.player[data-position='0']>.name{ + top:30px; +} +#arena .player>.name{ + top:36px; +} diff --git a/mode/guozhan.js b/mode/guozhan.js index cf4174b1e..c7b4dbd1c 100755 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -153,14 +153,15 @@ mode.guozhan={ dialog.add('选择座位'); var seats=document.createElement('table'); seats.style.margin='0 auto'; - seats.style.maxWidth='490px'; + seats.style.maxWidth=(60*parseInt(get.config('player_number')))+'px'; var tr=document.createElement('tr'); seats.appendChild(tr); for(var i=1;i<=game.players.length;i++){ var td=document.createElement('td'); tr.appendChild(td); td.style.width='40px'; - td.style.fontSize='18px'; + td.style.fontSize='25px'; + td.style.fontFamily='xinwei'; td.innerHTML=get.cnNumber(i,true); td.link=i-1; td.addEventListener(lib.config.touchscreen?'touchend':'click',function(){ diff --git a/mode/identity.js b/mode/identity.js index 5df74c4be..7a5579747 100755 --- a/mode/identity.js +++ b/mode/identity.js @@ -433,7 +433,7 @@ mode.identity={ dialog.add('选择身份'); var table=document.createElement('table'); table.style.margin='0 auto'; - table.style.maxWidth='500px'; + table.style.maxWidth='400px'; var tr=document.createElement('tr'); table.appendChild(tr); var list; @@ -447,9 +447,9 @@ mode.identity={ for(var i=0;i