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

1

This commit is contained in:
libccy 2016-06-10 23:45:51 +08:00
parent 58890d9635
commit 927e4fca18
6 changed files with 130 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
card/swd.js
View File

@ -703,7 +703,7 @@ card.swd={
trigger:{source:'damageBegin'},
forced:true,
filter:function(event){
return event.nature=='fire';
return event.nature=='fire'&&event.notLink();
},
content:function(){
trigger.num++;

4
character/ow.js
View File

@ -183,7 +183,7 @@ character.ow={
trigger:{player:'phaseEnd'},
forced:true,
filter:function(event,player){
return player.storage.xie%2==1;
return player.storage.xie%2==1&&player.hp<player.maxHp;
},
content:function(){
player.recover();
@ -609,6 +609,7 @@ character.ow={
filterCard:true,
selectCard:function(){
if(_status.event.player.storage.yuedong_eff) return 1;
if(_status.event.player.storage.yuedong_num) return 2;
return [1,2];
},
position:'he',
@ -676,6 +677,7 @@ character.ow={
guangshu:{
enable:'phaseUse',
check:function(card){
var player=_status.event.player;
var suit=get.suit(card);
if(suit=='heart'){
for(var i=0;i<game.players.length;i++){

35
character/rank.js
View File

@ -16,6 +16,7 @@ window.characterRank={
'pal_liumengli',
],
ap:[
'ow_yuanshi',
'swd_xuanyuanjianxian',
'swd_yuwentuo',
'pal_xuanxiao',
@ -51,8 +52,11 @@ window.characterRank={
'hs_xsylvanas',
'hs_malygos',
'hs_alakir',
'ow_luxiao',
],
a:[
'sundeng',
'hs_xialikeer',
'hs_sainaliusi',
'hs_lrhonin',
'hs_ysera',
@ -99,10 +103,19 @@ window.characterRank={
'yxs_guiguzi',
'hs_shanlingjuren',
'hs_tgolem',
'zhangrang',
],
am:[
'guohuanghou',
'sunziliufang',
'hs_blingtron',
'ow_shibing',
'hs_kcthun',
'ow_tianshi',
'ow_zhixuzhiguang',
'ow_chanyata',
'ow_falaozhiying',
'hs_bolvar',
'hs_lafamu',
'lifeng',
'hs_fuding',
'zhugeguo',
@ -174,8 +187,22 @@ window.characterRank={
'swd_xiyan',
'hs_jiaziruila',
'hs_brann',
're_liubei',
'ow_liekong',
'liyan',
],
bp:[
'liuyu',
'chess_zhangliao',
'chess_sunshangxiang',
'chess_huangzhong',
'chess_taishici',
'chess_diaochan',
'cenhun',
'huanghao',
'chengyu',
'guansuo',
'ow_sishen',
'hs_hudunren',
'hs_nate',
'hs_finley',
@ -285,9 +312,13 @@ window.characterRank={
'hs_lreno',
'hs_zhouzhuo',
'hs_liadrin',
'hs_anomalus',
'yanbaihu',
],
b:[
'xin_liru',
'sp_xiahoudun',
'hs_lafamu',
'jsp_huangyueying',
'cuiyan',
'sp_zhangfei',
@ -363,8 +394,10 @@ window.characterRank={
'lingju',
're_ganning',
'xin_yujin',
'hs_yogg',
],
bm:[
'tadun',
'guohuai',
'diy_feishi',
'sunluban',

2
game/game.js
View File

@ -4784,7 +4784,7 @@
}
if(!_status.connectMode&&lib.config.wuxie_self&&event.getParent().state){
var tw=event.getTrigger().parent;
if(tw.player==player&&tw.targets&&tw.targets.length==1){
if(tw.player.isUnderControl(true)&&tw.targets&&tw.targets.length==1){
event.result={
bool:false
}

24
game/update.js
View File

@ -1,32 +1,16 @@
window.noname_update={
version:'1.8.15',
version:'1.8.16',
changeLog:[
'修bug',
'新武将'
],
files:{
global:[
'character/rank.js',
'character/ow.js',
'character/swd.js',
'character/gujian.js',
'character/hearth.js',
'character/yijiang.js',
'character/yxs.js',
'character/boss.js',
'character/shenhua.js',
'character/sp.js',
'card/swd.js',
'card/hearth.js',
'card/shenqi.js',
'card/guozhan.js',
'game/package.js',
'mode/chess.js',
'game/game.js',
'game/source.js',
'game/asset.js',
'image/card/fengxueren.png',
'layout/default/layout.css'
'card/swd.js',
],
'1.8.14.2':[],
'1.8.15':[]
}
}

100
mode/chess.js
View File

@ -40,10 +40,10 @@ mode.chess={
}
if(get.config('chess_card')){
lib.card.list=lib.card.list.concat(lib.chess_cardlist);
}
if(parseFloat(get.config('chess_obstacle'))>0&&_status.mode!='tafang'){
lib.card.list=lib.card.list.concat(lib.chess_obstaclelist);
delete lib.chess_obstaclelist
if(parseFloat(get.config('chess_obstacle'))>0&&_status.mode!='tafang'){
lib.card.list=lib.card.list.concat(lib.chess_obstaclelist);
delete lib.chess_obstaclelist
}
}
ui.create.cards();
game.finishCards();
@ -4126,7 +4126,9 @@ mode.chess={
ui.control.style.top='';
ui.control.style.transition='';
for(var i=0;i<result.links.length;i++){
game.addRecentCharacter(result.links[i]);
}
if(_status.mode=='combat'){
_status.mylist=result.links.slice(0,parseInt(get.config('battle_number')));
_status.replacelist=result.links.slice(parseInt(get.config('battle_number')));
@ -6234,13 +6236,13 @@ mode.chess={
},
chess_cardlist:[],
chess_obstaclelist:[
['club',3,'chess_shezhang'],
['spade',5,'chess_shezhang'],
['spade',7,'chess_shezhang'],
['diamond',1,'chess_chuzhang'],
['diamond',4,'chess_chuzhang'],
['heart',8,'chess_chuzhang'],
// ['diamond',9,'chess_chuzhang'],
// ['club',3,'chess_shezhang'],
// ['spade',5,'chess_shezhang'],
// ['spade',7,'chess_shezhang'],
// ['diamond',1,'chess_chuzhang'],
// ['diamond',4,'chess_chuzhang'],
// ['heart',8,'chess_chuzhang'],
// // ['diamond',9,'chess_chuzhang'],
],
rank:{
rarity:{
@ -6273,7 +6275,6 @@ mode.chess={
'swd_murongshi',
'shen_lvmeng',
'chenlin',
'hs_zhouzhuo',
'diy_caiwenji',
're_luxun',
'shen_zhaoyun',
@ -6282,8 +6283,24 @@ mode.chess={
'shen_simayi',
'shen_guanyu',
'hs_siwangzhiyi',
'chengyu',
'yangxiu',
'hs_yogg',
'hs_malygos',
'hs_ysera',
'hanba',
],
epic:[
'lingju',
'daxiaoqiao',
'sunxiu',
'swd_weida',
'swd_lilian',
'yxs_luban',
'hs_alextrasza',
'zhugeguo',
'sp_caiwenji',
'ow_yuanshi',
'xk_fujianhan',
'diy_zhenji',
'swd_jipeng',
@ -6333,8 +6350,64 @@ mode.chess={
'gjqt_fanglansheng',
'swd_qiner',
'hs_xsylvanas',
'zhongyao',
'hs_blingtron',
'hs_fuding',
'shixie',
'hs_lafamu',
'hs_nozdormu',
'ow_tianshi',
'yxs_guiguzi',
'ow_zhixuzhiguang',
'hs_jiaziruila',
'hs_yelise',
'hs_xuefashi',
'hs_liadrin',
'yxs_libai',
],
rare:[
'sunluban',
'sunluyu',
'zhangliang',
'zhangbao',
'sp_zhangjiao',
'swd_xiyan',
'sunluban',
'ow_falaozhiying',
'yxs_kaisa',
'yxs_napolun',
'hs_nate',
'yxs_jinke',
'yxs_yuefei',
'guyong',
'hs_anomalus',
'hs_jinglinglong',
'jiangqing',
'mayunlu',
're_liubei',
're_lidian',
'hs_alleria',
'jsp_huangyueying',
'hs_lreno',
'hs_zhouzhuo',
'cenhun',
'hs_loatheb',
'sunziliufang',
'hs_finley',
'ow_chanyata',
'yxs_huamulan',
'cuiyan',
'wangji',
'xin_liru',
'swd_quxian',
'caorui',
'ow_liekong',
'ow_zhixuzhiguang',
'lifeng',
'sundeng',
'hs_xialikeer',
'hs_sainaliusi',
'hs_lrhonin',
'yxs_diaochan',
'hs_anduin',
'swd_hengai',
@ -6349,6 +6422,7 @@ mode.chess={
'diy_yuji',
're_zhangliao',
'caoang',
'hs_zhishigushu',
'pal_jingtian',
'swd_shanxiaoxiao',
'yxs_caocao',