From df98eb1deb12f679f5fa3e240681f22c96789cae Mon Sep 17 00:00:00 2001 From: libccy Date: Sun, 27 Mar 2016 21:35:05 +0800 Subject: [PATCH] s --- game/game.js | 186 ++++++++++++++--------- game/source.js | 97 ++++++++++++ game/update.js | 7 +- layout/default/fold.css | 11 -- layout/default/fold2.css | 15 -- layout/default/scrollbar.css | 50 ------- layout/default/vertical.css | 5 - play/strategy.js | 280 ----------------------------------- 8 files changed, 219 insertions(+), 432 deletions(-) create mode 100644 game/source.js delete mode 100755 layout/default/fold.css delete mode 100755 layout/default/fold2.css delete mode 100755 layout/default/scrollbar.css delete mode 100755 layout/default/vertical.css delete mode 100755 play/strategy.js diff --git a/game/game.js b/game/game.js index 556dbe754..ec5270496 100755 --- a/game/game.js +++ b/game/game.js @@ -2974,8 +2974,6 @@ } } ui.css.layout=lib.init.css('layout/'+layout,'layout'); - // if(lib.config.fold_card) ui.css.fold=lib.init.css('layout/default','fold'); - // if(lib.config.threed_card) ui.css.threed=lib.init.css('layout/default','fold2'); if(lib.config.blur_ui) ui.css.blur_ui=lib.init.css('layout/default','blur'); ui.css.theme=lib.init.css('theme/'+lib.config.theme,'style'); ui.css.card_style=lib.init.css('theme/style/card',lib.config.card_style); @@ -10007,67 +10005,6 @@ zipReady(); } }, - checkForUpdate:function(forcecheck){ - if(_status.checkingForUpdate){ - alert('正在检查...'); - } - else{ - _status.checkingForUpdate=true; - var createLayer=function(){ - var layer=document.createElement('div'); - layer.classList.add('poplayer'); - layer.style.zIndex='100'; - layer.listen(function(){ - this.remove(); - }); - layer.style.background='rgba(0,0,0,0.5)'; - - var iframe=document.createElement('iframe'); - iframe.src='http://pan.baidu.com/s/1jG5oK8e'; - iframe.width=Math.round(ui.window.offsetWidth*0.8)+'px'; - iframe.height=Math.round(ui.window.offsetHeight*0.9)+'px'; - iframe.style.left=Math.round(ui.window.offsetWidth*0.1)+'px'; - iframe.style.top=Math.round(ui.window.offsetHeight*0.05)+'px'; - iframe.style.position='absolute'; - layer.appendChild(iframe); - - ui.window.appendChild(layer); - }; - var script=lib.init.js(lib.updateURL,'game/update',function(){ - _status.checkingForUpdate=false; - script.remove(); - var update=window.noname_update; - delete window.noname_update; - if(forcecheck===false&&update.version==lib.config.check_version){ - return; - } - game.saveConfig('check_version',update.version); - if(update.version!=lib.version){ - var str='有新版本'+update.version+'可用,是否下载?'; - if(navigator.notification&&navigator.notification.confirm){ - navigator.notification.confirm( - update.content, - function(index){ - if(index==1){ - createLayer(); - } - }, - str, - ['确定','取消'] - ); - } - else{ - if(confirm(str)){ - createLayer(); - } - } - } - else{ - alert('当前版本已是最新'); - } - }); - } - }, playVideo:function(time,mode){ if(!_status.replayvideo){ localStorage.setItem(lib.configprefix+'playbackmode',lib.config.mode); @@ -17321,14 +17258,126 @@ var button1,button2; - game.checkForAssetUpdate=function(forcecheck){ - if(_status.checkingForAssetUpdate){ + game.checkForUpdate=function(forcecheck){ + if(button1.disabled){ + return; + } + else{ + button1.innerHTML='正在检查更新'; + button1.disabled=true; + + var goupdate=function(){ + if(game.download){ + var script=lib.init.js(lib.updateURL,'game/source',function(){ + script.remove(); + var updates=window.noname_source_list; + delete window.noname_source_list; + + if(!ui.arena.classList.contains('menupaused')){ + ui.click.configMenu(); + ui.click.menuTab('帮助'); + } + var p=button1.parentNode; + button1.remove(); + var span=document.createElement('span'); + var n1=0; + var n2=updates.length; + var n=n2; + span.innerHTML='正在下载文件('+n1+'/'+n2+')'; + p.appendChild(span); + var finish=function(){ + span.innerHTML='游戏更新完毕('+n1+'/'+n2+')'; + p.appendChild(document.createElement('br')); + var button=document.createElement('button'); + button.innerHTML='重新启动'; + button.onclick=game.reload; + p.appendChild(button); + } + for(var i=0;idiv>.fold1>.card:not(.selected){margin-right: -15px;} -#arena:not(.low_performance) #me>div>.fold2>.card:not(.selected){margin-right: -30px;} -#arena:not(.low_performance) #me>div>.fold3>.card:not(.selected){margin-right: -45px;} - -#arena:not(.low_performance) #me>div>.fold1>.card:not(.selected):hover, -#arena:not(.low_performance) #me>div>.fold2>.card:not(.selected):hover, -#arena:not(.low_performance) #me>div>.fold3>.card:not(.selected):hover{margin-right: 0;} - -#arena:not(.low_performance) #me>div>div>.card:last-child{margin-right: 0 !important;} -#arena:not(.low_performance) #me>div>div>.card.last{margin-right: 0 !important;} -#arena:not(.low_performance) #me>div>div>.card.removing{margin-right: -52px !important;} diff --git a/layout/default/fold2.css b/layout/default/fold2.css deleted file mode 100755 index f8c452796..000000000 --- a/layout/default/fold2.css +++ /dev/null @@ -1,15 +0,0 @@ -#me>div>.fold1>.card:not(.selected){margin-right: -30px;transform:perspective(1000px) rotateY(30deg);} -#me>div>.fold2>.card:not(.selected){margin-right: -38px;transform:perspective(1000px) rotateY(38deg);} -#me>div>.fold3>.card:not(.selected){margin-right: -45px;transform:perspective(1000px) rotateY(45deg);} - -#me>div>.fold1>.card:not(.selected):hover, -#me>div>.fold2>.card:not(.selected):hover, -#me>div>.fold3>.card:not(.selected):hover{margin-right: -8px;transform:perspective(1000px) rotateY(0);} - -#me>div>.fold1>.card.start, -#me>div>.fold2>.card.start, -#me>div>.fold3>.card.start{transform:none;} - -#me>div>div>.card:last-child{margin-right: -8px;} -#me>div>div>.card.last{margin-right: -8px;} -#me>div>div>.card.removing{margin-right: -52px !important;} diff --git a/layout/default/scrollbar.css b/layout/default/scrollbar.css deleted file mode 100755 index 6784c50ad..000000000 --- a/layout/default/scrollbar.css +++ /dev/null @@ -1,50 +0,0 @@ -::-webkit-scrollbar { - display: block; - height:8px; - width:8px -} - -::-webkit-scrollbar:vertical { - display: none; -} -::-webkit-scrollbar-button { - height:0; - width:0 -} -::-webkit-scrollbar-button:start:decrement,::-webkit-scrollbar-button:end:increment { - display:block -} -::-webkit-scrollbar-button:vertical:start:increment,::-webkit-scrollbar-button:vertical:end:decrement { - display:none -} -::-webkit-scrollbar-track:vertical,::-webkit-scrollbar-track:horizontal,::-webkit-scrollbar-thumb:vertical,::-webkit-scrollbar-thumb:horizontal,::-webkit-scrollbar-track:vertical,::-webkit-scrollbar-track:horizontal,::-webkit-scrollbar-thumb:vertical,::-webkit-scrollbar-thumb:horizontal { - border-style:solid; - border-color:transparent -} -::-webkit-scrollbar-track:vertical::-webkit-scrollbar-track:horizontal{ - background-clip:padding-box; - background-color:#fff; -} -::-webkit-scrollbar-thumb { - background-clip:padding-box; - background-color:rgba(0,0,0,0.2); - min-height:28px; - padding-top:100; - border-radius: 8px; - -webkit-transition:all 0.5s; -} -::-webkit-scrollbar-thumb:hover { - background-color:rgba(0,0,0,.4); -} -::-webkit-scrollbar-thumb:active { - background-color:rgba(0,0,0,.5) -} -::-webkit-scrollbar-track:vertical,::-webkit-scrollbar-track:horizontal,::-webkit-scrollbar-thumb:vertical,::-webkit-scrollbar-thumb:horizontal { - border-width:0; -} -::-webkit-scrollbar-track:hover { - background-color:rgba(0,0,0,0) -} -::-webkit-scrollbar-track:active { - background-color:rgba(0,0,0,0) -} diff --git a/layout/default/vertical.css b/layout/default/vertical.css deleted file mode 100755 index bc94a7ce8..000000000 --- a/layout/default/vertical.css +++ /dev/null @@ -1,5 +0,0 @@ -#handcards1,#handcards2{ - white-space:normal; - overflow-y: scroll; - overflow-x:hidden; -} \ No newline at end of file diff --git a/play/strategy.js b/play/strategy.js deleted file mode 100755 index a371b4ac6..000000000 --- a/play/strategy.js +++ /dev/null @@ -1,280 +0,0 @@ -play.strategy={ - mode:['identity','guozhan','infinity'], - game:{ - checkResult:function(){ - if(get.population('zhong')==0||(get.population('fan')+get.population('nei')==0)){ - for(var i=0;i0) return; - if(lib.storage.test){ - if(game.zhu.isAlive()){ - console.log('主忠胜利'); - } - else if(game.players[0].identity=='nei'&&game.players.length==1){ - console.log('内奸胜利'); - } - else{ - console.log('反贼胜利'); - } - } - for(var i=0;i0&&game.zhu.classList.contains('dead')){ - game.over(true); - } - else{ - game.over(false); - } - } - }, - }, - skill:{ - _zhaoxiang:{ - mode:['identity','infinity'], - enable:'chooseToUse', - filter:function(event,player){ - if(player.num('h')==0) return false; - if(player.spy) return false; - if(event.dying==player) return false; - if(event.type!='dying') return false; - if(event.dying.storage._zhaoxiang) return false; - if(event.dying.storage.zhaoxiang2==player&&event.dying.skills.contains('zhaoxiang2')) return false; - if(lib.config.mode=='infinity'){ - if(player==game.me){ - if(get.population('zhong')=0.4&&player.num('h')