From 6468d698a788637419ec538c1f8667dc112e6580 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sat, 2 May 2015 17:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E5=B0=86=E3=80=81=E5=8D=A1=E7=89=8C?=
 =?UTF-8?q?=E4=B8=80=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/game.js                            | 435 +++++++++++++++++++-----
 layout/default/layout.css               |   1 +
 mode/guozhan.js                         | 112 +-----
 mode/identity.js                        | 107 +-----
 theme/{ => archive}/block/block.png     | Bin
 theme/{ => archive}/block/style.css     |   0
 theme/{ => archive}/default/.DS_Store   | Bin
 theme/{ => archive}/default/oxygen.jpg  | Bin
 theme/{ => archive}/default/oxygen2.jpg | Bin
 theme/{ => archive}/default/style.css   |   0
 theme/{ => archive}/dock/dock.png       | Bin
 theme/{ => archive}/dock/dock2.png      | Bin
 theme/{ => archive}/dock/grid.png       | Bin
 theme/{ => archive}/dock/oxygen.jpg     | Bin
 theme/{ => archive}/dock/style.css      |   0
 theme/{ => archive}/dock/wood.png       | Bin
 theme/{ => archive}/glass/blur.jpg      | Bin
 theme/{ => archive}/glass/glow.png      | Bin
 theme/{ => archive}/glass/style.css     |   0
 theme/{ => archive}/jeans/jeans.jpg     | Bin
 theme/{ => archive}/jeans/style.css     |   0
 theme/{ => archive}/metro/style.css     |   0
 theme/{ => archive}/round/bg_1.jpg      | Bin
 theme/{ => archive}/round/bg_2.jpg      | Bin
 theme/{ => archive}/round/block.png     | Bin
 theme/{ => archive}/round/dock.png      | Bin
 theme/{ => archive}/round/dock2.png     | Bin
 theme/{ => archive}/round/grid.png      | Bin
 theme/{ => archive}/round/jeans.jpg     | Bin
 theme/{ => archive}/round/oxygen.jpg    | Bin
 theme/{ => archive}/round/p_4.png       | Bin
 theme/{ => archive}/round/style.css     |   0
 theme/{ => archive}/round/wood.jpg      | Bin
 theme/{ => archive}/round/wood.png      | Bin
 theme/{ => archive}/simple/style.css    |   0
 theme/{ => archive}/white/grid.png      | Bin
 theme/{ => archive}/white/oxygen.jpg    | Bin
 theme/{ => archive}/white/style.css     |   0
 theme/woodden/style.css                 |   3 +
 39 files changed, 352 insertions(+), 306 deletions(-)
 rename theme/{ => archive}/block/block.png (100%)
 rename theme/{ => archive}/block/style.css (100%)
 rename theme/{ => archive}/default/.DS_Store (100%)
 rename theme/{ => archive}/default/oxygen.jpg (100%)
 rename theme/{ => archive}/default/oxygen2.jpg (100%)
 rename theme/{ => archive}/default/style.css (100%)
 rename theme/{ => archive}/dock/dock.png (100%)
 rename theme/{ => archive}/dock/dock2.png (100%)
 rename theme/{ => archive}/dock/grid.png (100%)
 rename theme/{ => archive}/dock/oxygen.jpg (100%)
 rename theme/{ => archive}/dock/style.css (100%)
 rename theme/{ => archive}/dock/wood.png (100%)
 rename theme/{ => archive}/glass/blur.jpg (100%)
 rename theme/{ => archive}/glass/glow.png (100%)
 rename theme/{ => archive}/glass/style.css (100%)
 rename theme/{ => archive}/jeans/jeans.jpg (100%)
 rename theme/{ => archive}/jeans/style.css (100%)
 rename theme/{ => archive}/metro/style.css (100%)
 rename theme/{ => archive}/round/bg_1.jpg (100%)
 rename theme/{ => archive}/round/bg_2.jpg (100%)
 rename theme/{ => archive}/round/block.png (100%)
 rename theme/{ => archive}/round/dock.png (100%)
 rename theme/{ => archive}/round/dock2.png (100%)
 rename theme/{ => archive}/round/grid.png (100%)
 rename theme/{ => archive}/round/jeans.jpg (100%)
 rename theme/{ => archive}/round/oxygen.jpg (100%)
 rename theme/{ => archive}/round/p_4.png (100%)
 rename theme/{ => archive}/round/style.css (100%)
 rename theme/{ => archive}/round/wood.jpg (100%)
 rename theme/{ => archive}/round/wood.png (100%)
 rename theme/{ => archive}/simple/style.css (100%)
 rename theme/{ => archive}/white/grid.png (100%)
 rename theme/{ => archive}/white/oxygen.jpg (100%)
 rename theme/{ => archive}/white/style.css (100%)

