diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 397d761a5..1f02ab964 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,3 +1,4 @@ 1.5.5 塔防模式 修复若干bug +提升性能 diff --git a/game/game.js b/game/game.js index a023c8ad5..143f765e8 100755 --- a/game/game.js +++ b/game/game.js @@ -1375,12 +1375,14 @@ map.chess_obstacle.hide(); map.tafang_size.show(); map.tafang_turn.show(); + map.tafang_difficulty.show(); } else{ map.chess_treasure.show(); map.chess_obstacle.show(); map.tafang_size.hide(); map.tafang_turn.hide(); + map.tafang_difficulty.hide(); } if(config.chess_mode=='combat'||config.chess_mode=='tafang'){ map.ban_weak.show(); @@ -1915,6 +1917,7 @@ game.saveConfig('totouched',true); if(totouch){ game.saveConfig('touchscreen',true); + game.saveConfig('fold_card',false); game.reload(); } } @@ -5908,17 +5911,29 @@ } if(cards){ cards=cards.slice(0); - node=cards.shift().copy('drawing','thrown'); + node=cards.shift().copy('thrown'); } else{ - node=ui.create.div('.card.drawing.thrown'); + node=ui.create.div('.card.thrown'); } node.fixed=true; - node.dataset.position=this.dataset.position; + node.hide(); + // node.dataset.position=this.dataset.position; + node.style.left='calc(50% - 52px)'; + node.style.top='calc(50% - 52px)'; this.parentNode.appendChild(node); + node.style.transitionDuration='1s'; + ui.refresh(node); + + var dx=this.offsetLeft+this.offsetWidth/2-52-node.offsetLeft; + var dy=this.offsetTop+this.offsetHeight/2-52-node.offsetTop; + node.style.transform+=' translate('+dx+'px,'+dy+'px)'; + node.show(); + setTimeout(function(){ - node.remove(); - },1000); + node.style.transitionDuration='0.5s'; + node.delete(); + },700); var that=this; if(num&&num>1){ setTimeout(function(){ @@ -5998,7 +6013,7 @@ if(false){ var node=this.$throwxy(card, 'calc(50% - 52px '+((Math.random()-0.5<0)?'+':'-')+' '+Math.random()*100+'px)', - 'calc(50% - 52px '+((Math.random()-0.5<0)?'+':'-')+' '+Math.random()*80+'px)',true + 'calc(50% - 52px '+((Math.random()-0.5<0)?'+':'-')+' '+Math.random()*80+'px)' ); } else{ @@ -6011,22 +6026,9 @@ } }, $throwordered:function(node,nosource){ - if(nosource){ - node.style.transform='scale(0)'; - node.classList.add('center'); - } - else{ - node.dataset.position=this.dataset.position; - } node.classList.add('thrown'); node.hide(); node.style.transitionProperty='left,top,opacity,transform'; - ui.arena.appendChild(node); - ui.refresh(node); - if(nosource){ - node.style.transform=''; - } - node.show(); for(var i=0;i=width){ - node.dataset.fold=3; + // node.dataset.fold=3; + node.classList.add('fold3'); } else if(num*93+25>=width){ - node.dataset.fold=2; + // node.dataset.fold=2; + node.classList.add('fold2'); } else if(num*112+6>=width){ - node.dataset.fold=1; + // node.dataset.fold=1; + node.classList.add('fold1'); } else{ - node.dataset.fold=0; + // node.dataset.fold=0; + node.classList.add('fold0'); } }, update:function(){ diff --git a/image/character/fullskin/boss_dongzhuo.jpg b/image/character/fullskin/boss_dongzhuo.jpg index 96294821c..8138267e9 100755 Binary files a/image/character/fullskin/boss_dongzhuo.jpg and b/image/character/fullskin/boss_dongzhuo.jpg differ diff --git a/image/character/fullskin/boss_liubei.jpg b/image/character/fullskin/boss_liubei.jpg index a77fd2797..018918ed4 100755 Binary files a/image/character/fullskin/boss_liubei.jpg and b/image/character/fullskin/boss_liubei.jpg differ diff --git a/image/character/fullskin/boss_pangtong.jpg b/image/character/fullskin/boss_pangtong.jpg index cca531303..19135e79f 100755 Binary files a/image/character/fullskin/boss_pangtong.jpg and b/image/character/fullskin/boss_pangtong.jpg differ diff --git a/image/character/fullskin/boss_shuijing.jpg b/image/character/fullskin/boss_shuijing.jpg index 5a3b21f15..22f7587a0 100755 Binary files a/image/character/fullskin/boss_shuijing.jpg and b/image/character/fullskin/boss_shuijing.jpg differ diff --git a/image/character/fullskin/boss_zhenji.jpg b/image/character/fullskin/boss_zhenji.jpg index 8a6e73b48..b5ec0a7f7 100755 Binary files a/image/character/fullskin/boss_zhenji.jpg and b/image/character/fullskin/boss_zhenji.jpg differ diff --git a/image/character/fullskin/hs_totemic.jpg b/image/character/fullskin/hs_totemic.jpg index 82829b48a..ff8cda22d 100644 Binary files a/image/character/fullskin/hs_totemic.jpg and b/image/character/fullskin/hs_totemic.jpg differ diff --git a/image/character/fullskin/hs_wujiyuansu.jpg b/image/character/fullskin/hs_wujiyuansu.jpg index 0a8b010c7..afd11c5c4 100644 Binary files a/image/character/fullskin/hs_wujiyuansu.jpg and b/image/character/fullskin/hs_wujiyuansu.jpg differ diff --git a/image/character/fullskin/hs_wuther.jpg b/image/character/fullskin/hs_wuther.jpg index 0bab2a6d1..fee211994 100755 Binary files a/image/character/fullskin/hs_wuther.jpg and b/image/character/fullskin/hs_wuther.jpg differ diff --git a/image/character/fullskin/hs_wvelen.jpg b/image/character/fullskin/hs_wvelen.jpg index 526202afa..f7936cb12 100644 Binary files a/image/character/fullskin/hs_wvelen.jpg and b/image/character/fullskin/hs_wvelen.jpg differ diff --git a/image/character/fullskin/hs_yngvar.jpg b/image/character/fullskin/hs_yngvar.jpg index 28b85f73a..4745518a5 100644 Binary files a/image/character/fullskin/hs_yngvar.jpg and b/image/character/fullskin/hs_yngvar.jpg differ diff --git a/image/character/fullskin/hs_zhouzhuo.jpg b/image/character/fullskin/hs_zhouzhuo.jpg index 2698b0a43..b7f4b1b9b 100644 Binary files a/image/character/fullskin/hs_zhouzhuo.jpg and b/image/character/fullskin/hs_zhouzhuo.jpg differ diff --git a/image/character/fullskin/null.png b/image/character/fullskin/null.png deleted file mode 100644 index 28f7e3ca0..000000000 Binary files a/image/character/fullskin/null.png and /dev/null differ diff --git a/image/character/fullskin/re_zhangfei.jpg b/image/character/fullskin/re_zhangfei.jpg index 7f7a6011f..77fb464fb 100755 Binary files a/image/character/fullskin/re_zhangfei.jpg and b/image/character/fullskin/re_zhangfei.jpg differ diff --git a/image/character/fullskin/swd_duanmeng.jpg b/image/character/fullskin/swd_duanmeng.jpg index 637267d45..90e8d1079 100755 Binary files a/image/character/fullskin/swd_duanmeng.jpg and b/image/character/fullskin/swd_duanmeng.jpg differ diff --git a/image/character/fullskin/swd_hengai.jpg b/image/character/fullskin/swd_hengai.jpg index dccf4d5cc..65ba23c3c 100755 Binary files a/image/character/fullskin/swd_hengai.jpg and b/image/character/fullskin/swd_hengai.jpg differ diff --git a/image/character/fullskin/swd_huanyuanzhi.jpg b/image/character/fullskin/swd_huanyuanzhi.jpg index 17217aa3e..2abca2242 100755 Binary files a/image/character/fullskin/swd_huanyuanzhi.jpg and b/image/character/fullskin/swd_huanyuanzhi.jpg differ diff --git a/image/character/fullskin/swd_huyue.jpg b/image/character/fullskin/swd_huyue.jpg index e67ac1b14..e55cba910 100755 Binary files a/image/character/fullskin/swd_huyue.jpg and b/image/character/fullskin/swd_huyue.jpg differ diff --git a/image/character/fullskin/swd_jiangwu.jpg b/image/character/fullskin/swd_jiangwu.jpg index 20df85c8f..b9cadddc0 100755 Binary files a/image/character/fullskin/swd_jiangwu.jpg and b/image/character/fullskin/swd_jiangwu.jpg differ diff --git a/image/character/fullskin/swd_jiliang.jpg b/image/character/fullskin/swd_jiliang.jpg index 55d4f2bd1..22ecf993c 100755 Binary files a/image/character/fullskin/swd_jiliang.jpg and b/image/character/fullskin/swd_jiliang.jpg differ diff --git a/image/character/fullskin/swd_jipeng.jpg b/image/character/fullskin/swd_jipeng.jpg index 75253658d..ea4eab8c4 100755 Binary files a/image/character/fullskin/swd_jipeng.jpg and b/image/character/fullskin/swd_jipeng.jpg differ diff --git a/image/character/fullskin/swd_jiting.jpg b/image/character/fullskin/swd_jiting.jpg index 953ebc340..0c761ee8d 100755 Binary files a/image/character/fullskin/swd_jiting.jpg and b/image/character/fullskin/swd_jiting.jpg differ diff --git a/image/character/fullskin/swd_kangnalishi.jpg b/image/character/fullskin/swd_kangnalishi.jpg index b55ecece7..301d31662 100644 Binary files a/image/character/fullskin/swd_kangnalishi.jpg and b/image/character/fullskin/swd_kangnalishi.jpg differ diff --git a/image/character/fullskin/swd_muyue.jpg b/image/character/fullskin/swd_muyue.jpg index 872313ba0..b0ef97ac3 100755 Binary files a/image/character/fullskin/swd_muyue.jpg and b/image/character/fullskin/swd_muyue.jpg differ diff --git a/image/character/fullskin/swd_rongshuang.jpg b/image/character/fullskin/swd_rongshuang.jpg index ae59612dd..b37f3811c 100755 Binary files a/image/character/fullskin/swd_rongshuang.jpg and b/image/character/fullskin/swd_rongshuang.jpg differ diff --git a/image/character/fullskin/swd_septem.jpg b/image/character/fullskin/swd_septem.jpg index 3f3a865b3..54019c39d 100755 Binary files a/image/character/fullskin/swd_septem.jpg and b/image/character/fullskin/swd_septem.jpg differ diff --git a/image/character/fullskin/swd_shangzhang.jpg b/image/character/fullskin/swd_shangzhang.jpg index 6378eb6e5..15b182217 100755 Binary files a/image/character/fullskin/swd_shangzhang.jpg and b/image/character/fullskin/swd_shangzhang.jpg differ diff --git a/image/character/fullskin/swd_situqiang.jpg b/image/character/fullskin/swd_situqiang.jpg index 442048b11..3e7784533 100755 Binary files a/image/character/fullskin/swd_situqiang.jpg and b/image/character/fullskin/swd_situqiang.jpg differ diff --git a/image/character/fullskin/swd_wangsiyue.jpg b/image/character/fullskin/swd_wangsiyue.jpg index e0a4610ce..0c23a437a 100644 Binary files a/image/character/fullskin/swd_wangsiyue.jpg and b/image/character/fullskin/swd_wangsiyue.jpg differ diff --git a/image/character/fullskin/swd_youzhao.jpg b/image/character/fullskin/swd_youzhao.jpg index 3e0eaea01..410c1bca7 100755 Binary files a/image/character/fullskin/swd_youzhao.jpg and b/image/character/fullskin/swd_youzhao.jpg differ diff --git a/image/meta/noname.png b/image/meta/iconset/icon-1024.png old mode 100755 new mode 100644 similarity index 100% rename from image/meta/noname.png rename to image/meta/iconset/icon-1024.png diff --git a/image/meta/iconset/icon-128.png b/image/meta/iconset/icon-128.png new file mode 100644 index 000000000..0268c36eb Binary files /dev/null and b/image/meta/iconset/icon-128.png differ diff --git a/image/meta/iconset/icon-144.png b/image/meta/iconset/icon-144.png new file mode 100644 index 000000000..52a97a2b5 Binary files /dev/null and b/image/meta/iconset/icon-144.png differ diff --git a/image/meta/iconset/icon-192.png b/image/meta/iconset/icon-192.png new file mode 100644 index 000000000..e211ad549 Binary files /dev/null and b/image/meta/iconset/icon-192.png differ diff --git a/image/meta/iconset/icon-256.png b/image/meta/iconset/icon-256.png new file mode 100644 index 000000000..6c0d77457 Binary files /dev/null and b/image/meta/iconset/icon-256.png differ diff --git a/image/meta/iconset/icon-512.png b/image/meta/iconset/icon-512.png new file mode 100644 index 000000000..7cb6faa0e Binary files /dev/null and b/image/meta/iconset/icon-512.png differ diff --git a/image/meta/iconset/icon-72.png b/image/meta/iconset/icon-72.png new file mode 100644 index 000000000..0f3d2c8e2 Binary files /dev/null and b/image/meta/iconset/icon-72.png differ diff --git a/image/meta/iconset/icon-96.png b/image/meta/iconset/icon-96.png new file mode 100644 index 000000000..2d75db9f8 Binary files /dev/null and b/image/meta/iconset/icon-96.png differ diff --git a/layout/default/fold.css b/layout/default/fold.css index 7f89dd94b..74e205b38 100755 --- a/layout/default/fold.css +++ b/layout/default/fold.css @@ -1,10 +1,10 @@ -#me>[data-fold='1']>.card:not(.selected){margin-right: -15px;} -#me>[data-fold='2']>.card:not(.selected){margin-right: -30px;} -#me>[data-fold='3']>.card:not(.selected){margin-right: -45px;} +#me>.fold1>.card:not(.selected){margin-right: -15px;} +#me>.fold2>.card:not(.selected){margin-right: -30px;} +#me>.fold3>.card:not(.selected){margin-right: -45px;} -#me>[data-fold='1']>.card:not(.selected):hover, -#me>[data-fold='2']>.card:not(.selected):hover, -#me>[data-fold='3']>.card:not(.selected):hover{margin-right: 0;} +#me>.fold1>.card:not(.selected):hover, +#me>.fold2>.card:not(.selected):hover, +#me>.fold3>.card:not(.selected):hover{margin-right: 0;} #me>div>.card:last-child{margin-right: 0 !important;} #me>div>.card.last{margin-right: 0 !important;} diff --git a/layout/default/fold2.css b/layout/default/fold2.css index 41b826f0d..c0f13a8d7 100755 --- a/layout/default/fold2.css +++ b/layout/default/fold2.css @@ -1,14 +1,14 @@ -#me>[data-fold='1']>.card:not(.selected){margin-right: -30px;transform:perspective(1000px) rotateY(30deg);} -#me>[data-fold='2']>.card:not(.selected){margin-right: -38px;transform:perspective(1000px) rotateY(38deg);} -#me>[data-fold='3']>.card:not(.selected){margin-right: -45px;transform:perspective(1000px) rotateY(45deg);} +#me>.fold1>.card:not(.selected){margin-right: -30px;transform:perspective(1000px) rotateY(30deg);} +#me>.fold2>.card:not(.selected){margin-right: -38px;transform:perspective(1000px) rotateY(38deg);} +#me>.fold3>.card:not(.selected){margin-right: -45px;transform:perspective(1000px) rotateY(45deg);} -#me>[data-fold='1']>.card:not(.selected):hover, -#me>[data-fold='2']>.card:not(.selected):hover, -#me>[data-fold='3']>.card:not(.selected):hover{margin-right: -8px;transform:perspective(1000px) rotateY(0);} +#me>.fold1>.card:not(.selected):hover, +#me>.fold2>.card:not(.selected):hover, +#me>.fold3>.card:not(.selected):hover{margin-right: -8px;transform:perspective(1000px) rotateY(0);} -#me>[data-fold='1']>.card.start, -#me>[data-fold='2']>.card.start, -#me>[data-fold='3']>.card.start{transform:none;} +#me>.fold1>.card.start, +#me>.fold2>.card.start, +#me>.fold3>.card.start{transform:none;} #me>div>.card:last-child{margin-right: -8px;} #me>div>.card.last{margin-right: -8px;} diff --git a/manifest.json b/manifest.json new file mode 100644 index 000000000..f0802d2a8 --- /dev/null +++ b/manifest.json @@ -0,0 +1,33 @@ +{ + "name": "noname", + "xwalk_version": "1.5.5", + "start_url": "index.html", + "icons": [ + { + "src": "image/meta/iconset/icon-256.png", + "sizes": "192x192", + "type": "image/png", + "density": "1.3" + }, + { + "src": "image/meta/iconset/icon-256.png", + "sizes": "144x144", + "type": "image/png", + "density": "1.8" + }, + { + "src": "image/meta/iconset/icon-256.png", + "sizes": "96x96", + "type": "image/png", + "density": "2.7" + }, + { + "src": "image/meta/iconset/icon-256.png", + "sizes": "72x72", + "type": "image/png", + "density": "3.6" + } + ], + "display": "fullscreen", + "orientation": "landscape" +} diff --git a/mode/chess.js b/mode/chess.js index 1fb2d1391..5b4e8a99a 100755 --- a/mode/chess.js +++ b/mode/chess.js @@ -674,10 +674,11 @@ mode.chess={ treasures:[], obstacles:[], getVideoName:function(){ - var name=[ - get.translation(game.me.name), - '战棋'+get.translation(get.config('chess_mode'))+' - '+_status.friendCount+'v'+_status.enemyCount - ]; + var str='战棋'+get.translation(get.config('chess_mode'))+' - '+_status.friendCount+'v'+_status.enemyCount; + if(get.config('chess_mode')=='tafang'){ + str='战棋 - 塔防'; + } + var name=[get.translation(game.me.name),str]; return name; }, addChessPlayer:function(name,enemy,num,pos){ diff --git a/mode/versus.js b/mode/versus.js index a6719f7d1..60c31dab8 100755 --- a/mode/versus.js +++ b/mode/versus.js @@ -517,17 +517,17 @@ mode.versus={ game.enemy[i].identity='zhong'; game.enemy[i].setIdentity(!_status.color+'Zhong'); } - if(lib.storage.zhu&&!game.enemyZhu){ - game.enemy[0].identity='zhu'; - game.enemy[0].setIdentity(!_status.color+'Zhu'); - game.enemyZhu=game.enemy[0]; - } } game.friend[i].node.identity.dataset.color=get.translation(_status.color+'Color'); game.enemy[i].node.identity.dataset.color=get.translation(!_status.color+'Color'); // game.friend[i].node.identity.style.backgroundColor=get.translation(_status.color+'Color'); // game.enemy[i].node.identity.style.backgroundColor=get.translation(!_status.color+'Color'); } + if(lib.storage.zhu&&!game.enemyZhu){ + game.enemy[0].identity='zhu'; + game.enemy[0].setIdentity(!_status.color+'Zhu'); + game.enemyZhu=game.enemy[0]; + } "step 2" var num=lib.storage.number; if(result&&result.buttons){