bug

card/yibao.js

@@ -322,7 +322,7 @@ card.yibao={
 					var clone=event.card1.clone;
 					if(clone){
 						clone.style.transition='all 0.5s';
-						clone.style.webkitTransform='scale(1.2)';
+						clone.style.transform='scale(1.2)';
 						clone.delete();
 						game.addVideo('deletenode',player,get.cardsInfo([clone]));
 					}

character/gujian.js

@@ -792,7 +792,12 @@ character.gujian={
 			},
 			ai:{
 				result:{
-					player:1
+					player:function(player){
+						if(player.num('h')<=player.hp&&player.hp==player.maxHp){
+							return 0;
+						}
+						return 1;
+					}
 				},
 				order:6
 			}

character/mountain.js

@@ -967,7 +967,7 @@ character.mountain={
 							var mark=player.marks.huashen;
 							if(trigger.name=='game'){
 								mark.hide();
-								mark.style.webkitTransform='scale(0.8)';
+								mark.style.transform='scale(0.8)';
 								mark.style.transition='all 0.3s';
 								setTimeout(function(){
 									mark.style.transition='all 0s';
@@ -979,7 +979,7 @@ character.mountain={
 									setTimeout(function(){
 										mark.style.transition='';
 										mark.show();
-										mark.style.webkitTransform='';
+										mark.style.transform='';
 									},50);
 								},500);
 							}

character/refresh.js

@@ -184,10 +184,8 @@ character.refresh={
 				trigger.finish();
 				"step 1"
 				event.cards=get.cards(3);
-				event.dialog=ui.create.dialog('裸衣',event.cards);
+				player.showCards(event.cards,'裸衣');
-				game.delay(2);
 				"step 2"
-				event.dialog.close();
 				for(var i=0;i<cards.length;i++){
 					if(get.type(cards[i],'trick')=='trick'&&cards[i].name!='juedou'){
 						ui.discardPile.appendChild(cards[i]);

character/swd.js

@@ -3394,7 +3394,14 @@ character.swd={
 			},
 			content:function(){
 				"step 0"
-				player.chooseToDiscard('是否发动苏生？').ai=ai.get.unuseful2;
+				var att=ai.get.attitude(player,trigger.player);
+				var nh=player.num('h');
+				player.chooseToDiscard('是否发动苏生？').ai=function(card){
+					if(att>3||(att>1&&nh>2)){
+						return ai.get.unuseful2(card);
+					}
+					return 0;
+				};
 				"step 1"
 				if(result.bool){
 					// player.chooseToDiscard('h',true);

game/background.js

@@ -16,15 +16,41 @@
         bg.style.backgroundSize="cover";
 
         switch (temp.image_background_filter){
-            case 'blur':bg.style.webkitFilter='blur(8px)';bg.style.webkitTransform='scale(1.05)';break;
+            case 'blur':
-            case 'gray':bg.style.webkitFilter='grayscale(1)';break;
+                bg.style.filter='blur(8px)';
-            case 'sepia':bg.style.webkitFilter='sepia(0.5)';break;
+                bg.style.webkitFilter='blur(8px)';
-            case 'invert':bg.style.webkitFilter='invert(1)';break;
+                bg.style.transform='scale(1.05)';
-            case 'saturate':bg.style.webkitFilter='saturate(5)';break;
+                break;
-            case 'contrast':bg.style.webkitFilter='contrast(1.4)';break;
+            case 'gray':
-            case 'hue':bg.style.webkitFilter='hue-rotate(180deg)';break;
+                bg.style.filter='grayscale(1)';
-            case 'brightness':bg.style.webkitFilter='brightness(5)';break;
+                bg.style.webkitFilter='grayscale(1)';
-            default:bg.style.webkitFilter='';
+                break;
+            case 'sepia':
+                bg.style.filter='sepia(0.5)';
+                bg.style.webkitFilter='sepia(0.5)';
+                break;
+            case 'invert':
+                bg.style.filter='invert(1)';
+                bg.style.webkitFilter='invert(1)';
+                break;
+            case 'saturate':
+                bg.style.filter='saturate(5)';
+                bg.style.webkitFilter='saturate(5)';
+                break;
+            case 'contrast':
+                bg.style.filter='contrast(1.4)';
+                bg.style.webkitFilter='contrast(1.4)';
+                break;
+            case 'hue':
+                bg.style.filter='hue-rotate(180deg)';
+                bg.style.webkitFilter='hue-rotate(180deg)';
+                break;
+            case 'brightness':
+                bg.style.filter='brightness(5)';
+                bg.style.webkitFilter='brightness(5)';
+                break;
+            default:
+                bg.style.webkitFilter='';
         }
     }
     window.resetGameTimeout=setTimeout(function(){

game/config.js

@@ -3,7 +3,7 @@ window.config={
 	forbidsingle:['menghuo','huanggai','caoren','machao','pangde','yanwen','xiahoudun','xuzhu','luxun',
 	'xuhuang','yujin','xiaoqiao','daqiao','zhangjiao','zhangbao'],
 	forbidall:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu',
-	'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan'],
+	'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan','zhangjiao'],
 	forbidversus:['swd_kangnalishi'],
 	forbidstone:['zhugedan','pal_xuanxiao'],
 	forbidchess:['hetaihou','swd_kangnalishi'],
@@ -157,7 +157,6 @@ window.config={
 		show_auto_config:'显示托管按钮',
 		show_volumn_config:'显示音量按钮',
 		show_name_config:'显示角色名称',
-		auto_popped_config:'自动弹出菜单',
 		ui_zoom_config:'界面缩放',
 		no_ios_zoom_config:'禁止触屏缩放',
 		show_stat_config:'显示战斗统计',
@@ -196,7 +195,8 @@ window.config={
 	volumn_audio:8,
 
 	config_menu:true,
-	auto_popped:true,
+	auto_popped_config:true,
+	auto_popped_history:false,
 	auto_skill:true,
 	auto_confirm:true,
 	enable_drag:true,
@@ -210,7 +210,7 @@ window.config={
 
 
 	theme:'woodden',
-	layout:'newlayout',
+	layout:'mobile',
 
 	image_character:'default',
 	image_background:'default',

index.html

@@ -1,5 +1,6 @@
 <!DOCTYPE HTML>
 <meta charset="UTF-8">
+<meta name="format-detection" content="telephone=no">
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="viewport" content="user-scalable=no">
 <link rel="apple-touch-icon" href="image/meta/icon.png">

layout/default/blur.css

@@ -1,3 +1,4 @@
 #arena.paused,#arena.right{
+    filter:blur(3px);
     -webkit-filter:blur(3px);
 }

layout/default/fold2.css

@@ -1,14 +1,14 @@
-#me>[data-fold='1']>.card:not(.selected){margin-right: -30px;-webkit-transform:perspective(1000px) rotateY(30deg);}
+#me>[data-fold='1']>.card:not(.selected){margin-right: -30px;transform:perspective(1000px) rotateY(30deg);}
-#me>[data-fold='2']>.card:not(.selected){margin-right: -38px;-webkit-transform:perspective(1000px) rotateY(38deg);}
+#me>[data-fold='2']>.card:not(.selected){margin-right: -38px;transform:perspective(1000px) rotateY(38deg);}
-#me>[data-fold='3']>.card:not(.selected){margin-right: -45px;-webkit-transform:perspective(1000px) rotateY(45deg);}
+#me>[data-fold='3']>.card:not(.selected){margin-right: -45px;transform:perspective(1000px) rotateY(45deg);}
 
 #me>[data-fold='1']>.card:not(.selected):hover,
 #me>[data-fold='2']>.card:not(.selected):hover,
-#me>[data-fold='3']>.card:not(.selected):hover{margin-right: -8px;-webkit-transform:perspective(1000px) rotateY(0);}
+#me>[data-fold='3']>.card:not(.selected):hover{margin-right: -8px;transform:perspective(1000px) rotateY(0);}
 
 #me>[data-fold='1']>.card.start,
 #me>[data-fold='2']>.card.start,
-#me>[data-fold='3']>.card.start{-webkit-transform:none;}
+#me>[data-fold='3']>.card.start{transform:none;}
 
 #me>div>.card:last-child{margin-right: -8px;}
 #me>div>.card.last{margin-right: -8px;}

layout/default/layout.css

@@ -1,5 +1,9 @@
 /*--------标签--------*/
-html{width: 100%;height: 100%;font-size: 16px;cursor: default;overflow: hidden;-webkit-user-select:none;-webkit-font-smoothing: subpixel-antialiased;-webkit-tap-highlight-color:rgba(0,0,0,0);}
+html{width: 100%;height: 100%;font-size: 16px;cursor: default;overflow: hidden;
+	-ms-user-select:none;
+	-moz-user-select:none;
+	-webkit-user-select:none;
+	-webkit-font-smoothing: subpixel-antialiased;-webkit-tap-highlight-color:rgba(0,0,0,0);}
 body{width: 100%;height: 100%;padding: 0; margin: 0;text-rendering:optimizeLegibility;font-family:'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif}
 div{display: inline-block;position: absolute;transition: all 0.5s;}
 table{table-layout: fixed;}
@@ -52,28 +56,43 @@ table{table-layout: fixed;}
 #scrollzone3{right: calc(50% - 140px);}
 #scrollzone4{right: 0;}
 .scrollzone{width: 20px;height: 140px;}
-body>.background.paused{-webkit-filter:blur(3px);}
+body>.background.paused{
+	filter:blur(3px);
+	-webkit-filter:blur(3px);
+}
 body>.background{z-index:-2}
 .popup{padding: 5px;}
 .removing,.hidden{opacity: 0 !important;}
 #system>div>div.hidden{opacity:0.5 !important;}
 .transparent{opacity:  0.3 !important;}
-.out{opacity: 0.3 !important;-webkit-filter:blur(3px)}
+.out{opacity: 0.3 !important;
-.blur{-webkit-filter:blur(3px) !important;}
+	filter:blur(3px);
-.blur2{-webkit-filter:blur(6px) !important;}
+	-webkit-filter:blur(3px)
-.zoomin{-webkit-transform: scale(1.05) !important;}
+}
-.zoomout{-webkit-transform: scale(0.95) !important;}
+.blur{
-.zoomin2{-webkit-transform: scale(2) !important;}
+	filter:blur(3px) !important;
-.zoomin3{-webkit-transform: scale(3) !important;}
+	-webkit-filter:blur(3px) !important;
-.zoomout2{-webkit-transform: scale(0.5) !important;}
+}
-.zoomout3{-webkit-transform: scale(0.3) !important;}
+.blur2{
-.rotateleft{-webkit-transform: rotate(-3deg) !important;}
+	filter:blur(6px) !important;
-.rotateright{-webkit-transform: rotate(3deg) !important;}
+	-webkit-filter:blur(6px) !important;
+}
+.zoomin{transform: scale(1.05) !important;}
+.zoomout{transform: scale(0.95) !important;}
+.zoomin2{transform: scale(2) !important;}
+.zoomin3{transform: scale(3) !important;}
+.zoomout2{transform: scale(0.5) !important;}
+.zoomout3{transform: scale(0.3) !important;}
+.rotateleft{transform: rotate(-3deg) !important;}
+.rotateright{transform: rotate(3deg) !important;}
 .exclude{opacity: 0.6 !important;}
-.button.buttonclick{-webkit-animation:buttonclick 0.8s}
+.button.buttonclick{
+	animation:buttonclick 0.8s;
+	-webkit-animation:buttonclick 0.8s
+}
 .background{width: 100%;height: 100%;left:0;top: 0;margin: 0;padding:0;display: inline-block !important;}
 .background2{width: 90%;height: 90%;left:5%;top: 5%;margin: 0;padding:0;display: inline-block !important;}
-.background,.button,.avatar,.avatar2{transition-property: top,box-shadow,opacity,-webkit-transform;transition-duration:0.5s;}
+.background,.button,.avatar,.avatar2{transition-property: top,box-shadow,opacity,transform;transition-duration:0.5s;}
 .intro{width: 20px;height: 20px;}
 
 #systembutton{
@@ -103,9 +122,11 @@ body>.background{z-index:-2}
 	display:none !important;
 }
 .card.cardflip{
+	animation:cardflip 0.3s ease-out;
 	-webkit-animation:cardflip 0.3s ease-out;
 }
 .player.playerflip{
+	animation:playerflip 0.3s ease-out;
 	-webkit-animation:playerflip 0.3s ease-out;
 }
 .button.card.button>.intro{top:69px;}
@@ -113,16 +134,16 @@ body>.background{z-index:-2}
 	zoom:0.65
 }
 .buttons .card.button>.name{
-	-webkit-transform:scale(0.8);
+	transform:scale(0.8);
-	-webkit-transform-origin:top left;
+	transform-origin:top left;
 }
 .buttons .card.button>.info{
-	-webkit-transform:scale(0.8);
+	transform:scale(0.8);
-	-webkit-transform-origin:top right;
+	transform-origin:top right;
 }
 .buttons .card.button>.addinfo{
-	-webkit-transform:scale(0.8);
+	transform:scale(0.8);
-	-webkit-transform-origin:bottom left;
+	transform-origin:bottom left;
 }
 .card.center{top:calc(50% - 52px);left:calc(50% - 52px);}
 .card>.background{font-size: 80px;height: 80px;padding-top: 14px;text-align: center;}
@@ -149,7 +170,7 @@ body>.background{z-index:-2}
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
 	border-radius:6px;
 	transition: all 0.3s;
-	-webkit-animation:none;
+	animation:dialog_start2 0.2s;
 	-webkit-animation:dialog_start2 0.2s;
 	transition-property:opacity;
 }
@@ -238,10 +259,19 @@ margin-bottom: 5px;
 .player.controlfakeme>.avatar{width: 100%;height: 100%;box-shadow: none;left: 0;top: 0}
 .player{z-index: 4;width: 240px;height: 120px;}
 .player.minskin{width:120px;}
-.player.replaceme{-webkit-animation:replaceme 0.5s}
+.player.replaceme{
-.player.replaceenemy{-webkit-animation:replaceenemy 0.5s}
+	animation:replaceme 0.5s;
+	-webkit-animation:replaceme 0.5s
+}
+.player.replaceenemy{
+	animation:replaceenemy 0.5s;
+	-webkit-animation:replaceenemy 0.5s
+}
 .player>div{z-index: 2;}
-.player.dead,.player.likedead{z-index: 1;-webkit-filter:grayscale(1);}
+.player.dead,.player.likedead{z-index: 1;
+	filter:grayscale(1);
+	-webkit-filter:grayscale(1);
+}
 .player>.name{left: 18px;top:36px;font-family: 'huangcao';font-size:20px}
 .player>.intro{top:87px;left: 18px;}
 .player>.damage{
@@ -252,17 +282,17 @@ margin-bottom: 5px;
 	top:calc(50% - 36px);
 	left:0;
 	opacity: 0;
-	-webkit-transform:scale(0.7);
+	transform:scale(0.7);
 }
 .player>.damage.damageadded{
 	opacity: 1;
-	-webkit-transform:scale(1);
+	transform:scale(1);
 }
 .player.linked>.damage{
-	-webkit-transform:scale(0.7) rotate(90deg);
+	transform:scale(0.7) rotate(90deg);
 }
 .player.linked>.damage.damageadded{
-	-webkit-transform:scale(1) rotate(90deg);
+	transform:scale(1) rotate(90deg);
 }
 .avatar{width: 96px;height: 96px;left: 12px;top: 12px;overflow: hidden;}
 .avatar2{width: 42px;height: 42px;top: 70px;left: 70px;overflow: hidden;}
@@ -275,8 +305,16 @@ margin-bottom: 5px;
 .equips>.equip5{top: calc(50% - 21px);left:calc(50% - 21px);border-radius: 21px;z-index: 1}
 .equips>div>div:not(.image),.judges>div>div:not(.image),.marks>div>div:not(.image){display: none;}
 .equips>div>.image,.judges>div>.image,.marks>div>.image{width:120%;height:120%;left:-20%;top:-20%;}
-.equips>div:hover>.info{display: inline-block;-webkit-animation:equip_hover 1s;left: 0;right: auto;width: 42px;text-align: center;}
+.equips>div:hover>.info{display: inline-block;
-.equips>div:hover>.background {-webkit-animation:equip_hover2 1s;-webkit-animation-fill-mode: forwards;}
+	animation:equip_hover 1s;
+	-webkit-animation:equip_hover 1s;
+	left: 0;right: auto;width: 42px;text-align: center;}
+.equips>div:hover>.background {
+	animation:equip_hover2 1s;
+	animation-fill-mode: forwards;
+	-webkit-animation:equip_hover2 1s;
+	-webkit-animation-fill-mode: forwards;
+}
 .judges{height: 24px;left: 14px;top: -18px;}
 .marks{height: 24px;left: 14px;top: 112px;}
 .judges>div,.marks>div{width: 24px;height: 24px;margin-left: 0;margin-top: 0;margin-right: 4px;opacity: 1;}
@@ -288,6 +326,7 @@ margin-bottom: 5px;
 	border-radius: 100%;
 	box-shadow: rgba(0,0,0,0.2) 1px -1px 2px inset,rgba(255,255,255,0.15) -1px 1px 5px inset;
 	position: relative;
+	filter: brightness(1.5);
 	-webkit-filter: brightness(1.5);
 	transition: all 0.5s;
 }
@@ -317,11 +356,13 @@ margin-bottom: 5px;
 .hp.actcount>.lost{
 	background: rgba(63, 119, 173,1);
 	border: 1px solid rgba(31, 82, 131, 1);
+	filter: grayscale(1);
 	-webkit-filter: grayscale(1);
 }
 .hp>.lost{
 	background: rgba(57, 123, 4,1);
 	border: 1px solid rgba(39, 79, 7, 1);
+	filter: grayscale(1);
 	-webkit-filter: grayscale(1);
 }
 .hp.text[data-condition="low"]{
@@ -345,11 +386,11 @@ margin-bottom: 5px;
 .identity{text-align: center;width: 22px;height: 22px;}
 .identity>div{position: relative;top: 2px;}
 .unseen>.avatar,.unseen>.name,.unseen2>.avatar2{opacity: 0 !important;}
-.linked>.avatar,.linked>.avatar2{-webkit-transform:rotate(-90deg);}
+.linked>.avatar,.linked>.avatar2{transform:rotate(-90deg);}
 .linked>.avatar2{top: 5px;}
 .linked>.identity{top: 88px;}
 .linked>.count{right: 154px;}
-.acted>.identity{-webkit-transform:rotate(180deg);}
+.acted>.identity{transform:rotate(180deg);}
 
 /*--------位置(8人)------*/
 [data-number='8']>.player[data-position='1']{top:calc(200% / 3 - 90px);left:calc(100% - 240px);}
@@ -447,23 +488,62 @@ margin-bottom: 5px;
 .card[data-position='0']{top:calc(100% - 130px);left:calc(50% - 52px);}
 .popup[data-position='0']{top:calc(100% - 176px);left:calc(50% - 106px);}
 /*--------动画--------*/
-.start,.equips>.card,.judges>.card,.marks>.card,.popup{-webkit-animation: game_start 0.5s;}
+.start,.equips>.card,.judges>.card,.marks>.card,.popup{
-.dialog{-webkit-animation: dialog_start 0.5s;}
+	animation: game_start 0.5s;
-.dialog.noslide{-webkit-animation: dialog_start2 0.5s;transition-property:opacity,background,box-shadow}
+	-webkit-animation: game_start 0.5s;
+}
+.dialog{
+	animation: dialog_start 0.5s;
+	-webkit-animation: dialog_start 0.5s;
+}
+.dialog.noslide{
+	animation: dialog_start2 0.5s;
+	-webkit-animation: dialog_start2 0.5s;
+	transition-property:opacity,background,box-shadow
+}
 .dialog.removing{top: 100px}
-.card.drawing{-webkit-animation: drawing 1s; -webkit-animation-fill-mode: forwards;}
+.card.drawing{
+	animation: drawing 1s;
+	animation-fill-mode: forwards;
+	-webkit-animation: drawing 1s;
+	-webkit-animation-fill-mode: forwards;
+}
 .card.thrown{position: absolute;opacity: 1;margin:0}
-.card.start{-webkit-animation: card_start 0.5s;}
+.card.start{
-.card.judgestart{-webkit-animation: card_judgestart 1s;}
+	animation: card_start 0.5s;
-#me>div>.card.start{-webkit-animation: card_start2 0.5s;}
+	-webkit-animation: card_start 0.5s;
-.card.removing{-webkit-transform:scale(0);}
+}
+.card.judgestart{
+	animation: card_judgestart 1s;
+	-webkit-animation: card_judgestart 1s;
+}
+#me>div>.card.start{
+	animation: card_start2 0.5s;
+	-webkit-animation: card_start2 0.5s;
+}
+.card.removing{transform:scale(0);}
 #me>div>.card.removing{margin-left: -52px;margin-right: -52px;}
-.card.thrown.removing{width: 104px;height: 104px;-webkit-transform:none}
+.card.thrown.removing{width: 104px;height: 104px;transform:none}
-#sidebar.sidebar{-webkit-animation:sidebar 0.5s}
+#sidebar.sidebar{
-.button.zoom{-webkit-animation:zoom_button 0.5s}
+	animation:sidebar 0.5s;
-.content>.config.start{-webkit-animation:config 0.5s;}
+	-webkit-animation:sidebar 0.5s
-.flash{-webkit-animation:flash 1s;}
+}
-.flip{-webkit-animation:flip 1s;}
+.button.zoom{
+	animation:zoom_button 0.5s;
+	-webkit-animation:zoom_button 0.5s
+}
+.content>.config.start{
+	animation:config 0.5s;
+	-webkit-animation:config 0.5s;
+}
+.flash{
+	animation:flash 1s;
+	-webkit-animation:flash 1s;
+}
+.flip{
+	animation:flip 1s;
+	-webkit-animation:flip 1s;
+}
 /*--------样式--------*/
 #arena.selecting:not(.video) .player[data-position='0'] .card:not(.selectable)>.background,
 #arena.selecting:not(.video) .player[data-position='0'] .card:not(.selectable)>.image,
@@ -530,14 +610,14 @@ div:hover>.intro{opacity: 1;}
 .dialog.scroll2{box-shadow:0 10px 10px -9px rgba(0,0,0,0.1),0 10px 0 -9px rgba(0,0,0,0.05)}
 .dialog.scroll1.scroll2{box-shadow:0 -10px 10px -9px rgba(0,0,0,0.1),0 -10px 0 -9px rgba(0,0,0,0.05),
 	0 10px 10px -9px rgba(0,0,0,0.1),0 10px 0 -9px rgba(0,0,0,0.05);}*/
-.selected,.target{/*-webkit-transform: scale(1.05);*/}
+.selected,.target{/*transform: scale(1.05);*/}
-.target{-webkit-transform: rotate(-3deg);}
+.target{transform: rotate(-3deg);}
-.target2{-webkit-transform: rotate(3deg);}
+.target2{transform: rotate(3deg);}
 .content>.config.line2{
-	-webkit-transform:translateX(-5px);
+	transform:translateX(-5px);
 }
 #sidebar2>.config:not(.line2){
-	-webkit-transform:translateX(5px);
+	transform:translateX(5px);
 }
 .popup{
 	background: rgba(0,0,0,0.2);
@@ -599,6 +679,7 @@ div:hover>.intro{opacity: 1;}
 	top:0;
 }
 .player .identity.animate{
+	animation:identity 0.8s;
 	-webkit-animation:identity 0.8s;
 }
 .player .identity[data-color="zhu"],
@@ -763,6 +844,7 @@ div[data-color="unknownm"]{
 	height:12px;
 	margin-left:4px;
 	margin-bottom: 3px;
+	animation:game_start 0.5s;
 	-webkit-animation:game_start 0.5s;
 }
 .player .wunature{
@@ -820,6 +902,14 @@ div[data-color="unknownm"]{
 }
 
 /*--------动画--------*/
+@keyframes control_glow{
+	0%{box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px}
+	30%{box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(10, 155, 67, 1) 0 0 15px, rgba(10, 155, 67, 1) 0 0 15px}
+	70%{box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(10, 155, 67, 1) 0 0 15px, rgba(10, 155, 67, 1) 0 0 15px}
+	100%{box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px}
+	/*from{box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(10, 155, 67, 1) 0 0 15px, rgba(10, 155, 67, 1) 0 0 15px !important;}
+	to{box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px !important}*/
+}
 @-webkit-keyframes control_glow{
 	0%{box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px}
 	30%{box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(10, 155, 67, 1) 0 0 15px, rgba(10, 155, 67, 1) 0 0 15px}
@@ -828,36 +918,70 @@ div[data-color="unknownm"]{
 	/*from{box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(10, 155, 67, 1) 0 0 15px, rgba(10, 155, 67, 1) 0 0 15px !important;}
 	to{box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px !important}*/
 }
+@keyframes cardflip{
+	from {transform:perspective(600px) rotateY(-90deg) translateX(52px)}
+	to{transform:perspective(600px) rotateY(0deg) translateX(0)}
+}
 @-webkit-keyframes cardflip{
-	from {-webkit-transform:perspective(600px) rotateY(-90deg) translateX(52px)}
+	from {transform:perspective(600px) rotateY(-90deg) translateX(52px)}
-	to{-webkit-transform:perspective(600px) rotateY(0deg) translateX(0)}
+	to{transform:perspective(600px) rotateY(0deg) translateX(0)}
+}
+@keyframes playerflip{
+	from {transform:perspective(1200px) rotateY(-90deg) translateX(150px)}
+	to{transform:perspective(1200px) rotateY(0deg) translateX(0)}
+}
+@keyframes playerflip{
+	from {transform:perspective(1200px) rotateY(-90deg) translateX(150px)}
+	to{transform:perspective(1200px) rotateY(0deg) translateX(0)}
 }
 @-webkit-keyframes playerflip{
-	from {-webkit-transform:perspective(1200px) rotateY(-90deg) translateX(150px)}
+	from {transform:perspective(1200px) rotateY(-90deg) translateX(150px)}
-	to{-webkit-transform:perspective(1200px) rotateY(0deg) translateX(0)}
+	to{transform:perspective(1200px) rotateY(0deg) translateX(0)}
 }
+@keyframes game_start{from {opacity: 0;}}
 @-webkit-keyframes game_start{from {opacity: 0;}}
+@keyframes equip_hover{0% {opacity: 0;}50% {opacity: 0;}}
 @-webkit-keyframes equip_hover{0% {opacity: 0;}50% {opacity: 0;}}
-@-webkit-keyframes buttonclick{0% {-webkit-transform: scale(1);}50% {-webkit-transform: scale(0.9);}}
+@keyframes buttonclick{0% {transform: scale(1);}50% {transform: scale(0.9);}}
+@-webkit-keyframes buttonclick{0% {transform: scale(1);}50% {transform: scale(0.9);}}
+@keyframes equip_hover2{0% {}50% {opacity: 0.6}100%{opacity: 0.3}}
 @-webkit-keyframes equip_hover2{0% {}50% {opacity: 0.6}100%{opacity: 0.3}}
+@keyframes dialog_start{from {opacity: 0;top:100px;}}
 @-webkit-keyframes dialog_start{from {opacity: 0;top:100px;}}
-@-webkit-keyframes dialog_start2{from {opacity: 0;-webkit-transform:scale(0.8);}}
+@keyframes dialog_start2{from {opacity: 0;transform:scale(0.8);}}
-@-webkit-keyframes replaceme{from {opacity: 0;-webkit-transform:translateY(120px)}}
+@-webkit-keyframes dialog_start2{from {opacity: 0;transform:scale(0.8);}}
-@-webkit-keyframes replaceenemy{from {opacity: 0;-webkit-transform:translateY(-120px)}}
+@keyframes replaceme{from {opacity: 0;transform:translateY(120px)}}
+@-webkit-keyframes replaceme{from {opacity: 0;transform:translateY(120px)}}
+@keyframes replaceenemy{from {opacity: 0;transform:translateY(-120px)}}
+@-webkit-keyframes replaceenemy{from {opacity: 0;transform:translateY(-120px)}}
+@keyframes drawing{0% {opacity: 0;left:calc(50% - 52px);top:calc(50% - 52px);}50%{opacity: 1}100%{opacity: 0}}
 @-webkit-keyframes drawing{0% {opacity: 0;left:calc(50% - 52px);top:calc(50% - 52px);}50%{opacity: 1}100%{opacity: 0}}
+@keyframes drawing2{0% {opacity: 0}50%{opacity: 1}100%{opacity: 0}}
 @-webkit-keyframes drawing2{0% {opacity: 0}50%{opacity: 1}100%{opacity: 0}}
-@-webkit-keyframes card_start{from {opacity: 0;-webkit-transform:scale(0);}}
+@keyframes card_start{from {opacity: 0;transform:scale(0);}}
-@-webkit-keyframes card_start2{from {opacity: 0;-webkit-transform:scale(0);margin-left: -52px;margin-right: -52px;}}
+@-webkit-keyframes card_start{from {opacity: 0;transform:scale(0);}}
-@-webkit-keyframes card_judgestart{from {opacity: 0;-webkit-transform:scale(0) rotateY(-180deg) perspective(600px);}}
+@keyframes card_start2{from {opacity: 0;transform:scale(0);margin-left: -52px;margin-right: -52px;}}
+@-webkit-keyframes card_start2{from {opacity: 0;transform:scale(0);margin-left: -52px;margin-right: -52px;}}
+@keyframes card_judgestart{from {opacity: 0;transform:scale(0) rotateY(-180deg) perspective(600px);}}
+@-webkit-keyframes card_judgestart{from {opacity: 0;transform:scale(0) rotateY(-180deg) perspective(600px);}}
+@keyframes sidebar{from {left: -120px;opacity: 0}}
 @-webkit-keyframes sidebar{from {left: -120px;opacity: 0}}
-@-webkit-keyframes zoom_button{from {margin-top: -48px;margin-bottom: -48px;-webkit-transform:scale(0);opacity: 0}}
+@keyframes zoom_button{from {margin-top: -48px;margin-bottom: -48px;transform:scale(0);opacity: 0}}
+@-webkit-keyframes zoom_button{from {margin-top: -48px;margin-bottom: -48px;transform:scale(0);opacity: 0}}
+@keyframes config{from {margin-top:-28px;opacity: 0}}
 @-webkit-keyframes config{from {margin-top:-28px;opacity: 0}}
-@-webkit-keyframes zoomin{from {opacity: 0;-webkit-transform:scale(0.5);}}
+@keyframes zoomin{from {opacity: 0;transform:scale(0.5);}}
-@-webkit-keyframes zoomout{from {opacity: 0;-webkit-transform:scale(2);}}
+@-webkit-keyframes zoomin{from {opacity: 0;transform:scale(0.5);}}
-@-webkit-keyframes zoomout3{from {opacity: 0;-webkit-transform:scale(3);}}
+@keyframes zoomout{from {opacity: 0;transform:scale(2);}}
-@-webkit-keyframes zoomout4{from {opacity: 0;-webkit-transform:scale(4);}}
+@-webkit-keyframes zoomout{from {opacity: 0;transform:scale(2);}}
+@keyframes zoomout3{from {opacity: 0;transform:scale(3);}}
+@-webkit-keyframes zoomout3{from {opacity: 0;transform:scale(3);}}
+@keyframes zoomout4{from {opacity: 0;transform:scale(4);}}
+@-webkit-keyframes zoomout4{from {opacity: 0;transform:scale(4);}}
+@keyframes flash{0%{opacity: 1;}50%{opacity: 0;}100%{opacity: 1;}}
 @-webkit-keyframes flash{0%{opacity: 1;}50%{opacity: 0;}100%{opacity: 1;}}
-@-webkit-keyframes flip{from{-webkit-transform:perspective(1000px) rotateY(0);}to{-webkit-transform:perspective(1000px) rotateY(360deg);}}
+@keyframes flip{from{transform:perspective(1000px) rotateY(0);}to{transform:perspective(1000px) rotateY(360deg);}}
+@-webkit-keyframes flip{from{transform:perspective(1000px) rotateY(0);}to{transform:perspective(1000px) rotateY(360deg);}}
 /*--------其它--------*/
 @font-face {font-family: 'xiaozhuan';src: url('../../font/xiaozhuan.ttf');}
 @font-face {font-family: 'huangcao';src: url('../../font/huangcao.ttf');}

layout/default/menu.css

@@ -73,15 +73,19 @@
 	top:calc(50% - 150px);
 }
 .menu.main.slideup{
+	animation:menuslideup 0.5s forwards;
 	-webkit-animation:menuslideup 0.5s forwards;
 }
 .menu.main.slidedown{
+	animation:menuslidedown 0.5s forwards;
 	-webkit-animation:menuslidedown 0.5s forwards;
 }
 .menu.main.zoomin{
+	animation:menuzoomin 0.3s forwards;
 	-webkit-animation:menuzoomin 0.3s forwards;
 }
 .menu.main.zoomout{
+	animation:menuzoomout 0.3s forwards;
 	-webkit-animation:menuzoomout 0.3s forwards;
 }
 .menu.main{
@@ -122,7 +126,8 @@
 	margin-right:5px;
 	transition:color 0.5s;
 }
-.menu.main>.menu-tab>div:not(.active):not(*:hover){
+.menu.main>.menu-tab>div:not(.active):not(*:hover),
+.menu.main>.menu-tab>.disabled{
 	color:rgba(255,255,255,0.6);
 }
 .menu.main>.menu-content{
@@ -328,10 +333,15 @@
 	color:rgba(255,255,255,0.5);
 }
 
+@keyframes fadein{from{opacity:0}}
 @-webkit-keyframes fadein{from{opacity:0}}
+@keyframes menuslideup{from{top:100%}}
 @-webkit-keyframes menuslideup{from{top:100%}}
+@keyframes menuslidedown{to{top:100%}}
 @-webkit-keyframes menuslidedown{to{top:100%}}
+@keyframes menuzoomin{from{transform:scale(0.5);opacity:0;transform-origin:2px -35px}to{transform-origin:2px -35px}}
 @-webkit-keyframes menuzoomin{from{transform:scale(0.5);opacity:0;transform-origin:2px -35px}to{transform-origin:2px -35px}}
+@keyframes menuzoomout{from{transform-origin:2px -35px}to{transform:scale(0.5);opacity:0;transform-origin:2px -35px}}
 @-webkit-keyframes menuzoomout{from{transform-origin:2px -35px}to{transform:scale(0.5);opacity:0;transform-origin:2px -35px}}
 
 

layout/default/scrollbar.css

@@ -47,4 +47,4 @@
 }
 ::-webkit-scrollbar-track:active {
     background-color:rgba(0,0,0,0)
-}
+}

layout/mobile/equip.css

@@ -10,8 +10,8 @@
 }
 .player:not([data-position='0']).minskin .equips,
 #arena.chess .player.minskin .equips{
-	-webkit-transform:scale(0.73);
+	transform:scale(0.73);
-	-webkit-transform-origin:bottom left;
+	transform-origin:bottom left;
 }
 .player:not([data-position='0']) .equips>.card,
 #arena.chess .player .equips>.card{
@@ -26,6 +26,7 @@
 	box-shadow:none;
 	color:white;
 	text-shadow:black 0 0 2px;
+	animation: card_start2x 0.5s;
 	-webkit-animation: card_start2x 0.5s;
 	display:block;
 	left:0;
@@ -94,6 +95,7 @@
 }
 .player:not([data-position='0']) .equips>.card>div,
 #arena.chess .player .equips>.card>div{
+	animation:none !important;
 	-webkit-animation:none !important;
 }
 .player:not([data-position='0']) .equips>.card>.name,
@@ -108,7 +110,7 @@
 #arena.chess .player .equips>.removing{
 	margin-top:-12px !important;
 	margin-bottom:-11px !important;
-	-webkit-transform:scale(1);
+	transform:scale(1);
 }
 .player:not([data-position='0']) .equips>.removing+.removing,
 #arena.chess .player .equips>.removing+.removing{
