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

Revert "b" 

This reverts commit 19e6ac752a.
This commit is contained in:
libccy 2016-08-15 00:24:00 +08:00
parent 19e6ac752a
commit b737f18a30
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game/game.js
View File

@ -37,7 +37,6 @@
window.indexedDB=null; window.indexedDB=null;
} }
}()); }());
(function(){ (function(){
var _status={ var _status={
paused:false, paused:false,
@ -3370,7 +3369,7 @@
game.saveConfig('confirmtouch',true); game.saveConfig('confirmtouch',true);
game.saveConfig('low_performance',true); game.saveConfig('low_performance',true);
game.saveConfig('confirm_exit',true); game.saveConfig('confirm_exit',true);
if(!lib.ipad){ if(lib.ipad){
game.saveConfig('layout','phone'); game.saveConfig('layout','phone');
} }
} }
@ -4397,7 +4396,8 @@
str=str.replace(/'step 0'|"step 0"/,'if(event.step=='+k+') {event.finish();return;}switch(step){case 0:'); str=str.replace(/'step 0'|"step 0"/,'if(event.step=='+k+') {event.finish();return;}switch(step){case 0:');
} }
return (new Function('event','step','source','player','target','targets', return (new Function('event','step','source','player','target','targets',
'card','cards','skill','forced','num','trigger','result',str)); 'card','cards','skill','forced','num','trigger','result',
'_status','lib','game','ui','get','ai',str));
}, },
eval:function(func){ eval:function(func){
if(typeof func=='function'){ if(typeof func=='function'){
@ -10701,7 +10701,12 @@
clearEquipTrigger:function(){ clearEquipTrigger:function(){
var es=this.get('e'); var es=this.get('e');
for(var i=0;i<es.length;i++){ for(var i=0;i<es.length;i++){
var info=get.info(es) var info=get.info(es[i]);
if(info.skills){
for(var j=0;j<info.skills.length;j++){
this.removeSkillTrigger(info.skills[j]);
}
}
} }
}, },
removeSkillTrigger:function(skill){ removeSkillTrigger:function(skill){
@ -18071,7 +18076,8 @@
} }
else{ else{
event.content(event,step,source,player,target,targets, event.content(event,step,source,player,target,targets,
card,cards,skill,forced,num,trigger,result); card,cards,skill,forced,num,trigger,result,
_status,lib,game,ui,get,ai);
// eval(lib.init.parse(event.content))(); // eval(lib.init.parse(event.content))();
} }
event.step++; event.step++;
@ -19326,6 +19332,7 @@
game.addVideo('addFellow',null,[position,character]); game.addVideo('addFellow',null,[position,character]);
var player=ui.create.player(ui.arena).animate(animation||'start'); var player=ui.create.player(ui.arena).animate(animation||'start');
player.dataset.position=position||game.players.length+game.dead.length; player.dataset.position=position||game.players.length+game.dead.length;
player.getId();
if(character) player.init(character); if(character) player.init(character);
game.players.push(player);game.arrangePlayers(); game.players.push(player);game.arrangePlayers();
return player; return player;