diff --git a/character/hearth.js b/character/hearth.js index 09d4a2a9d..9f4eabba1 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -2898,6 +2898,7 @@ character.hearth={ return true; }, content:function(){ + 'step 0' player.hp=Math.min(player.storage.chongsheng,player.maxHp); player.discard(player.get('hej')); player.draw(player.storage.chongsheng); @@ -2905,7 +2906,9 @@ character.hearth={ if(player.storage.chongsheng<=0){ player.unmarkSkill('chongsheng'); } + 'step 1' if(player.isLinked()) player.link(); + 'step 2' if(player.isTurnedOver()) player.turnOver(); player.syncStorage('chongsheng'); }, diff --git a/character/old.js b/character/old.js index 7543beda2..cb886c8b3 100644 --- a/character/old.js +++ b/character/old.js @@ -5,7 +5,7 @@ character.old={ xushu:['male','shu',3,['wuyan','jujian']], fazheng:['male','shu',3,['enyuan','xuanhuo']], liru:['male','qun',3,['juece','mieji','fencheng']], - yujin:['male','wei',4,['jieyue']], + yujin:['male','wei',4,['yizhong']], lusu:['male','wu',3,['haoshi','dimeng']], yuanshao:['male','qun',4,['luanji','xueyi'],['zhu']], old_zhonghui:['male','wei',3,['zzhenggong','zquanji','zbaijiang']], diff --git a/character/rank.js b/character/rank.js index 7634d0f66..0ea90e496 100644 --- a/character/rank.js +++ b/character/rank.js @@ -134,11 +134,13 @@ window.characterRank={ 'pal_wangpengxu', 'yxs_luobinhan', 'hs_alleria', - 'pal_wenhui', - 'gjqt_xunfang', + 'old_wangyi', + 're_lusu', ], am:[ 'swd_duanmeng', + 'pal_wenhui', + 'gjqt_xunfang', 'ow_shibing', 'sunziliufang', 'hs_blingtron', @@ -235,6 +237,7 @@ window.characterRank={ 'yxs_zhaoyong', 'yxs_yangguang', 'litong', + 'old_quancong', 'mizhu', 'hs_hallazeal', 'liuyu', @@ -279,6 +282,7 @@ window.characterRank={ 'swd_zhiyin', 're_machao', 'yuanshao', + 're_yuanshao', 'hs_waleera', 'gjqt_yinqianshang', 'gjqt_hongyu', @@ -356,9 +360,12 @@ window.characterRank={ 'hanba', 'pal_lixiaoyao', 'sunjian', + 'pangtong', ], b:[ 'caochun', + 'old_zhuran', + 'old_lingtong', 'sp_pangde', 'sp_jiaxu', 'sp_liubei', @@ -429,7 +436,6 @@ window.characterRank={ 'wuyi', 'hanhaoshihuan', 'caoxiu', - 'zhuzhi', 'zhangyi', 'yxs_baosi', 'lingju', @@ -438,9 +444,12 @@ window.characterRank={ 'hs_yogg', 'diy_feishi', 'yxs_lvzhi', + 'madai', ], bm:[ 'yxs_tangbohu', + 'zhuzhi', + 'old_caozhen', 'tadun', 'guohuai', 'sunluban', @@ -450,7 +459,6 @@ window.characterRank={ 'dingfeng', 'mayunlu', 'yxs_mingchenghuanghou', - 'pangtong', 'yxs_libai', 'sp_zhugeliang', 'shen_guanyu', @@ -475,7 +483,6 @@ window.characterRank={ 'diy_lukang', 'old_zhonghui', 'xusheng', - 'madai', 'liru', 're_zhangfei', 'yxs_goujian', @@ -487,7 +494,9 @@ window.characterRank={ 'xiahouyuan', ], c:[ - 'huaxiong', + 'old_xusheng', + 'old_caoxiu', + 'old_madai', 'liaohua', 'zhaoyun', 'machao', @@ -500,6 +509,7 @@ window.characterRank={ ], d:[ 'menghuo', + 'huaxiong', 'panfeng', 'zhoucang', 'guanyu', @@ -511,5 +521,6 @@ window.characterRank={ 'gongsunzan', 'pangde', 'zhangfei', + 'old_huaxiong', ], }; diff --git a/character/yijiang.js b/character/yijiang.js index 41cfa5bb8..a633c8542 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -3586,7 +3586,9 @@ character.yijiang={ return player.canUse(player.storage.taoxi,target); }, selectTarget:function(){ - return get.select(get.info(_status.event.player.storage.taoxi).selectTarget); + var info=get.info(_status.event.player.storage.taoxi); + if(info.notarget) return -1; + return get.select(info.selectTarget); }, multitarget:true, multiline:true, @@ -3627,10 +3629,8 @@ character.yijiang={ return player.storage.taoxi?true:false; }, content:function(){ - if(get.owner(player.storage.taoxi)==player.storage.taoxi2&&player.num('he')){ - game.log(player,'发动了','【讨袭】'); - player.popup('taoxi'); - player.chooseToDiscard('he',true); + if(get.owner(player.storage.taoxi)==player.storage.taoxi2){ + player.loseHp(); } delete player.storage.taoxi; delete player.storage.taoxi2; @@ -7694,7 +7694,7 @@ character.yijiang={ taoxi:'讨袭', taoxi2:'讨袭', taoxi3:'讨袭', - taoxi_info:'出牌阶段限一次，你使用牌指定一名其他角色为唯一目标后，你可以亮出其一张手牌直到回合结束，并且你可以于此回合内将此牌如手牌般使用。回合结束时，若该角色未失去此手牌，则你须弃置一张牌', + taoxi_info:'出牌阶段限一次，当你使用牌指定一名其他角色为唯一目标后，你可以亮出其一张手牌直到回合结束，并且你可以于此回合内将此牌如手牌般使用。回合结束时，若该角色未失去此手牌，则你失去1点体力', huituo:'恢拓', huituo_info:'每当你受到伤害后，你可以令一名角色进行一次判定，若结果为红色，该角色回复1点体力；若结果为黑色，该角色摸X张牌（X为此次伤害的伤害数）', mingjian:'明鉴', diff --git a/game/update.js b/game/update.js index 9bc73155b..299be5df8 100644 --- a/game/update.js +++ b/game/update.js @@ -1,24 +1,17 @@ window.noname_update={ - version:'1.9.6', - update:'1.9.5.2', + version:'1.9.6.1', + update:'1.9.6', changeLog:[ - '武将修改', 'bug修复', ], files:[ - 'game/game.js', - 'game/config.js', - 'game/package.js', - 'game/asset.js', - 'game/source.js', - 'character/*', - 'card/swd.js', - 'card/guozhan.js', - 'mode/tafang.js', - 'layout/newlayout/global.css', - 'layout/long/layout.css', - 'theme/woodden/style.css', - 'theme/music/style.css', + // 'game/game.js', + 'character/hearth.js', + 'character/old.js', + 'character/rank.js', + 'character/yijiang.js', + // 'card/swd.js', + // 'mode/tafang.js', 'theme/simple/style.css', ] } diff --git a/image/character/caozhen.jpg b/image/character/caozhen.jpg index a72e7c572..c62c37a08 100644 Binary files a/image/character/caozhen.jpg and b/image/character/caozhen.jpg differ diff --git a/image/character/old_caozhen.jpg b/image/character/old_caozhen.jpg index c62c37a08..220fff6e7 100644 Binary files a/image/character/old_caozhen.jpg and b/image/character/old_caozhen.jpg differ diff --git a/image/character/swd_tuobayuer.jpg b/image/character/swd_tuobayuer.jpg index cf83ade67..5cd5bd4c6 100644 Binary files a/image/character/swd_tuobayuer.jpg and b/image/character/swd_tuobayuer.jpg differ diff --git a/theme/simple/style.css b/theme/simple/style.css index 1055162ea..702b3c034 100644 --- a/theme/simple/style.css +++ b/theme/simple/style.css @@ -51,8 +51,8 @@ body{ #arena.long .player.unseen2 .equips:not(*:empty){ border-radius:4px; } -#arena:not(.long_.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card, -#arena:not(.long_:not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card, +#arena:not(.long).mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card, +#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card, #arena.long.mobile:not(.oldlayout) .player.unseen2:not([data-position="0"]) .equips:not(*:empty)>.card, #arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card{ background: none !important;