YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

h

This commit is contained in:
libccy 2017-02-06 16:01:18 +08:00
parent 090c5a9ba5
commit 5804e756d5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
character/hearth.js
View File

@ -1570,9 +1570,7 @@ character.hearth={
xianji3:{ xianji3:{
mark:'character', mark:'character',
intro:{ intro:{
content:function(storage,player){ content:'每当$对你使用一张牌，你摸一张牌'
return '每当'+get.translation(storage)+'对你使用一张牌，你摸一张牌';
}
}, },
trigger:{target:'useCardToBegin'}, trigger:{target:'useCardToBegin'},
filter:function(event,player){ filter:function(event,player){

8
game/game.js
View File

@ -3596,7 +3596,8 @@
}, },
placePoppedDialog:function(dialog,e){ placePoppedDialog:function(dialog,e){
if(dialog._place_text){ if(dialog._place_text){
if(dialog._place_text.firstChild.offsetWidth>=190){ if(dialog._place_text.firstChild.offsetWidth>=190||
dialog._place_text.firstChild.offsetHeight>=30){
dialog._place_text.style.textAlign='left'; dialog._place_text.style.textAlign='left';
dialog._place_text.style.marginLeft='14px'; dialog._place_text.style.marginLeft='14px';
} }
@ -12232,6 +12233,11 @@
if(typeof intro=='function'){ if(typeof intro=='function'){
intro=intro(this.storage[skill],this); intro=intro(this.storage[skill],this);
} }
else if(typeof intro=='string'){
intro=intro.replace(/#/g,this.storage[skill]);
intro=intro.replace(/&/g,get.cnNumber(this.storage[skill]));
intro=intro.replace(/\$/g,get.translation(this.storage[skill]));
}
this.markSkillCharacter(skill,this.storage[skill],get.translation(skill),intro); this.markSkillCharacter(skill,this.storage[skill],get.translation(skill),intro);
} }
else{ else{