@@ -118,16 +120,16 @@
 
 .player:not([data-position='0']).linked .equips,
 #arena.chess .player.linked .equips{
-	-webkit-transform:rotate(90deg) translate(-150px,-6px);
+	transform:rotate(90deg) translate(-150px,-6px);
-	-webkit-transform-origin:bottom left;
+	transform-origin:bottom left;
 }
 .player:not([data-position='0']).minskin.linked .equips,
 #arena.chess .player.minskin.linked .equips{
-	-webkit-transform:rotate(90deg) translate(-90px,-6px) scale(0.73);
+	transform:rotate(90deg) translate(-90px,-6px) scale(0.73);
 }
 .player:not([data-position='0']).linked div:not(.equips) .card,
 .player:not([data-position='0']).linked .identity,
 #arena.chess .player.linked div:not(.equips) .card,
 #arena.chess .player.linked .identity{
-	-webkit-transform:rotate(90deg);
+	transform:rotate(90deg);
 }

layout/mobile/layout.css

@@ -70,7 +70,8 @@
     border-radius:0px !important;
     top:0;
     left:0;
-    transition: transform 0.5s;
+    transition-property: opacity,transform;
+    transition-duration: 0.5s;
     pointer-events: auto;
 }
 #arena:not(.chess) .player[data-position='0']:not(.minskin)>.judges,

