From 090c5a9ba5a1490dcb85768a9b5f1ae533ab9ecc Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 6 Feb 2017 15:35:38 +0800 Subject: [PATCH] 1 --- card/gujian.js | 40 +++++++++++++++++++++++++++++++++++++--- character/ow.js | 20 +++++--------------- character/xianjian.js | 16 +++++----------- game/game.js | 29 +++++++++++++++++------------ 4 files changed, 64 insertions(+), 41 deletions(-) diff --git a/card/gujian.js b/card/gujian.js index a1e5d6cf3..12929e789 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -114,12 +114,33 @@ card.gujian={ heilonglinpian:{ fullskin:true, type:'trick', + enable:true, + filterTarget:function(card,player,target){ + return target==player; + }, + selectTarget:-1, + modTarget:true, + content:function(){ + target.changeHujia(); + target.addTempSkill('heilonglinpian',{player:'phaseBegin'}); + }, + ai:{ + value:[5.5,1], + useful:1, + order:2, + result:{ + target:1 + } + } }, mutoumianju:{ fullskin:true, type:'equip', subtype:'equip2', - skills:['mutoumianju_skill'] + skills:['mutoumianju_skill'], + ai:{ + equipValue:4 + } }, yuheng:{ fullskin:true, @@ -433,6 +454,18 @@ card.gujian={ }, }, skill:{ + heilonglinpian:{ + mark:true, + marktext:'鳞', + intro:{ + content:'计算其他角色与你的距离时始终+1' + }, + mod:{ + globalTo:function(from,to,distance){ + return distance+1 + } + } + }, mutoumianju_skill:{ enable:'chooseToUse', filterCard:true, @@ -678,8 +711,8 @@ card.gujian={ mutoumianju_info:'你可以将一张手牌当作杀使用', mutoumianju_skill:'木杀', mutoumianju_skill_info:'你可以将一张手牌当作杀使用', - // heilonglinpian:'黑龙鳞片', - // heilonglinpian_info:'对自己使用，获得一点护甲，直到下一回合开始，计算其他角色与你的距离时始终+1', + heilonglinpian:'黑龙鳞片', + heilonglinpian_info:'对自己使用，获得一点护甲，直到下一回合开始，计算其他角色与你的距离时始终+1', // food:'食物', // chunbing:'春饼', @@ -722,6 +755,7 @@ card.gujian={ ['spade',7,'yuheng'], ['club',4,'mutoumianju'], + ['spade',2,'heilonglinpian'], ['diamond',6,'shujinsan'], ['spade',2,'shujinsan'], diff --git a/character/ow.js b/character/ow.js index c648679de..8e1a4e956 100644 --- a/character/ow.js +++ b/character/ow.js @@ -1369,9 +1369,7 @@ character.ow={ bingqiang2:{ mark:true, intro:{ - content:function(storage){ - return '防御距离+'+storage; - } + content:'防御距离+#' }, mod:{ globalTo:function(from,to,distance){ @@ -1382,9 +1380,7 @@ character.ow={ bingqiang3:{ mark:true, intro:{ - content:function(storage){ - return '防御距离-'+storage; - } + content:'防御距离-#' }, mod:{ globalTo:function(from,to,distance){ @@ -1395,9 +1391,7 @@ character.ow={ bingqiang4:{ mark:true, intro:{ - content:function(storage){ - return '进攻距离+'+storage; - } + content:'进攻距离+#' }, mod:{ globalFrom:function(from,to,distance){ @@ -1408,9 +1402,7 @@ character.ow={ bingqiang5:{ mark:true, intro:{ - content:function(storage){ - return '进攻距离-'+storage; - } + content:'进攻距离-#' }, mod:{ globalFrom:function(from,to,distance){ @@ -1557,9 +1549,7 @@ character.ow={ player.storage.jijia2=0; }, intro:{ - content:function(storage){ - return '机甲体力值：'+storage; - } + content:'机甲体力值：#' }, mod:{ maxHandcard:function(player,num){ diff --git a/character/xianjian.js b/character/xianjian.js index 18b1e046d..8ba857d33 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -154,9 +154,7 @@ character.xianjian={ }, mark:true, intro:{ - content:function(storage){ - return '已累计摸'+storage+'次牌'; - } + content:'已累计摸#次牌' }, trigger:{player:'drawBegin'}, forced:true, @@ -180,9 +178,7 @@ character.xianjian={ }, mark:true, intro:{ - content:function(storage){ - return '已累计受到'+storage+'次伤害'; - } + content:'已累计受到#次伤害' }, trigger:{player:'damageBegin'}, filter:function(event,player){ @@ -210,9 +206,7 @@ character.xianjian={ }, mark:true, intro:{ - content:function(storage){ - return '已累计造成'+storage+'次伤害'; - } + content:'已累计造成#次伤害' }, trigger:{source:'damageBegin'}, forced:true, @@ -1510,11 +1504,11 @@ character.xianjian={ player.logSkill('changnian',target); target.marks.changnian=target.markCharacter(player,{ name:'长念', - content:'$
【追思】
锁定技，结束阶段，你摸一张牌
' + content:'@
【追思】
锁定技，结束阶段，你摸一张牌
' }); game.addVideo('markCharacter',target,{ name:'长念', - content:'$
【追思】
锁定技，结束阶段，你摸一张牌
', + content:'@
【追思】
锁定技，结束阶段，你摸一张牌
', id:'changnian', target:player.dataset.position }); diff --git a/game/game.js b/game/game.js index 7d253fda5..763b64b09 100644 --- a/game/game.js +++ b/game/game.js @@ -33334,7 +33334,8 @@ default:{ if(typeof type=='string'){ type=type.replace(/#/g,content); - type=type.replace(/\$/g,get.cnNumber(content)); + type=type.replace(/&/g,get.cnNumber(content)); + type=type.replace(/\$/g,get.translation(content)); return type; } else if(typeof type=='function'){ @@ -33589,26 +33590,30 @@ if(typeof info.mark=='function'){ var stint=info.mark(uiintro,player.storage[node.skill],player); if(stint){ - if(stint.length<=100){ - uiintro.add('
'+stint+'
'); - } - else{ - uiintro.add('
'+stint+'
'); - } + uiintro._place_text=uiintro.add('
'+stint+'
'); + // if(stint.length<=100){ + // uiintro.add('
'+stint+'
'); + // } + // else{ + // uiintro.add('
'+stint+'
'); + // } } } else{ var stint=get.storageintro(info.content,player.storage[node.skill],player,uiintro,node.skill); if(stint){ - if(stint[0]=='$'){ + if(stint[0]=='@'){ uiintro.add('
'+stint.slice(1)+'
'); } - else if(stint.length<=100){ - uiintro.add('
'+stint+'
'); - } else{ - uiintro.add('
'+stint+'
'); + uiintro._place_text=uiintro.add('
'+stint+'
'); } + // else if(stint.length<=100){ + // uiintro.add('
'+stint+'
'); + // } + // else{ + // uiintro.add('
'+stint+'
'); + // } } } uiintro.add(ui.create.div('.placeholder.slim'));