diff --git a/game/game.js b/game/game.js index 463861cf4..07bdbbadc 100755 --- a/game/game.js +++ b/game/game.js @@ -16,12 +16,9 @@ dieClose:[] }; var lib={ - version:'1.8.0', + version:'1.8.1', changeLog:[ - '安卓版改进:', - '·程序与素材分离', - '·可导出数据', - '·自动暂停、确认退出等' + '', ], configprefix:'noname_0.9_', assetURL:'', @@ -3228,7 +3225,7 @@ } else if(lib.device=='ios'){ window._onDeviceReady=function(){ - game.export('123'); + } } }, @@ -5710,10 +5707,6 @@ } this.node.count.innerHTML=numh; } - // this.node.equips.dataset.number=this.num('e'); - // if(this==game.me){ - // ui.updateh(); - // } if(this.updates){ for(var i=0;i.card, +#arena.chess.low_performance .player .equips>.card{ + animation: game_start 0.5s !important; + -webkit-animation: game_start 0.5s !important; +} + @media screen and (min-width: 1150px) { .dialog{ width: 630px; diff --git a/manifest.json b/manifest.json deleted file mode 100644 index b19767b73..000000000 --- a/manifest.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "noname", - "xwalk_version": "1.8.0", - "xwalk_app_version": "1.8.0", - "xwalk_package_id": "com.widget.noname_full", - "xwalk_android_keep_screen_on":true, - "start_url": "index.html", - "icons": [ - { - "src": "../res/icon/icon-256.png", - "sizes": "192x192", - "type": "image/png", - "density": "1.3" - }, - { - "src": "../res/icon/icon-256.png", - "sizes": "144x144", - "type": "image/png", - "density": "1.8" - }, - { - "src": "../res/icon/icon-256.png", - "sizes": "96x96", - "type": "image/png", - "density": "2.7" - }, - { - "src": "../res/icon/icon-256.png", - "sizes": "72x72", - "type": "image/png", - "density": "3.6" - } - ], - "display": "fullscreen", - "orientation": "landscape" -} diff --git a/mode/identity.js b/mode/identity.js index 4f52cf178..aef33d28a 100755 --- a/mode/identity.js +++ b/mode/identity.js @@ -1024,10 +1024,10 @@ mode.identity={ identity2='zhong'; if(from==to) return 10; } - if(to.identity=='nei'&&to.ai.shown<1&&(to.ai.identity_mark=='fan'||to.ai.identity_mark=='zhong')){ + if(from!=to&&to.identity=='nei'&&to.ai.shown<1&&(to.ai.identity_mark=='fan'||to.ai.identity_mark=='zhong')){ identity2=to.ai.identity_mark; } - if(get.population('fan')==0&&identity2=='zhong'){ + if(from.identity!='nei'&&from!=to&&get.population('fan')==0&&identity2=='zhong'){ for(var i=0;i