From 2e3a7a7e260c31d11a7ca66507f04a9ea7f36aaa Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Tue, 14 Nov 2017 14:28:08 +0800
Subject: [PATCH] v1.9.43.1

---
 character/standard.js   |  9 +++++++--
 game/game.js            |  5 +++--
 game/update.js          | 24 ++++++++++++------------
 layout/default/menu.css | 13 ++++++++++++-
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/character/standard.js b/character/standard.js
index f5019ad2c..5e804b10a 100644
--- a/character/standard.js
+++ b/character/standard.js
@@ -265,7 +265,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					effect:{
 						target:function(card,player,target){
 							if(player.hasSkillTag('jueqing',false,target)) return [1,-1];
-							if(get.tag(card,'damage')&&get.damageEffect(target,player,player)>0) return [1,0,0,-1.5];
+							return 0.8;
+							// if(get.tag(card,'damage')&&get.damageEffect(target,player,player)>0) return [1,0,0,-1.5];
 						}
 					}
 				}
@@ -334,7 +335,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			tiandu:{
 				audio:2,
 				trigger:{player:'judgeEnd'},
-				frequent:'check',
+				frequent:function(event){
+					if(event.result.card.name=='du') return false;
+					if(get.mode()=='guozhan') return false;
+					return true;
+				},
 				check:function(event){
 					if(event.result.card.name=='du') return false;
 					return true;
diff --git a/game/game.js b/game/game.js
index 22b3619fc..471bba25e 100644
--- a/game/game.js
+++ b/game/game.js
@@ -2138,7 +2138,7 @@
 									cbnum4=0;
 								}
 								ui.css.buttonsheet=lib.init.sheet(
-									'#system>div>div{padding-top:'+cbnum1+'px;padding-bottom:'+cbnum2+'px}',
+									'#system>div>div, .caption>div>.tdnode{padding-top:'+cbnum1+'px !important;padding-bottom:'+cbnum2+'px !important}',
 									'#control>.control>div{padding-top:'+cbnum3+'px;padding-bottom:'+cbnum4+'px}',
 									'#control>.control{padding-top:'+cbnum5+'px;padding-bottom:'+cbnum6+'px}'
 								);
@@ -38512,7 +38512,8 @@
 								ui.create.div('.name','<span style="opacity:0.6">'+(button.info[i][0]||'无名玩家'),node);
 							}
 							if(button.info[i][3]){
-								ui.create.div('.menubutton.videotext',uiintro.content,button.info[i][3]);
+								ui.create.div('.videostatus',node,button.info[i][3].slice(0,80));
+								node.classList.add('videonodestatus')
 							}
 						}
 					};
diff --git a/game/update.js b/game/update.js
index 175473c88..63d699c6c 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,34 +1,34 @@
 window.noname_update={
-    version:'1.9.43',
-    // update:'1.9.41',
+    version:'1.9.43.1',
+    update:'1.9.43',
     changeLog:[
+        'bug修复',
         '部分DIY比赛武将',
         '联机断线重连、重开改进'
     ],
     files:[
-        // 'game/game.js',
+        'game/game.js',
         // 'game/package.js',
         // 'game/config.js',
         // 'game/source.js',
         // 'game/pressure.js',
         // 'game/asset.js',
         // 'card/*',
-        'card/swd.js',
-        'card/gujian.js',
-        'card/yunchou.js',
-        'card/hearth.js',
-        'card/gwent.js',
+        // 'card/gujian.js',
+        // 'card/yunchou.js',
+        // 'card/hearth.js',
+        // 'card/gwent.js',
         // 'card/guozhan.js',
         // 'character/*',
         // 'character/hearth.js',
         // 'character/gwent.js',
         // 'character/old.js',
-        // 'character/standard.js',
+        'character/standard.js',
         // 'character/sp.js',
         // 'character/swd.js',
         // 'character/rank.js',
-        'character/yijiang.js',
-        'character/xianjian.js',
+        // 'character/yijiang.js',
+        // 'character/xianjian.js',
         // 'mode/identity.js',
         // 'mode/boss.js',
         // 'mode/guozhan.js',
@@ -43,7 +43,7 @@ window.noname_update={
         // 'theme/simple/style.css',
         // 'layout/default/layout.css',
         // 'layout/default/phone.css',
-        // 'layout/default/menu.css',
+        'layout/default/menu.css',
         // 'theme/style/cardback/*',
         // 'layout/long/layout.css',
         // 'layout/long2/layout.css',
diff --git a/layout/default/menu.css b/layout/default/menu.css
index 8aec8c6c8..b1cbebfb4 100644
--- a/layout/default/menu.css
+++ b/layout/default/menu.css
@@ -1284,7 +1284,18 @@ input.fileinput::-webkit-file-upload-button {
 	height: 30px;
 	line-height: 30px;
 	font-size: 18px;
-	font-family: 'xinwei';
+	font-family: 'lishu','xinwei';
+}
+.onlineclient .videonode.videonodestatus{
+	height: auto;
+}
+.onlineclient .videonode.videonodestatus>.videostatus{
+	position: relative;
+	display: block;
+	margin-left: 10px;
+	margin-top: 30px;
+	margin-bottom: 5px;
+	width: calc(100% - 20px);
 }
 .onlineevent>div{
 	text-align: left;