From 19e6ac752aa2e1840bfd16dd5c8f312078a3879a Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Mon, 15 Aug 2016 00:14:24 +0800
Subject: [PATCH] b

---
 game/game.js | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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