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

a

This commit is contained in:
libccy 2016-07-20 10:04:20 +08:00
parent 0fcb690856
commit f5da7f4eb2
9 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
card/hearth.js
View File

@ -569,8 +569,8 @@ card.hearth={
if(target.hasSkillTag('maixie')&&target.hp>1&&ui.selected.cards.length){
return 0;
}
if(player.get('s').contains('xinwuyan')) return 0;
if(target.get('s').contains('xinwuyan')) return 0;
if(player.hasSkillTag('notricksource')) return 0;
if(target.hasSkillTag('notrick')) return 0;
if(card.name=='tao') return 0;
if(target.hp==1&&card.name=='jiu') return 0;
if(get.type(card)!='basic'){

12
card/standard.js
View File

@ -615,8 +615,8 @@ card.standard={
next.set('ai',function(card){
var evt=_status.event.getParent();
if(ai.get.damageEffect(evt.target,evt.player,evt.target)>=0) return 0;
if(evt.player.get('s').contains('xinwuyan')) return 0;
if(evt.target.get('s').contains('xinwuyan')) return 0;
if(evt.player.hasSkillTag('notricksource')) return 0;
if(evt.target.hasSkillTag('notrick')) return 0;
return 1;
});
next.autochoose=lib.filter.autoRespondSha;
@ -675,8 +675,8 @@ card.standard={
next.set('ai',function(card){
var evt=_status.event.getParent();
if(ai.get.damageEffect(evt.target,evt.player,evt.target)>=0) return 0;
if(evt.player.get('s').contains('xinwuyan')) return 0;
if(evt.target.get('s').contains('xinwuyan')) return 0;
if(evt.player.hasSkillTag('notricksource')) return 0;
if(evt.target.hasSkillTag('notrick')) return 0;
return 1;
});
next.autochoose=lib.filter.autoRespondShan;
@ -767,8 +767,8 @@ card.standard={
else{
var next=event.turn.chooseToRespond({name:'sha'});
next.ai=function(card){
if(player.get('s').contains('xinwuyan')) return 0;
if(target.get('s').contains('xinwuyan')) return 0;
if(player.hasSkillTag('notricksource')) return 0;
if(target.hasSkillTag('notrick')) return 0;
if(event.turn==target){
if(player.hasSkill('naman')) return -1;
if(ai.get.attitude(target,player)<0){

12
card/swd.js
View File

@ -756,8 +756,8 @@ card.swd={
var next=target.chooseToRespond({name:'sha'});
next.ai=function(card){
if(ai.get.damageEffect(target,player,target,'thunder')>=0) return 0;
if(player.get('s').contains('xinwuyan')) return 0;
if(target.get('s').contains('xinwuyan')) return 0;
if(player.hasSkillTag('notricksource')) return 0;
if(target.hasSkillTag('notrick')) return 0;
return 1;
};
next.autochoose=lib.filter.autoRespondSha;
@ -817,8 +817,8 @@ card.swd={
var next=target.chooseToRespond({name:'shan'});
next.ai=function(card){
if(ai.get.damageEffect(target,player,target,'fire')>=0) return 0;
if(player.get('s').contains('xinwuyan')) return 0;
if(target.get('s').contains('xinwuyan')) return 0;
if(player.hasSkillTag('notricksource')) return 0;
if(target.hasSkillTag('notrick')) return 0;
return 1;
};
next.autochoose=lib.filter.autoRespondShan;
@ -2326,8 +2326,8 @@ card.swd={
nigong2:'逆攻',
nigong3:'逆攻',
nigong4:'逆攻',
guilingyupei_info:'每当你受到一点伤害，你获得一个逆攻标记，标记数不能超4。出牌阶段，你可以弃置所有逆攻标记并令任意一名其他角色X/2点伤害，X为逆攻标记的数量且向下取整',
nigong_info:'每当你受到一点伤害，你获得一个逆攻标记，标记数不能超4。出牌阶段，你可以弃置所有逆攻标记并令任意一名其他角色X/2点伤害，X为逆攻标记的数量且向下取整',
guilingyupei_info:'每当你受到一点伤害，你获得一个逆攻标记，标记数不能超过4。出牌阶段，你可以弃置所有逆攻标记并令任意一名其他角色X/2点伤害，X为逆攻标记的数量且向下取整',
nigong_info:'每当你受到一点伤害，你获得一个逆攻标记，标记数不能超过4。出牌阶段，你可以弃置所有逆攻标记并令任意一名其他角色X/2点伤害，X为逆攻标记的数量且向下取整',
baihupifeng:'白狐披风',
baihupifeng_bg:'狐',
baihupifeng_info:'回合结束阶段，若你的体力值是全场最小的之一，你可以回复一点体力',

4
card/yunchou.js
View File

@ -529,8 +529,8 @@ card.yunchou={
target.chooseToDiscard('he',2).ai=function(card){
if(target.hasSkillTag('nofire')) return 0;
if(ai.get.damageEffect(target,player,target,'fire')>=0) return 0;
if(player.get('s').contains('xinwuyan')) return 0;
if(target.get('s').contains('xinwuyan')) return 0;
if(player.hasSkillTag('notricksource')) return 0;
if(target.hasSkillTag('notrick')) return 0;
if(card.name=='tao') return 0;
if(target.hp==1&&card.name=='jiu') return 0;
if(target.hp==1&&get.type(card)!='basic'){

2
character/yijiang.js
View File

@ -5430,6 +5430,8 @@ character.yijiang={
trigger.finish();
},
ai:{
notrick:true,
notricksource:true,
effect:{
target:function(card,player,target,current){
if(get.type(card)=='trick'&&get.tag(card,'damage')){

2
game/asset.js
View File

@ -1,5 +1,5 @@
window.noname_asset_list=[
'1.8.13',
'1.8.14',
'image/background/huangtian_bg.jpg',
'image/background/shengshi_bg.jpg',
'image/background/xueji_bg.jpg',

29
game/game.js
View File

@ -1111,6 +1111,15 @@
ui.arena.dataset.target_shake=bool;
}
},
link_style:{
name:'横置样式',
init:'rotate',
unfrequent:true,
item:{
rotate:'横置',
mark:'标记'
}
},
name_font:{
name:'人名字体',
init:'xinwei',
@ -9149,6 +9158,10 @@
ui.restart.close();
delete ui.restart;
}
if(ui.continue_game){
ui.continue_game.close();
delete ui.continue_game;
}
}
},
isMad:function(){
@ -11102,8 +11115,11 @@
if(lib.isMobileMe(this)){
this.node.avatar.style.transform=transform;
this.node.avatar2.style.transform=transform;
this.style.transform='';
}
else{
this.node.avatar.style.transform='';
this.node.avatar2.style.transform='';
this.style.transform=transform;
}
this.queue(false);
@ -17491,7 +17507,11 @@
}
game.me.node.handcards1.remove();
game.me.node.handcards2.remove();
var current=game.me;
game.me=player;
if(current.isDead()){
current.$die();
}
ui.handcards1=player.node.handcards1.animate('start').fix();
ui.handcards2=player.node.handcards2.animate('start').fix();
ui.handcards1Container.appendChild(ui.handcards1);
@ -17514,6 +17534,10 @@
ui.restart.close();
delete ui.restart;
}
if(ui.continue_game){
ui.continue_game.close();
delete ui.continue_game;
}
}
if(lib.config.mode=='identity'){
game.me.setIdentity(game.me.identity);
@ -17548,6 +17572,10 @@
ui.restart.close();
delete ui.restart;
}
if(ui.continue_game){
ui.continue_game.close();
delete ui.continue_game;
}
}
},
findNext:function(player){
@ -23518,7 +23546,6 @@
// }
ui.arena.dataset.target_shake=lib.config.target_shake||'off';
ui.arena.dataset.name_font=lib.config.name_font||'xinwei';
ui.arena.dataset.identity_font=lib.config.identity_font||'huangcao';
ui.arena.dataset.cardtext_font=lib.config.cardtext_font||'default';

24
game/update.js
View File

@ -1,29 +1,19 @@
window.noname_update={
version:'1.8.18',
version:'1.8.18.1',
changeLog:[
'修bug',
],
files:{
global:[
'game/game.js',
'game/asset.js',
'card/swd.js',
'card/standard.js',
'card/sp.js',
'card/yunchou.js',
'card/guozhan.js',
'character/rank.js',
'character/ow.js',
'character/yxs.js',
'character/swd.js',
'character/sp.js',
'character/hearth.js',
'character/xianjian.js',
'character/gujian.js',
'mode/identity.js',
'mode/guozhan.js',
'character/yijiang.js',
'card/swd.js',
'card/hearth.js',
'card/standard.js',
'card/yunchou.js',
'layout/default/layout.css',
],
'1.8.17.5':[],
'1.8.18':[],
}
}

8
layout/default/layout.css
View File

@ -518,6 +518,14 @@ div:not(.handcards)>.card>.info,
.handcards>.card:last-child>.info,
div:not(.handcards)>.card>.name,
.handcards>.card:last-child>.name{transform: none !important}
div:not(.handcards).menu-buttons>.button.card>.name{
transform: scale(0.9) !important;
transform-origin: top left;
}
div:not(.handcards).menu-buttons>.button.card>.info{
transform: scale(0.9) !important;
transform-origin: top right;
}
div:not(.handcards)>.card>.info>span,
.handcards>.card:last-child>.info>span{display: inline !important}
.card>.image{