From 29327bca60a82e96b0c6040cfd7c43233c59bd69 Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 25 Mar 2017 13:32:51 +0800 Subject: [PATCH] tmp --- game/game.js | 38 ++++++++++++++++++++++++-------------- game/update.js | 11 ++++++----- layout/mode/chess.css | 3 ++- mode/tafang.js | 3 ++- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/game/game.js b/game/game.js index 7d927448c..bdac59759 100644 --- a/game/game.js +++ b/game/game.js @@ -5963,6 +5963,7 @@ ui.updatep1.style.display=''; ui.updatep2.style.display=''; ui.updatep3.style.display=''; + ui.updatep4.innerHTML='更新'; } game.download=function(url,folder,onsuccess,onerror,dev){ if(url.indexOf('http')!=0){ @@ -6107,6 +6108,7 @@ ui.updatep1.style.display=''; ui.updatep2.style.display=''; ui.updatep3.style.display=''; + ui.updatep4.innerHTML='更新'; } game.download=function(url,folder,onsuccess,onerror,dev){ if(url.indexOf('http')!=0){ @@ -30364,14 +30366,10 @@ game.download(encodeURI(url),this.info[0]+'.zip',function(){ if(window.resolveLocalFileSystemURL){ window.resolveLocalFileSystemURL(lib.assetURL,function(entry){ - game.print(entry); entry.getFile(that.info[0]+'.zip',{},function(fileEntry){ - game.print(fileEntry); fileEntry.file(function(fileToLoad){ - game.print(123); var fileReader = new FileReader(); fileReader.onload = function(e){ - game.print(456); importExtensionf(e.target.result,fileEntry); }; fileReader.readAsArrayBuffer(fileToLoad, "UTF-8"); @@ -30426,7 +30424,7 @@ var info=list[i]; var node=ui.create.div('.videonode.menubutton.extension.large',page,clickExtension); ui.create.div('.caption',list[i][0],node); - ui.create.div('.text.author','作者：'+list[i][1]); + ui.create.div('.text.author','作者：'+list[i][1],node); ui.create.div('.text',list[i][2],node); var download=ui.create.div('.menubutton.text.active','下载扩展',node.firstChild); if(game.download){ @@ -30583,10 +30581,12 @@ ui.updatep1=li1.querySelector('p'); ui.updatep2=li2; ui.updatep3=li3; + ui.updatep4=node; if(!game.download){ ui.updatep1.style.display='none'; ui.updatep2.style.display='none'; - ui.updatep3.style.display='none'; + ui.updatep3.style.display='none'; + ui.updatep4.innerHTML='关于'; } var button1,button2,button3,button4,button5; @@ -30994,11 +30994,11 @@ } }); }; - li3.lastChild.appendChild(button4); + // li3.lastChild.appendChild(button4); var button6=document.createElement('button'); button6.innerHTML='设为国内镜像'; - button6.style.marginLeft='5px'; + // button6.style.marginLeft='5px'; button6.onclick=function(){ game.saveConfig('updateURL',lib.updateURL2); button5.style.display=''; @@ -31008,7 +31008,7 @@ li3.lastChild.appendChild(button6); button5=document.createElement('button'); - button5.innerHTML='恢复默认地址'; + button5.innerHTML='设为默认镜像'; button5.style.marginLeft='5px'; button5.onclick=function(){ game.saveConfig('updateURL'); @@ -31036,26 +31036,36 @@ this.classList.toggle('on'); if(!this.classList.contains('on')){ span2.style.display='none'; + br1.style.display='none'; span2_check.style.display='none'; span3.style.display='none'; + br2.style.display='none'; span3_check.style.display='none'; span4.style.display='none'; + br3.style.display='none'; span4_check.style.display='none'; span5.style.display='none'; + br4.style.display='none'; span5_check.style.display='none'; span6.style.display='none'; + br5.style.display='none'; span6_check.style.display='none'; } else{ - span2.style.display=''; + span2.style.display=''; + br1.style.display=''; span2_check.style.display=''; - span3.style.display=''; + span3.style.display=''; + br2.style.display=''; span3_check.style.display=''; - span4.style.display=''; + span4.style.display=''; + br3.style.display=''; span4_check.style.display=''; - span5.style.display=''; + span5.style.display=''; + br4.style.display=''; span5_check.style.display=''; - span6.style.display=''; + span6.style.display=''; + br5.style.display=''; span6_check.style.display=''; } }) diff --git a/game/update.js b/game/update.js index b0ccc3e80..b3207d57f 100644 --- a/game/update.js +++ b/game/update.js @@ -1,11 +1,11 @@ window.noname_update={ - version:'1.9.14', - // update:'1.9.13.1', + version:'1.9.14.1', + update:'1.9.14', changeLog:[ - '下载扩展', + 'bug修复', ], files:[ - // 'game/game.js', + 'game/game.js', // 'game/package.js', // 'game/config.js', // 'game/source.js', @@ -20,6 +20,7 @@ window.noname_update={ // 'mode/guozhan.js', // 'mode/identity.js', // 'mode/stone.js', + 'mode/tafang.js', // 'theme/woodden/style.css', // 'layout/default/layout.css', // 'layout/default/phone.css', @@ -29,7 +30,7 @@ window.noname_update={ // 'layout/long2/layout.css', // 'layout/mobile/layout.css', // 'layout/newlayout/global.css', - // 'layout/mode/chess.css', + 'layout/mode/chess.css', // 'extension/boss/extension.js', ] } diff --git a/layout/mode/chess.css b/layout/mode/chess.css index dce87e506..c96b7b2a3 100644 --- a/layout/mode/chess.css +++ b/layout/mode/chess.css @@ -28,7 +28,8 @@ #window:not(.nopointer) .dialog.fullheight .buttons .button.character:not(.squarebutton):not(.selectable){ cursor: default; } -#window:not(.nopointer) .obstacle.glow{ +#window:not(.nopointer) .obstacle.glow, +#window:not(.nopointer) .player.playerblank.glow{ cursor: pointer; } #chess-container{ diff --git a/mode/tafang.js b/mode/tafang.js index e77f05216..4fd1916a8 100644 --- a/mode/tafang.js +++ b/mode/tafang.js @@ -246,7 +246,8 @@ mode.tafang={ ui.chessinfo=ui.create.div('.fakeme.player',ui.me,function(e){ e.stopPropagation(); }); - lib.setScroll(ui.chessinfo); + ui.create.div(ui.chessinfo); + lib.setScroll(ui.chessinfo.firstChild); game.arrangePlayers(); "step 4"