diff --git a/character/xianjian.js b/character/xianjian.js index b3ad543cd..4e002ad36 100755 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -1358,7 +1358,7 @@ character.xianjian={ pal_hanlingsha:'韩菱纱', pal_liumengli:'柳梦璃', pal_murongziying:'慕容紫英', - pal_changqing:'长聊', + pal_changqing:'长卿', pal_xuanxiao:'玄霄', xuanyan:'玄炎', diff --git a/character/yxs.js b/character/yxs.js index d75140318..aa6cc09b9 100755 --- a/character/yxs.js +++ b/character/yxs.js @@ -2108,7 +2108,7 @@ character.yxs={ yxs_mingchenghuanghou:'明成皇后', yxs_wangzhaojun:'王昭君', yxs_luocheng:'罗成', - yxs_direnjie:'狄人杰', + yxs_direnjie:'狄仁杰', yxs_sunwu:'孙武', yxs_chengyaojin:'程咬金', yxs_yujix:'虞姬', diff --git a/game/config.js b/game/config.js index e2f5126cd..ef49caf3f 100755 --- a/game/config.js +++ b/game/config.js @@ -207,6 +207,7 @@ window.config={ hiddenPlayPack:[], favouriteCharacter:[], recentCharacter:[], + recentIP:[], theme:'woodden', layout:'mobile', diff --git a/game/game.js b/game/game.js index 86a6d8d8f..7227d8155 100755 --- a/game/game.js +++ b/game/game.js @@ -65,7 +65,7 @@ onover:[], chatHistory:[], arenaReady:[], - packageReady:[], + extensions:[], characterDialogGroup:{ '收藏':function(name,capt){ return lib.config.favouriteCharacter.contains(name)?capt:null; @@ -138,9 +138,11 @@ onclick:function(bool){ game.saveConfig('cheat',bool); if(_status.connectMode) return; - if(lib.config.cheat&&bool==false){ - lib.cheat=window.cheat; - delete window.cheat; + if(bool){ + lib.cheat.i(); + } + else{ + delete window.cheat; delete window.game; delete window.ui; delete window.get; @@ -148,10 +150,6 @@ delete window.lib; delete window._status; } - else if(!lib.config.cheat&&bool){ - window.cheat=lib.cheat; - window.cheat.i(); - } }, unfrequent:true, }, @@ -3068,7 +3066,7 @@ lib.configMenu.appearence.config.theme.item[i]=theme.pack[i]; } } - + ui.fontsheet=document.createElement('style'); document.head.appendChild(ui.fontsheet); if(font&&font.pack){ @@ -3122,9 +3120,14 @@ } } try{ - _status.extension=game.importedPack.name; - game.importedPack.content(cfg); - delete _status.extension; + if(game.importedPack.precontent){ + _status.extension=game.importedPack.name; + game.importedPack.precontent(cfg); + delete _status.extension; + } + if(game.importedPack.content){ + lib.extensions.push([game.importedPack.name,game.importedPack.content,cfg]); + } } catch(e){ console.log(e); @@ -3748,12 +3751,8 @@ _status.connectMode=true; } if(lib.config.cheat&&!lib.storage.test&&(!_status.connectMode||lib.config.debug)){ - cheat.i(); + lib.cheat.i(); } - else{ - lib.cheat=window.cheat; - delete window.cheat; - } lib.config.sort_card=get.sortCard(lib.config.sort); delete window.config; delete window.mode; @@ -3765,10 +3764,19 @@ delete lib.init[i]; } } - while(lib.packageReady.length){ - (lib.init.eval(lib.packageReady.shift()))(); - } - delete lib.packageReady; + if(!_status.connectMode){ + for(var i=0;i0&&typeof arguments[i]=='number'){ + for(var j=0;j'+ui.cardPile.childNodes.length); + var num; + if(game.online){ + num=_status.cardPileNum||0; + } + else{ + num=ui.cardPile.childNodes.length; + } + uiintro.add('剩余 '+num); + + if(_status.connectMode) return uiintro; uiintro.add('
弃牌堆
'); if(ui.discardPile.childNodes.length){ var list=[]; @@ -25369,210 +25618,6 @@ } return list; }; - window.cheat={ - i:function(){ - window.game=game; - window.ui=ui; - window.get=get; - window.ai=ai; - window.lib=lib; - window._status=_status; - }, - uy:function(me){ - if(me){ - game.me.useCard({name:'spell_yexinglanghun'},game.me); - } - else{ - var enemy=game.me.getEnemy(); - enemy.useCard({name:'spell_yexinglanghun'},enemy); - } - }, - gs:function(name,act){ - var card=game.createCard('spell_'+name); - game.me.node.handcards1.appendChild(card); - if(!act){ - game.me.actused=-99; - } - ui.updatehl(); - setTimeout(game.check,300); - }, - gc:function(name,act){ - var card=game.createCard('stone_'+name+'_stonecharacter'); - game.me.node.handcards1.appendChild(card); - if(!act){ - game.me.actused=-99; - } - ui.updatehl(); - setTimeout(game.check,300); - }, - aa:function(){ - game.saveConfig('test_game',!lib.config.test_game); - game.reload(); - }, - a:function(name){ - if(lib.storage.test&&!name){ - game.save('test',false); - if(lib.config.mode=='identity'){ - game.saveConfig('double_character',false,true); - } - } - else{ - game.save('test',name||true); - if(lib.config.mode=='identity'){ - game.saveConfig('double_character',true,true); - } - } - game.reload(); - }, - u:function(){ - var card={name:'sha'},source=game.me.next; - for(var i=0;i0&&typeof arguments[i]=='number'){ - for(var j=0;j.text{font-size:16px;text-align:left} .caption>.text.center{text-align:center} .caption>.text.chat{word-break: break-all;margin-bottom: 3px;margin-left: 10px;width: calc(100% - 20px)} +.caption>.text.textlink{margin-left: 10px} +.caption>.text.textlink:hover{text-decoration: underline;} .caption>div>div{font-size: 16px;position: relative;width: calc(100% - 70px);vertical-align: top;margin: 0;padding: 0;} .skill{left: 0 !important;width: 70px !important;} .caption>.ctext{text-align:center;font-size:16px;} diff --git a/mode/connect.js b/mode/connect.js index 007cf9d14..aad79ab50 100644 --- a/mode/connect.js +++ b/mode/connect.js @@ -21,7 +21,7 @@ mode.connect={ var connect=function(e){ clearTimeout(event.timeout); - e.preventDefault(); + if(e) e.preventDefault(); game.saveConfig('last_ip',node.innerHTML); game.connect(node.innerHTML); }; @@ -53,6 +53,31 @@ mode.connect={ button.style.top='calc(50% + 60px)'; ui.window.appendChild(button); ui.ipbutton=button; + + ui.recentIP=ui.create.system('最近连接',null,true); + var clickLink=function(){ + node.innerHTML=this.innerHTML; + connect(); + }; + var trimIP=function(str){ + var len=str.length-5; + if(str.lastIndexOf(':8080')==len){ + str=str.slice(0,len); + } + return str; + }; + lib.setPopped(ui.recentIP,function(){ + var uiintro=ui.create.dialog('hidden'); + uiintro.listen(function(e){ + e.stopPropagation(); + }); + var list=ui.create.div('.caption'); + for(var i=0;i