layout/mode/boss.css

@@ -29,7 +29,7 @@
     transition:all 0.5s;
 }
 .player.bossplayer.highlight{
-    -webkit-transform:scale(1.1);
+    transform:scale(1.1);
     opacity:1;
 }
 #bosslist.removing>.player.bossplayer.highlight{
@@ -45,6 +45,7 @@
     height:216px;
     transition: all 0.3s;
     opacity:0.6;
+    animation:game_start 0.5s;
     -webkit-animation:game_start 0.5s;
 }
 .player.bossplayer>div:not(.hp):not(.identity):not(.avatar){

layout/mode/chess.css

@@ -105,10 +105,13 @@
 	box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(255, 0, 0, 1) 0 0 5px, rgba(255, 0, 0, 1) 0 0 10px !important;
 }
 .fakeme.player>.dead{
+    filter:grayscale(1);
     -webkit-filter:grayscale(1);
     opacity:0.5;
 }
 .card.drawing{
+    animation: drawing2 1s;
+    animation-fill-mode: forwards;
     -webkit-animation: drawing2 1s;
     -webkit-animation-fill-mode: forwards;
 }

layout/newlayout/equip.css

@@ -8,8 +8,8 @@
 	text-align:left;
 }
 .player.minskin .equips{
-	-webkit-transform:scale(0.73);
+	transform:scale(0.73);
-	-webkit-transform-origin:bottom left;
+	transform-origin:bottom left;
 }
 .player .equips>.card{
 	position:relative;
@@ -23,6 +23,7 @@
 	box-shadow:none;
 	color:white;
 	text-shadow:black 0 0 2px;
+	animation: card_start2x 0.5s;
 	-webkit-animation: card_start2x 0.5s;
 	display:block;
 	left:0;
@@ -79,6 +80,7 @@
 	margin-left:5px;
 }
 .equips>.card>div{
+	animation:none !important;
 	-webkit-animation:none !important;
 }
 .equips>.card>.name,
