From 96e84e63a4756cdb1907c1573f12b1deb231cf0b Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Thu, 3 Aug 2017 09:55:44 +0800
Subject: [PATCH] e

---
 character/hearth.js       |  1 +
 game/game.js              |  7 ++++---
 game/update.js            | 16 ++++++++--------
 layout/default/layout.css | 26 +++++++++++++++++---------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index 54ac4ad23..91a275852 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -3566,6 +3566,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			filter:function(event,player){
     				return !player.hasSkill('xunbao2');
     			},
+                derivation:['hsbaowu_cangbaotu','hsbaowu_huangjinyuanhou'],
     			priority:1,
     			// filterCard:true,
     			// check:function(card){
diff --git a/game/game.js b/game/game.js
index 97d58c554..86c45c4f2 100644
--- a/game/game.js
+++ b/game/game.js
@@ -35171,8 +35171,9 @@
                         node.appendChild(newlined);
                     }
                     else if(newlined){
-                        var span=document.createElement('span');
+                        var span=ui.create.div('.tdnode.pointerdiv.shadowed.reduce_radius');
                         span.style.margin='3px';
+						span.style.width='auto';
     					span.innerHTML=' '+namecapt[i].toUpperCase()+' ';
     					span.link=namecapt[i];
     					span.addEventListener(lib.config.touchscreen?'touchend':'click',clickCapt);
@@ -35254,7 +35255,7 @@
     					}
                     };
                     for(var i=0;i<groups.length;i++){
-                        var span=document.createElement('span');
+                        var span=ui.create.div('.tdnode.pointerdiv.shadowed.reduce_radius.reduce_margin');
                         span.style.margin='3px';
                         newlined.appendChild(span);
                         span.innerHTML=get.translation(groups[i]);
@@ -35267,7 +35268,7 @@
                     newlined.appendChild(span);
                     span.style.margin='8px';
 
-                    packsource=document.createElement('span');
+                    packsource=ui.create.div('.tdnode.pointerdiv.shadowed.reduce_radius.reduce_margin');
                     packsource.style.margin='3px';
                     newlined.appendChild(packsource);
 					var filternode=null;
diff --git a/game/update.js b/game/update.js
index d2f8d9cf2..323a04cc5 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,24 +1,24 @@
 window.noname_update={
-    version:'1.9.34',
-    update:'1.9.33.1',
+    version:'1.9.35',
+    // update:'1.9.34',
     changeLog:[
         'bug修复',
     ],
     files:[
         'game/game.js',
         // 'game/package.js',
-        'game/config.js',
+        // 'game/config.js',
         // 'game/source.js',
         // 'game/pressure.js',
         // 'game/asset.js',
         // 'card/*',
-        'card/standard.js',
-        'card/gwent.js',
+        // 'card/standard.js',
+        // 'card/gwent.js',
         // 'card/gujian.js',
         // 'character/*',
         // 'character/hearth.js',
-        'character/old.js',
-        'character/gwent.js',
+        // 'character/old.js',
+        // 'character/gwent.js',
         // 'character/sp.js',
         // 'character/swd.js',
         // 'character/rank.js',
@@ -26,7 +26,7 @@ window.noname_update={
         // 'character/xianjian.js',
         // 'mode/identity.js',
         // 'mode/guozhan.js',
-        'mode/versus.js',
+        // 'mode/versus.js',
         // 'mode/chess.js',
         // 'mode/tafang.js',
         // 'mode/guozhan.js',
diff --git a/layout/default/layout.css b/layout/default/layout.css
index e5e8ba116..7965061b1 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -3151,15 +3151,23 @@ div:hover>.intro {
 }
 
 .tdnode{
-	position:relative;
-	display:inline-block;
-	padding:5px;
-	padding-left:8px;
-	padding-right:8px;
-	font-size:18px;
-	margin:4px;
-	margin-left:6px;
-	margin-right:6px;
+	position:relative !important;
+	display:inline-block !important;
+	padding:5px !important;
+	padding-left:8px !important;
+	padding-right:8px !important;
+	font-size:18px !important;
+	margin:4px !important;
+	margin-left:6px !important;
+	margin-right:6px !important;
+	width: auto !important;
+}
+.tdnode.thundertext{
+	background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1)) !important;
+}
+.tdnode.reduce_margin{
+	margin-left: 4px !important;
+	margin-right: 4px !important;
 }
 
 .shadowed,