diff --git a/game/game.js b/game/game.js
index 3a403f430..d11b97cd5 100644
--- a/game/game.js
+++ b/game/game.js
@@ -4475,7 +4475,7 @@ window.play={};
 					else{
 						var buttons=ui.create.div('.buttons',this.content);
 						if(zoom) buttons.classList.add('smallzoom');
-						this.buttons=this.buttons.concat(ui.create.buttons(item[0],item[1],buttons));
+						this.buttons=this.buttons.concat(ui.create.buttons(item[0],item[1],buttons,noclick));
 					}
 					ui.update();
 					return item;
@@ -6366,6 +6366,196 @@ window.play={};
 	            }
 	            return node;
 			},
+			groupControl:function(dialog){
+				return ui.create.control('wei','shu','wu','qun',function(link,node){
+					if(link=='全部'){
+						dialog.currentcapt='';
+						dialog.currentgroup='';
+						for(var i=0;i<dialog.buttons.length;i++){
+							dialog.buttons[i].style.display='';
+						}
+					}
+					else{
+						if(node.classList.contains('thundertext')){
+							dialog.currentgroup=null;
+							dialog.currentgroupnode=null;
+							node.classList.remove('thundertext');
+							for(var i=0;i<dialog.buttons.length;i++){
+								if(dialog.currentcapt&&dialog.buttons[i].capt!=dialog.currentcapt){
+									dialog.buttons[i].style.display='none';
+								}
+								else{
+									dialog.buttons[i].style.display='';
+								}
+							}
+						}
+						else{
+							if(dialog.currentgroupnode){
+								dialog.currentgroupnode.classList.remove('thundertext');
+							}
+							dialog.currentgroup=link;
+							dialog.currentgroupnode=node;
+							node.classList.add('thundertext');
+							for(var i=0;i<dialog.buttons.length;i++){
+								if(dialog.buttons[i].group!=link||
+								(dialog.currentcapt&&dialog.buttons[i].capt!=dialog.currentcapt)){
+									dialog.buttons[i].style.display='none';
+								}
+								else{
+									dialog.buttons[i].style.display='';
+								}
+							}
+						}
+					}
+				});
+			},
+			cardDialog:function(){
+				var args=['thisiscard'];
+				for(var i=0;i<arguments.length;i++){
+					args.push(arguments[i]);
+				}
+				return ui.create.characterDialog.apply(this,args);
+			},
+			characterDialog:function(){
+				var filter,str,noclick,thisiscard;
+				for(var i=0;i<arguments.length;i++){
+					if(arguments[i]==='thisiscard'){
+						thisiscard=true;
+					}
+					else if(typeof arguments[i]==='string'){
+						str=arguments[i];
+					}
+					else if(typeof arguments[i]==='function'){
+						filter=arguments[i];
+					}
+					else if(typeof arguments[i]=='boolean'){
+						noclick=arguments[i];
+					}
+				}
+				var list=[];
+				var dialog;
+				var node=ui.create.div('.caption');
+				var namecapt=[];
+				var getCapt=function(str){
+					if(str.indexOf('_')==-1){
+						return str[0];
+					}
+					return str[str.indexOf('_')+1];
+				}
+				if(thisiscard){
+					for(var i in lib.card){
+						if(!lib.translate[i+'_info']) continue;
+						if(filter&&filter(i)) continue;
+						list.push(['',get.translation(lib.card[i].type),i]);
+						if(namecapt.indexOf(getCapt(i))==-1){
+							namecapt.push(getCapt(i));
+						}
+					}
+				}
+				else{
+					for(var i in lib.character){
+						if(filter&&filter(i)) continue;
+						list.push(i);
+						if(namecapt.indexOf(getCapt(i))==-1){
+							namecapt.push(getCapt(i));
+						}
+					}
+				}
+				namecapt.sort(function(a,b){
+					return a>b?1:-1;
+				});
+				var clickCapt=function(e){
+					if(_status.dragged) return;
+					if(this.classList.contains('thundertext')){
+						dialog.currentcapt=null;
+						dialog.currentcaptnode=null;
+						this.classList.remove('thundertext');
+						for(var i=0;i<dialog.buttons.length;i++){
+							if(dialog.currentgroup&&dialog.buttons[i].group!=dialog.currentgroup){
+								dialog.buttons[i].style.display='none';
+							}
+							else{
+								dialog.buttons[i].style.display='';
+							}
+						}
+					}
+					else{
+						if(dialog.currentcaptnode){
+							dialog.currentcaptnode.classList.remove('thundertext');
+						}
+						dialog.currentcapt=this.link;
+						dialog.currentcaptnode=this;
+						this.classList.add('thundertext');
+						for(var i=0;i<dialog.buttons.length;i++){
+							if(dialog.buttons[i].capt!=dialog.currentcapt||
+							(dialog.currentgroup&&dialog.buttons[i].group!=dialog.currentgroup)){
+								dialog.buttons[i].style.display='none';
+							}
+							else{
+								dialog.buttons[i].style.display='';
+							}
+						}
+					}
+
+					e.stopPropagation();
+				};
+				for(i=0;i<namecapt.length;i++){
+					var span=document.createElement('span');
+					span.innerHTML=' '+namecapt[i].toUpperCase()+' ';
+					span.link=namecapt[i];
+					span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
+					node.appendChild(span);
+				}
+				var groupSort;
+				if(thisiscard){
+					groupSort=function(){return 0;};
+				}
+				else{
+					groupSort=function(name){
+						if(lib.character[name][1]=='wei') return 0;
+						if(lib.character[name][1]=='shu') return 1;
+						if(lib.character[name][1]=='wu') return 2;
+						if(lib.character[name][1]=='qun') return 3;
+					}
+				}
+				list.sort(function(a,b){
+					var del=groupSort(a)-groupSort(b);
+					if(del!=0) return del;
+					var aa=a,bb=b;
+					if(a.indexOf('_')!=-1){
+						a=a.slice(a.indexOf('_')+1);
+					}
+					if(b.indexOf('_')!=-1){
+						b=b.slice(b.indexOf('_')+1);
+					}
+					if(a!=b){
+						return a>b?1:-1;
+					}
+					return aa>bb?1:-1;
+				});
+				dialog=ui.create.dialog('hidden');
+				if(str){
+					dialog.add(str);
+				}
+				dialog.add(node);
+				if(thisiscard){
+					dialog.add([list,'vcard'],noclick);
+				}
+				else{
+					dialog.add([list,'character'],noclick);
+				}
+				dialog.add(ui.create.div('.placeholder'));
+				for(i=0;i<dialog.buttons.length;i++){
+					if(thisiscard){
+						dialog.buttons[i].capt=getCapt(dialog.buttons[i].link[2]);
+					}
+					else{
+						dialog.buttons[i].group=lib.character[dialog.buttons[i].link][1];
+						dialog.buttons[i].capt=getCapt(dialog.buttons[i].link);
+					}
+				}
+				return dialog;
+			},
 			dialog:function(){
 				var i;
 				var hidden=false;
@@ -7004,8 +7194,7 @@ window.play={};
 
 				var cardlist=[];
 				folditems.push(cardlist);
-				foldsubitems.push(cardlist);
-				ui.config.appendChild(ui.create.line2('卡牌信息',function(){
+				ui.config.appendChild(ui.create.line2('游戏资料',function(){
 					if(this.clicked) return;
 					if(cardlist.fold){
 						cardlist.fold=false;
@@ -7017,77 +7206,124 @@ window.play={};
 					}
 
 				}));
-				var cardinfo,cardinfo2;
-				var clickcardinfo=function(){
-					var node=this.parentNode.link;
-					if(node.classList.contains('hidden')){
-						node.show();
-						setTimeout(function(){
-							node.parentNode.style.height=(30+node.parentNode.lastChild.offsetHeight)+'px';
-						})
+				ui.cardviewdialog=(function(){
+					var dialog=ui.create.cardDialog(true);
+					dialog.style.height='calc(100% - 80px)';
+					dialog.style.top='40px';
+					var stopprop=function(e){e.stopPropagation();return false;};
+					var clickpop=function(){
+						this.delete();
+						if(dialog.popped==this) delete dialog.popped;
 					}
-					else{
-						node.hide();
-						node.parentNode.style.height='20px';
-					}
-				};
-				for(i in lib.card){
-					if(lib.translate[i+'_info']){
-						cardinfo=ui.create.line(get.translation(i),clickcardinfo);
-						cardinfo.style.height='20px';
-						cardinfo2=ui.create.div('.configinfo');
-						cardinfo2.innerHTML=get.translation(i+'_info');
-						cardinfo2.hide();
-						cardinfo.link=cardinfo2;
-						cardinfo.appendChild(cardinfo2);
-						cardlist.push(cardinfo);
-					}
-				}
-				// ui.config.appendChild(ui.create.div('.placeholder'));
+					var clickbutt=function(e){
+						if(dialog.popped){
+							dialog.popped.delete();
+							if(dialog.popped.node==this&&dialog.popped.parentNode){
+								delete dialog.popped;
+								return;
+							}
+						}
+						var uiintro=get.nodeintro(this);
+						uiintro.classList.add('popped');
+						uiintro.classList.add('static');
+						uiintro.addEventListener(lib.config.touchscreen?'touchend':'click',clickpop);
+						ui.window.appendChild(uiintro);
+						lib.placePoppedDialog(uiintro,e);
 
-
-				if(false){
-					var characterlist=[];
-					folditems.push(characterlist);
-					ui.config.appendChild(ui.create.line2('角色一览',function(){
-						if(this.clicked) return;
-						if(characterlist.fold){
-							characterlist.fold=false;
-							fold(characterlist);
-						}
-						else{
-							characterlist.fold=true;
-							unfold(this,characterlist);
-						}
-
-					}));
-					var characterinfo,characterinfo2;
-					var clickcharacterinfo=function(){
-						var node=this.parentNode.link;
-						if(node.classList.contains('hidden')){
-							node.show();
-							setTimeout(function(){
-								node.parentNode.style.height=(30+node.parentNode.lastChild.offsetHeight)+'px';
-							})
-						}
-						else{
-							node.hide();
-							node.parentNode.style.height='20px';
-						}
+						dialog.popped=uiintro;
+						dialog.popped.node=this;
 					};
-					for(i in lib.character){
-						characterinfo=ui.create.line(get.translation(i),clickcharacterinfo);
-						characterinfo.style.height='20px';
-						characterinfo2=ui.create.div('.configinfo');
-						characterinfo2.innerHTML=get.intro(i);
-						characterinfo2.hide();
-						characterinfo.link=characterinfo2;
-						characterinfo.appendChild(characterinfo2);
-						characterlist.push(characterinfo);
+					for(var i=0;i<dialog.buttons.length;i++){
+						dialog.buttons[i].listen(clickbutt);
 					}
-				}
+					dialog.listen(stopprop);
+					dialog.oncontextmenu=stopprop;
+					dialog.origin='card';
+					dialog.style.zIndex=6;
+					dialog.classList.add('scroll1');
+					dialog.classList.add('scroll2');
+					return dialog;
+				}());
+				cardlist.push(ui.create.line('卡牌一览',function(){
+					if(ui.gameviewdialog){
+						if(ui.gameviewdialog.popped){
+							ui.gameviewdialog.popped.delete();
+							delete ui.gameviewdialog.popped;
+						}
+						ui.gameviewdialog.close();
+						ui.arena.classList.remove('paused2');
+						if(ui.gameviewdialog.origin=='card'){
+							this.classList.remove('thundertext');
+							delete ui.gameviewdialog;
+							return;
+						}
+					}
+					this.classList.add('thundertext');
+					ui.currentgameview=this;
+					this.parentNode.nextSibling.firstChild.classList.remove('thundertext');
+					ui.arena.classList.add('paused2');
+					ui.gameviewdialog=ui.cardviewdialog;
+					ui.configbg.appendChild(ui.cardviewdialog);
+				}));
+				ui.characterviewdialog=(function(){
+					var dialog=ui.create.characterDialog(true);
+					dialog.style.height='calc(100% - 80px)';
+					dialog.style.top='40px';
+					var stopprop=function(e){e.stopPropagation();return false;};
+					var clickpop=function(){
+						this.delete();
+						if(dialog.popped==this) delete dialog.popped;
+					}
+					var clickbutt=function(e){
+						if(dialog.popped){
+							dialog.popped.delete();
+							if(dialog.popped.node==this&&dialog.popped.parentNode){
+								delete dialog.popped;
+								return;
+							}
+						}
+						var uiintro=get.nodeintro(this);
+						uiintro.classList.add('popped');
+						uiintro.classList.add('static');
+						uiintro.addEventListener(lib.config.touchscreen?'touchend':'click',clickpop);
+						ui.window.appendChild(uiintro);
+						lib.placePoppedDialog(uiintro,e);
 
-				// ui.config.appendChild(ui.create.div('.placeholder'));
+						dialog.popped=uiintro;
+						dialog.popped.node=this;
+					};
+					for(var i=0;i<dialog.buttons.length;i++){
+						dialog.buttons[i].listen(clickbutt);
+					}
+					dialog.listen(stopprop);
+					dialog.oncontextmenu=stopprop;
+					dialog.origin='character';
+					dialog.style.zIndex=6;
+					dialog.classList.add('scroll1');
+					dialog.classList.add('scroll2');
+					return dialog;
+				}());
+				cardlist.push(ui.create.line('武将一览',function(){
+					if(ui.gameviewdialog){
+						if(ui.gameviewdialog.popped){
+							ui.gameviewdialog.popped.delete();
+							delete ui.gameviewdialog.popped;
+						}
+						ui.gameviewdialog.close();
+						ui.arena.classList.remove('paused2');
+						if(ui.gameviewdialog.origin=='character'){
+							this.classList.remove('thundertext');
+							delete ui.gameviewdialog;
+							return;
+						}
+					}
+					this.classList.add('thundertext');
+					ui.currentgameview=this;
+					this.parentNode.previousSibling.firstChild.classList.remove('thundertext');
+					ui.arena.classList.add('paused2');
+					ui.gameviewdialog=ui.characterviewdialog;
+					ui.configbg.appendChild(ui.characterviewdialog);
+				}));
 
 				var autoskill=[];
 				folditems.push(autoskill);
@@ -7407,7 +7643,7 @@ window.play={};
 					break;
 
 					case 'vcard':
-					node=ui.create.card(position,'noclick').init(item);
+					node=ui.create.card(position,'noclick',noclick).init(item);
 					node.classList.add('button');
 					node.link=item;
 					break;
@@ -7435,14 +7671,16 @@ window.play={};
 							node.node.name.innerHTML+=name[i]+'<br/>';
 						}
 						node.node.intro.innerHTML=lib.config.intro;
-						if(lib.config.touchscreen){
-							lib.setLongPress(node,ui.click.intro);
-						}
-						if(lib.config.right_info){
-							node.oncontextmenu=ui.click.rightplayer;
-						}
-						if(lib.config.hover_all){
-							lib.setHover(node,ui.click.hoverplayer);
+						if(!noclick){
+							if(lib.config.touchscreen){
+								lib.setLongPress(node,ui.click.intro);
+							}
+							if(lib.config.right_info){
+								node.oncontextmenu=ui.click.rightplayer;
+							}
+							if(lib.config.hover_all){
+								lib.setHover(node,ui.click.hoverplayer);
+							}
 						}
 						node.node.group.innerHTML='<div>'+get.translation(lib.character[item][1])+'</div>';
 						node.node.group.style.backgroundColor=get.translation(lib.character[item][1]+'Color');
@@ -7571,7 +7809,7 @@ window.play={};
 				ui.me.appendChild(ui.handcards1);
 				ui.me.appendChild(ui.handcards2);
 			},
-			card:function(position,info){
+			card:function(position,info,noclick){
 				var node=ui.create.div('.card',position);
 				node.node={
 					image:ui.create.div('.image',node),
@@ -7585,14 +7823,16 @@ window.play={};
 					node[i]=lib.element.card[i];
 				}
 				node.node.intro.innerHTML=lib.config.intro;
-				if(lib.config.touchscreen){
-					lib.setLongPress(node,ui.click.intro);
-				}
-				if(lib.config.right_info){
-					node.oncontextmenu=ui.click.rightplayer;
-				}
-				if(lib.config.hover_all){
-					lib.setHover(node,ui.click.hoverplayer);
+				if(!noclick){
+					if(lib.config.touchscreen){
+						lib.setLongPress(node,ui.click.intro);
+					}
+					if(lib.config.right_info){
+						node.oncontextmenu=ui.click.rightplayer;
+					}
+					if(lib.config.hover_all){
+						lib.setHover(node,ui.click.hoverplayer);
+					}
 				}
 				node.storage={};
 				if(info!='noclick'){
@@ -8144,9 +8384,11 @@ window.play={};
 					_status.tempunpop=false;
 				}
 				else{
-					if(ui.currentpopped&&ui.currentpopped._uiintro){
-						ui.currentpopped._uiintro.delete();
-						delete ui.currentpopped._uiintro;
+					if(ui.currentpopped){
+						if(ui.currentpopped._uiintro){
+							ui.currentpopped._uiintro.delete();
+							delete ui.currentpopped._uiintro;
+						}
 						delete ui.currentpopped;
 					}
 				}
@@ -8507,6 +8749,7 @@ window.play={};
 				uiintro.addEventListener('click',clickintro);
 
 				game.pause2();
+				return uiintro;
 			},
 			intro2:function(){
 				if(ui.intro){
@@ -8602,13 +8845,23 @@ window.play={};
 				ui.system.show();
 				ui.arena.classList.remove('right');
 				ui.arena.classList.remove('left');
+				ui.arena.classList.remove('paused2');
 				// ui.arena.classList.remove('paused');
 				this.remove();
+				if(ui.gameviewdialog){
+					if(ui.gameviewdialog.popped){
+						ui.gameviewdialog.popped.delete();
+						delete ui.gameviewdialog.popped;
+					}
+					ui.gameviewdialog.close();
+					delete ui.gameviewdialog;
+					ui.currentgameview.classList.remove('thundertext');
+				}
 				ui.config.delete();
 				if(_status.config2){
 					game.resume2();
 				}
-				// e.stopPropagation();
+				e.stopPropagation();
 				return false;
 			},
 			swap:function(){
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 4b488bf6f..1e1ac50e1 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -10,6 +10,7 @@ table{table-layout: fixed;}
 #arena.left{left:calc(10% - 240px);opacity: 0.6;}
 #arena.top{top:-100%;}
 #arena.paused{/*-webkit-filter:blur(3px);*/opacity:  0.3 !important;}
+#arena.paused2{opacity:  0.1 !important;}
 #arena>.poplayer{
 	width:100%;
 	height:100%;
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 571848d24..05a068b0b 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -175,93 +175,7 @@ mode.guozhan={
 						event.ai(game.me,list);
 					};
 
-					(function(){
-						var dialog;
-						var node=ui.create.div('.caption');
-						var namecapt=[];
-						var list=[];
-						var getCapt=function(str){
-							if(str.indexOf('_')==-1){
-								return str[0];
-							}
-							return str[str.indexOf('_')+1];
-						}
-						for(i in lib.character){
-							if(i=='zuoci') continue;
-							if(get.config('ban_weak')&&lib.config.forbidall.contains(i)) continue;
-							list.push(i);
-							if(namecapt.indexOf(getCapt(i))==-1){
-								namecapt.push(getCapt(i));
-							}
-						}
-						namecapt.sort(function(a,b){
-							return a>b?1:-1;
-						});
-						var clickCapt=function(e){
-							if(_status.dragged) return;
-							dialog.currentcapt=this.link;
-							for(var i=0;i<dialog.buttons.length;i++){
-								if(dialog.buttons[i].capt!=dialog.currentcapt||
-								(dialog.currentgroup&&dialog.buttons[i].group!=dialog.currentgroup)){
-									dialog.buttons[i].style.display='none';
-								}
-								else{
-									dialog.buttons[i].style.display='';
-								}
-							}
-							e.stopPropagation();
-						};
-						for(i=0;i<namecapt.length;i++){
-							var span=document.createElement('span');
-							span.innerHTML=' '+namecapt[i].toUpperCase()+' ';
-							span.link=namecapt[i];
-							span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
-							node.appendChild(span);
-						}
-						var groupSort=function(name){
-							if(lib.character[name][1]=='wei') return 0;
-							if(lib.character[name][1]=='shu') return 1;
-							if(lib.character[name][1]=='wu') return 2;
-							if(lib.character[name][1]=='qun') return 3;
-						}
-						list.sort(function(a,b){
-							var del=groupSort(a)-groupSort(b);
-							if(del!=0) return del;
-							var aa=a,bb=b;
-							if(a.indexOf('_')!=-1){
-								a=a.slice(a.indexOf('_')+1);
-							}
-							if(b.indexOf('_')!=-1){
-								b=b.slice(b.indexOf('_')+1);
-							}
-							if(a!=b){
-								return a>b?1:-1;
-							}
-							return aa>bb?1:-1;
-						});
-						if(lib.storage.hide_alphabet){
-							node.style.display='none';
-						}
-						dialog=ui.create.dialog('hidden','自由选将',node,[list,'character']);
-						dialog.add(ui.create.div('.placeholder'));
-						dialog.firstChild.firstChild.firstChild.addEventListener(lib.config.touchscreen?'touchend':'click',function(){
-							if(_status.dragged) return;
-							if(node.style.display=='none'){
-								node.style.display='';
-								game.save('hide_alphabet',false);
-							}
-							else{
-								node.style.display='none';
-								game.save('hide_alphabet',true);
-							}
-						});
-						for(i=0;i<dialog.buttons.length;i++){
-							dialog.buttons[i].group=lib.character[dialog.buttons[i].link][1];
-							dialog.buttons[i].capt=getCapt(dialog.buttons[i].link);
-						}
-						_status.event.dialogxx=dialog;
-					}());
-
+					event.dialogxx=ui.create.characterDialog();
 					ui.create.cheat2=function(){
 						ui.cheat2=ui.create.control('自由选将',function(){
 							if(this.dialog==_status.event.dialog){
@@ -277,29 +191,7 @@ mode.guozhan={
 								}
 							}
 							else{
-								ui.cheat2x=ui.create.control('全部','wei','shu','wu','qun',function(link){
-									if(link=='全部'){
-										ui.dialog.currentcapt='';
-										ui.dialog.currentgroup='';
-										for(var i=0;i<ui.dialog.buttons.length;i++){
-											ui.dialog.buttons[i].style.display='';
-										}
-									}
-									else{
-										ui.dialog.currentgroup=link;
-										for(var i=0;i<ui.dialog.buttons.length;i++){
-											if(ui.dialog.buttons[i].group!=link||
-											(ui.dialog.currentcapt&&ui.dialog.buttons[i].capt!=ui.dialog.currentcapt)){
-												ui.dialog.buttons[i].style.display='none';
-											}
-											else{
-												ui.dialog.buttons[i].style.display='';
-											}
-										}
-									}
-									game.uncheck();
-									game.check();
-								});
+								ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx);
 								this.backup=_status.event.dialog;
 								_status.event.dialog.close();
 								_status.event.dialog=_status.event.parent.dialogxx;
diff --git a/mode/identity.js b/mode/identity.js
index 61a73bb90..bf7cb3680 100644
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -376,90 +376,7 @@ mode.identity={
 						game.check();
 					});
 				};
-				(function(){
-					var list=[];
-					var dialog;
-					var node=ui.create.div('.caption');
-					var namecapt=[];
-					var getCapt=function(str){
-						if(str.indexOf('_')==-1){
-							return str[0];
-						}
-						return str[str.indexOf('_')+1];
-					}
-					for(i in lib.character){
-						if(get.config('ban_weak')&&lib.config.forbidall.contains(i)) continue;
-						list.push(i);
-						if(namecapt.indexOf(getCapt(i))==-1){
-							namecapt.push(getCapt(i));
-						}
-					}
-					namecapt.sort(function(a,b){
-						return a>b?1:-1;
-					});
-					var clickCapt=function(){
-						if(_status.dragged) return;
-						dialog.currentcapt=this.link;
-						for(var i=0;i<dialog.buttons.length;i++){
-							if(dialog.buttons[i].capt!=dialog.currentcapt||
-							(dialog.currentgroup&&dialog.buttons[i].group!=dialog.currentgroup)){
-								dialog.buttons[i].style.display='none';
-							}
-							else{
-								dialog.buttons[i].style.display='';
-							}
-						}
-					};
-					for(i=0;i<namecapt.length;i++){
-						var span=document.createElement('span');
-						span.innerHTML=' '+namecapt[i].toUpperCase()+' ';
-						span.link=namecapt[i];
-						span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
-						node.appendChild(span);
-					}
-					var groupSort=function(name){
-						if(lib.character[name][1]=='wei') return 0;
-						if(lib.character[name][1]=='shu') return 1;
-						if(lib.character[name][1]=='wu') return 2;
-						if(lib.character[name][1]=='qun') return 3;
-					}
-					list.sort(function(a,b){
-						var del=groupSort(a)-groupSort(b);
-						if(del!=0) return del;
-						var aa=a,bb=b;
-						if(a.indexOf('_')!=-1){
-							a=a.slice(a.indexOf('_')+1);
-						}
-						if(b.indexOf('_')!=-1){
-							b=b.slice(b.indexOf('_')+1);
-						}
-						if(a!=b){
-							return a>b?1:-1;
-						}
-						return aa>bb?1:-1;
-					});
-					if(lib.storage.hide_alphabet){
-						node.style.display='none';
-					}
-					dialog=ui.create.dialog('hidden','自由选将',node,[list,'character']);
-					dialog.add(ui.create.div('.placeholder'));
-					dialog.firstChild.firstChild.firstChild.addEventListener(lib.config.touchscreen?'touchend':'click',function(){
-						if(_status.dragged) return;
-						if(node.style.display=='none'){
-							node.style.display='';
-							game.save('hide_alphabet',false);
-						}
-						else{
-							node.style.display='none';
-							game.save('hide_alphabet',true);
-						}
-					});
-					for(i=0;i<dialog.buttons.length;i++){
-						dialog.buttons[i].group=lib.character[dialog.buttons[i].link][1];
-						dialog.buttons[i].capt=getCapt(dialog.buttons[i].link);
-					}
-					_status.event.dialogxx=dialog;
-				}());
+				event.dialogxx=ui.create.characterDialog();
 				ui.create.cheat2=function(){
 					ui.cheat2=ui.create.control('自由选将',function(){
 						if(this.dialog==_status.event.dialog){
@@ -475,27 +392,7 @@ mode.identity={
 							}
 						}
 						else{
-							ui.cheat2x=ui.create.control('全部','wei','shu','wu','qun',function(link){
-								if(link=='全部'){
-									ui.dialog.currentcapt='';
-									ui.dialog.currentgroup='';
-									for(var i=0;i<ui.dialog.buttons.length;i++){
-										ui.dialog.buttons[i].style.display='';
-									}
-								}
-								else{
-									ui.dialog.currentgroup=link;
-									for(var i=0;i<ui.dialog.buttons.length;i++){
-										if(ui.dialog.buttons[i].group!=link||
-										(ui.dialog.currentcapt&&ui.dialog.buttons[i].capt!=ui.dialog.currentcapt)){
-											ui.dialog.buttons[i].style.display='none';
-										}
-										else{
-											ui.dialog.buttons[i].style.display='';
-										}
-									}
-								}
-							});
+							ui.cheat2x=ui.create.groupControl(_status.event.parent.dialogxx);
 							this.backup=_status.event.dialog;
 							_status.event.dialog.close();
 							_status.event.dialog=_status.event.parent.dialogxx;
diff --git a/theme/block/block.png b/theme/archive/block/block.png
similarity index 100%
rename from theme/block/block.png
rename to theme/archive/block/block.png
diff --git a/theme/block/style.css b/theme/archive/block/style.css
similarity index 100%
rename from theme/block/style.css
rename to theme/archive/block/style.css
diff --git a/theme/default/.DS_Store b/theme/archive/default/.DS_Store
similarity index 100%
rename from theme/default/.DS_Store
rename to theme/archive/default/.DS_Store
diff --git a/theme/default/oxygen.jpg b/theme/archive/default/oxygen.jpg
similarity index 100%
rename from theme/default/oxygen.jpg
rename to theme/archive/default/oxygen.jpg
diff --git a/theme/default/oxygen2.jpg b/theme/archive/default/oxygen2.jpg
similarity index 100%
rename from theme/default/oxygen2.jpg
rename to theme/archive/default/oxygen2.jpg
diff --git a/theme/default/style.css b/theme/archive/default/style.css
similarity index 100%
rename from theme/default/style.css
rename to theme/archive/default/style.css
diff --git a/theme/dock/dock.png b/theme/archive/dock/dock.png
similarity index 100%
rename from theme/dock/dock.png
rename to theme/archive/dock/dock.png
diff --git a/theme/dock/dock2.png b/theme/archive/dock/dock2.png
similarity index 100%
rename from theme/dock/dock2.png
rename to theme/archive/dock/dock2.png
diff --git a/theme/dock/grid.png b/theme/archive/dock/grid.png
similarity index 100%
rename from theme/dock/grid.png
rename to theme/archive/dock/grid.png
diff --git a/theme/dock/oxygen.jpg b/theme/archive/dock/oxygen.jpg
similarity index 100%
rename from theme/dock/oxygen.jpg
rename to theme/archive/dock/oxygen.jpg
diff --git a/theme/dock/style.css b/theme/archive/dock/style.css
similarity index 100%
rename from theme/dock/style.css
rename to theme/archive/dock/style.css
diff --git a/theme/dock/wood.png b/theme/archive/dock/wood.png
similarity index 100%
rename from theme/dock/wood.png
rename to theme/archive/dock/wood.png
diff --git a/theme/glass/blur.jpg b/theme/archive/glass/blur.jpg
similarity index 100%
rename from theme/glass/blur.jpg
rename to theme/archive/glass/blur.jpg
diff --git a/theme/glass/glow.png b/theme/archive/glass/glow.png
similarity index 100%
rename from theme/glass/glow.png
rename to theme/archive/glass/glow.png
diff --git a/theme/glass/style.css b/theme/archive/glass/style.css
similarity index 100%
rename from theme/glass/style.css
rename to theme/archive/glass/style.css
diff --git a/theme/jeans/jeans.jpg b/theme/archive/jeans/jeans.jpg
similarity index 100%
rename from theme/jeans/jeans.jpg
rename to theme/archive/jeans/jeans.jpg
diff --git a/theme/jeans/style.css b/theme/archive/jeans/style.css
similarity index 100%
rename from theme/jeans/style.css
rename to theme/archive/jeans/style.css
diff --git a/theme/metro/style.css b/theme/archive/metro/style.css
similarity index 100%
rename from theme/metro/style.css
rename to theme/archive/metro/style.css
diff --git a/theme/round/bg_1.jpg b/theme/archive/round/bg_1.jpg
similarity index 100%
rename from theme/round/bg_1.jpg
rename to theme/archive/round/bg_1.jpg
diff --git a/theme/round/bg_2.jpg b/theme/archive/round/bg_2.jpg
similarity index 100%
rename from theme/round/bg_2.jpg
rename to theme/archive/round/bg_2.jpg
diff --git a/theme/round/block.png b/theme/archive/round/block.png
similarity index 100%
rename from theme/round/block.png
rename to theme/archive/round/block.png
diff --git a/theme/round/dock.png b/theme/archive/round/dock.png
similarity index 100%
rename from theme/round/dock.png
rename to theme/archive/round/dock.png
diff --git a/theme/round/dock2.png b/theme/archive/round/dock2.png
similarity index 100%
rename from theme/round/dock2.png
rename to theme/archive/round/dock2.png
diff --git a/theme/round/grid.png b/theme/archive/round/grid.png
similarity index 100%
rename from theme/round/grid.png
rename to theme/archive/round/grid.png
diff --git a/theme/round/jeans.jpg b/theme/archive/round/jeans.jpg
similarity index 100%
rename from theme/round/jeans.jpg
rename to theme/archive/round/jeans.jpg
diff --git a/theme/round/oxygen.jpg b/theme/archive/round/oxygen.jpg
similarity index 100%
rename from theme/round/oxygen.jpg
rename to theme/archive/round/oxygen.jpg
diff --git a/theme/round/p_4.png b/theme/archive/round/p_4.png
similarity index 100%
rename from theme/round/p_4.png
rename to theme/archive/round/p_4.png
diff --git a/theme/round/style.css b/theme/archive/round/style.css
similarity index 100%
rename from theme/round/style.css
rename to theme/archive/round/style.css
diff --git a/theme/round/wood.jpg b/theme/archive/round/wood.jpg
similarity index 100%
rename from theme/round/wood.jpg
rename to theme/archive/round/wood.jpg
diff --git a/theme/round/wood.png b/theme/archive/round/wood.png
similarity index 100%
rename from theme/round/wood.png
rename to theme/archive/round/wood.png
diff --git a/theme/simple/style.css b/theme/archive/simple/style.css
similarity index 100%
rename from theme/simple/style.css
rename to theme/archive/simple/style.css
diff --git a/theme/white/grid.png b/theme/archive/white/grid.png
similarity index 100%
rename from theme/white/grid.png
rename to theme/archive/white/grid.png
diff --git a/theme/white/oxygen.jpg b/theme/archive/white/oxygen.jpg
similarity index 100%
rename from theme/white/oxygen.jpg
rename to theme/archive/white/oxygen.jpg
diff --git a/theme/white/style.css b/theme/archive/white/style.css
similarity index 100%
rename from theme/white/style.css
rename to theme/archive/white/style.css
diff --git a/theme/woodden/style.css b/theme/woodden/style.css
index 41366db10..8de070c1e 100644
--- a/theme/woodden/style.css
+++ b/theme/woodden/style.css
@@ -25,6 +25,9 @@ html{
 .popup.thunder{
 	color: rgb(117,186,255);
 }
+.control .thundertext{
+	color: rgba(29, 63, 137, 1);
+}
 .player,.card,.button,.dialog>.bar{
 	background: url('wood.jpg');
 }