@@ -90,7 +92,7 @@
 .equips>.removing{
 	margin-top:-12px !important;
 	margin-bottom:-11px !important;
-	-webkit-transform:scale(1);
+	transform:scale(1);
 }
 .equips>.removing+.removing{
 	margin-top:-23px !important;
@@ -98,13 +100,13 @@
 
 
 .player.linked .equips{
-	-webkit-transform:rotate(90deg) translate(-150px,-6px);
+	transform:rotate(90deg) translate(-150px,-6px);
-	-webkit-transform-origin:bottom left;
+	transform-origin:bottom left;
 }
 .player.minskin.linked .equips{
-	-webkit-transform:rotate(90deg) translate(-90px,-6px) scale(0.73);
+	transform:rotate(90deg) translate(-90px,-6px) scale(0.73);
 }
 .player.linked div:not(.equips) .card,
 .player.linked .identity{
-	-webkit-transform:rotate(90deg);
+	transform:rotate(90deg);
 }

layout/newlayout/global.css

@@ -44,7 +44,7 @@
 	bottom: auto;
 	right: auto;
 	text-align: left;
-	-webkit-transform: none;
+	transform: none;
 }
 .player.fullskin2 .avatar,
 .player.fullskin2 .avatar2{
@@ -92,6 +92,7 @@
 	line-height:20px;
 	position:relative;
 	display:block;
+	animation:card_start2xx 0.5s;
 	-webkit-animation:card_start2xx 0.5s;
 }
 .player .marks>.removing,
