From 249c97210983ef6a764f6008c6ab161a3c5c8c8a Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sun, 19 Mar 2017 12:59:17 +0800
Subject: [PATCH] b

---
 game/game.js   | 24 +++++++++++++++++-------
 game/update.js |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/game/game.js b/game/game.js
index 54ec9aae1..9595263ac 100644
--- a/game/game.js
+++ b/game/game.js
@@ -1674,7 +1674,7 @@
 										if(ui.css.control_stylesheet){
 											ui.css.control_stylesheet.remove();
 										}
-										ui.css.control_stylesheet=lib.init.sheet('#window .control,#window #system>div>div,#window #system>div>.pressdown2{background-image:url("'+fileLoadedEvent.target.result+'")}');
+										ui.css.control_stylesheet=lib.init.sheet('#window .control,.menubutton:not(.active):not(.highlight):not(.red):not(.blue),#window #system>div>div{background-image:url("'+fileLoadedEvent.target.result+'")}');
 									};
 									fileReader.readAsDataURL(fileToLoad, "UTF-8");
 								});
@@ -1686,7 +1686,12 @@
 									case 'music':str='linear-gradient(#4b4b4b, #464646);color:white;text-shadow:black 0 0 2px';break;
 									case 'simple':str='linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4));color:white;text-shadow:black 0 0 2px';break;
 								}
-								ui.css.control_stylesheet=lib.init.sheet('#window .control,#window #system>div>div,#window #system>div>.pressdown2{background-image:'+str+'}');
+								if(layout=='wood'){
+									ui.css.control_stylesheet=lib.init.sheet('#window .control,#window .menubutton,#window #system>div>div,#window #system>div>.pressdown2{background-image:'+str+'}');
+								}
+								else{
+									ui.css.control_stylesheet=lib.init.sheet('#window .control,.menubutton:not(.active):not(.highlight):not(.red):not(.blue),#window #system>div>div{background-image:'+str+'}');
+								}
 							}
 						},
 						unfrequent:true,
@@ -1912,7 +1917,7 @@
 					},
 					animation:{
 						name:'游戏特效',
-						intro:'开启后属性伤害等会显示动画',
+						intro:'开启后出现属性伤害、回复体力等情况时会显示动画',
 						init:true,
 						unfrequent:true,
 					},
@@ -1923,8 +1928,8 @@
 						unfrequent:true,
 					},
 					target_shake:{
-						name:'目标特效',
-						intro:'一名玩家成为目标时的显示效果',
+						name:'目标效果',
+						intro:'一名玩家成为卡牌或技能的目标时的显示效果',
 						init:'off',
 						item:{
 							off:'关闭',
@@ -5791,7 +5796,12 @@
 						case 'music':str='linear-gradient(#4b4b4b, #464646);color:white;text-shadow:black 0 0 2px';break;
 						case 'simple':str='linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4));color:white;text-shadow:black 0 0 2px';break;
 					}
-					ui.css.control_stylesheet=lib.init.sheet('#window .control,#window #system>div>div,#window #system>div>.pressdown2{background-image:'+str+'}');
+					if(lib.config.control_style=='wood'){
+						ui.css.control_stylesheet=lib.init.sheet('#window .control,#window .menubutton,#window #system>div>div,#window #system>div>.pressdown2{background-image:'+str+'}');
+					}
+					else{
+						ui.css.control_stylesheet=lib.init.sheet('#window .control,.menubutton:not(.active):not(.highlight):not(.red):not(.blue),#window #system>div>div{background-image:'+str+'}');
+					}
 				}
 				if(lib.config.menu_style!='default'&&lib.config.menu_style!='custom'){
 					var str='';
@@ -6291,7 +6301,7 @@
 								if(ui.css.control_stylesheet){
 									ui.css.control_stylesheet.remove();
 								}
-								ui.css.control_stylesheet=lib.init.sheet('#window .control,#window #system>div>div,#window #system>div>.pressdown2{background-image:url("'+fileLoadedEvent.target.result+'")}');
+								ui.css.control_stylesheet=lib.init.sheet('#window .control,.menubutton:not(.active):not(.highlight):not(.red):not(.blue),#window #system>div>div{background-image:url("'+fileLoadedEvent.target.result+'")}');
 							};
 							fileReader.readAsDataURL(fileToLoad, "UTF-8");
 						});
diff --git a/game/update.js b/game/update.js
index f7be4e28a..9cd55be3f 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.9.12',
+    version:'1.9.12beta',
     // update:'1.9.11',
     changeLog:[
         '新外观选项',