From 0764456c9ef9563f87c50938c8cda3a87d7717a1 Mon Sep 17 00:00:00 2001 From: libccy Date: Sat, 7 Nov 2015 08:01:37 +0800 Subject: [PATCH] x --- CHANGELOG.MD | 2 +- character/diy.js | 3 +++ character/gujian.js | 2 +- character/mountain.js | 4 ++-- character/rank.js | 2 +- layout/mode/boss.css | 4 ++-- mode/chess.js | 2 +- mode/identity.js | 6 ++++-- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 3ebce337a..870d3be95 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,4 +1,4 @@ -1.4.2 +1.5.0 录像功能 AI改进 Bug修复 diff --git a/character/diy.js b/character/diy.js index dfea65a96..eeaf06e2b 100755 --- a/character/diy.js +++ b/character/diy.js @@ -549,6 +549,9 @@ character.diy={ else{ event.finish(); } + }, + ai:{ + threaten:1.2 } }, moshou:{ diff --git a/character/gujian.js b/character/gujian.js index 8c9a21c15..612987383 100755 --- a/character/gujian.js +++ b/character/gujian.js @@ -948,7 +948,7 @@ character.gujian={ } }, yuling2:{ - trigger:{player:['loseEnd','drawEnd']}, + trigger:{player:['loseEnd','drawEnd'],global:'gameDrawAfter'}, check:function(event,player){ return player.num('h')<2; }, diff --git a/character/mountain.js b/character/mountain.js index fb7e538e7..93bc4702f 100755 --- a/character/mountain.js +++ b/character/mountain.js @@ -968,7 +968,7 @@ character.mountain={ var mark=player.marks.huashen; if(trigger.name=='game'){ mark.hide(); - mark.style.transform='scale(0.8)'; + // mark.style.transform='scale(0.8)'; mark.style.transition='all 0.3s'; setTimeout(function(){ mark.style.transition='all 0s'; @@ -980,7 +980,7 @@ character.mountain={ setTimeout(function(){ mark.style.transition=''; mark.show(); - mark.style.transform=''; + // mark.style.transform=''; },50); },500); } diff --git a/character/rank.js b/character/rank.js index 95fefaa90..d958f0b2a 100644 --- a/character/rank.js +++ b/character/rank.js @@ -255,6 +255,7 @@ window.characterRank={ ], bm:[ 'guohuai', + 'diy_feishi', 'sunluban', 'caozhang', 'pal_lixiaoyao', @@ -264,7 +265,6 @@ window.characterRank={ 'pangtong', 'zhugeliangwolong', 'shen_guanyu', - 'diy_feishi', 'jiangfei', 're_caocao', 're_lvbu', diff --git a/layout/mode/boss.css b/layout/mode/boss.css index 374e6f8fa..f94d96829 100755 --- a/layout/mode/boss.css +++ b/layout/mode/boss.css @@ -62,8 +62,8 @@ left:144px; } .player.bossplayer>.avatar{ - width:156px; - height:192px; + width:160px; + height:196px; } #control.bosslist{ diff --git a/mode/chess.js b/mode/chess.js index 328e7753c..2c477cc25 100755 --- a/mode/chess.js +++ b/mode/chess.js @@ -4132,7 +4132,7 @@ mode.chess={ '任何卡牌或技能无法指定位置相隔8个格以上的角色为目标
  • '+ '杀死对方阵营的角色可摸一张牌，杀死本方阵营无惩罚
  • '+ '开启交替行动后，在一方所有角色行动完毕进行下一轮行动时，若其人数比另一方少，另一方可指定至多X名角色名摸一张牌，X为人数之差'+ - '
    对阵