@@ -120,12 +121,12 @@
 	top: auto;
 	left: 116px;
 	z-index:3;
-	-webkit-transform:rotate(180deg);
+	transform:rotate(180deg);
 }
 .player .hp.text{
 	font-family:'huangcao';
 	font-size:22px;
-	-webkit-transform:none;
+	transform:none;
 	transition:all 0s;
 	left:114px;
 }
@@ -168,6 +169,7 @@
 .player .count[data-condition="none"]{
 	background: rgba(57, 123, 4,1);
 	border: 1px solid rgba(39, 79, 7, 1);
+	filter: grayscale(1);
 	-webkit-filter: grayscale(1);
 }
 .player .count[data-condition="high"]{
@@ -195,12 +197,12 @@
 	left:102px;
 }
 .player.linked{
-	-webkit-transform:rotate(-90deg);
+	transform:rotate(-90deg);
 }
 .player.acted.linked .identity{
-	-webkit-transform:rotate(270deg);
+	transform:rotate(270deg);
 }
-.linked>.avatar,.linked>.avatar2{-webkit-transform:rotate(0deg);}
+.linked>.avatar,.linked>.avatar2{transform:rotate(0deg);}
 .linked>.avatar2{top:73px;}
 .linked>.identity{top: -5px;}
 .linked>.count{right: auto;}
