Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
libccy authored and libccy committed Oct 7, 2016
1 parent 6bbf379 commit d930e8f
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 12 deletions.
1 change: 1 addition & 0 deletions card/swd.js
Original file line number Diff line number Diff line change
Expand Up @@ -4249,6 +4249,7 @@ card.swd={
shencaojie:'神草结',
shencaojie_info:'你的锦囊牌即将造成伤害时对目标使用,令此伤害+1',
yuruyi:'玉如意',
yuruyi_ab:'如意',
yuruyi_info:'你有更高的机率摸到好牌',
fengyinzhidan:'封印之蛋',
fengyinzhidan_info:'随机使用三张非延时锦囊牌(随机指定目标)',
Expand Down
18 changes: 10 additions & 8 deletions character/hearth.js
Original file line number Diff line number Diff line change
Expand Up @@ -3970,12 +3970,13 @@ character.hearth={
mark:'image',
nopop:true,
intro:{
content:'你的锦囊牌造成的伤害+1'
content:'在你的回合内,你的锦囊牌造成的首次伤害+1'
},
trigger:{source:'damageBegin'},
forced:true,
filter:function(event){
return event.card&&get.type(event.card)=='trick'&&event.notLink();
usable:1,
filter:function(event,player){
return _status.currentPhase==player&&event.card&&get.type(event.card)=='trick'&&event.notLink();
},
content:function(){
trigger.num++;
Expand All @@ -3997,13 +3998,14 @@ character.hearth={
mark:'image',
nopop:true,
intro:{
content:'你的杀造成的伤害+1'
content:'在你的回合内,你的杀造成的首次伤害+1'
},
trigger:{source:'damageBegin'},
forced:true,
filter:function(event){
return event.card&&event.card.name=='sha'&&event.notLink();
filter:function(event,player){
return _status.currentPhase==player&&event.card&&event.card.name=='sha'&&event.notLink();
},
usable:1,
content:function(){
trigger.num++;
}
Expand Down Expand Up @@ -4892,11 +4894,11 @@ character.hearth={
tuteng3:'石爪图腾',
tuteng3_info:'你受到的伤害-1',
tuteng4:'空气之怒图腾',
tuteng4_info:'你的锦囊牌造成的伤害+1',
tuteng4_info:'在你的回合内,你的锦囊牌造成的首次伤害+1',
tuteng5:'法力之潮图腾',
tuteng5_info:'回合结束阶段,你摸一张牌',
tuteng6:'火舌图腾',
tuteng6_info:'你的杀造成的伤害+1',
tuteng6_info:'在你的回合内,你的杀造成的首次伤害+1',
tuteng7:'活力图腾',
tuteng7_info:'回合结束阶段,你令一名其他角色回复一点体力',
tuteng8:'图腾魔像',
Expand Down
2 changes: 1 addition & 1 deletion character/shenhua.js
Original file line number Diff line number Diff line change
Expand Up @@ -3257,7 +3257,7 @@ character.shenhua={
lieren_info:'你每使用【杀】造成一次伤害,可与受到该伤害的角色拼点;若你赢,你获得对方的一张牌。',
xingshang_info:'你可以立即获得死亡角色的所有牌。',
fangzhu_info:'你每受到一次伤害,可令除你以外的任一角色补X张牌,X为你已损失的体力值,然后该角色将其武将牌翻面。',
songwei_info:'主公技,其他魏势力的角色的判定牌结果为♠或♣且失效后,可以让你摸一张牌。',
songwei_info:'主公技,其他魏势力的角色的判定牌结果为♠或♣且生效后,可以让你摸一张牌。',
duanliang_info:'出牌阶段,你可以将你的任意一张♠或♣的基本牌或装备牌当【兵粮寸断】使用;你可以对与你距离2以内的角色使用【兵粮寸断】。',
haoshi_info:'摸牌阶段,你可以额外摸两张牌,若此时你的手牌数多于五张,你必须将一半(向下取整)的手牌交给场上除你外手牌数最少的一名角色。',
dimeng_info:'出牌阶段,你可以选择其他两名角色,你弃掉等同于这两名角色手牌数量之差的牌,然后交换他们的手牌,每回合限一次。',
Expand Down
2 changes: 1 addition & 1 deletion character/sp.js
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ character.sp={
else{
event.draw=true;
event.num=Math.min(num2,5)-num1;
player.chooseBool(get.prompt('fenyu'));
player.chooseBool(get.prompt('benyu'));
}
"step 1"
if(result.bool){
Expand Down
8 changes: 6 additions & 2 deletions game/update.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
window.noname_update={
version:'1.9.2',
version:'1.9.2.1',
changeLog:[
'bug修复',
'乱斗创建关卡',
Expand All @@ -15,6 +15,7 @@ window.noname_update={
'game/game.js',
'character/diy.js',
'character/swd.js',
'character/sp.js',
'character/hearth.js',
'character/xianjian.js',
'character/shenhua.js',
Expand All @@ -27,7 +28,10 @@ window.noname_update={
'mode/stone.js',
'extension/boss/extension.js',
'layout/mode/boss.css',
'layout/default/layout.css',
'layout/newlayout/global.css',
],
'1.9.1.2':[]
'1.9.1.2':[],
'1.9.2':[],
}
}
1 change: 1 addition & 0 deletions layout/default/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,7 @@ div:not(.handcards)>.card>.info>span,
margin-left: -12px;
margin-right:-12px;
opacity:0;
pointer-events: none;
}
/*--------窗口--------*/
.dialog{text-align: center;z-index:4;transition-property:opacity,background,box-shadow;}
Expand Down
1 change: 1 addition & 0 deletions layout/newlayout/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
margin-top: -12px;
margin-bottom:-12px;
opacity:0;
pointer-events: none;
}


Expand Down

0 comments on commit d930e8f

Please sign in to comment.