From 1cc2c1ad22b9ef9c73aac473354e2b796b1786e8 Mon Sep 17 00:00:00 2001 From: libccy Date: Sun, 14 May 2017 15:45:46 +0800 Subject: [PATCH] v1.9.28.2 --- card/extra.js | 1 - card/gujian.js | 6 +++-- card/guozhan.js | 14 +++++++---- card/sp.js | 12 ++++++---- card/swd.js | 57 +++++++++++++++++++++++++++++---------------- card/yunchou.js | 19 ++++++++------- character/gujian.js | 36 ++++++++++++++-------------- game/game.js | 23 +++++++++++++++++- game/update.js | 10 ++++---- 9 files changed, 112 insertions(+), 66 deletions(-) diff --git a/card/extra.js b/card/extra.js index 48a4ef744..d540cde1f 100644 --- a/card/extra.js +++ b/card/extra.js @@ -552,7 +552,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){ baiyin:'白银狮子', baiyin_info:'锁定技，你每次受到伤害时，最多承受1点伤害（防止多余的伤害）；当你失去装备区里的【白银狮子】时，你回复1点体力。', baiyin_skill:'白银狮子', - _baiyin:'白银狮子', }, list:[ ["heart",4,"sha","fire"], diff --git a/card/gujian.js b/card/gujian.js index edf43d0c4..e21a04e37 100644 --- a/card/gujian.js +++ b/card/gujian.js @@ -29,6 +29,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'trick', fullskin:true, filterTarget:true, + global:'g_jinlianzhu', content:function(){ var evt=event.getParent(3)._trigger; evt.untrigger(); @@ -877,6 +878,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'trick', fullskin:true, filterTarget:true, + global:'g_shihuifen', content:function(){ 'step 0' _status.currentPhase.chooseToRespond({name:'shan'},'石灰粉
打出一张闪，否则本回合无法对其他角色使用卡牌'); @@ -1517,7 +1519,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - _shihuifen:{ + g_shihuifen:{ trigger:{global:'phaseUseBegin'}, direct:true, filter:function(event,player){ @@ -1533,7 +1535,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ },trigger.player,-1).targetRequired=true; } }, - _jinlianzhu:{ + g_jinlianzhu:{ trigger:{global:'damageBefore'}, direct:true, filter:function(event,player){ diff --git a/card/guozhan.js b/card/guozhan.js index 43007ec1e..101a85595 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -12,6 +12,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ nomod:true, nopower:true, unique:true, + global:'g_feilongduofeng_ai', distance:{attackFrom:-1}, skills:['feilongduofeng','feilongduofeng2'], ai:{ @@ -34,6 +35,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ nomod:true, nopower:true, unique:true, + global:['g_taipingyaoshu','g_taipingyaoshu_ai'], skills:['taipingyaoshu'], ai:{ equipValue:function(card,player){ @@ -298,6 +300,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'trick', lianheng:true, enable:true, + global:'g_diaohulishan', filterTarget:function(card,player,target){ return target!=player; }, @@ -562,6 +565,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ fullskin:true, type:'equip', subtype:'equip1', + global:'g_wuliu_skill', distance:{attackFrom:-1}, ai:{ basic:{ @@ -597,7 +601,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, }, skill:{ - _feilongduofeng_ai:{ + g_feilongduofeng_ai:{ ai:{ effect:{ player:function(card,player){ @@ -611,7 +615,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - _taipingyaoshu_ai:{ + g_taipingyaoshu_ai:{ ai:{ effect:{ player:function(card,player){ @@ -786,7 +790,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - _taipingyaoshu:{ + g_taipingyaoshu:{ mod:{ maxHandcard:function(player,num){ var source=game.findPlayer(function(current){ @@ -965,7 +969,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ event.goto(1); } }, - _diaohulishan:{ + g_diaohulishan:{ trigger:{player:'useCardAfter'}, forced:true, popup:false, @@ -1067,7 +1071,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, wuliu_skill:{}, - _wuliu_skill2:{ + g_wuliu_skill:{ mod:{ attackFrom:function(from,to,distance){ return distance-game.countPlayer(function(current){ diff --git a/card/sp.js b/card/sp.js index 31b766550..0be0349eb 100644 --- a/card/sp.js +++ b/card/sp.js @@ -8,6 +8,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ fullskin:true, type:'trick', notarget:true, + global:['g_jinchan','g_jinchan2'], content:function(){ var evt=event.getParent(3)._trigger; if(evt.jinchan){ @@ -277,6 +278,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, enable:true, modTarget:true, + global:'g_du', filterTarget:function(card,player,target){ return target==player; }, @@ -541,7 +543,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - _jinchan:{ + g_jinchan:{ trigger:{target:'useCardToBefore'}, forced:true, popup:false, @@ -560,7 +562,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ delete trigger.jinchan; } }, - _jinchan2:{ + g_jinchan2:{ trigger:{player:'discardAfter'}, forced:true, filter:function(event,player){ @@ -883,7 +885,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ return false; }, }, - _du:{ + g_du:{ trigger:{player:['useCardAfter','respondAfter','discardAfter']}, popup:false, forced:true, @@ -935,8 +937,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){ qijia:'弃甲曳兵', qijia_info:'出牌阶段，对一名装备区里有牌的其他角色使用。该角色选择一项：1.弃置手牌区和装备区里所有的武器和-1坐骑；2.弃置手牌区和装备区里所有的防具和+1坐骑。', jinchan:'金蝉脱壳', - _jinchan2:'金蝉脱壳', - _jinchan2_info:'当你因弃置而失去【金蝉脱壳】时，你摸一张牌', + g_jinchan2:'金蝉脱壳', + g_jinchan2_info:'当你因弃置而失去【金蝉脱壳】时，你摸一张牌', jinchan_info:'当你成为其他角色使用牌的目标时，若你的手牌里只有【金蝉脱壳】，使目标锦囊牌或基本牌对你无效，你摸两张牌。当你因弃置而失去【金蝉脱壳】时，你摸一张牌。', fulei:'浮雷', fulei_info:'出牌阶段，对你使用。将【浮雷】放置于你的判定区里，若判定结果为黑桃，则目标角色受到X点雷电伤害（X为此锦囊判定结果为黑桃的次数）。判定完成后，将此牌移动到下家的判定区里。', diff --git a/card/swd.js b/card/swd.js index 89ec530f4..b14d5781d 100644 --- a/card/swd.js +++ b/card/swd.js @@ -142,8 +142,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'trick', nodelay:true, chongzhu:true, + global:'g_shencaojie', content:function(){ - event.getParent('_shencaojie')._trigger.num++; + event.getParent('g_shencaojie')._trigger.num++; }, ai:{ order:1, @@ -244,6 +245,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'jiqi', addinfo:'杀', autoViewAs:'sha', + global:['g_yuchan_swap','g_yuchan_equip'], ai:{ value:6, useful:[5,1] @@ -254,6 +256,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'jiqi', addinfo:'药', autoViewAs:'caoyao', + global:['g_yuchan_swap','g_yuchan_equip'], ai:{ value:6, useful:[7,2] @@ -264,6 +267,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'jiqi', autoViewAs:'jiu', addinfo:'酒', + global:['g_yuchan_swap','g_yuchan_equip'], savable:function(card,player,dying){ return dying==player; }, @@ -277,6 +281,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'jiqi', autoViewAs:'tao', addinfo:'桃', + global:['g_yuchan_swap','g_yuchan_equip'], savable:true, ai:{ value:6, @@ -287,6 +292,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ fullskin:true, type:'jiqi', autoViewAs:'shenmiguo', + global:['g_yuchan_swap','g_yuchan_equip'], addinfo:'果', ai:{ order:1, @@ -312,6 +318,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ fullskin:true, type:'jiqi', autoViewAs:'tianxianjiu', + global:['g_yuchan_swap','g_yuchan_equip'], addinfo:'仙', ai:{ value:6, @@ -323,6 +330,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'jiqi', addinfo:'蛋', autoViewAs:'fengyinzhidan', + global:['g_yuchan_swap','g_yuchan_equip'], ai:{ value:6, useful:1 @@ -333,6 +341,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'jiqi', addinfo:'雪', autoViewAs:'xuejibingbao', + global:['g_yuchan_swap','g_yuchan_equip'], ai:{ value:6, useful:4 @@ -461,6 +470,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ zhuquezhizhang:{ type:'jiqi', fullskin:true, + global:'g_zhuquezhizhang`', ai:{ value:8, useful:6.5, @@ -469,6 +479,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ xuanwuzhihuang:{ type:'jiqi', fullskin:true, + global:'g_xuanwuzhihuang', ai:{ value:8, useful:6.5, @@ -477,6 +488,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ huanglinzhicong:{ type:'jiqi', fullskin:true, + global:'g_huanglinzhicong', ai:{ value:8, useful:6.5, @@ -485,6 +497,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ cangchizhibi:{ type:'jiqi', fullskin:true, + global:'g_cangchizhibi', ai:{ value:8, useful:6.5, @@ -493,6 +506,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ qinglongzhigui:{ type:'jiqi', fullskin:true, + global:'g_qinglongzhigui', ai:{ value:8, useful:6.5, @@ -501,6 +515,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ baishouzhihu:{ type:'jiqi', fullskin:true, + global:'g_baishouzhihu', ai:{ value:8, useful:6.5, @@ -869,6 +884,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ shenmiguo:{ fullskin:true, type:'basic', + global:'g_shenmiguo', content:function(){ if(Array.isArray(player.storage.shenmiguo)){ player.useCard(player.storage.shenmiguo[0],player.storage.shenmiguo[1]); @@ -1768,6 +1784,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ fullskin:true, type:'trick', enable:true, + global:'g_zhufangshenshi', filterTarget:function(card,player,target){ return target!=player; }, @@ -2045,7 +2062,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, onremove:true, }, - _zhufangshenshi:{ + g_zhufangshenshi:{ trigger:{player:'useCardAfter'}, forced:true, popup:false, @@ -2076,7 +2093,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, dujian2:{}, - _yuchan_swap:{ + g_yuchan_swap:{ trigger:{player:'useCardAfter'}, forced:true, popup:false, @@ -2092,7 +2109,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - _yuchan_equip:{ + g_yuchan_equip:{ enable:'phaseUse', usable:1, filter:function(event,player){ @@ -2186,7 +2203,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - _shencaojie:{ + g_shencaojie:{ trigger:{source:'damageBegin'}, direct:true, filter:function(event,player){ @@ -2201,11 +2218,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){ },trigger.player,-1).targetRequired=true; } }, - _shenmiguo:{ + g_shenmiguo:{ trigger:{player:'useCardAfter'}, direct:true, filter:function(event,player){ - if(event.parent.name=='_shenmiguo') return false; + if(event.parent.name=='g_shenmiguo') return false; if(_status.currentPhase!=player) return false; if(event.parent.parent.name!='phaseUse') return false; if(!event.targets||!event.card) return false; @@ -2432,7 +2449,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ delete player.storage.jiguanyuan; } }, - _qinglongzhigui:{ + g_qinglongzhigui:{ trigger:{player:'phaseBegin'}, forced:true, filter:function(event,player){ @@ -2446,7 +2463,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ player.chooseToDiscard('he',true); } }, - _baishouzhihu:{ + g_baishouzhihu:{ trigger:{player:'discardEnd'}, direct:true, filter:function(event,player){ @@ -2471,7 +2488,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, }, - _zhuquezhizhang:{ + g_zhuquezhizhang:{ trigger:{player:'damageEnd'}, forced:true, filter:function(event,player){ @@ -2489,7 +2506,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ game.delay(); } }, - _xuanwuzhihuang:{ + g_xuanwuzhihuang:{ trigger:{source:'damageEnd'}, forced:true, filter:function(event,player){ @@ -2500,7 +2517,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ player.recover(trigger.num); } }, - _huanglinzhicong:{ + g_huanglinzhicong:{ trigger:{player:'phaseBegin'}, forced:true, filter:function(event,player){ @@ -2512,7 +2529,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ player.update(); }, }, - _cangchizhibi:{ + g_cangchizhibi:{ trigger:{player:'phaseBegin'}, direct:true, filter:function(event,player){ @@ -4731,7 +4748,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ '专属、特殊装备无法被强化' }, translate:{ - _yuchan_equip:'玉蝉', + g_yuchan_equip:'玉蝉', yuchanqian_duanzao:'玉蝉', yuchanqian_equip1_info:'出牌阶段限一次，你可以弃置任意张基本牌并摸等量的牌', yuchanqian_equip2_info:'出牌阶段限一次，你可以弃置任意张基本牌并摸等量的牌', @@ -4818,7 +4835,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ jiguan:'机关', jiqi:'祭器', qinglongzhigui:'青龙之圭', - _qinglongzhigui:'青龙之圭', + g_qinglongzhigui:'青龙之圭', qinglongzhigui_info:'可用于煅造装备；此牌在你手牌中时，准备阶段，你摸两张牌然后弃置一张牌', qinglongzhigui_duanzao:'云屏', qinglongzhigui_equip1_info:'结束阶段，你摸一张牌', @@ -4827,7 +4844,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ qinglongzhigui_equip4_info:'结束阶段，你摸一张牌', qinglongzhigui_equip5_info:'结束阶段，你摸一张牌', baishouzhihu:'白兽之琥', - _baishouzhihu:'白兽之琥', + g_baishouzhihu:'白兽之琥', baishouzhihu_info:'可用于煅造装备；此牌在你手牌中时，每当你弃置卡牌，你可以弃置一名其他角色的一张牌', baishouzhihu_duanzao:'风牙', baishouzhihu_equip1_info:'结束阶段，你可以弃置一名其他角色的一张牌', @@ -4836,7 +4853,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ baishouzhihu_equip4_info:'结束阶段，你可以弃置一名其他角色的一张牌', baishouzhihu_equip5_info:'结束阶段，你可以弃置一名其他角色的一张牌', zhuquezhizhang:'朱雀之璋', - _zhuquezhizhang:'朱雀之璋', + g_zhuquezhizhang:'朱雀之璋', zhuquezhizhang_info:'可用于煅造装备；此牌在你手牌中时，每当你受到其他角色造成的伤害，你对伤害来源造成一点火属性伤害', zhuquezhizhang_duanzao:'炽翎', zhuquezhizhang_equip1_info:'结束阶段，你可以弃置一张红色牌并对一名体力值不小于你的角色造成一点火属性伤害', @@ -4845,7 +4862,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ zhuquezhizhang_equip4_info:'结束阶段，你可以弃置一张红色牌并对一名体力值不小于你的角色造成一点火属性伤害', zhuquezhizhang_equip5_info:'结束阶段，你可以弃置一张红色牌并对一名体力值不小于你的角色造成一点火属性伤害', xuanwuzhihuang:'玄武之璜', - _xuanwuzhihuang:'玄武之璜', + g_xuanwuzhihuang:'玄武之璜', xuanwuzhihuang_duanzao:'寒晶', xuanwuzhihuang_info:'可用于煅造装备；此牌在你手牌中时，每当你造成伤害，你回复等量的体力', xuanwuzhihuang_equip1_info:'结束阶段，你可以弃置一张红色牌并回复一点体力', @@ -4854,7 +4871,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ xuanwuzhihuang_equip4_info:'结束阶段，你可以弃置一张红色牌并回复一点体力', xuanwuzhihuang_equip5_info:'结束阶段，你可以弃置一张红色牌并回复一点体力', huanglinzhicong:'黄麟之琮', - _huanglinzhicong:'黄麟之琮', + g_huanglinzhicong:'黄麟之琮', huanglinzhicong_duanzao:'玄甲', huanglinzhicong_info:'可用于煅造装备；此牌在你手牌中时，准备阶段，若你没有护甲，你获得一点护甲', huanglinzhicong_equip1_info:'结束阶段，若你没有护甲，你可以弃置一张黑色牌并获得一点护甲', @@ -4863,7 +4880,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ huanglinzhicong_equip4_info:'结束阶段，若你没有护甲，你可以弃置一张黑色牌并获得一点护甲', huanglinzhicong_equip5_info:'结束阶段，若你没有护甲，你可以弃置一张黑色牌并获得一点护甲', cangchizhibi:'苍螭之璧', - _cangchizhibi:'苍螭之璧', + g_cangchizhibi:'苍螭之璧', cangchizhibi_duanzao:'灵枢', cangchizhibi_info:'可用于煅造装备；此牌在你手牌中时，准备阶段，你可以选择至多3名角色横置或重置之', cangchizhibi_equip1_info:'结束阶段，你可以横置或重置一名角色', diff --git a/card/yunchou.js b/card/yunchou.js index fb1f07445..860ff1320 100644 --- a/card/yunchou.js +++ b/card/yunchou.js @@ -409,6 +409,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ type:'trick', notarget:true, wuxieable:true, + global:'g_youdishenru', content:function(){ 'step 0' var info=event.getParent(2).youdiinfo||event.getParent(3).youdiinfo; @@ -514,6 +515,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ fullskin:true, type:'trick', filterTarget:true, + global:'g_chenhuodajie', content:function(){ if(target.countCards('he')){ player.gainPlayerCard('he',target,true); @@ -706,6 +708,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ hufu:{ fullskin:true, type:'basic', + global:['g_hufu_sha','g_hufu_shan','g_hufu_jiu'], savable:function(card,player,dying){ return dying==player; }, @@ -994,7 +997,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ delete player.storage.youdishenru; } }, - _youdishenru:{ + g_youdishenru:{ trigger:{target:'shaBefore'}, direct:true, filter:function(event,player){ @@ -1011,7 +1014,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ },'是否使用诱敌深入？').set('source',trigger.player); } }, - _chenhuodajie:{ + g_chenhuodajie:{ trigger:{global:'damageEnd'}, direct:true, filter:function(event,player){ @@ -1034,7 +1037,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, }, - _hufu_sha:{ + g_hufu_sha:{ enable:['chooseToRespond','chooseToUse'], filter:function(event,player){ return player.countCards('h','hufu')>0; @@ -1049,7 +1052,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ value:7.5 } }, - _hufu_shan:{ + g_hufu_shan:{ enable:['chooseToRespond','chooseToUse'], filter:function(event,player){ return player.countCards('h','hufu')>0; @@ -1064,7 +1067,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ value:7.5 } }, - _hufu_jiu:{ + g_hufu_jiu:{ enable:['chooseToRespond','chooseToUse'], filter:function(event,player){ return player.countCards('h','hufu')>0; @@ -1114,9 +1117,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){ qiankundai_info:'你的手牌上限+1。当你失去该装备时，你摸一张牌。', hufu:'虎符', hufu_bg:'符', - _hufu_sha:'符杀', - _hufu_shan:'符闪', - _hufu_jiu:'符酒', + g_hufu_sha:'符杀', + g_hufu_shan:'符闪', + g_hufu_jiu:'符酒', hufu_info:'你可以将一张虎符当作杀、闪或酒使用或打出', }, list:[ diff --git a/character/gujian.js b/character/gujian.js index 080d55928..1e6ef887f 100644 --- a/character/gujian.js +++ b/character/gujian.js @@ -202,26 +202,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } } var dialog=ui.create.dialog('云音',[list,'vcard']); + var taoyuan=0,nanman=0; + var players=game.filterPlayer(); + for(var i=0;i0){ + taoyuan++; + } + else if(eff1<0){ + taoyuan--; + } + if(eff2>0){ + nanman++; + } + else if(eff2<0){ + nanman--; + } + } player.chooseButton(dialog).ai=function(button){ var name=button.link[2]; - var taoyuan=0,nanman=0; - var players=game.filterPlayer(); - for(var i=0;i0){ - taoyuan++; - } - else if(eff1<0){ - taoyuan--; - } - if(eff2>0){ - nanman++; - } - else if(eff2<0){ - nanman--; - } - } if(Math.max(taoyuan,nanman)>1){ if(taoyuan>nanman) return name=='taoyuan'?1:0; return name=='nanman'?1:0; diff --git a/game/game.js b/game/game.js index 47da53147..c7d6fcfba 100644 --- a/game/game.js +++ b/game/game.js @@ -7213,6 +7213,9 @@ } else{ for(k in card[i][j]){ + if(j=='skill'&&k[0]=='_'&&!lib.config.cards.contains(i)){ + continue; + } if(j=='translate'&&k==i){ lib[j][k+'_card_config']=card[i][j][k]; } @@ -8769,6 +8772,9 @@ if(j=='mode'||j=='forbid') continue; if(j=='list') continue; for(k in card[i][j]){ + if(j=='skill'&&k[0]=='_'&&!lib.config.cards.contains(i)){ + continue; + } if(j=='translate'&&k==i){ lib[j][k+'_card_config']=card[i][j][k]; } @@ -17848,6 +17854,17 @@ lib.card[card[2]]={}; } var info=lib.card[card[2]]; + if(info.global&&!this.classList.contains('button')){ + if(Array.isArray(info.global)){ + while(info.global.length){ + game.addGlobalSkill(info.global.shift()); + } + } + else if(typeof info.global=='string'){ + game.addGlobalSkill(info.global); + } + delete info.global; + } if(this.name){ this.classList.remove('epic'); this.classList.remove('legend'); @@ -39946,7 +39963,11 @@ prompt:function(skill,target,player){ player=player||_status.event.player; if(target){ - return '是否对'+get.translation(target)+'发动【'+get.skillTranslation(skill,player)+'】？'; + var str=get.translation(target); + if(target==player){ + str+='（你）' + } + return '是否对'+str+'发动【'+get.skillTranslation(skill,player)+'】？'; } else{ return '是否发动【'+get.skillTranslation(skill,player)+'】？'; diff --git a/game/update.js b/game/update.js index 0b8e8ee36..a35ecb014 100644 --- a/game/update.js +++ b/game/update.js @@ -1,21 +1,19 @@ window.noname_update={ - version:'1.9.28.1', + version:'1.9.28.2', update:'1.9.28', changeLog:[ 'bug修复', - '新卡' ], files:[ - // 'game/game.js', + 'game/game.js', // 'game/package.js', // 'game/config.js', // 'game/source.js', // 'game/pressure.js', // 'game/asset.js', - // 'card/*', - 'card/gwent.js', + 'card/*', // 'card/standard.js', - // 'character/*', + 'character/*', // 'character/rank.js', // 'mode/boss.js', // 'mode/versus.js',