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

d

This commit is contained in:
libccy 2017-02-13 22:12:45 +08:00
parent afb42d62b6
commit 6a6c578482
4 changed files with 151 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
card/swd.js
View File

@ -2111,12 +2111,14 @@ card.swd={
if(event.card.name=='shenmiguo') return false; if(event.card.name=='shenmiguo') return false;
if(event.card.name=='yuchankan') return false; if(event.card.name=='yuchankan') return false;
if(player.hasSkill('shenmiguo2')) return false; if(player.hasSkill('shenmiguo2')) return false;
if(get.info(event.card).complexTarget) return false;
var type=get.type(event.card); var type=get.type(event.card);
if(type!='basic'&&type!='trick') return false; if(type!='basic'&&type!='trick') return false;
var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature); var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature);
for(var i=0;i<event.targets.length;i++){ var targets=event._targets||event.targets;
if(!event.targets[i].isAlive()) return false; for(var i=0;i<targets.length;i++){
if(!player.canUse({name:event.card.name},event.targets[i],false,false)){ if(!targets[i].isIn()) return false;
if(!player.canUse({name:event.card.name},targets[i],false,false)){
return false; return false;
} }
} }
@ -2127,7 +2129,7 @@ card.swd={
content:function(){ content:function(){
'step 0' 'step 0'
var card=game.createCard(trigger.card.name,trigger.card.suit,trigger.card.number,trigger.card.nature); var card=game.createCard(trigger.card.name,trigger.card.suit,trigger.card.number,trigger.card.nature);
player.storage.shenmiguo=[card,trigger.targets]; player.storage.shenmiguo=[card,(trigger._targets||trigger.targets).slice(0)];
player.chooseToUse('是否使用神秘果？',function(card,player){ player.chooseToUse('是否使用神秘果？',function(card,player){
if(card.name!='shenmiguo'&&card.name!='yuchankan') return false; if(card.name!='shenmiguo'&&card.name!='yuchankan') return false;
var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.get('s')); var mod=game.checkMod(card,player,'unchanged','cardEnabled',player.get('s'));

12
character/hearth.js
View File

@ -2605,12 +2605,14 @@ character.hearth={
if(_status.currentPhase!=player) return false; if(_status.currentPhase!=player) return false;
if(event.parent.parent.name!='phaseUse') return false; if(event.parent.parent.name!='phaseUse') return false;
if(!event.targets||!event.card) return false; if(!event.targets||!event.card) return false;
if(get.info(event.card).complexTarget) return false;
var type=get.type(event.card); var type=get.type(event.card);
if(type!='basic'&&type!='trick') return false; if(type!='basic'&&type!='trick') return false;
var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature); var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature);
for(var i=0;i<event.targets.length;i++){ var targets=event._targets||event.targets;
if(!event.targets[i].isAlive()) return false; for(var i=0;i<targets.length;i++){
if(!player.canUse({name:event.card.name},event.targets[i],false,false)){ if(!targets[i].isIn()) return false;
if(!player.canUse({name:event.card.name},targets[i],false,false)){
return false; return false;
} }
} }
@ -2621,12 +2623,14 @@ character.hearth={
if(event.card.name=='jiu') return false; if(event.card.name=='jiu') return false;
if(event.card.name=='tianxianjiu') return false; if(event.card.name=='tianxianjiu') return false;
if(event.card.name=='toulianghuanzhu') return false; if(event.card.name=='toulianghuanzhu') return false;
if(event.card.name=='shijieshu') return false;
if(event.card.name=='xietianzi') return false;
return true; return true;
}, },
content:function(){ content:function(){
player.storage.qianghua++; player.storage.qianghua++;
var card=game.createCard(trigger.card.name,trigger.card.suit,trigger.card.number,trigger.card.nature); var card=game.createCard(trigger.card.name,trigger.card.suit,trigger.card.number,trigger.card.nature);
player.useCard(card,trigger.targets); player.useCard(card,(trigger._targets||trigger.targets).slice(0));
}, },
ai:{ ai:{
threaten:1.3 threaten:1.3

136
game/game.js
View File

@ -8550,6 +8550,7 @@
if(event.addedTargets){ if(event.addedTargets){
next.addedTargets=event.addedTargets; next.addedTargets=event.addedTargets;
next.addedTarget=event.addedTarget; next.addedTarget=event.addedTarget;
next._targets=event._targets;
} }
if(info.targetDelay===false){ if(info.targetDelay===false){
event.targetDelay=false; event.targetDelay=false;
@ -11403,6 +11404,7 @@
info.changeTarget(next.player,next.targets); info.changeTarget(next.player,next.targets);
} }
if(info.singleCard){ if(info.singleCard){
next._targets=next.targets.slice(0);
next.target=next.targets[0]; next.target=next.targets[0];
next.addedTargets=next.targets.splice(1); next.addedTargets=next.targets.splice(1);
if(next.addedTargets.length){ if(next.addedTargets.length){
@ -24110,7 +24112,7 @@
if(i!='others') createModeConfig(i,start.firstChild); if(i!='others') createModeConfig(i,start.firstChild);
} }
(function(){ (function(){
if(!lib.device&&!lib.node) return; if(!game.download||!lib.device) return;
var page=ui.create.div('#create-extension'); var page=ui.create.div('#create-extension');
var node=ui.create.div('.menubutton.large','文件',start.firstChild,clickMode); var node=ui.create.div('.menubutton.large','文件',start.firstChild,clickMode);
node.link=page; node.link=page;
@ -24147,11 +24149,12 @@
importExtension.style.width='100%'; importExtension.style.width='100%';
importExtension.style.textAlign='left'; importExtension.style.textAlign='left';
ui.create.div('','<input type="file" accept="application/zip" style="width:153px"><button>确定</button>',importExtension); ui.create.div('','<input type="file" accept="application/zip" style="width:153px"><button>确定</button>',importExtension);
var promptnode=ui.create.div('','<div style="width:153px;font-size:small;margin-top:8px">正在导入',importExtension); var promptnode=ui.create.div('','<div style="width:153px;font-size:small;margin-top:8px">',importExtension);
promptnode.style.display='none'; promptnode.style.display='none';
importExtension.firstChild.lastChild.onclick=function(){ importExtension.firstChild.lastChild.onclick=function(){
if(promptnode.style.display!='none') return; if(promptnode.style.display!='none') return;
promptnode.style.display=''; promptnode.style.display='';
promptnode.firstChild.innerHTML='正在导入...';
var fileToLoad=this.previousSibling.files[0]; var fileToLoad=this.previousSibling.files[0];
if(fileToLoad){ if(fileToLoad){
var fileReader = new FileReader(); var fileReader = new FileReader();
@ -24171,8 +24174,131 @@
var loadData=function(){ var loadData=function(){
var zip=new JSZip(); var zip=new JSZip();
zip.load(data); zip.load(data);
console.log(zip.files); var images=[],audios=[],fonts=[],directories={},directorylist=[];
window.z=zip; for(var i in zip.files){
var ext=i.slice(i.lastIndexOf('.')+1);
if(i.indexOf('audio/')==0&&(ext=='mp3'||ext=='ogg')){
audios.push(i);
}
else if(i.indexOf('font/')==0&&ext=='ttf'){
fonts.push(i);
}
else if(i.indexOf('image/')==0&&(ext=='jpg'||ext=='png')){
images.push(i);
}
else{
continue;
}
var index=i.lastIndexOf('/');
var str=i.slice(0,index);
if(!directories[str]){
directories[str]=[];
directorylist.push(str);
}
directories[str].push(i.slice(index+1));
}
if(audios.length||fonts.length||images.length){
var str='';
if(audios.length){
str+=audios.length+'个音频文件';
}
if(fonts.length){
if(str.length) str+='、'
str+=fonts.length+'个字体文件';
}
if(images.length){
if(str.length) str+='、'
str+=images.length+'个图片文件';
}
var filelist=audios.concat(fonts).concat(images);
if(filelist.length>500){
str+='，导入时间可能较长';
}
var assetLoaded=function(){
promptnode.firstChild.innerHTML='导入成功。<span style="text-decoration:underline">重新启动</span><span style="float:right">×</span>';
promptnode.querySelectorAll('span')[0].onclick=game.reload;
promptnode.querySelectorAll('span')[1].onclick=function(){
promptnode.style.display='none';
}
};
if(confirm('本次将导入'+str+'，是否继续？')){
if(lib.node&&lib.node.fs){
var access=function(str,dir,callback){
if(!dir.length){
callback();
str+='/'+dir[0];
}
else{
str+='/'+dir.shift();
lib.node.fs.access(__dirname+str,function(e){
if(e){
try{
lib.node.fs.mkdir(__dirname+str,function(){
access(str,dir,callback);
});
}
catch(e){
console.log(e);
}
}
else{
access(str,dir,callback);
}
});
}
}
var writeFile=function(){
if(filelist.length){
var str=filelist.shift();
lib.node.fs.writeFile(__dirname+'/'+str,zip.files[str].asNodeBuffer(),null,writeFile);
}
else{
assetLoaded();
}
};
var createDirectory=function(){
if(directorylist.length){
access('',directorylist.shift().split('/'),createDirectory);
}
else{
writeFile();
}
};
createDirectory();
}
else{
var getDirectory=function(){
if(directorylist.length){
var dir=directorylist.shift();
var filelist=directories[dir];
game.print(dir);
window.resolveLocalFileSystemURL(lib.assetURL+dir,function(entry){
if(filelist.length){
var filename=filelist.shift();
game.print(filename);
entry.getFile(filename,{create:true},function(fileEntry){
fileEntry.createWriter(function(fileWriter){
fileWriter.onwriteend=writeFile;
fileWriter.write(zip.files[dir+'/'+filename].asArrayBuffer());
});
});
}
else{
getDirectory();
}
});
}
else{
assetLoaded();
}
};
getDirectory();
}
}
else{
promptnode.style.display='none';
}
}
} }
if(!window.JSZip){ if(!window.JSZip){
lib.init.js(lib.assetURL+'game','jszip',loadData); lib.init.js(lib.assetURL+'game','jszip',loadData);
@ -24242,7 +24368,7 @@
return page; return page;
}()); }());
createDash('图','图片文件',dash1); createDash('图','图片文件',dash1);
createDash('音','音乐文件',dash2); createDash('音','音频文件',dash2);
createDash('字','字体文件',dash3); createDash('字','字体文件',dash3);
createDash('全','全部文件',dash4); createDash('全','全部文件',dash4);
}()); }());

11
mode/boss.js
View File

@ -832,11 +832,12 @@ mode.boss={
if(!event.targets||!event.card) return false; if(!event.targets||!event.card) return false;
if(event.card&&event.card.name=='wuxie') return false; if(event.card&&event.card.name=='wuxie') return false;
var type=get.type(event.card); var type=get.type(event.card);
if(type!='trick') return false; if(type!='basic'&&type!='trick') return false;
var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature); var card=game.createCard(event.card.name,event.card.suit,event.card.number,event.card.nature);
for(var i=0;i<event.targets.length;i++){ var targets=event._targets||event.targets;
if(!event.targets[i].isAlive()) return false; for(var i=0;i<targets.length;i++){
if(!player.canUse({name:event.card.name},event.targets[i],false,false)){ if(!targets[i].isIn()) return false;
if(!player.canUse({name:event.card.name},targets[i],false,false)){
return false; return false;
} }
} }
@ -848,7 +849,7 @@ mode.boss={
}, },
content:function(){ content:function(){
var card=game.createCard(trigger.card.name,trigger.card.suit,trigger.card.number,trigger.card.nature); var card=game.createCard(trigger.card.name,trigger.card.suit,trigger.card.number,trigger.card.nature);
player.useCard(card,trigger.targets); player.useCard(card,(trigger._targets||trigger.targets).slice(0));
}, },
ai:{ ai:{
threaten:1.3 threaten:1.3