diff --git a/card/standard.js b/card/standard.js index 9964019bf..7a3b6fd34 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1588,6 +1588,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ logTarget:'target', check:function(event,player){ if(get.attitude(player,event.target)>0) return true; + var target=event.target; return target.countCards('h')==0||!target.hasSkillTag('noh'); }, filter:function(event,player){ diff --git a/character/refresh.js b/character/refresh.js index b9ff98db0..729536a8f 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -15,7 +15,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ connect:true, character:{ re_xusheng:['male','wu',4,['repojun']], - re_wuguotai:['male','wu',3,['reganlu','buyi']], + re_wuguotai:['female','wu',3,['reganlu','buyi']], re_gaoshun:['male','qun',4,['rexianzhen','rejinjiu']], re_caocao:['male','wei',4,['new_rejianxiong','hujia'],['zhu']], re_simayi:['male','wei',3,['refankui','reguicai']], @@ -299,8 +299,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return player.storage.repojun2&&player.storage.repojun2.length>0; }, content:function(){ - player.removeSkill('repojun2'); game.log(player,'收回了'+get.cnNumber(player.gain(player.storage.repojun2,'draw','fromStorage').cards.length)+'张〖破军〗牌'); + player.storage.repojun2.length=0; + player.removeSkill('repojun2'); }, intro:{ onunmark:'throw', diff --git a/game/asset.js b/game/asset.js index 8876a2e6a..27a6fb80b 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.98.3', + '1.9.98.3.1', 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/aozhan_rewrite.mp3', @@ -2407,7 +2407,12 @@ window.noname_asset_list=[ 'image/card/kuwu.png', 'image/card/jiuwei.png', 'image/card/mianju.png', - 'image/card/shoulijian.png', + 'image/card/shoulijian.png','image/card/rewrite_bagua.png', + 'image/card/rewrite_baiyin.png', + 'image/card/rewrite_lanyinjia.png', + 'image/card/rewrite_renwang.png', + 'image/card/rewrite_tengjia.png', + 'image/card/rewrite_zhuge.png', 'image/card/bagua.png', 'image/card/baihupifeng.png', @@ -2839,7 +2844,6 @@ window.noname_asset_list=[ 'image/character/re_wuguotai.jpg', 'image/character/re_xusheng.jpg', 'image/character/zhangyì.jpg', - 'image/character/gz_wuguotai.jpg', 'image/character/baiwuchang.jpg', 'image/character/baosanniang.jpg', @@ -3762,22 +3766,23 @@ window.noname_asset_list=[ 'image/emotion/zhenji_emotion/19.gif', 'image/emotion/zhenji_emotion/20.gif', - 'image/mode/boss/card/chixueqingfeng.jpg', - 'image/mode/boss/card/chiyanzhenhunqin.jpg', - 'image/mode/boss/card/guilongzhanyuedao.jpg', - 'image/mode/boss/card/guofengyupao.jpg', + 'image/mode/boss/card/chixueqingfeng.png', + 'image/mode/boss/card/chiyanzhenhunqin.png', + 'image/mode/boss/card/guilongzhanyuedao.png', + 'image/mode/boss/card/guofengyupao.png', 'image/mode/boss/card/honghuangzhili.png', - 'image/mode/boss/card/hongmianbaihuapao.jpg', - 'image/mode/boss/card/juechenjinge.jpg', - 'image/mode/boss/card/linglongshimandai.jpg', - 'image/mode/boss/card/qimenbagua.jpg', + 'image/mode/boss/card/hongmianbaihuapao.png', + 'image/mode/boss/card/juechenjinge.png', + 'image/mode/boss/card/linglongshimandai.png', + 'image/mode/boss/card/qimenbagua.png', 'image/mode/boss/card/sadouchengbing.png', - 'image/mode/boss/card/shufazijinguan.jpg', - 'image/mode/boss/card/wushuangfangtianji.jpg', - 'image/mode/boss/card/xiuluolianyuji.jpg', - 'image/mode/boss/card/xuwangzhimian.jpg', + 'image/mode/boss/card/shufazijinguan.png', + 'image/mode/boss/card/wushuangfangtianji.png', + 'image/mode/boss/card/xiuluolianyuji.png', + 'image/mode/boss/card/xuwangzhimian.png', 'image/mode/boss/card/yihuajiemu.png', - 'image/mode/boss/card/qicaishenlu.jpg', + 'image/mode/boss/card/qicaishenlu.png', + 'image/mode/boss/card/longfenghemingjian.png', 'image/mode/boss/character/boss_bianchengwang.jpg', 'image/mode/boss/character/boss_chujiangwang.jpg', diff --git a/game/update.js b/game/update.js index ba2fb9210..5a99f5235 100644 --- a/game/update.js +++ b/game/update.js @@ -1,40 +1,38 @@ window.noname_update={ - version:'1.9.98.3', - update:'1.9.98.2.4', + version:'1.9.98.3.1', + update:'1.9.98.3', changeLog:[ - '贾逵，张翼，界一将成名', - '特效接口（只有接口，没有特效）', 'bug修复', ], files:[ - 'card/extra.js', - 'card/huanlekapai.js', + //'card/extra.js', + //'card/huanlekapai.js', //'card/sp.js', 'card/standard.js', //'card/swd.js', //'card/mtg.js', //'card/guozhan.js', //'card/gwent.js', - 'card/zhenfa.js', + //'card/zhenfa.js', //'card/zhulu.js', - 'character/diy.js', - 'character/extra.js', + //'character/diy.js', + //'character/extra.js', //'character/hearth.js', - 'character/gujian.js', + //'character/gujian.js', //'character/gwent.js', - 'character/hearth.js', - 'character/mobile.js', - 'character/mtg.js', - 'character/old.js', + //'character/hearth.js', + //'character/mobile.js', + //'character/mtg.js', + //'character/old.js', 'character/refresh.js', - 'character/shenhua.js', - 'character/sp.js', - 'character/tw.js', - 'character/standard.js', - 'character/swd.js', + //'character/shenhua.js', + //'character/sp.js', + //'character/tw.js', + //'character/standard.js', + //'character/swd.js', //'character/xianjian.js', - 'character/xinghuoliaoyuan.js', - 'character/yijiang.js', + //'character/xinghuoliaoyuan.js', + //'character/yijiang.js', //'character/yxs.js', //'extension/boss/extension.js', //'layout/default/layout.css', @@ -49,7 +47,7 @@ window.noname_update={ //'mode/brawl.js', //'mode/versus.js', 'mode/boss.js', - 'game/game.js', + //'game/game.js', //'game/NoSleep.js', //'game/config.js', //'game/package.js', diff --git a/image/card/ly_piliche.png b/image/card/ly_piliche.png index b2ef17106..62caf8170 100644 Binary files a/image/card/ly_piliche.png and b/image/card/ly_piliche.png differ diff --git a/image/card/pyzhuren_club.png b/image/card/pyzhuren_club.png index 5a88af5b4..dec4b4844 100644 Binary files a/image/card/pyzhuren_club.png and b/image/card/pyzhuren_club.png differ diff --git a/image/card/pyzhuren_diamond.png b/image/card/pyzhuren_diamond.png index aa6b5ac3a..589770e63 100644 Binary files a/image/card/pyzhuren_diamond.png and b/image/card/pyzhuren_diamond.png differ diff --git a/image/card/pyzhuren_heart.png b/image/card/pyzhuren_heart.png index 641de742c..1b2613570 100644 Binary files a/image/card/pyzhuren_heart.png and b/image/card/pyzhuren_heart.png differ diff --git a/image/card/pyzhuren_shandian.png b/image/card/pyzhuren_shandian.png index f20e08732..f27d8bacd 100644 Binary files a/image/card/pyzhuren_shandian.png and b/image/card/pyzhuren_shandian.png differ diff --git a/image/card/pyzhuren_spade.png b/image/card/pyzhuren_spade.png index 52ef2f43d..b5736be2c 100644 Binary files a/image/card/pyzhuren_spade.png and b/image/card/pyzhuren_spade.png differ diff --git a/image/card/rewrite_bagua.png b/image/card/rewrite_bagua.png new file mode 100644 index 000000000..7b12141d0 Binary files /dev/null and b/image/card/rewrite_bagua.png differ diff --git a/image/card/rewrite_baiyin.png b/image/card/rewrite_baiyin.png new file mode 100644 index 000000000..63f822cb3 Binary files /dev/null and b/image/card/rewrite_baiyin.png differ diff --git a/image/card/rewrite_lanyinjia.png b/image/card/rewrite_lanyinjia.png new file mode 100644 index 000000000..f95771ce9 Binary files /dev/null and b/image/card/rewrite_lanyinjia.png differ diff --git a/image/card/rewrite_renwang.png b/image/card/rewrite_renwang.png new file mode 100644 index 000000000..80749b9f4 Binary files /dev/null and b/image/card/rewrite_renwang.png differ diff --git a/image/card/rewrite_tengjia.png b/image/card/rewrite_tengjia.png new file mode 100644 index 000000000..4d8d9856b Binary files /dev/null and b/image/card/rewrite_tengjia.png differ diff --git a/image/card/rewrite_zhuge.png b/image/card/rewrite_zhuge.png new file mode 100644 index 000000000..395d6b7a2 Binary files /dev/null and b/image/card/rewrite_zhuge.png differ diff --git a/image/card/wy_meirenji.png b/image/card/wy_meirenji.png index bc515aec6..d728b373a 100644 Binary files a/image/card/wy_meirenji.png and b/image/card/wy_meirenji.png differ diff --git a/image/card/wy_xiaolicangdao.png b/image/card/wy_xiaolicangdao.png index 737bf6cba..60462e70b 100644 Binary files a/image/card/wy_xiaolicangdao.png and b/image/card/wy_xiaolicangdao.png differ diff --git a/image/mode/boss/card/chixueqingfeng.png b/image/mode/boss/card/chixueqingfeng.png new file mode 100644 index 000000000..f815b4411 Binary files /dev/null and b/image/mode/boss/card/chixueqingfeng.png differ diff --git a/image/mode/boss/card/chiyanzhenhunqin.png b/image/mode/boss/card/chiyanzhenhunqin.png new file mode 100644 index 000000000..be609ca18 Binary files /dev/null and b/image/mode/boss/card/chiyanzhenhunqin.png differ diff --git a/image/mode/boss/card/guilongzhanyuedao.png b/image/mode/boss/card/guilongzhanyuedao.png new file mode 100644 index 000000000..50434a195 Binary files /dev/null and b/image/mode/boss/card/guilongzhanyuedao.png differ diff --git a/image/mode/boss/card/guofengyupao.png b/image/mode/boss/card/guofengyupao.png new file mode 100644 index 000000000..5d9356c46 Binary files /dev/null and b/image/mode/boss/card/guofengyupao.png differ diff --git a/image/mode/boss/card/hongmianbaihuapao.png b/image/mode/boss/card/hongmianbaihuapao.png new file mode 100644 index 000000000..4f832675d Binary files /dev/null and b/image/mode/boss/card/hongmianbaihuapao.png differ diff --git a/image/mode/boss/card/juechenjinge.png b/image/mode/boss/card/juechenjinge.png new file mode 100644 index 000000000..feb394fc9 Binary files /dev/null and b/image/mode/boss/card/juechenjinge.png differ diff --git a/image/mode/boss/card/linglongshimandai.png b/image/mode/boss/card/linglongshimandai.png new file mode 100644 index 000000000..0f590f605 Binary files /dev/null and b/image/mode/boss/card/linglongshimandai.png differ diff --git a/image/mode/boss/card/longfenghemingjian.png b/image/mode/boss/card/longfenghemingjian.png new file mode 100644 index 000000000..f061064e6 Binary files /dev/null and b/image/mode/boss/card/longfenghemingjian.png differ diff --git a/image/mode/boss/card/qicaishenlu.png b/image/mode/boss/card/qicaishenlu.png new file mode 100644 index 000000000..11b697080 Binary files /dev/null and b/image/mode/boss/card/qicaishenlu.png differ diff --git a/image/mode/boss/card/qimenbagua.png b/image/mode/boss/card/qimenbagua.png new file mode 100644 index 000000000..3ed66c7bb Binary files /dev/null and b/image/mode/boss/card/qimenbagua.png differ diff --git a/image/mode/boss/card/shufazijinguan.png b/image/mode/boss/card/shufazijinguan.png new file mode 100644 index 000000000..a17d05c25 Binary files /dev/null and b/image/mode/boss/card/shufazijinguan.png differ diff --git a/image/mode/boss/card/wushuangfangtianji.png b/image/mode/boss/card/wushuangfangtianji.png new file mode 100644 index 000000000..b62dc9dee Binary files /dev/null and b/image/mode/boss/card/wushuangfangtianji.png differ diff --git a/image/mode/boss/card/xiuluolianyuji.png b/image/mode/boss/card/xiuluolianyuji.png new file mode 100644 index 000000000..244d2c1ed Binary files /dev/null and b/image/mode/boss/card/xiuluolianyuji.png differ diff --git a/image/mode/boss/card/xuwangzhimian.png b/image/mode/boss/card/xuwangzhimian.png new file mode 100644 index 000000000..656911587 Binary files /dev/null and b/image/mode/boss/card/xuwangzhimian.png differ diff --git a/mode/boss.js b/mode/boss.js index d48ab2853..3bd7434d4 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -474,6 +474,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ card:{ "wushuangfangtianji":{ type:"equip", + modeimage:'boss', subtype:"equip1", distance:{ attackFrom:-3, @@ -481,205 +482,47 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ ai:{ basic:{ equipValue:2.5, - order:function(card,player){ - if(player&&player.hasSkillTag('reverseEquip')){ - return 8.5-get.equipValue(card,player)/20; - } - else{ - return 8+get.equipValue(card,player)/20; - } - }, - useful:2, - value:function(card,player){ - var value=0; - var info=get.info(card); - var current=player.getEquip(info.subtype); - if(current&&card!=current){ - value=get.value(current,player); - } - var equipValue=info.ai.equipValue; - if(equipValue==undefined){ - equipValue=info.ai.basic.equipValue; - } - if(typeof equipValue=='function') return equipValue(card,player)-value; - if(typeof equipValue!='number') equipValue=0; - return equipValue-value; - }, - }, - result:{ - target:function(player,target){ - return get.equipResult(player,target,name); - }, }, }, skills:["wushuangfangtianji_skill"], - enable:true, - selectTarget:-1, - filterTarget:function(card,player,target){ - return target==player; - }, - modTarget:true, - allowMultiple:false, - content:function(){ - target.equip(card); - }, - toself:true, - fullimage:true, + fullskin:true, }, "shufazijinguan":{ type:"equip", subtype:"equip5", + modeimage:'boss', ai:{ basic:{ equipValue:9, - order:function (card,player){ - if(player&&player.hasSkillTag('reverseEquip')){ - return 8.5-get.equipValue(card,player)/20; - } - else{ - return 8+get.equipValue(card,player)/20; - } - }, - useful:2, - value:function (card,player){ - var value=0; - var info=get.info(card); - var current=player.getEquip(info.subtype); - if(current&&card!=current){ - value=get.value(current,player); - } - var equipValue=info.ai.equipValue; - if(equipValue==undefined){ - equipValue=info.ai.basic.equipValue; - } - if(typeof equipValue=='function') return equipValue(card,player)-value; - if(typeof equipValue!='number') equipValue=0; - return equipValue-value; - }, - }, - result:{ - target:function(player,target){ - return get.equipResult(player,target,name); - }, }, }, skills:["shufazijinguan_skill"], - enable:true, - selectTarget:-1, - filterTarget:function (card,player,target){ - return target==player; - }, - modTarget:true, - allowMultiple:false, - content:function (){ - target.equip(card); - }, - toself:true, - fullimage:true, + fullskin:true, }, "hongmianbaihuapao":{ type:"equip", subtype:"equip2", + modeimage:'boss', ai:{ basic:{ equipValue:7, - order:function(card,player){ - if(player&&player.hasSkillTag('reverseEquip')){ - return 8.5-get.equipValue(card,player)/20; - } - else{ - return 8+get.equipValue(card,player)/20; - } - }, - useful:2, - value:function(card,player){ - var value=0; - var info=get.info(card); - var current=player.getEquip(info.subtype); - if(current&&card!=current){ - value=get.value(current,player); - } - var equipValue=info.ai.equipValue; - if(equipValue==undefined){ - equipValue=info.ai.basic.equipValue; - } - if(typeof equipValue=='function') return equipValue(card,player)-value; - if(typeof equipValue!='number') equipValue=0; - return equipValue-value; - }, - }, - result:{ - target:function(player,target){ - return get.equipResult(player,target,name); - }, }, }, skills:["hongmianbaihuapao_skill"], - enable:true, - selectTarget:-1, - filterTarget:function(card,player,target){ - return target==player; - }, - modTarget:true, - allowMultiple:false, - content:function(){ - target.equip(card); - }, - toself:true, - fullimage:true, + fullskin:true, }, "linglongshimandai":{ type:"equip", subtype:"equip2", + modeimage:'boss', ai:{ basic:{ equipValue:7.5, - order:function(card,player){ - if(player&&player.hasSkillTag('reverseEquip')){ - return 8.5-get.equipValue(card,player)/20; - } - else{ - return 8+get.equipValue(card,player)/20; - } - }, - useful:2, - value:function(card,player){ - var value=0; - var info=get.info(card); - var current=player.getEquip(info.subtype); - if(current&&card!=current){ - value=get.value(current,player); - } - var equipValue=info.ai.equipValue; - if(equipValue==undefined){ - equipValue=info.ai.basic.equipValue; - } - if(typeof equipValue=='function') return equipValue(card,player)-value; - if(typeof equipValue!='number') equipValue=0; - return equipValue-value; - }, - }, - result:{ - target:function(player,target){ - return get.equipResult(player,target,name); - }, }, }, skills:["linglongshimandai_skill"], - enable:true, - selectTarget:-1, - filterTarget:function(card,player,target){ - return target==player; - }, - modTarget:true, - allowMultiple:false, - content:function(){ - target.equip(card); - }, - toself:true, - fullimage:true, + fullskin:true, }, - sadouchengbing:{ fullskin:true, type:'trick', @@ -782,7 +625,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, guilongzhanyuedao:{ type:'equip', - fullimage:true, + fullskin:true, + modeimage:'boss', subtype:'equip1', distance:{attackFrom:-2}, skills:['guilongzhanyuedao'], @@ -795,7 +639,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, guofengyupao:{ type:'equip', - fullimage:true, + fullskin:true, + modeimage:'boss', subtype:'equip2', nomod:true, nopower:true, @@ -807,7 +652,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, qimenbagua:{ type:'equip', - fullimage:true, + fullskin:true, + modeimage:'boss', subtype:'equip2', skills:['qimenbagua'], nomod:true, @@ -819,7 +665,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, chixueqingfeng:{ type:'equip', - fullimage:true, + fullskin:true, + modeimage:'boss', subtype:'equip1', distance:{attackFrom:-1}, skills:['chixueqingfeng'], @@ -832,8 +679,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, chiyanzhenhunqin:{ type:'equip', - fullimage:true, + fullskin:true, subtype:'equip1', + modeimage:'boss', distance:{attackFrom:-3}, skills:['chiyanzhenhunqin'], nomod:true, @@ -845,7 +693,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, juechenjinge:{ type:'equip', - fullimage:true, + fullskin:true, + modeimage:'boss', subtype:'equip3', skills:['juechenjinge'], nomod:true, @@ -857,8 +706,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, xiuluolianyuji:{ type:'equip', - fullimage:true, + fullskin:true, subtype:'equip1', + modeimage:'boss', distance:{attackFrom:-3}, skills:['xiuluolianyuji'], nomod:true, @@ -870,8 +720,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, xuwangzhimian:{ type:'equip', - fullimage:true, + fullskin:true, subtype:'equip5', + modeimage:'boss', skills:['xuwangzhimian'], nomod:true, nopower:true, @@ -883,7 +734,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ longfenghemingjian:{ type:'equip', fullskin:true, - cardimage:'feilongduofeng', + modeimage:'boss', subtype:'equip1', distance:{attackFrom:-2}, skills:['longfenghemingjian'], @@ -895,7 +746,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, qicaishenlu:{ - fullimage:true, + fullskin:true, + modeimage:'boss', type:'equip', subtype:'equip4', distance:{globalFrom:-1}, diff --git a/mode/guozhan.js b/mode/guozhan.js index 6f500e091..5f135c9ae 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -4834,6 +4834,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ unique:true, forceunique:true, enable:'phaseUse', + usable:1, filterCard:function(card){ return get.name(card)!='taipingyaoshu'&&get.color(card)=='red'; },