r

game/game.js

@@ -26773,7 +26773,7 @@
 					var createModeConfig=function(mode,position){
                         var info=lib.mode[mode];
                         var page=ui.create.div('');
-                        var node=ui.create.div('.menubutton.large','<div>'+info.name+'</div>',position,clickMode);
+                        var node=ui.create.div('.menubutton.large',info.name,position,clickMode);
 						node.link=page;
 						node.mode=mode;
                         if(connectMenu){
@@ -27094,7 +27094,7 @@
 					var createModeConfig=function(mode,position){
                         var info=lib.configMenu[mode];
                         var page=ui.create.div('');
-                        var node=ui.create.div('.menubutton.large','<div>'+info.name+'</div>',position,clickMode);
+                        var node=ui.create.div('.menubutton.large',info.name,position,clickMode);
 						node.link=page;
 						node.mode=mode;
                         var map={};
@@ -28100,7 +28100,7 @@
 					var createModeConfig=function(mode,position,position2){
                         var info=lib.characterPack[mode];
                         var page=ui.create.div('');
-                        var node=ui.create.div('.menubutton.large','<div>'+lib.translate[mode+'_character_config']+'</div>',position,clickMode);
+                        var node=ui.create.div('.menubutton.large',lib.translate[mode+'_character_config'],position,clickMode);
                         if(node.innerHTML.length>=5){
                             node.classList.add('smallfont');
                         }
@@ -28442,7 +28442,7 @@
 					var createModeConfig=function(mode,position){
                         var info=lib.cardPack[mode];
                         var page=ui.create.div('');
-                        var node=ui.create.div('.menubutton.large','<div>'+lib.translate[mode+'_card_config']+'</div>',position,clickMode);
+                        var node=ui.create.div('.menubutton.large',lib.translate[mode+'_card_config'],position,clickMode);
                         if(node.innerHTML.length>=5){
                             node.classList.add('smallfont');
                         }
@@ -28750,7 +28750,7 @@
 					(function(){
                         if(connectMenu) return;
 						var page=ui.create.div('.menu-buttons');
-                        var node=ui.create.div('.menubutton.large','<div>牌堆</div>',clickMode);
+                        var node=ui.create.div('.menubutton.large','牌堆',clickMode);
 						start.firstChild.insertBefore(node,start.firstChild.querySelector('.lefttext'));
 						node.link=page;
 						node.mode='cardpile';
@@ -28972,10 +28972,10 @@
                         page.style.paddingBottom='10px';
                         var node;
                         if(mode.indexOf('extension_')==0){
-                            node=ui.create.div('.menubutton.large','<div>'+mode.slice(10)+'</div>',position,clickMode);
+                            node=ui.create.div('.menubutton.large',mode.slice(10),position,clickMode);
                         }
                         else{
-                            node=ui.create.div('.menubutton.large','<div>'+lib.translate[mode+'_play_config']+'</div>',position,clickMode);
+                            node=ui.create.div('.menubutton.large',lib.translate[mode+'_play_config'],position,clickMode);
                         }
                         if(node.innerHTML.length>=5){
                             node.classList.add('smallfont');
@@ -29023,7 +29023,7 @@
                         if(!lib.device&&!lib.db) return;
                         if(lib.config.show_extensionmaker==false) return;
                         var page=ui.create.div('#create-extension');
-                        var node=ui.create.div('.menubutton.large','<div>制作扩展</div>',start.firstChild,clickMode);
+                        var node=ui.create.div('.menubutton.large','制作扩展',start.firstChild,clickMode);
 						node.link=page;
 						node.mode='create';
                         var pageboard=ui.create.div(page);
@@ -31021,7 +31021,7 @@
                     }());
                     (function(){
                         var page=ui.create.div('');
-                        var node=ui.create.div('.menubutton.large','<div>获取扩展</div>',start.firstChild,clickMode);
+                        var node=ui.create.div('.menubutton.large','获取扩展',start.firstChild,clickMode);
 						node.link=page;
 						node.mode='get';
                         var importextensionexpanded=false;
@@ -31281,7 +31281,7 @@
 					};
                     (function(){
                         var page=ui.create.div('');
-                        var node=ui.create.div('.menubutton.large','<div>更新</div>',start.firstChild,clickMode);
+                        var node=ui.create.div('.menubutton.large','更新',start.firstChild,clickMode);
     					node.link=page;
     					page.classList.add('menu-help');
     					var ul=document.createElement('ul');
@@ -31750,14 +31750,14 @@
 									updatep2.style.display='none';
 									updatep3.style.display='none';
 									updatepx.style.display='';
-		                            updatep4.innerHTML='<div>关于</div>';
+		                            updatep4.innerHTML='关于';
 		                        }
 								else{
 									updatep1.style.display='';
 									updatep2.style.display='';
 			                        updatep3.style.display='';
 									updatepx.style.display='none';
-									updatep4.innerHTML='<div>更新</div>';
+									updatep4.innerHTML='更新';
 								}
 							}
 							ui.updateUpdate();
@@ -32071,7 +32071,7 @@
 						});
 
 						var page=ui.create.div('');
-						var node=ui.create.div('.menubutton.large','<div>控制</div>',start.firstChild,clickMode);
+						var node=ui.create.div('.menubutton.large','控制',start.firstChild,clickMode);
 						node.link=page;
 						node.type='cheat';
 						page.classList.add('menu-sym');
@@ -32215,8 +32215,75 @@
 						});
 					}());
 					(function(){
+						if(true) return;
 						var page=ui.create.div('');
-						var node=ui.create.div('.menubutton.large','<div>命令</div>',start.firstChild,clickMode);
+						var node=ui.create.div('.menubutton.large','换人',start.firstChild,clickMode);
+						node.link=page;
+						page.classList.add('menu-sym');
+						var caption=ui.create.div('','选择一个换人目标',page);
+						caption.style.margin='5px';
+						caption.style.marginTop='6px';
+						var row3=ui.create.div('.menu-buttons.leftbutton',page);
+						row3.style.marginTop='3px';
+
+						var currentrow3=null;
+						var clickrow3=function(){
+							if(game.changeCoin){
+								game.changeCoin(-10);
+							}
+							game.swapPlayer(this.link);
+						};
+						menuUpdates.push(function(){
+							if(_status.connectMode||(lib.config.mode!='identity'&&lib.config.mode!='guozhan')){
+								node.classList.add('off');
+								var active=start.firstChild.querySelector('.active');
+								if(active==node){
+									node.classList.remove('active');
+									node.link.remove();
+                                    active=start.firstChild.firstChild;
+                                    if(!_status.connectMode){
+                                        cheatButton.style.display='';
+                                    }
+									active.classList.add('active');
+									rightPane.appendChild(active.link);
+								}
+                                return;
+							}
+							var list=[];
+							for(var i=0;i<game.players.length;i++){
+								if(lib.character[game.players[i].name]&&
+									game.players[i].isAlive()&&game.players[i]!=game.me){
+									list.push(game.players[i]);
+								}
+							}
+							if(_status.video){
+								node.remove();
+							}
+							if(!_status.video&&list.length&&game.phaseNumber&&!_status.event.isMine()){
+								node.classList.remove('off');
+								row3.innerHTML='';
+								var buttons=ui.create.buttons(list,'player',row3,true);
+								for(var i=0;i<buttons.length;i++){
+									buttons[i].listen(clickrow3);
+								}
+							}
+							else{
+								node.classList.add('off');
+								var active=start.firstChild.querySelector('.active');
+								if(active==node){
+									node.classList.remove('active');
+									node.link.remove();
+									active=start.firstChild.firstChild;
+									active.classList.add('active');
+									rightPane.appendChild(active.link);
+									cheatButton.style.display='';
+								}
+							}
+						});
+					}());
+					(function(){
+						var page=ui.create.div('');
+						var node=ui.create.div('.menubutton.large','命令',start.firstChild,clickMode);
                         ui.commandnode=node;
 						node.type='cmd';
 						node.link=page;
@@ -32353,7 +32420,7 @@
 					}());
 					(function(){
 						var page=ui.create.div('');
-						var node=ui.create.div('.menubutton.large','<div>战绩</div>',start.firstChild,clickMode);
+						var node=ui.create.div('.menubutton.large','战绩',start.firstChild,clickMode);
 						node.type='rec';
 						node.link=page;
 						page.style.paddingBottom='10px';
@@ -32387,7 +32454,7 @@
 					(function(){
 						if(!window.indexedDB) return;
 						var page=ui.create.div('');
-						var node=ui.create.div('.menubutton.large','<div>录像</div>',start.firstChild,clickMode);
+						var node=ui.create.div('.menubutton.large','录像',start.firstChild,clickMode);
 						node.type='video';
 						node.link=page;
 
@@ -32567,7 +32634,7 @@
 
 					for(var i in lib.help){
 						var page=ui.create.div('');
-						var node=ui.create.div('.menubutton.large','<div>'+i+'</div>',start.firstChild,clickMode);
+						var node=ui.create.div('.menubutton.large',i,start.firstChild,clickMode);
                         node.type='help';
 						node.link=page;
                         node.style.display='none';
@@ -32576,9 +32643,9 @@
 					}
 
                     if(!connectMenu){
-                        var node=ui.create.div('.menubutton.large','<div>帮助</div>',start.firstChild,function(){
+                        var node=ui.create.div('.menubutton.large','帮助',start.firstChild,function(){
                             var activex=start.firstChild.querySelector('.active');
-                            if(this.innerHTML=='<div>帮助</div>'){
+                            if(this.innerHTML=='帮助'){
 								cheatButton.style.display='none';
 								runButton.style.display='none';
 								clearButton.style.display='none';
@@ -32586,7 +32653,7 @@
 								saveButton.style.display='none';
 								deleteButton.style.display='none';
 
-                                this.innerHTML='<div>返回</div>';
+                                this.innerHTML='返回';
                                 for(var i=0;i<start.firstChild.childElementCount;i++){
                                     var nodex=start.firstChild.childNodes[i];
                                     if(nodex==node) continue;
@@ -32606,7 +32673,7 @@
                                 }
                             }
                             else{
-                                this.innerHTML='<div>帮助</div>';
+                                this.innerHTML='帮助';
                                 for(var i=0;i<start.firstChild.childElementCount;i++){
                                     var nodex=start.firstChild.childNodes[i];
                                     if(nodex==node) continue;

game/package.js

@@ -68,5 +68,4 @@ theme.pack={
     woodden:'木纹',
     music:'音乐',
     simple:'简约',
-    ol:'手杀',
 }

theme/ol/style.css

@@ -1,149 +0,0 @@
-html{
-	color: white;
-	text-shadow: black 0 0 2px;
-	min-height: 100%;
-	background-image: url('../../image/background/ol_bg.jpg');
-	background-size: cover;
-}
-#system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped,
-#arena:not(.long) .player.unseen .equips:not(*:empty),
-#arena.long .player.unseen2 .equips:not(*:empty),.menu,#splash>div,
-#arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,#window .player.playerbg,.menubg,.mebg{
-	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
-	background-image: linear-gradient(#4b4b4b, #464646);
-	border-radius: 8px;
-}
-#arena.observe .handcards>.card{
-	background: linear-gradient(#4b4b4b, #464646) !important;
-}
-
-.videonode.menubutton.extension.current{
-	box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 133, 255, 0.4) 0 2px 5px, rgba(0, 133, 255, 0.5) 0 0 12px, rgba(0, 133, 255, 0.8) 0 0 15px;
-}
-
-.marks>.card.fullskin>.markcount.menubutton{
-	background: url('wood3.png');
-}
-
-#window>.dialog.popped{
-	border-radius: 6px;
-}
-.control,#system>div>div,.judges>div,.marks>div,
-#arena:not(.long) .player.unseen .equips:not(*:empty),
-#arena.long .player.unseen2 .equips:not(*:empty){
-	border-radius:4px;
-	overflow: hidden;
-}
-
-#arena:not(.long).mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card:not(.selected),
-#arena.long.mobile:not(.oldlayout) .player.unseen2:not([data-position="0"]) .equips:not(*:empty)>.card,
-#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
-	background: none !important;
-}
-
-.card{
-	color:white;
-}
-.cardbg{
-	background-size: initial !important;
-}
-.card:not(*:empty),.cardbg{
-	color:rgb(77, 60, 51);
-	text-shadow:none;
-	background: url('wood3.png');
-}
-.marks>.card:not(.fullskin){
-	color: white;
-	text-shadow: black 0 0 2px;
-	background: linear-gradient(#4b4b4b, #464646);
-}
-#me>div>div>.card,#arena>.card:not(*:empty){
-	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
-}
-
-#system>div>.glow {
-    background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));
-	box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px !important;
-}
-
-.fire{
-	color: rgb(255,119,63);
-}
-.thunder{
-	color: rgb(117,186,255);
-}
-.poison{
-	color: rgb(104,221,127);
-}
-.brown{
-	color: rgb(195,161,223);
-}
-
-#roundmenu.clock>div:nth-of-type(15){
-	background: linear-gradient(#4b4b4b, #464646);
-	box-shadow: rgba(0,0,0,0.6) 0 0 5px inset;
-}
-
-.menu.main{
-	background: none;
-	box-shadow: none;
-	overflow: visible;
-}
-.menu.main::before{
-	content:'';
-	position: absolute;
-	left:-18px;
-	top: -6px;
-	width: 430px;
-	height: 329px;
-	background-image: url('menu.png');
-	background-size: 100% 100%;
-}
-
-.menu.main>.menu-tab{
-	font-family: xinwei;
-	font-size: 20px;
-	top: 3px;
-}
-.menu-tab-bar{
-	display: none;
-}
-
-.left.pane>.menubutton.large{
-	background: none !important;
-	box-shadow: none !important;
-	overflow: visible;
-}
-.left.pane>.menubutton.large>div{
-	color: transparent;
-	background-color: #dab071;
-	text-shadow: rgba(0, 0, 0, 0.5) 0 5px 6px, rgba(0, 0, 0, 0.2) 1px 3px 3px;
-	-webkit-background-clip: text;
-}
-.menu.main>.menu-tab>div{
-	color: transparent !important;
-	background-color: #dab071;
-	text-shadow: rgba(41, 41, 41, 0.5) 1px 1px 0px, rgba(0, 0, 0, 0.2) 1px 3px 3px;
-	-webkit-background-clip: text;
-}
-.menu.main>.menu-tab>div:not(.active){
-	opacity: 0.5;
-    background-color: #e4caa3;
-	text-shadow: rgba(41, 41, 41, 0.3) 1px 1px 0px, rgba(0, 0, 0, 0.2) 1px 3px 3px;
-}
-.left.pane>.menubutton.large:not(.active)>div{
-    text-shadow: rgba(0, 0, 0, 0.3) 0 5px 6px, rgba(0, 0, 0, 0.2) 1px 3px 3px;
-	opacity: 0.5;
-    background-color: #e4caa3;
-}
-.left.pane>.menubutton.large::before{
-	content: '';
-	position: absolute;
-	left: -4px;
-	top: -4px;
-	width: 123px;
-	height: 40px;
-	background-image: url('button_large.png');
-	background-size: 100% 100%;
-}