@@ -312,6 +314,7 @@
 	height:calc(100% - 385px);
 	z-index:4;
 	transition-property:opacity,background,box-shadow;
+	animation: dialog_start2 0.5s;
 	-webkit-animation: dialog_start2 0.5s;
 }
 #arena.stone .dialog{
@@ -364,6 +367,11 @@
 		left: calc(5% + 220px);
 	}
 }
+
+@keyframes card_start2x{from {opacity: 0;margin-top: -13px;margin-bottom:-11px}}
+@keyframes card_start2xx{from {opacity: 0;margin-top: -12px;margin-bottom:-12px;transform:scale(0)}}
+@keyframes card_start2xxx{from {opacity: 0;margin-top: -12px;margin-bottom:-12px;transform:scale(0) rotate(90deg)}}
+
 @-webkit-keyframes card_start2x{from {opacity: 0;margin-top: -13px;margin-bottom:-11px}}
-@-webkit-keyframes card_start2xx{from {opacity: 0;margin-top: -12px;margin-bottom:-12px;-webkit-transform:scale(0)}}
+@-webkit-keyframes card_start2xx{from {opacity: 0;margin-top: -12px;margin-bottom:-12px;transform:scale(0)}}
-@-webkit-keyframes card_start2xxx{from {opacity: 0;margin-top: -12px;margin-bottom:-12px;-webkit-transform:scale(0) rotate(90deg)}}
+@-webkit-keyframes card_start2xxx{from {opacity: 0;margin-top: -12px;margin-bottom:-12px;transform:scale(0) rotate(90deg)}}

