From 046586816f0c570b8c767387714db0d6bce5b3ac Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Tue, 26 Sep 2017 19:20:38 +0800
Subject: [PATCH] v1.9.39

---
 character/hearth.js   |  8 ++------
 character/sp.js       |  2 +-
 character/xianjian.js |  4 ++--
 game/game.js          | 10 ++++++++--
 game/update.js        |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index bd170ec83..367fecc25 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -206,7 +206,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                 video:function(player,data){
                     var skill=data[0];
                     var name=data[1];
-                    console.log(skill,name);
                     lib.skill.hsnitai.process(skill,name);
                 },
                 onremove:function(player){
@@ -284,13 +283,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
                         mark:'card',
                         onremove:true,
                         intro:{
-                            name:function(storage){
-                                var skill=storage.name.slice(8);
-                                return '拟态：'+lib.translate[skill];
-                            },
                             content:function(storage){
                                 var skill=storage.name.slice(8);
-                                return lib.translate[skill+'_info'];
+                                return '<div class="skill">【'+lib.translate[skill]+'】</div><div>'+
+            					get.skillInfoTranslation(skill)+'</div>';
                             }
                         }
                     }
diff --git a/character/sp.js b/character/sp.js
index 1ebf1c51e..7aa494bff 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -7716,7 +7716,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				player.storage.cunsi=true;
     				game.delay();
     				target.addSkill('yongjue');
-    				target.markSkillCharacter('yongjue',player,'存嗣','$<div><div class="skill">【勇决】</div><div>每当其他角色于回合内使用一张杀，若目标不是你，你可以获得之，每回合限一次</div></div>');
+    				target.markSkillCharacter('yongjue',player,'存嗣','<div class="skill">【勇决】</div><div>每当其他角色于回合内使用一张杀，若目标不是你，你可以获得之，每回合限一次</div>');
     				"step 1"
     				player.turnOver();
     			},
diff --git a/character/xianjian.js b/character/xianjian.js
index 922100f7f..58c0fc532 100644
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -3211,11 +3211,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.logSkill('changnian',target);
 						target.marks.changnian=target.markCharacter(player,{
 							name:'长念',
-							content:'@<div><div class="skill">【追思】</div><div>锁定技，结束阶段，你摸一张牌</div></div>'
+							content:'<div class="skill">【追思】</div><div>锁定技，结束阶段，你摸一张牌</div>'
 						});
 						game.addVideo('markCharacter',target,{
 							name:'长念',
-							content:'@<div><div class="skill">【追思】</div><div>锁定技，结束阶段，你摸一张牌</div></div>',
+							content:'<div class="skill">【追思】</div><div>锁定技，结束阶段，你摸一张牌</div>',
 							id:'changnian',
 							target:player.dataset.position
 						});
diff --git a/game/game.js b/game/game.js
index ec06f8b91..e0918c0b2 100644
--- a/game/game.js
+++ b/game/game.js
@@ -43423,7 +43423,10 @@
 				if(typeof info.mark=='function'){
 					var stint=info.mark(uiintro,player.storage[node.skill],player);
 					if(stint){
-						uiintro._place_text=uiintro.add('<div class="text" style="display:inline">'+stint+'</div>');
+						var placetext=uiintro.add('<div class="text" style="display:inline">'+stint+'</div>');
+						if(stint.indexOf('<div class="skill"')!=0){
+							uiintro._place_text=placetext;
+						}
 						// if(stint.length<=100){
 						// 	uiintro.add('<div class="text center">'+stint+'</div>');
 						// }
@@ -43439,7 +43442,10 @@
 							uiintro.add('<div class="caption">'+stint.slice(1)+'</div>');
 						}
 						else{
-							uiintro._place_text=uiintro.add('<div class="text" style="display:inline">'+stint+'</div>');
+							var placetext=uiintro.add('<div class="text" style="display:inline">'+stint+'</div>');
+							if(stint.indexOf('<div class="skill"')!=0){
+								uiintro._place_text=placetext;
+							}
 						}
 						// else if(stint.length<=100){
 						// 	uiintro.add('<div class="text center">'+stint+'</div>');
diff --git a/game/update.js b/game/update.js
index 8da19aed1..abd3558cd 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,6 +1,6 @@
 window.noname_update={
-    version:'1.9.38.1',
-    update:'1.9.38',
+    version:'1.9.39',
+    // update:'1.9.38',
     changeLog:[
         'bug修复'
     ],