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

l

This commit is contained in:
libccy 2016-09-25 12:06:04 +08:00
parent 677cb6c1a2
commit 31d475fca3
5 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
card/swd.js
View File

@ -2418,6 +2418,7 @@ card.swd={
check:function(event,player){ check:function(event,player){
return ai.get.attitude(player,event.player)>=3; return ai.get.attitude(player,event.player)>=3;
}, },
logTarget:'player',
content:function(){ content:function(){
"step 0" "step 0"
trigger.player.recover(); trigger.player.recover();
@ -4140,7 +4141,7 @@ card.swd={
chiyuxi_info:'出牌阶段，对所有其他角色使用。每名目标角色需打出一张【闪】，否则受到1点火焰伤害。', chiyuxi_info:'出牌阶段，对所有其他角色使用。每名目标角色需打出一张【闪】，否则受到1点火焰伤害。',
guangshatianyi:'光纱天衣', guangshatianyi:'光纱天衣',
guangshatianyi_bg:'纱', guangshatianyi_bg:'纱',
guangshatianyi_info:'仅女性可装备，锁定技，每当你即将受到伤害，有三分之一的概率令伤害减一', guangshatianyi_info:'仅女性角色可使用，锁定技，每当你即将受到伤害，有三分之一的概率令伤害减一',
sifeizhenmian:'四非真面', sifeizhenmian:'四非真面',
sifeizhenmian_info:'出牌阶段限一次，你可以指定攻击范围内的一名角色并亮出牌堆顶的一张牌，若此牌为黑色，该角色进入混乱状态直到下一回合结束；否则该角色摸一张牌', sifeizhenmian_info:'出牌阶段限一次，你可以指定攻击范围内的一名角色并亮出牌堆顶的一张牌，若此牌为黑色，该角色进入混乱状态直到下一回合结束；否则该角色摸一张牌',
yiluan:'意乱', yiluan:'意乱',

25
character/hearth.js
View File

@ -2232,29 +2232,30 @@ character.hearth={
enable:'chooseToUse', enable:'chooseToUse',
mark:true, mark:true,
init:function(player){ init:function(player){
player.storage.chongsheng=0; player.storage.chongsheng=2;
game.addVideo('storage',player,['chongsheng',player.storage.chongsheng]); player.syncStorage('chongsheng');
}, },
filter:function(event,player){ filter:function(event,player){
if(event.type!='dying') return false; if(event.type!='dying') return false;
if(player!=_status.dying) return false; if(player!=_status.dying) return false;
if(player.storage.chongsheng==2) return false; if(player.storage.chongsheng<=0) return false;
return true;
}, },
content:function(){ content:function(){
player.hp=Math.min(2-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(2-player.storage.chongsheng); player.draw(player.storage.chongsheng);
player.storage.chongsheng++; player.storage.chongsheng--;
if(player.storage.chongsheng==2){ if(player.storage.chongsheng<=0){
player.unmarkSkill('chongsheng'); player.unmarkSkill('chongsheng');
} }
if(player.isLinked()) player.link(); if(player.isLinked()) player.link();
if(player.isTurnedOver()) player.turnOver(); if(player.isTurnedOver()) player.turnOver();
game.addVideo('storage',player,['chongsheng',player.storage.chongsheng]); player.syncStorage('chongsheng');
}, },
ai:{ ai:{
skillTagFilter:function(player){ skillTagFilter:function(player){
if(player.storage.chongsheng==2) return false; if(player.storage.chongsheng<=0) return false;
if(player.hp>0) return false; if(player.hp>0) return false;
}, },
save:true, save:true,
@ -2262,13 +2263,11 @@ character.hearth={
player:10 player:10
}, },
threaten:function(player,target){ threaten:function(player,target){
if(target.storage.chongsheng<2) return 0.6; if(target.storage.chongsheng>0) return 0.6;
} }
}, },
intro:{ intro:{
content:function(storage){ content:'time'
return '剩余'+get.cnNumber(2-storage)+'次';
}
} }
}, },
guozai:{ guozai:{

24
character/swd.js
View File

@ -459,7 +459,7 @@ character.swd={
if(!player.num('he',{color:'red'})) return false; if(!player.num('he',{color:'red'})) return false;
}, },
}, },
group:['huanxia_expire','huanxia_draw'], group:['huanxia_expire','huanxia_draw','huanxia_gain'],
subSkill:{ subSkill:{
expire:{ expire:{
trigger:{source:'damageAfter'}, trigger:{source:'damageAfter'},
@ -474,16 +474,32 @@ character.swd={
}, },
draw:{ draw:{
trigger:{player:'shaAfter'}, trigger:{player:'shaAfter'},
direct:true, forced:true,
popup:false,
content:function(){ content:function(){
if(trigger.parent.skill=='huanxia'){ if(trigger.parent.skill=='huanxia'){
var card=trigger.cards[0]; var card=trigger.cards[0];
if(get.itemtype(card)=='card'&&get.position(card)=='d'&&!player.storage.huanxia){ if(get.itemtype(card)=='card'&&get.position(card)=='d'&&!player.storage.huanxia){
player.gain(card,'gain2'); ui.special.appendChild(card);
if(!player.storage.huanxia_draw){
player.storage.huanxia_draw=[];
}
player.storage.huanxia_draw.push(card);
} }
} }
delete player.storage.huanxia; delete player.storage.huanxia;
} }
},
gain:{
trigger:{player:'phaseEnd'},
forced:true,
filter:function(event,player){
return player.storage.huanxia_draw;
},
content:function(){
player.gain(player.storage.huanxia_draw,'gain2');
delete player.storage.huanxia_draw;
}
} }
} }
}, },
@ -8067,7 +8083,7 @@ character.swd={
jinlin:'金鳞', jinlin:'金鳞',
jinlin_info:'限定技，出牌阶段，你可以令任意名角色各获得3点护甲，获得护甲的角色于每个回合开始阶段失去1点护甲直到首次失去所有护甲或累计以此法失去3点护甲', jinlin_info:'限定技，出牌阶段，你可以令任意名角色各获得3点护甲，获得护甲的角色于每个回合开始阶段失去1点护甲直到首次失去所有护甲或累计以此法失去3点护甲',
huanxia:'幻霞', huanxia:'幻霞',
huanxia_info:'你可以将一张红色牌当作杀使用，若此杀未造成伤害，你可以在其进入弃牌堆后收回此牌', huanxia_info:'你可以将一张红色牌当作杀使用，若此杀未造成伤害，你在回合结束时收回此牌',
jingjie:'镜界', jingjie:'镜界',
jingjie_info:'回合开始阶段，你可以流失一点体力，并', jingjie_info:'回合开始阶段，你可以流失一点体力，并',
jingjie_old_info:'限定技，出牌阶段，你可以令所有角色弃置所有牌，然后摸两张牌（不触发任何技能）', jingjie_old_info:'限定技，出牌阶段，你可以令所有角色弃置所有牌，然后摸两张牌（不触发任何技能）',

25
game/game.js
View File

@ -3431,7 +3431,6 @@
lib.status.canvas=false; lib.status.canvas=false;
return false; return false;
} }
_status.canvasChanged=true;
ui.canvas.width=ui.arena.offsetWidth; ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight; ui.canvas.height=ui.arena.offsetHeight;
var ctx=ui.ctx; var ctx=ui.ctx;
@ -19236,11 +19235,8 @@
ui.touchlines.shift().delete(); ui.touchlines.shift().delete();
} }
} }
if(_status.canvasChanged||!lib.config.low_performance){ ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.width=ui.arena.offsetWidth; ui.canvas.height=ui.arena.offsetHeight;
ui.canvas.height=ui.arena.offsetHeight;
delete _status.canvasChanged;
}
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
game.players[i].unprompt(); game.players[i].unprompt();
} }
@ -28899,8 +28895,6 @@
_status.clicked=false; _status.clicked=false;
game.uncheck(); game.uncheck();
game.check(); game.check();
ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight;
_status.clicked=true; _status.clicked=true;
} }
return; return;
@ -29125,6 +29119,8 @@
ui.confirm.close(); ui.confirm.close();
} }
ui.click.ok(); ui.click.ok();
ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight;
} }
else{ else{
game.uncheck(); game.uncheck();
@ -29142,11 +29138,6 @@
while(ui.touchlines.length){ while(ui.touchlines.length){
ui.touchlines.shift().delete(); ui.touchlines.shift().delete();
} }
if(_status.canvasChanged){
ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight;
delete _status.canvasChanged;
}
if(tmpflag){ if(tmpflag){
game.check(); game.check();
} }
@ -29237,8 +29228,6 @@
_status.clicked=false; _status.clicked=false;
game.uncheck(); game.uncheck();
game.check(); game.check();
ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight;
_status.clicked=true; _status.clicked=true;
} }
return; return;
@ -29485,8 +29474,6 @@
_status.mouseleft=false; _status.mouseleft=false;
_status.mousedragorigin=null; _status.mousedragorigin=null;
_status.dragstatuschanged=false; _status.dragstatuschanged=false;
ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight;
game.uncheck(); game.uncheck();
game.check(); game.check();
_status.noright=true; _status.noright=true;
@ -32192,13 +32179,13 @@
} }
case 'turn':{ case 'turn':{
if(content>0){ if(content>0){
return '还剩'+content+'个回合'; return '剩余'+content+'个回合';
} }
return false; return false;
} }
case 'time':{ case 'time':{
if(content>0){ if(content>0){
return '还剩'+content+'次'; return '剩余'+content+'次';
} }
return false; return false;
} }

2
game/update.js
View File

@ -22,8 +22,10 @@ window.noname_update={
// 'card/swd.js', // 'card/swd.js',
// 'game/package.js', // 'game/package.js',
// 'game/asset.js', // 'game/asset.js',
// 'game/game.js',
// 'character/diy.js', // 'character/diy.js',
// 'character/swd.js', // 'character/swd.js',
// 'character/hearth.js',
// 'mode/boss.js', // 'mode/boss.js',
// 'mode/versus.js', // 'mode/versus.js',
// 'extension/boss/extension.js', // 'extension/boss/extension.js',