layout/phone/layout.css

@@ -41,5 +41,5 @@
 
 
 @media screen and (orientation:portrait) {
-    
+
 }

main.js

@@ -6,7 +6,7 @@ app.on('window-all-closed', function() {
     app.quit();
 });
 app.on('ready', function() {
-  mainWindow = new BrowserWindow({width: 1190, height: 780});
+  mainWindow = new BrowserWindow({width: 960, height: 660});
   mainWindow.loadUrl('file://' + __dirname + '/index.html');
 
   mainWindow.on('closed', function() {

mode/chess.js

@@ -18,15 +18,15 @@ mode.chess={
 				}
 				if(method=='flip'){
 					this.style.transition='all 0.5s';
-					this.style.webkitTransform='rotate'+(Math.random()<0.5?'X':'Y')+'(180deg) perspective(1000px)';
+					this.style.transform='rotate'+(Math.random()<0.5?'X':'Y')+'(180deg) perspective(1000px)';
 				}
 				else if(method=='rotate'){
 					this.style.transition='all 0.5s';
-					this.style.webkitTransform='rotate(180deg)';
+					this.style.transform='rotate(180deg)';
 				}
 				else{
 					this.style.transition='all 0.5s';
-					this.style.webkitTransform='';
+					this.style.transform='';
 				}
 				return this;
 			},
@@ -238,7 +238,7 @@ mode.chess={
 				node.dataset.position=this.dataset.position;
 				this.parentNode.appendChild(node);
 				ui.refresh(node);
-				node.style.webkitTransform='';
+				node.style.transform='';
 				setTimeout(function(){
 					node.remove();
 				},1000);
@@ -271,15 +271,15 @@ mode.chess={
 				}
 				node.fixed=true;
 				game.$randomMove(this,node,100,30);
-				var ot=node.style.webkitTransform;
+				var ot=node.style.transform;
-				node.style.webkitTransform+='scale(0.6)';
+				node.style.transform+='scale(0.6)';
 				node.dataset.position=this.dataset.position;
 				this.parentNode.appendChild(node);
 				ui.refresh(node);
 				node.show();
-				node.style.webkitTransform=ot;
+				node.style.transform=ot;
 				setTimeout(function(){
-					node.style.webkitTransform='';
+					node.style.transform='';
 					node.delete();
 				},500);
 				var that=this;
@@ -371,7 +371,7 @@ mode.chess={
 				node.hide();
 				node.style.transitionProperty='left,top,opacity';
 				if(transform){
-					node.style.webkitTransform='rotate('+(Math.random()*16-8)+'deg)';
+					node.style.transform='rotate('+(Math.random()*16-8)+'deg)';
 				}
 				ui.arena.appendChild(node);
 				ui.refresh(node);
@@ -816,7 +816,7 @@ mode.chess={
 			else if(rect.top+rect.height+80>=ui.chessContainer.offsetHeight){
 				ty=-Math.abs(ty);
 			}
-			node.style.webkitTransform='translate('+tx+'px,'+ty+'px)';
+			node.style.transform='translate('+tx+'px,'+ty+'px)';
 		},
 		draw2:function(func){
 			lib.canvasUpdates2.push(func);
@@ -871,9 +871,10 @@ mode.chess={
 				ui.create.arena();
 				ui.create.cards();
 				game.finishCards();
-				if(get.config('chess_character')){
+				var playback=localStorage.getItem(lib.configprefix+'playback');
+				if(get.config('chess_character')||playback){
 					for(var i in lib.chess_character){
-						if(i.indexOf('leader_')==0) continue;
+						if(!playback&&i.indexOf('leader_')==0&&get.config('chess_mode')!='leader') continue;
 						lib.character[i]=lib.chess_character[i];
 						if(!lib.character[i][4]){
 							lib.character[i][4]=[];
@@ -889,8 +890,12 @@ mode.chess={
 				ui.chess.appendChild(ui.canvas2);
 				ui.ctx2=ui.canvas2.getContext('2d');
 				game.me=ui.create.player();
-				var playback=localStorage.getItem(lib.configprefix+'playback');
 				if(playback){
+					for(var i in lib.characterPack){
+						for(var j in lib.characterPack[i]){
+							lib.character[j]=lib.character[j]||lib.characterPack[i][j];
+						}
+					}
 					game.pause();
 					ui.system.style.display='none';
 					_status.playback=playback;
@@ -915,6 +920,7 @@ mode.chess={
 						}
 						case 'combat':{
 							if(lib.storage.test){
+								lib.config.game_speed='vfast';
 								_status.auto=true;
 								setTimeout(function(){
 									console.log(get.translation(game.players));
@@ -940,6 +946,9 @@ mode.chess={
 					mylistmap=[];
 					enemylistmap=[];
 					for(var i=0;i<videocontent.length;i++){
+						if(videocontent[i].lord){
+							_status.lord=videocontent[i].name;
+						}
 						if(videocontent[i].identity=='friend'){
 							_status.mylist.push(videocontent[i].name);
 							mylistmap.push(videocontent[i].position);
@@ -1135,11 +1144,6 @@ mode.chess={
 				game.arrangePlayers();
 				"step 2"
 				ui.control.style.display='';
-				if(event.video){
-					game.playVideoContent(event.video);
-					game.setChessInfo(game.me);
-					return;
-				}
 				var p;
 				for(var i=0;i<game.players.length;i++){
 					if(_status.lord){
@@ -1157,6 +1161,11 @@ mode.chess={
 						}
 					}
 				}
+				if(event.video){
+					game.playVideoContent(event.video);
+					game.setChessInfo(p);
+					return;
+				}
 
 				var players=get.players(lib.sort.position);
 				var info=[];
@@ -1164,7 +1173,8 @@ mode.chess={
 					info.push({
 						name:players[i].name,
 						identity:players[i].identity,
-						position:players[i].dataset.position
+						position:players[i].dataset.position,
+						lord:players[i].name==_status.lord
 					});
 				}
 				_status.videoInited=true,
@@ -1305,7 +1315,7 @@ mode.chess={
 						ui.refresh(node);
 					}
 					else if(!load){
-						node.style.webkitTransform='perspective(1200px) rotateY(180deg) translate(0,-200px)';
+						node.style.transform='perspective(1200px) rotateY(180deg) translate(0,-200px)';
 					}
 					node.name=name;
 					if(!load){
@@ -1379,7 +1389,7 @@ mode.chess={
 					}
 					if(kaibao){
 						node.node.avatar.style.display='none';
-						node.style.webkitTransform='perspective(1200px) rotateY(180deg) translateX(0)';
+						node.style.transform='perspective(1200px) rotateY(180deg) translateX(0)';
 						if(typeof i=='string'){
 							node.listen(event.turnCard2);
 						}
@@ -1409,7 +1419,7 @@ mode.chess={
 						}
 					}
 					else{
-						node.style.webkitTransform='';
+						node.style.transform='';
 					}
 					return node;
 				};
@@ -1617,8 +1627,8 @@ mode.chess={
 					this.turned=true;
 					var node=this;
 					node.style.transition='all ease-in 0.3s';
-					node.style.webkitTransform='perspective(1200px) rotateY(270deg) translateX(150px)';
+					node.style.transform='perspective(1200px) rotateY(270deg) translateX(150px)';
-					node.addEventListener('webkitTransitionEnd',function(){
+					var onEnd=function(){
 						game.minskin=false;
 						node.init(node.name);
 						game.minskin=true;
@@ -1628,7 +1638,7 @@ mode.chess={
 							node.node.intro.classList.add('showintro');
 						}
 						node.classList.add('playerflip');
-						node.style.webkitTransform='none';
+						node.style.transform='none';
 						node.style.transition='';
 						if(lib.config.animation){
 							setTimeout(function(){
@@ -1639,7 +1649,9 @@ mode.chess={
 								}
 							},150);
 						}
-					});
+					};
+					// node.addEventListener('transitionEnd',onEnd);
+					node.addEventListener('webkitTransitionEnd',onEnd);
 				};
 				var zhaomu2=function(){
 					if(_status.qianfan||_status.kaibao) return;
@@ -2092,7 +2104,7 @@ mode.chess={
 								var node=event.arenanodes.shift();
 								if(node==this){
 									node.node.hp.hide();
-									node.style.webkitTransform='scale(0.5)';
+									node.style.transform='scale(0.5)';
 									node.style.top='calc(50% + 50px)';
 									event.arenachoicenodes.push(node);
 									event.arrangeNodes();
@@ -2122,7 +2134,7 @@ mode.chess={
 						node.init(node.name);
 						node.isChosen=true;
 						node.listen(event.clickNode);
-						node.style.webkitTransform='scale(0.5)';
+						node.style.transform='scale(0.5)';
 						node.style.top='calc(50% + 50px)';
 						event.arenachoicenodes.push(node);
 					}
@@ -2209,7 +2221,7 @@ mode.chess={
 				ui.arena.classList.add('noleft');
 				var nodes=event.arenachoicenodes;
 				for(var i=0;i<nodes.length;i++){
-					nodes[i].style.webkitTransform='scale(0.8)';
+					nodes[i].style.transform='scale(0.8)';
 				}
 				if(_status.arenaLoaded){
 					setTimeout(function(){
@@ -2313,7 +2325,7 @@ mode.chess={
 						},1000);
 						if(node.name=='chess_coin'||node.name=='chess_dust'){
 							node.style.transition='all 0s';
-							node.style.webkitTransform='none';
+							node.style.transform='none';
 							node.style.overflow='visible';
 							node.style.background='none';
 							node.style.boxShadow='none';
@@ -2340,8 +2352,8 @@ mode.chess={
 							return;
 						}
 						node.style.transition='all ease-in 0.3s';
-						node.style.webkitTransform='perspective(1200px) rotateY(270deg) translateX(150px)';
+						node.style.transform='perspective(1200px) rotateY(270deg) translateX(150px)';
-						node.addEventListener('webkitTransitionEnd',function(){
+						var onEnd=function(){
 							node.init(node.name);
 							node.node.avatar.style.display='';
 							if(node.rarity){
@@ -2349,7 +2361,7 @@ mode.chess={
 								node.node.intro.classList.add('showintro');
 							}
 							node.classList.add('playerflip');
-							node.style.webkitTransform='none';
+							node.style.transform='none';
 							node.style.transition='';
 							if(lib.config.animation){
 								setTimeout(function(){
@@ -2360,7 +2372,9 @@ mode.chess={
 									}
 								},150);
 							}
-						});
+						};
+						// node.addEventListener('transitionEnd',onEnd);
+						node.addEventListener('webkitTransitionEnd',onEnd);
 					};
 					setTimeout(function(){
 						nodes[0].delete();
@@ -3076,6 +3090,7 @@ mode.chess={
 								}
 							}
 							player.storage.tongshuai.owned[name]=skills;
+							game.addVideo('chess_tongshuai',player,player.storage.tongshuai.owned);
 						}
 					}
 				}
@@ -3117,7 +3132,7 @@ mode.chess={
 					}
 				}
 			},
-			mark:true
+			// mark:true
 		},
 		tongshuai1:{
 			trigger:{global:'gameStart'},
@@ -3185,29 +3200,17 @@ mode.chess={
 						if(link!='cancel'){
 							var currentname=event.dialog.querySelector('.selected.button').link;
 							var mark=player.marks.tongshuai;
-							if(trigger.name=='game'){
+							if(!mark){
-								mark.hide();
+								player.markSkill('tongshuai');
-								mark.style.webkitTransform='scale(0.8)';
+								mark=player.marks.tongshuai;
-								mark.style.transition='all 0.3s';
+								if(mark.firstChild){
-								setTimeout(function(){
+									mark.firstChild.remove();
-									mark.style.transition='all 0s';
+								}
-									ui.refresh(mark);
-									mark.setBackground(currentname,'character');
-									if(mark.firstChild){
-										mark.firstChild.remove();
-									}
-									setTimeout(function(){
-										mark.style.transition='';
-										mark.show();
-										mark.style.webkitTransform='';
-									},50);
-								},500);
-							}
-							else{
-								mark.setBackground(currentname,'character');
 							}
+							mark.setBackground(currentname,'character');
 
 							player.additionalSkills.tongshuai=link;
+							game.addVideo('chess_tongshuai_skill',player,[currentname,link]);
 							player.logSkill('tongshuai2');
 							game.log(get.translation(player)+'获得技能'+get.translation(link));
 							player.popup(link);
@@ -3225,10 +3228,12 @@ mode.chess={
 						ui.auto.show();
 						event.dialog.close();
 						event.control.close();
+						_status.imchoosing=false;
 						game.resume();
 					};
 					event.control.custom=event.clickControl;
 					ui.auto.hide();
+					_status.imchoosing=true;
 					game.pause();
 					for(var i=0;i<event.dialog.buttons.length;i++){
 						event.dialog.buttons[i].classList.add('selectable');

mode/guozhan.js

@@ -41,6 +41,7 @@ mode.guozhan={
 				}
 				"step 1"
 				if(lib.storage.test){
+					lib.config.game_speed='vfast';
 					_status.auto=true;
 					ui.auto.classList.add('glow');
 				}

mode/identity.js

@@ -43,6 +43,7 @@ mode.identity={
 				}
 				"step 1"
 				if(lib.storage.test){
+					lib.config.game_speed='vfast';
 					_status.auto=true;
 					ui.auto.classList.add('glow');
 				}
@@ -87,7 +88,7 @@ mode.identity={
 				}
 				lib.config.ai_guess=true;
 				event.trigger('gameStart');
-				
+
 				var players=get.players(lib.sort.position);
 				var info=[];
 				for(var i=0;i<players.length;i++){

theme/woodden/style.css

@@ -8,7 +8,8 @@ html{
 	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
 	border-radius: 8px;
 }
-.menu.main>.menu-tab>div:not(.active):not(*:hover){
+.menu.main>.menu-tab>div:not(.active):not(*:hover),
+.menu.main>.menu-tab>.disabled{
 	color: rgba(77, 60, 51,0.5);
 }
 #window>.dialog.popped,.menu{