diff --git a/game/game.js b/game/game.js
index 0c6dd1f8d..23a517a87 100755
--- a/game/game.js
+++ b/game/game.js
@@ -374,8 +374,9 @@
 					},
                     connect_nickname:{
                         name:'联机昵称',
-                        clear:true,
-                        unfrequent:true
+                        input:true,
+                        unfrequent:true,
+                        init:'无名玩家'
                     },
                     connect_avatar:{
                         name:'联机头像',
@@ -2761,11 +2762,14 @@
 			}
 			node._customintro=func;
 		},
-		setPopped:function(node,func,width,height){
+		setPopped:function(node,func,width,height,forceclick){
 			node._poppedfunc=func;
 			node._poppedwidth=width;
 			node._poppedheight=height;
-			if(lib.config.touchscreen){
+            if(forceclick){
+                node.forceclick=true;
+            }
+			if(lib.config.touchscreen||forceclick){
 				node.listen(ui.click.hoverpopped);
 			}
 			else{
@@ -4433,6 +4437,10 @@
 				},
 				chooseButton:function(){
 					"step 0"
+                    if(event.createDialog){
+                        event.dialog=ui.create.dialog.apply(this,event.createDialog);
+                        event.closeDialog=true;
+                    }
 					if(event.dialog==undefined) event.dialog=ui.dialog;
 					if(event.isMine()){
 						event.dialog.style.display='';
@@ -4442,11 +4450,22 @@
 					if(event.isMine()){
 						game.pause();
 					}
+                    else if(event.isOnline()){
+                        event.player.send(function(){
+                            game.me.chooseButton.apply(game.me,arguments);
+                            game.resume();
+                        },event.createDialog,event.filterButton,event.selectButton,event.forced);
+                        event.player.wait();
+                    }
 					else{
-						if(ai.basic.chooseButton(event.ai)||forced) ui.click.ok();
-						else ui.click.cancel();
+                        event.result='ai';
 					}
 					"step 1"
+                    if(event.result=='ai'){
+                        game.check();
+                        if(ai.basic.chooseButton(event.ai)||forced) ui.click.ok();
+						else ui.click.cancel();
+                    }
 					if(event.closeDialog){
 						event.dialog.close();
 					}
@@ -6137,6 +6156,19 @@
 					this.update();
 					return this;
 				},
+                initOL:function(name,character){
+                    this.node.avatar.setBackground(character,'character');
+                    this.node.avatar.show();
+                    this.node.name.innerHTML=get.verticalStr(name);
+                    this.nickname=name;
+                    this.avatar=character;
+                },
+                uninitOL:function(){
+                    this.node.avatar.hide();
+                    this.node.name.innerHTML='';
+                    delete this.nickname;
+                    delete this.avatar;
+                },
 				uninit:function(){
 					this.node.avatar.hide();
 					this.node.count.hide();
@@ -6180,6 +6212,13 @@
 
 					return this;
 				},
+                send:function(){
+                    this.ws.send.apply(this.ws,arguments);
+                },
+                setNameOL:function(str){
+                    this.node.nameol.innerHTML=str;
+                    return this;
+                },
 				update:function(){
 					if(_status.video&&arguments.length==0) return;
 					if(this.hp>=this.maxHp) this.hp=this.maxHp;
@@ -6826,8 +6865,12 @@
 							if(next.ai) next.filterButton=arguments[i];
 							else next.ai=arguments[i];
 						}
+                        else if(Array.isArray(arguments[i])){
+                            next.createDialog=arguments[i];
+                        }
 					}
 					next.player=this;
+                    if(typeof next.forced!='boolean') next.forced=false;
 					if(next.isMine()==false&&next.dialog) next.dialog.style.display='none';
 					if(next.filterButton==undefined) next.filterButton=lib.filter.filterButton;
 					if(next.selectButton==undefined) next.selectButton=[1,1];
@@ -7638,6 +7681,26 @@
 				skip:function(name){
 					this.skipList.add(name);
 				},
+                wait:function(){
+                    if(lib.node){
+                        lib.node.torespond[this.playerid]='_noname_waiting';
+                        game.pause();
+                    }
+                },
+                unwait:function(result){
+                    lib.node.torespond[this.playerid]=result;
+                    if(_status.paused){
+                        for(var i in lib.node.torespond){
+                            if(lib.node.torespond[i]=='_noname_waiting'){
+                                return;
+                            }
+                        }
+                        _status.event.result=result;
+                        _status.event.result2=lib.node.torespond;
+                        lib.node.torespond={};
+                        game.resume();
+                    }
+                },
 				logSkill:function(name,targets,nature){
 					if(get.itemtype(targets)=='player') targets=[targets];
 					var nopop=false;
@@ -8150,6 +8213,12 @@
 					}
 					return false;
 				},
+                isOnline:function(){
+                    if(this.ws&&lib.node&&lib.node.clients.contains(this.ws)){
+                        return true;
+                    }
+                    return false;
+                },
 				hasSkill:function(skill){
 					return this.get('s').contains(skill);
 				},
@@ -9505,6 +9574,9 @@
 				isMine:function(){
 					return (this.player&&this.player==game.me&&!_status.auto&&!this.player.isMad());
 				},
+                isOnline:function(){
+                    return (this.player&&this.player.isOnline());
+                },
 				notLink:function(){
 					return this.parent.name!='_lianhuan'&&this.parent.name!='_lianhuan2';
 				},
@@ -9773,33 +9845,47 @@
 			},
             client:{
                 send:function(){
-                    this.ws.send(JSON.stringify(Array.from(arguments)));
+                    var args=Array.from(arguments);
+                    if(typeof args[0]=='function'){
+                        args.unshift('exec');
+                    }
+                    for(var i=1;i<args.length;i++){
+                        args[i]=get.stringifiedResult(args[i]);
+                    }
+                    this.ws.send(JSON.stringify(args));
                     return this;
                 },
                 close:function(){
-                    lib.node.clients.remove(this);
+                    if(_status.waitingForPlayer){
+                        lib.node.clients.remove(this);
+                        for(var i=0;i<game.connectPlayers.length;i++){
+                            if(game.connectPlayers[i].playerid==this.id){
+                                game.connectPlayers[i].uninitOL();
+                                delete game.connectPlayers[i].playerid;
+                            }
+                        }
+                        game.updateWaiting();
+                    }
+                    else{
+                        lib.node.clients.remove(this);
+                    }
                     return this;
                 }
             },
             ws:{
-                onopen(){
+                onopen:function(){
                     game.send('init',lib.versionOL,{
-                        avatar:lib.config.online_avatar,
-                        nickname:lib.config.online_nickname
+                        avatar:lib.config.connect_avatar,
+                        nickname:lib.config.connect_nickname
                     });
                 },
-                onreconnect(){
-                    game.online=true;
-                    if(_status.connectCallback){
-                        _status.connectCallback(true);
-                        delete _status.connectCallback;
-                    }
+                onreconnect:function(){
                     game.send('reinit',game.onlineID,lib.versionOL,{
-                        avatar:lib.config.online_avatar,
-                        nickname:lib.config.online_nickname
+                        avatar:lib.config.connect_avatar,
+                        nickname:lib.config.connect_nickname
                     });
                 },
-                onmessage(messageevent){
+                onmessage:function(messageevent){
                     var message;
                     try{
                         message=JSON.parse(messageevent.data);
@@ -9807,6 +9893,9 @@
                             typeof lib.message.client[message[0]]!=='function'){
                             throw('err');
                         }
+                        for(var i=1;i<message.length;i++){
+                            message[i]=get.parsedResult(message[i]);
+                        }
                     }
                     catch(e){
                         console.log('invalid message: '+messageevent.data);
@@ -9814,18 +9903,14 @@
                     }
                     lib.message.client[message.shift()].apply(null,message);
                 },
-                onerror(e){
+                onerror:function(e){
                     alert('连接失败');
                 },
-                onclose(){
+                onclose:function(){
                     if(game.online){
                         alert('连接已断开');
                         game.reload();
                     }
-                    if(_status.connectCallback){
-                        _status.connectCallback(false);
-                        delete _status.connectCallback;
-                    }
                     game.online=false;
                     game.ws=null;
                 }
@@ -10315,10 +10400,10 @@
                     if(version!=lib.versionOL){
                         this.send('denied','version');
                     }
-                    else if(_status.gaming){
+                    else if(!_status.waitingForPlayer){
                         this.send('denied','gaming');
                     }
-                    else if(lib.node.clients.length>=lib.configOL.number){
+                    else if(lib.node.clients.length>=parseInt(lib.configOL.number)){
                         this.send('denied','number');
                     }
                     else{
@@ -10326,23 +10411,100 @@
                             this.avatar=config.avatar;
                             this.nickname=config.nickname;
                         }
+                        for(var i=0;i<game.connectPlayers.length;i++){
+                            if(game.connectPlayers[i]!=game.me&&!game.connectPlayers[i].playerid){
+                                game.connectPlayers[i].playerid=this.id;
+                                game.connectPlayers[i].initOL(this.nickname,this.avatar);
+                                break;
+                            }
+                        }
                         this.send('init',this.id,lib.configOL);
                     }
+                },
+                inited:function(){
+                    if(_status.waitingForPlayer){
+                        game.updateWaiting();
+                    }
+                },
+                result:function(result){
+                    var player=lib.playerOL[this.id];
+                    if(player){
+                        player.unwait(result);
+                    }
                 }
             },
             client:{
                 init:function(id,config){
-                    console.log(id,config);
-                    if(_status.connectCallback){
-                        _status.connectCallback(true);
-                        delete _status.connectCallback;
-                    }
                     game.online=true;
                     game.onlineID=id;
+                    _status.connectMode=true;
                     lib.configOL=config;
+                    game.clearArena();
+                    ui.create.connectPlayers();
+                    game.forceOver('noover',function(){
+                        _status.event={
+                			finished:true,
+                			next:[],
+                		};
+                        game.createEvent('game',false).content=function(){
+                            'step 0'
+                            event._result=null;
+                            game.pause();
+                            'step 1'
+                            if(result){
+                                if(_status.auto){
+                                    game.send('result','ai');
+                                }
+                                else{
+                                    game.send('result',get.stringifiedResult(result));
+                                }
+                            }
+                            event.goto(0);
+                        };
+                        game.loop();
+                    });
+                    game.send('inited');
+                },
+                exec:function(funcstr){
+                    try{
+                        var args=Array.from(arguments);
+                        args.shift();
+                        eval('('+funcstr+').apply(this,args);');
+                    }
+                    catch(e){
+                        console.log(e);
+                    }
                 },
                 denied:function(reason){
-                    console.log(reason);
+                    switch(reason){
+                        case 'version':alert('加入失败：版本不匹配');break;
+                        case 'gaming':alert('加入失败：游戏已开始');break;
+                        case 'number':alert('加入失败：房间已满');break;
+                    }
+                    game.ws.close();
+                },
+                gameStart:function(){
+                    for(var i=0;i<game.connectPlayers.length;i++){
+                        game.connectPlayers[i].delete();
+                    }
+                    delete game.connectPlayers;
+                    if(ui.connectStartButton){
+                        ui.connectStartButton.delete();
+                        delete ui.connectStartButton;
+                    }
+                },
+                updateWaiting:function(map){
+                    for(var i=0;i<map.length;i++){
+                        if(map[i]){
+                            if(i==0){
+                                game.connectPlayers[i].setIdentity('zhu');
+                            }
+                            game.connectPlayers[i].initOL(map[i][0],map[i][1]);
+                        }
+                        else{
+                            game.connectPlayers[i].uninitOL();
+                        }
+                    }
                 }
             }
         },
@@ -10353,11 +10515,43 @@
 	var game={
         online:false,
         onlineID:null,
-        waitForStart:function(){
-            var next=game.createEvent('waitForStart',false);
+        broadcast:function(){
+            for(var i=0;i<lib.node.clients.length;i++){
+                lib.node.clients[i].send.apply(lib.node.clients[i],arguments);
+            }
+        },
+        updateWaiting:function(){
+            var map=[];
+            for(var i=0;i<game.connectPlayers.length;i++){
+                var player=game.connectPlayers[i];
+                if(player.playerid){
+                    map[i]=[player.nickname,player.avatar];
+                }
+                else{
+                    map[i]=null;
+                }
+            }
+            game.broadcast('updateWaiting',map);
+        },
+        waitForPlayer:function(){
+            var next=game.createEvent('waitForPlayer',false);
             next.content=function(){
-                console.log(1);
+                'step 0'
+                ui.create.connectPlayers();
+                var me=game.connectPlayers[0];
+                me.initOL(lib.config.connect_nickname,lib.config.connect_avatar);
+                me.playerid=1;
+                me.setIdentity('zhu');
+                _status.waitingForPlayer=true;
                 game.pause();
+                'step 1'
+                _status.waitingForPlayer=false;
+                for(var i=0;i<game.connectPlayers.length;i++){
+                    game.connectPlayers[i].delete();
+                }
+                delete game.connectPlayers;
+                game.broadcast('gameStart');
+                game.delay(2);
             }
         },
         countDown:function(time,onEnd){
@@ -10397,10 +10591,21 @@
                 ui.timer.hide();
             }
         },
-        connect:function(ip,port,callback){
+        connect:function(ip){
+            var withport=false;
+            var index=ip.lastIndexOf(':');
+            if(index!=-1){
+                index=parseFloat(ip.slice(index+1));
+                if(index&&Math.floor(index)==index){
+                    withport=true;
+                }
+            }
+            if(!withport){
+                ip=ip+':8080';
+            }
             if(game.online) return;
             try{
-                game.ws=new WebSocket('ws://'+ip+':'+(port||8080)+'');
+                game.ws=new WebSocket('ws://'+ip+'');
             }
             catch(e){
                 alert('错误：无效联机地址');
@@ -10418,7 +10623,6 @@
             game.ws.onmessage=lib.element.ws.onmessage;
             game.ws.onerror=lib.element.ws.onerror;
             game.ws.onclose=lib.element.ws.onclose;
-            _status.connectCallback=callback;
         },
         send:function(){
             if(game.ws){
@@ -10427,13 +10631,16 @@
         },
         createServer:function(){
             lib.node.clients=[];
+            lib.node.torespond={};
             lib.configOL={};
+			lib.playerOL={};
+			lib.cardOL={};
             var WebSocketServer=require('ws').Server;
             var wss=new WebSocketServer({port:8080});
             wss.on('connection',function(ws){
                 var client={
                     ws:ws,
-                    id:(new Date()).getTime(),
+                    id:get.id(),
                     closed:false
                 };
                 lib.node.clients.push(client);
@@ -10448,6 +10655,9 @@
                             typeof lib.message.server[message[0]]!=='function'){
                             throw('err');
                         }
+                        for(var i=1;i<message.length;i++){
+                            message[i]=get.parsedResult(message[i]);
+                        }
                     }
                     catch(e){
                         console.log('invalid message: '+messagestr);
@@ -10886,7 +11096,6 @@
 						if(nodes[i]==ui.roundmenu) continue;
 						nodes[i].remove();
 					}
-					// ui.me.f.innerHTML='';
 					ui.sidebar.innerHTML='';
 					ui.cardPile.innerHTML='';
 					ui.discardPile.innerHTML='';
@@ -12640,10 +12849,11 @@
 			}
 			return ui.create.card(ui.special).init([suit,number,name,nature]);
 		},
-		forceOver:function(bool){
+		forceOver:function(bool,callback){
 			_status.event.next.length=0;
 			var next=game.createEvent('finish_game');
 			next.bool=bool;
+            next.callback=callback;
 			next.content=function(){
 				'step 0'
 				while(ui.controls.length){
@@ -12653,7 +12863,12 @@
 					ui.dialogs[0].close();
 				}
 				'step 1'
-				game.over(event.bool);
+                if(event.bool!='noover'){
+                    game.over(event.bool);
+                }
+                if(event.callback){
+                    event.callback();
+                }
 			};
 			if(_status.paused){
 				game.uncheck();
@@ -14069,6 +14284,31 @@
 			ui.create.cards();
 			game.finishCards();
 		},
+        clearArena:function(){
+            ui.control.innerHTML='';
+            ui.arenalog.innerHTML='';
+            var nodes=[];
+            for(var i=0;i<ui.arena.childNodes.length;i++){
+                nodes.push(ui.arena.childNodes[i]);
+            }
+            for(var i=0;i<nodes.length;i++){
+                if(nodes[i]==ui.canvas) continue;
+                if(nodes[i]==ui.control) continue;
+                if(nodes[i]==ui.arenalog) continue;
+                if(nodes[i]==ui.roundmenu) continue;
+                if(nodes[i]==ui.timer) continue;
+                nodes[i].remove();
+            }
+            ui.sidebar.innerHTML='';
+            ui.cardPile.innerHTML='';
+            ui.discardPile.innerHTML='';
+            ui.special.innerHTML='';
+            ui.playerids.remove();
+            ui.connectconfig.remove();
+            game.players.length=0;
+            game.dead.length=0;
+            game.me=null;
+        },
 		log:function(str){
 			var str='';
 			for(var i=0;i<arguments.length;i++){
@@ -15044,6 +15284,7 @@
 					switcher.link=current;
 					switcher.innerHTML=get.translation(current);
 					switcher.contentEditable=true;
+                    switcher.style.webkitUserSelect='text';
 					switcher.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.editor);
 				}
 				else if(typeof current=='object'){
@@ -15467,7 +15708,8 @@
 				ui.system1=ui.create.div('#system1',ui.system);
 				ui.system2=ui.create.div('#system2',ui.system);
 
-                ui.connectconfig=ui.create.system('联机',ui.click.connectButton,true);
+                ui.connectconfig=ui.create.system('联机',null,true);
+                lib.setPopped(ui.connectconfig,ui.click.connectconfig,220,null,true);
 				ui.replay=ui.create.system('重来',game.reload,true);
 				ui.config2=ui.create.system('选项',ui.click.config);
 				ui.pause=ui.create.system('暂停',ui.click.pause);
@@ -15585,9 +15827,9 @@
                     ui.playerids.remove();
                     ui.connectconfig.remove();
                     ui.pause.innerHTML='历史';
-                    setTimerPosition.call(ui.timer);
-                    ui.arena.appendChild(ui.timer);
                 }
+                setTimerPosition.call(ui.timer);
+                ui.arena.appendChild(ui.timer);
 
 				(function(){
 					var menu,menuContainer;
@@ -15631,10 +15873,11 @@
                             if(this._link.menu.childElementCount>10){
                                 openMenu(this._link.menu,{
     		                        x:pos1.left+pos1.width+5-pos2.left,
-    		                        y:40
+    		                        y:Math.min((ui.window.offsetHeight-400)/2,pos1.top-pos2.top)
     		                    },function(){
     		                        node.classList.remove('on');
     		                    });
+                                lib.setScroll(this._link.menu);
                             }
                             else{
                                 openMenu(this._link.menu,{
@@ -15647,16 +15890,6 @@
 		                }
 		            };
 					var clickContainer=function(){
-						// if(this.animating){
-                        //     return;
-                        // }
-                        // this.animating=true;
-                        // menu.classList.add('zoomout');
-                        // menu.classList.remove('zoomin');
-                        // setTimeout(function(){
-                        //     menuContainer.classList.add('hidden');
-                        //     menuContainer.animating=false;
-                        // },300);
 						menuContainer.classList.add('hidden');
 
 						game.resume2();
@@ -15747,6 +15980,28 @@
 						else if(config.clear){
 							node.listen(clickToggle);
 						}
+                        else if(config.input){
+                            node.classList.add('switcher');
+                            var input=ui.create.div(node);
+                            input.innerHTML=config.init||'无名玩家';
+                            input.contentEditable=true;
+                            input.style.webkitUserSelect='text';
+                            input.style.minWidth='10px';
+                            input.onkeydown=function(e){
+            					if(e.keyCode==13){
+            						e.preventDefault();
+            						e.stopPropagation();
+            						input.blur();
+            					}
+            				};
+                            input.onblur=function(){
+                                input.innerHTML=input.innerHTML.replace(/\<br\>/g,'');
+                                if(!input.innerHTML){
+                                    input.innerHTML='无名玩家';
+                                }
+                                game.saveConfig('connect_nickname',input.innerHTML);
+                            }
+                        }
 		                else{
 		                    node.classList.add('toggle');
 		                    node.listen(clickToggle);
@@ -17880,7 +18135,14 @@
 							menuUpdates.push(function(){
 								if(_status.video||_status.connectMode){
 									node.classList.add('off');
-									node.classList.remove('active');
+                                    if(node.classList.contains('active')){
+                                        node.classList.remove('active');
+										node.link.remove();
+										active=start.firstChild.lastChild;
+										active.classList.add('active');
+										rightPane.appendChild(active.link);
+                                    }
+
 									page.remove();
 									cheatButton.remove();
 									if(_status.video) node.remove();
@@ -17936,10 +18198,15 @@
 									if(active==node){
 										node.classList.remove('active');
 										node.link.remove();
-										active=start.firstChild.firstChild;
+                                        if(_status.connectMode){
+                                            active=start.firstChild.lastChild;
+                                        }
+                                        else{
+                                            active=start.firstChild.firstChild;
+                                            cheatButton.style.display='';
+                                        }
 										active.classList.add('active');
 										rightPane.appendChild(active.link);
-										cheatButton.style.display='';
 									}
                                     return;
 								}
@@ -17981,9 +18248,18 @@
 							node.type='cmd';
 							node.link=page;
 							page.classList.add('menu-sym');
-                            if(_status.connectMode){
-                                node.classList.add('off');
-                            }
+                            menuUpdates.push(function(){
+								if(_status.connectMode){
+									node.classList.add('off');
+                                    if(node.classList.contains('active')){
+                                        node.classList.remove('active');
+										node.link.remove();
+										active=start.firstChild.lastChild;
+										active.classList.add('active');
+										rightPane.appendChild(active.link);
+                                    }
+                                }
+                            });
 							var text=document.createElement('div');
 							text.style.width='194px';
                             text.style.height='104px';
@@ -18817,6 +19093,7 @@
 					hp:ui.create.div('.hp',node),
 					name:ui.create.div('.name',node),
 					name2:ui.create.div('.name.name2',node),
+                    nameol:ui.create.div('.nameol',node),
 					count:ui.create.div('.count',node).hide(),
 					equips:ui.create.div('.equips',node).hide(),
 					judges:ui.create.div('.judges',node),
@@ -18857,6 +19134,32 @@
 
 				return node;
 			},
+            connectPlayers:function(){
+                game.connectPlayers=[];
+                for(var i=0;i<8;i++){
+                    var player=ui.create.player(ui.window);
+                    player.dataset.position=i;
+                    player.classList.add('connect');
+                    game.connectPlayers.push(player);
+                    if(i>=lib.configOL.number){
+                        player.classList.add('unselectable2');
+                    }
+                }
+                var button=ui.create.div('.menubutton.large.highlight',game.online?'退出联机':'开始游戏',ui.window,function(){
+                    if(game.online){
+                        game.reload();
+                    }
+                    else{
+                        game.resume();
+                    }
+                    button.delete();
+                    delete ui.connectStartButton;
+                });
+                button.style.top='calc(200% / 3 + 280px / 3 + 6px)';
+                button.style.width='130px';
+                button.style.left='calc(50% - 65px)';
+                ui.connectStartButton=button;
+            },
 			players:function(num){
 				if(num===0){
 					return;
@@ -18970,9 +19273,6 @@
 			},
 		},
 		click:{
-            connectButton:function(){
-                game.connect('localhost');
-            },
             favouriteCharacter:function(e){
                 if(this.innerHTML=='添加收藏'){
                     this.innerHTML='移除收藏';
@@ -19191,6 +19491,32 @@
 				}
 				return uiintro;
 			},
+            connectconfig:function(){
+                if(game.online) return;
+                var uiintro=ui.create.dialog('hidden');
+				uiintro.listen(function(e){
+					e.stopPropagation();
+				});
+                uiintro.add('<div class="text center">输入地址</div>');
+                uiintro.classList.add('noleave');
+                var node=uiintro.add('<input type="text" value="">');
+                node.style.paddingTop=0;
+                node.style.marginBottom='16px';
+                var input=node.firstChild;
+                input.style.width='80%';
+                input.onkeydown=function(e){
+                    if(e.keyCode==13&&input.value){
+                        game.connect(input.value);
+                    }
+                    else{
+                        e.stopPropagation();
+                    }
+                }
+                setTimeout(function(){
+                    input.focus();
+                },200);
+                return uiintro;
+            },
 			volumn:function(){
 				var uiintro=ui.create.dialog('hidden');
 				uiintro.listen(function(e){
@@ -19275,7 +19601,7 @@
 				// if(this._poppedalready){
 				// 	return;
 				// }
-				if(lib.config.touchscreen){
+				if(lib.config.touchscreen||this.forceclick){
 					_status.touchpopping=true;
 					setTimeout(function(){
 						_status.touchpopping=false;
@@ -21269,6 +21595,9 @@
 		},
 	};
 	var get={
+        id:function(){
+            return (Math.floor((new Date()).getTime()*Math.random())).toString();
+        },
 		zhu:function(player,skill){
 			if(typeof player=='string'){
 				skill=player;
@@ -21353,6 +21682,131 @@
 			}
 			return cards;
 		},
+        cardInfoOL:function(card){
+            return '_noname_card:'+card.cardid;
+        },
+        infoCardOL:function(info){
+            return lib.cardOL[info.slice(13)];
+        },
+        cardsInfoOL:function(cards){
+            var info=[];
+            for(var i=0;i<cards.length;i++){
+                info.push(get.cardInfoOL(cards[i]));
+            }
+            return info;
+        },
+        infoCardsOL:function(info){
+            var cards=[];
+            for(var i=0;i<info.length;i++){
+                cards.push(get.infoCardOL(info[i]));
+            }
+            return cards;
+        },
+        playerInfoOL:function(player){
+            return '_noname_player:'+player.playerid;
+        },
+        infoPlayerOL:function(info){
+            return lib.playerOL[info.slice(15)];
+        },
+        playersInfoOL:function(players){
+            var info=[];
+            for(var i=0;i<players.length;i++){
+                info.push(get.playerInfoOL(players[i]));
+            }
+            return info;
+        },
+        infoPlayersOL:function(info){
+            var players=[];
+            for(var i=0;i<info.length;i++){
+                players.push(get.infoPlayerOL(info[i]));
+            }
+            return players;
+        },
+        funcInfoOL:function(func){
+            if(typeof func=='function'){
+                return '_noname_func:'+func.toString();
+            }
+            return '';
+        },
+        infoFuncOL:function(info){
+            var func;
+            try{
+                eval('func=('+info.slice(13)+');');
+            }
+            catch(e){
+                return function(){};
+            }
+            return func;
+        },
+        stringifiedResult:function(item){
+            if(!item) return item;
+            if(typeof item=='function'){
+                return get.funcInfoOL(item);
+            }
+            else if(typeof item=='object'){
+                switch(get.itemtype(item)){
+                    case 'card': return get.cardInfoOL(item);
+                    case 'cards': return get.cardsInfoOL(item);
+                    case 'player': return get.playerInfoOL(item);
+                    case 'players': return get.playersInfoOL(item);
+                    default:
+                    if(Array.isArray(item)){
+                        var item2=[];
+                        for(var i=0;i<item.length;i++){
+                            item2.push(get.stringifiedResult(item[i]));
+                        }
+                        return item2;
+                    }
+                    else if(Object.prototype.toString.call(item)=='[object Object]'){
+                        var item2={};
+                        for(var i in item){
+                            item2[i]=get.stringifiedResult(item[i]);
+                        }
+                        return item2;
+                    }
+                    else{
+                        return {};
+                    }
+                }
+            }
+            else{
+                return item;
+            }
+        },
+        parsedResult:function(item){
+            if(!item) return item;
+            if(typeof item=='string'){
+                if(item.indexOf('_noname_func:')==0){
+                    return get.infoFuncOL(item);
+                }
+                else if(item.indexOf('_noname_card:')==0){
+                    return get.infoCardOL(item);
+                }
+                else if(item.indexOf('_noname_player:')==0){
+                    return get.infoPlayerOL(item);
+                }
+                else{
+                    return item;
+                }
+            }
+            else if(Array.isArray(item)){
+                var item2=[];
+                for(var i=0;i<item.length;i++){
+                    item2.push(get.parsedResult(item[i]));
+                }
+                return item2;
+            }
+            else if(typeof item=='object'){
+                var item2={};
+                for(var i in item){
+                    item2[i]=get.parsedResult(item[i]);
+                }
+                return item2;
+            }
+            else{
+                return item;
+            }
+        },
 		verticalStr:function(str,sp){
 			if(typeof str!='string') return '';
 			str=str.toUpperCase();
diff --git a/game/update.js b/game/update.js
index 4edef19af..a2944c2bf 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,9 +1,6 @@
 window.noname_update={
     version:'1.8.1.5',
     changeLog:[
-        '自由选将改进',
-        '命令输入改进',
-        '修复不能导入模式的bug',
         '主题并入素材',
         '按钮位置选项',
         '录像兼容性改进'
diff --git a/layout/default/layout.css b/layout/default/layout.css
index b045c5009..03b3b4b5f 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -589,6 +589,17 @@ margin-bottom: 5px;
 	font-family: 'huangcao','xinwei';
 }
 
+.player>.nameol{
+	left:0;
+	top:15px;
+	width: 100%;
+	font-size: 12px;
+	text-align: center;
+	/*opacity: 0;*/
+}
+.player:hover>.nameol{
+	opacity: 1;
+}
 .player>.name{left: 16px;top:24px;font-size:20px;font-family: 'xinwei';}
 .player>.name.name2{left:81px}
 #arena.slim_player .player>.name{
@@ -979,6 +990,7 @@ margin-bottom: 5px;
 #arena.selecting:not(.video) .dialog:not(.noselect) .button:not(.selectable):not(.noclick),
 .dead,.likedead{opacity: 0.6;}
 .unselectable:not(.selected):not(.removing){opacity: 0.6 !important}
+.unselectable2{opacity: 0.4 !important}
 .mark>.background{opacity: 1 !important;}
 #arena.selecting:not(.video) #me .card:not(.selectable){
 	opacity:0.8
diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css
index 0bd544f9e..0b3887c39 100644
--- a/layout/mobile/layout.css
+++ b/layout/mobile/layout.css
@@ -110,6 +110,9 @@
     top:10px;
     transform: none;
 }
+#arena:not(.chess) .player[data-position='0']>.nameol{
+    display: none;
+}
 #arena:not(.chess) .player[data-position='0']>.name.name2,
 #arena:not(.chess) .player[data-position='0'].linked>.name.name2{
     left:69px;
diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css
index 7b2b9f93f..a54db8aa9 100644
--- a/layout/newlayout/global.css
+++ b/layout/newlayout/global.css
@@ -6,7 +6,7 @@
 	width:130px;
 	height:160px;
 }
-#arena.slim_player .player:not(.minskin):not(.fakeme) .avatar{
+#window>.player>.avatar,#arena.slim_player .player:not(.minskin):not(.fakeme) .avatar{
 	width: 136px;
 	height: 166px;
 	left:7px;
@@ -351,6 +351,18 @@
 [data-number='2']>.popup[data-position='1']{top:190px;left:calc(50% - 61px);}
 /*--------位置(1人)------*/
 .player[data-position='0']{top:calc(100% - 170px);left:calc(50% - 75px);}
+/*--------位置(联机)------*/
+#window>.player.connect[data-position='0']{left:calc(200% / 7 - 1200px / 7);top:calc(100% / 3 - 400px / 3 + 12px);}
+#window>.player.connect[data-position='1']{left:calc(300% / 7 - 750px / 7);top:calc(100% / 3 - 400px / 3 + 12px);}
+#window>.player.connect[data-position='2']{left:calc(400% / 7 - 300px / 7);top:calc(100% / 3 - 400px / 3 + 12px);}
+#window>.player.connect[data-position='3']{left:calc(500% / 7 + 150px / 7);top:calc(100% / 3 - 400px / 3 + 12px);}
+#window>.player.connect[data-position='4']{left:calc(200% / 7 - 1200px / 7);top:calc(150% / 3 - 20px + 9px);}
+#window>.player.connect[data-position='5']{left:calc(300% / 7 - 750px / 7);top:calc(150% / 3 - 20px + 9px);}
+#window>.player.connect[data-position='6']{left:calc(400% / 7 - 300px / 7);top:calc(150% / 3 - 20px + 9px);}
+#window>.player.connect[data-position='7']{left:calc(500% / 7 + 150px / 7);top:calc(150% / 3 - 20px + 9px);}
+
+
+
 .card[data-position='0']{top:calc(100% - 130px);left:calc(50% - 52px);}
 .popup[data-position='0']{top:calc(100% - 206px);left:calc(50% - 61px);}
 #me,#mebg{top:calc(100% - 150px);}
diff --git a/mode/identity.js b/mode/identity.js
index 3d94a44a0..3ea2d9e7e 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -13,9 +13,15 @@ mode.identity={
 					lib.configOL[i]=get.config(i);
 				}
 			}
-			lib.configOL.number=lib.configOL.player_number;
+			if(_status.mode=='zhong'){
+				lib.configOL.number=8;
+			}
+			else{
+				lib.configOL.number=lib.configOL.player_number;
+			}
 			lib.configOL.characterPack='standard';
 			lib.configOL.cardPack='standard';
+			lib.configOL.mode='identity';
 		}
 		"step 1"
 		var playback=localStorage.getItem(lib.configprefix+'playback');
@@ -37,7 +43,7 @@ mode.identity={
 			}
 			event.finish();
 		}
-		else{
+		else if(!_status.connectMode){
 			if(_status.mode=='zhong'){
 				game.prepareArena(8);
 			}
@@ -48,6 +54,9 @@ mode.identity={
 				game.delay();
 			}
 		}
+		if(!lib.node){
+			game.connect('localhost');
+		}
 		"step 2"
 		if(!lib.config.new_tutorial){
 			game.saveConfig('version',lib.version);
@@ -151,12 +160,57 @@ mode.identity={
 			ui.auto.classList.add('glow');
 		}
 		if(_status.connectMode){
-			game.waitForStart();
+			game.waitForPlayer();
+		}
+		"step 4"
+		if(_status.connectMode){
+			game.prepareArena();
+			var list=[];
+			for(var i=0;i<game.players.length;i++){
+				if(game.players[i]!=game.me){
+					list.push(game.players[i]);
+				}
+			}
+			var map=[];
+			for(var i=0;i<lib.node.clients.length;i++){
+				var current=list.randomRemove();
+				current.ws=lib.node.clients[i];
+				current.setNameOL(current.ws.nickname);
+				current.playerid=current.ws.id;
+				current.nickname=current.ws.nickname;
+			}
+			game.me.playerid=get.id();
+			game.me.nickname=lib.config.connect_nickname;
+			game.me.setNameOL(game.me.nickname);
+			for(var i=0;i<game.players.length;i++){
+				if(!game.players[i].playerid){
+					game.players[i].playerid=get.id();
+				}
+				map.push([game.players[i].playerid,game.players[i].nickname]);
+				lib.playerOL[game.players[i].playerid]=game.players[i];
+			}
+			game.broadcast(function(map){
+				ui.create.players();
+				ui.create.me();
+				game.me.playerid=game.onlineID;
+				game.me.nickname=lib.config.connect_nickname;
+				for(var i=0;i<map.length;i++){
+					if(map[i][0]==game.me.playerid){
+						map=map.concat(map.splice(0,i));
+						break;
+					}
+				}
+				for(var i=0;i<game.players.length;i++){
+					game.players[i].playerid=map[i][0];
+					game.players[i].setNameOL(map[i][1]);
+				}
+			},map);
+			game.chooseCharacterOL();
 		}
 		else{
 			game.chooseCharacter();
 		}
-		"step 4"
+		"step 5"
 		if(ui.coin){
 			_status.coinCoeff=get.coinCoeff([game.me.name]);
 		}
@@ -777,6 +831,132 @@ mode.identity={
 				}
 			}
 		},
+		chooseCharacterOL:function(){
+			var next=game.createEvent('chooseCharacter',false);
+			next.content=function(){
+				"step 0"
+				var i;
+				var identityList;
+				if(_status.mode=='zhong'){
+					event.zhongmode=true;
+					identityList=['zhu','zhong','mingzhong','nei','fan','fan','fan','fan'];
+				}
+				else{
+					identityList=lib.config.mode_config.identity.identity[game.players.length-2].slice(0);
+					if(get.config('double_nei')){
+						switch(get.config('player_number')){
+							case '8':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+							case '7':
+							identityList.remove('zhong');
+							identityList.push('nei');
+							break;
+							case '6':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+							case '5':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+							case '4':
+							identityList.remove('zhong');
+							identityList.push('nei');
+							break;
+							case '3':
+							identityList.remove('fan');
+							identityList.push('nei');
+							break;
+						}
+					}
+				}
+				identityList.randomSort();
+				for(i=0;i<game.players.length;i++){
+					game.players[i].identity=identityList[i];
+					game.players[i].setIdentity('cai');
+					if(event.zhongmode){
+						if(identityList[i]=='mingzhong'){
+							game.zhu=game.players[i];
+						}
+						else if(identityList[i]=='zhu'){
+							game.zhu2=game.players[i];
+						}
+					}
+					else{
+						if(identityList[i]=='zhu'){
+							game.zhu=game.players[i];
+						}
+					}
+					game.players[i].identityShown=false;
+				}
+				game.zhu.setIdentity();
+				game.zhu.identityShown=true;
+				game.zhu.isZhu=(game.zhu.identity=='zhu');
+				game.me.setIdentity();
+
+				var list;
+				var list2=[];
+				var list3=[];
+				event.list=[];
+				for(i in lib.character){
+					if(lib.character[i][4]&&lib.character[i][4].contains('forbidai')) continue;
+					if(lib.config.forbidai.contains(i)) continue;
+					if(lib.config.forbidall.contains(i)) continue;
+					if(lib.config.banned.contains(i)) continue;
+					if(!get.config('double_character')&&get.config('ban_weak')&&
+					(lib.config.forbidsingle.contains(i)||lib.rank.c.contains(i)||lib.rank.d.contains(i))) continue;
+					if(get.config('ban_strong')&&(lib.rank.s.contains(i)||lib.rank.ap.contains(i))) continue;
+					if(get.config('double_character')&&lib.config.forbiddouble.contains(i)) continue;
+					event.list.push(i);
+					if(lib.character[i][4]&&lib.character[i][4].contains('zhu')){
+						list2.push(i);
+					}
+					else{
+						list3.push(i);
+					}
+				}
+				var num=get.config('choice_'+game.zhu.identity);
+				if(event.zhongmode){
+					num=3;
+				}
+				if(event.zhongmode){
+					list=event.list.randomGets(6);
+				}
+				else{
+					list=list2.concat(list3.randomGets(num));
+				}
+				var next=game.zhu.chooseButton(true);
+				next.selectButton=(lib.configOL.double_character?2:1);
+				next.createDialog=['选择角色','hidden',[list,'character']];
+				next.ai=function(button){
+					return Math.random();
+				}
+				"step 1"
+				if(result.buttons.length==2){
+					game.zhu.init(result.links[0],result.links[1])
+				}
+				else{
+					game.zhu.init(result.links[0])
+				}
+				event.list.remove(game.zhu.name);
+				event.list.remove(game.zhu.name2);
+				// game.addRecentCharacter(game.me.name,game.me.name2);
+				// event.list.remove(game.me.name);
+				// event.list.remove(game.me.name2);
+				// if(game.me==game.zhu&&game.players.length>4){
+				// 	game.me.hp++;
+				// 	game.me.maxHp++;
+				// 	game.me.update();
+				// }
+				// for(var i=0;i<game.players.length;i++){
+				// 	if(game.players[i]!=game.zhu&&game.players[i]!=game.me){
+				// 		event.ai(game.players[i],event.list.splice(0,get.config('choice_'+game.players[i].identity)),null,event.list)
+				// 	}
+				// }
+			}
+		},
 	},
 	translate:{
 		zhu:"主",