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

1.9.6.1

This commit is contained in:
libccy 2017-01-24 22:45:08 +08:00
parent aab4a34abe
commit f3b6e39b22
9 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
character/hearth.js
View File

@ -2898,6 +2898,7 @@ character.hearth={
return true; return true;
}, },
content:function(){ content:function(){
'step 0'
player.hp=Math.min(player.storage.chongsheng,player.maxHp); player.hp=Math.min(player.storage.chongsheng,player.maxHp);
player.discard(player.get('hej')); player.discard(player.get('hej'));
player.draw(player.storage.chongsheng); player.draw(player.storage.chongsheng);
@ -2905,7 +2906,9 @@ character.hearth={
if(player.storage.chongsheng<=0){ if(player.storage.chongsheng<=0){
player.unmarkSkill('chongsheng'); player.unmarkSkill('chongsheng');
} }
'step 1'
if(player.isLinked()) player.link(); if(player.isLinked()) player.link();
'step 2'
if(player.isTurnedOver()) player.turnOver(); if(player.isTurnedOver()) player.turnOver();
player.syncStorage('chongsheng'); player.syncStorage('chongsheng');
}, },

2
character/old.js
View File

@ -5,7 +5,7 @@ character.old={
xushu:['male','shu',3,['wuyan','jujian']], xushu:['male','shu',3,['wuyan','jujian']],
fazheng:['male','shu',3,['enyuan','xuanhuo']], fazheng:['male','shu',3,['enyuan','xuanhuo']],
liru:['male','qun',3,['juece','mieji','fencheng']], liru:['male','qun',3,['juece','mieji','fencheng']],
yujin:['male','wei',4,['jieyue']], yujin:['male','wei',4,['yizhong']],
lusu:['male','wu',3,['haoshi','dimeng']], lusu:['male','wu',3,['haoshi','dimeng']],
yuanshao:['male','qun',4,['luanji','xueyi'],['zhu']], yuanshao:['male','qun',4,['luanji','xueyi'],['zhu']],
old_zhonghui:['male','wei',3,['zzhenggong','zquanji','zbaijiang']], old_zhonghui:['male','wei',3,['zzhenggong','zquanji','zbaijiang']],

23
character/rank.js
View File

@ -134,11 +134,13 @@ window.characterRank={
'pal_wangpengxu', 'pal_wangpengxu',
'yxs_luobinhan', 'yxs_luobinhan',
'hs_alleria', 'hs_alleria',
'pal_wenhui', 'old_wangyi',
'gjqt_xunfang', 're_lusu',
], ],
am:[ am:[
'swd_duanmeng', 'swd_duanmeng',
'pal_wenhui',
'gjqt_xunfang',
'ow_shibing', 'ow_shibing',
'sunziliufang', 'sunziliufang',
'hs_blingtron', 'hs_blingtron',
@ -235,6 +237,7 @@ window.characterRank={
'yxs_zhaoyong', 'yxs_zhaoyong',
'yxs_yangguang', 'yxs_yangguang',
'litong', 'litong',
'old_quancong',
'mizhu', 'mizhu',
'hs_hallazeal', 'hs_hallazeal',
'liuyu', 'liuyu',
@ -279,6 +282,7 @@ window.characterRank={
'swd_zhiyin', 'swd_zhiyin',
're_machao', 're_machao',
'yuanshao', 'yuanshao',
're_yuanshao',
'hs_waleera', 'hs_waleera',
'gjqt_yinqianshang', 'gjqt_yinqianshang',
'gjqt_hongyu', 'gjqt_hongyu',
@ -356,9 +360,12 @@ window.characterRank={
'hanba', 'hanba',
'pal_lixiaoyao', 'pal_lixiaoyao',
'sunjian', 'sunjian',
'pangtong',
], ],
b:[ b:[
'caochun', 'caochun',
'old_zhuran',
'old_lingtong',
'sp_pangde', 'sp_pangde',
'sp_jiaxu', 'sp_jiaxu',
'sp_liubei', 'sp_liubei',
@ -429,7 +436,6 @@ window.characterRank={
'wuyi', 'wuyi',
'hanhaoshihuan', 'hanhaoshihuan',
'caoxiu', 'caoxiu',
'zhuzhi',
'zhangyi', 'zhangyi',
'yxs_baosi', 'yxs_baosi',
'lingju', 'lingju',
@ -438,9 +444,12 @@ window.characterRank={
'hs_yogg', 'hs_yogg',
'diy_feishi', 'diy_feishi',
'yxs_lvzhi', 'yxs_lvzhi',
'madai',
], ],
bm:[ bm:[
'yxs_tangbohu', 'yxs_tangbohu',
'zhuzhi',
'old_caozhen',
'tadun', 'tadun',
'guohuai', 'guohuai',
'sunluban', 'sunluban',
@ -450,7 +459,6 @@ window.characterRank={
'dingfeng', 'dingfeng',
'mayunlu', 'mayunlu',
'yxs_mingchenghuanghou', 'yxs_mingchenghuanghou',
'pangtong',
'yxs_libai', 'yxs_libai',
'sp_zhugeliang', 'sp_zhugeliang',
'shen_guanyu', 'shen_guanyu',
@ -475,7 +483,6 @@ window.characterRank={
'diy_lukang', 'diy_lukang',
'old_zhonghui', 'old_zhonghui',
'xusheng', 'xusheng',
'madai',
'liru', 'liru',
're_zhangfei', 're_zhangfei',
'yxs_goujian', 'yxs_goujian',
@ -487,7 +494,9 @@ window.characterRank={
'xiahouyuan', 'xiahouyuan',
], ],
c:[ c:[
'huaxiong', 'old_xusheng',
'old_caoxiu',
'old_madai',
'liaohua', 'liaohua',
'zhaoyun', 'zhaoyun',
'machao', 'machao',
@ -500,6 +509,7 @@ window.characterRank={
], ],
d:[ d:[
'menghuo', 'menghuo',
'huaxiong',
'panfeng', 'panfeng',
'zhoucang', 'zhoucang',
'guanyu', 'guanyu',
@ -511,5 +521,6 @@ window.characterRank={
'gongsunzan', 'gongsunzan',
'pangde', 'pangde',
'zhangfei', 'zhangfei',
'old_huaxiong',
], ],
}; };

12
character/yijiang.js
View File

@ -3586,7 +3586,9 @@ character.yijiang={
return player.canUse(player.storage.taoxi,target); return player.canUse(player.storage.taoxi,target);
}, },
selectTarget:function(){ 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, multitarget:true,
multiline:true, multiline:true,
@ -3627,10 +3629,8 @@ character.yijiang={
return player.storage.taoxi?true:false; return player.storage.taoxi?true:false;
}, },
content:function(){ content:function(){
if(get.owner(player.storage.taoxi)==player.storage.taoxi2&&player.num('he')){ if(get.owner(player.storage.taoxi)==player.storage.taoxi2){
game.log(player,'发动了','【讨袭】'); player.loseHp();
player.popup('taoxi');
player.chooseToDiscard('he',true);
} }
delete player.storage.taoxi; delete player.storage.taoxi;
delete player.storage.taoxi2; delete player.storage.taoxi2;
@ -7694,7 +7694,7 @@ character.yijiang={
taoxi:'讨袭', taoxi:'讨袭',
taoxi2:'讨袭', taoxi2:'讨袭',
taoxi3:'讨袭', taoxi3:'讨袭',
taoxi_info:'出牌阶段限一次，你使用牌指定一名其他角色为唯一目标后，你可以亮出其一张手牌直到回合结束，并且你可以于此回合内将此牌如手牌般使用。回合结束时，若该角色未失去此手牌，则你须弃置一张牌', taoxi_info:'出牌阶段限一次，当你使用牌指定一名其他角色为唯一目标后，你可以亮出其一张手牌直到回合结束，并且你可以于此回合内将此牌如手牌般使用。回合结束时，若该角色未失去此手牌，则你失去1点体力',
huituo:'恢拓', huituo:'恢拓',
huituo_info:'每当你受到伤害后，你可以令一名角色进行一次判定，若结果为红色，该角色回复1点体力；若结果为黑色，该角色摸X张牌（X为此次伤害的伤害数）', huituo_info:'每当你受到伤害后，你可以令一名角色进行一次判定，若结果为红色，该角色回复1点体力；若结果为黑色，该角色摸X张牌（X为此次伤害的伤害数）',
mingjian:'明鉴', mingjian:'明鉴',

25
game/update.js
View File

@ -1,24 +1,17 @@
window.noname_update={ window.noname_update={
version:'1.9.6', version:'1.9.6.1',
update:'1.9.5.2', update:'1.9.6',
changeLog:[ changeLog:[
'武将修改',
'bug修复', 'bug修复',
], ],
files:[ files:[
'game/game.js', // 'game/game.js',
'game/config.js', 'character/hearth.js',
'game/package.js', 'character/old.js',
'game/asset.js', 'character/rank.js',
'game/source.js', 'character/yijiang.js',
'character/*', // 'card/swd.js',
'card/swd.js', // 'mode/tafang.js',
'card/guozhan.js',
'mode/tafang.js',
'layout/newlayout/global.css',
'layout/long/layout.css',
'theme/woodden/style.css',
'theme/music/style.css',
'theme/simple/style.css', 'theme/simple/style.css',
] ]
} }

BIN
image/character/caozhen.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
image/character/old_caozhen.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 82 KiB

BIN
image/character/swd_tuobayuer.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

4
theme/simple/style.css
View File

@ -51,8 +51,8 @@ body{
#arena.long .player.unseen2 .equips:not(*:empty){ #arena.long .player.unseen2 .equips:not(*:empty){
border-radius:4px; border-radius:4px;
} }
#arena:not(.long_.mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .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: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.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{ #arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card{
background: none !important; background: none !important;