From 44450a9ef046e3472d88027755be855d9b463b9a Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 17 Apr 2017 13:18:46 +0800 Subject: [PATCH] 3 --- card/extra.js | 8 +------- card/gujian.js | 8 +------- card/guozhan.js | 8 +------- card/hearth.js | 8 +------- card/sp.js | 8 +------- card/standard.js | 8 +------- card/swd.js | 8 +------- card/yunchou.js | 8 +------- card/zhenfa.js | 8 +------- character/diy.js | 8 +------- character/extra.js | 8 +------- character/gujian.js | 8 +------- character/gwent.js | 8 +------- character/hearth.js | 8 +------- character/jiange.js | 8 +------- character/old.js | 8 +------- character/ow.js | 8 +------- character/refresh.js | 8 +------- character/shenhua.js | 8 +------- character/sp.js | 8 +------- character/standard.js | 8 +------- character/swd.js | 8 +------- character/xiake.js | 8 +------- character/xianjian.js | 8 +------- character/yijiang.js | 8 +------- character/yxs.js | 8 +------- character/zhuogui.js | 8 +------- extension/boss/extension.js | 8 +------- extension/cardpile/extension.js | 8 +------- extension/coin/extension.js | 8 +------- extension/wuxing/extension.js | 8 +------- game/game.js | 21 +++++++-------------- game/update.js | 2 +- mode/boss.js | 8 +------- mode/brawl.js | 8 +------- mode/chess.js | 8 +------- mode/connect.js | 8 +------- mode/guozhan.js | 8 +------- mode/identity.js | 8 +------- mode/realtime.js | 8 +------- mode/stone.js | 8 +------- mode/tafang.js | 8 +------- mode/versus.js | 8 +------- 43 files changed, 49 insertions(+), 302 deletions(-) diff --git a/card/extra.js b/card/extra.js index 01517b359..638117ec6 100644 --- a/card/extra.js +++ b/card/extra.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'extra', connect:true, diff --git a/card/gujian.js b/card/gujian.js index fc91989f6..0f1f41f3f 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'gujian', card:{ diff --git a/card/guozhan.js b/card/guozhan.js index 3abe55716..10e21f690 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'guozhan', connect:true, diff --git a/card/hearth.js b/card/hearth.js index a10146c91..be5a4ee43 100644 --- a/card/hearth.js +++ b/card/hearth.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'hearth', card:{ diff --git a/card/sp.js b/card/sp.js index f1fe0a8c5..4e8a35c80 100644 --- a/card/sp.js +++ b/card/sp.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'sp', connect:true, diff --git a/card/standard.js b/card/standard.js index 3722510f8..4cab3a0e2 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'standard', connect:true, diff --git a/card/swd.js b/card/swd.js index 422996832..a9e741624 100644 --- a/card/swd.js +++ b/card/swd.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'swd', card:{ diff --git a/card/yunchou.js b/card/yunchou.js index 8fa3baa62..b5cf418c2 100644 --- a/card/yunchou.js +++ b/card/yunchou.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'yunchou', card:{ diff --git a/card/zhenfa.js b/card/zhenfa.js index f3f82fd1b..1dcf24727 100644 --- a/card/zhenfa.js +++ b/card/zhenfa.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('card',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'zhenfa', card:{ diff --git a/character/diy.js b/character/diy.js index 32c7979b9..33d112f3c 100644 --- a/character/diy.js +++ b/character/diy.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'diy', character:{ diff --git a/character/extra.js b/character/extra.js index ee80b188c..2cface1ad 100644 --- a/character/extra.js +++ b/character/extra.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'extra', character:{ diff --git a/character/gujian.js b/character/gujian.js index b4eb13d2e..f60812cc3 100644 --- a/character/gujian.js +++ b/character/gujian.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'gujian', character:{ diff --git a/character/gwent.js b/character/gwent.js index 70b5b4ee0..e4a9fcfa4 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'gwent', character:{ diff --git a/character/hearth.js b/character/hearth.js index b2931b353..83afe728c 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'hearth', character:{ diff --git a/character/jiange.js b/character/jiange.js index 3c42a6090..fbfad043a 100644 --- a/character/jiange.js +++ b/character/jiange.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'jiange', character:{ diff --git a/character/old.js b/character/old.js index aa4137d24..b65c5b211 100644 --- a/character/old.js +++ b/character/old.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'old', character:{ diff --git a/character/ow.js b/character/ow.js index 790afa52d..332e4fbac 100644 --- a/character/ow.js +++ b/character/ow.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'ow', character:{ diff --git a/character/refresh.js b/character/refresh.js index f0f6e6ad2..61c3b3359 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'refresh', connect:true, diff --git a/character/shenhua.js b/character/shenhua.js index 7894acc67..f7fa9d50b 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'shenhua', connect:true, diff --git a/character/sp.js b/character/sp.js index 463bcc409..7964bee0a 100644 --- a/character/sp.js +++ b/character/sp.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'sp', connect:true, diff --git a/character/standard.js b/character/standard.js index a436a471d..28bd18453 100644 --- a/character/standard.js +++ b/character/standard.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'standard', connect:true, diff --git a/character/swd.js b/character/swd.js index bd1a2eac1..dccce623c 100644 --- a/character/swd.js +++ b/character/swd.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'swd', character:{ diff --git a/character/xiake.js b/character/xiake.js index a509ed7ab..836e59edf 100644 --- a/character/xiake.js +++ b/character/xiake.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'xiake', character:{ diff --git a/character/xianjian.js b/character/xianjian.js index 85f22e2b8..81a927a40 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'xianjian', character:{ diff --git a/character/yijiang.js b/character/yijiang.js index 32316e30e..5ab62bf0f 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'yijiang', connect:true, diff --git a/character/yxs.js b/character/yxs.js index 83379e082..fce789f73 100644 --- a/character/yxs.js +++ b/character/yxs.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'yxs', character:{ diff --git a/character/zhuogui.js b/character/zhuogui.js index 7e6aeb335..6e1dd23c8 100644 --- a/character/zhuogui.js +++ b/character/zhuogui.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('character',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('character',function(lib,game,ui,get,ai,_status){ return { name:'zhuogui', character:{ diff --git a/extension/boss/extension.js b/extension/boss/extension.js index 0e4118f12..9a52a4866 100644 --- a/extension/boss/extension.js +++ b/extension/boss/extension.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('play',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('play',function(lib,game,ui,get,ai,_status){ return { name:'boss', init:function(){ diff --git a/extension/cardpile/extension.js b/extension/cardpile/extension.js index 30b591be1..043a6bcd8 100644 --- a/extension/cardpile/extension.js +++ b/extension/cardpile/extension.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('play',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('play',function(lib,game,ui,get,ai,_status){ return { name:'cardpile', arenaReady:function(){ diff --git a/extension/coin/extension.js b/extension/coin/extension.js index 6c3456266..b25c9a28b 100644 --- a/extension/coin/extension.js +++ b/extension/coin/extension.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('play',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('play',function(lib,game,ui,get,ai,_status){ return { name:'coin', init:function(){ diff --git a/extension/wuxing/extension.js b/extension/wuxing/extension.js index 7637bb506..f398a3685 100644 --- a/extension/wuxing/extension.js +++ b/extension/wuxing/extension.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('play',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('play',function(lib,game,ui,get,ai,_status){ return { name:'wuxing', arenaReady:function(){ diff --git a/game/game.js b/game/game.js index be7d04150..68ae63996 100644 --- a/game/game.js +++ b/game/game.js @@ -418,6 +418,12 @@ else{ map.touchscreen.hide(); } + if(lib.device||lib.node){ + map.auto_check_update.show(); + } + else{ + map.auto_check_update.hide(); + } if(lib.device){ map.enable_vibrate.show(); map.keep_awake.show(); @@ -20796,20 +20802,7 @@ if(!lib.imported[type]){ lib.imported[type]={}; } - var bool_ui=!window.ui; - var bool_get=!window.get; - var bool_ai=!window.ai; - var bool_lib=!window.lib; - window.ui=ui; - window.get=get; - window.ai=ai; - window.lib=lib; - window._status=_status; - var content2=content(); - if(bool_ui) delete window.ui; - if(bool_get) delete window.get; - if(bool_ai) delete window.ai; - if(bool_lib) delete window.lib; + var content2=content(lib,game,ui,get,ai,_status); if(content2.name){ lib.imported[type][content2.name]=content2; delete content2.name; diff --git a/game/update.js b/game/update.js index e5862321c..ae6c22e30 100644 --- a/game/update.js +++ b/game/update.js @@ -1,5 +1,5 @@ window.noname_update={ - version:'1.9.24.1', + version:'1.9.24.2', // update:'1.9.23', changeLog:[ 'bug修复', diff --git a/mode/boss.js b/mode/boss.js index 2f27fec43..6e5c771b9 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'boss', start:function(){ diff --git a/mode/brawl.js b/mode/brawl.js index 31b8c29df..008f442c9 100644 --- a/mode/brawl.js +++ b/mode/brawl.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'brawl', game:{ diff --git a/mode/chess.js b/mode/chess.js index 1d37421f2..b2f1a51e2 100644 --- a/mode/chess.js +++ b/mode/chess.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'chess', canvasUpdates2:[], diff --git a/mode/connect.js b/mode/connect.js index 565f44151..bbbe201de 100644 --- a/mode/connect.js +++ b/mode/connect.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'connect', start:function(){ diff --git a/mode/guozhan.js b/mode/guozhan.js index 8e33d35f9..d7b9b938d 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'guozhan', startBefore:function(){ diff --git a/mode/identity.js b/mode/identity.js index 28dffa9cf..7af48b80f 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'identity', start:function(){ diff --git a/mode/realtime.js b/mode/realtime.js index 1c4e4b7af..688c02b2f 100644 --- a/mode/realtime.js +++ b/mode/realtime.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'realtime', start:function(){ diff --git a/mode/stone.js b/mode/stone.js index a07eacef8..636b81929 100644 --- a/mode/stone.js +++ b/mode/stone.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'stone', start:function(){ diff --git a/mode/tafang.js b/mode/tafang.js index a61ac265d..8d6622b5b 100644 --- a/mode/tafang.js +++ b/mode/tafang.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'tafang', canvasUpdates2:[], diff --git a/mode/versus.js b/mode/versus.js index 324972465..f697f8c23 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -1,11 +1,5 @@ 'use strict'; -game.import('mode',function(){ - var game=window.game; - var ui=window.ui; - var get=window.get; - var ai=window.ai; - var lib=window.lib; - var _status=window._status; +game.import('mode',function(lib,game,ui,get,ai,_status){ return { name:'versus', init:function(){