From 10ea9313c5525d33801c03242d716de9bdb38a5c Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Wed, 10 Aug 2016 23:12:07 +0800
Subject: [PATCH] ios

---
 card/swd.js          |  5 ++++-
 character/shenhua.js |  2 +-
 game/game.js         | 16 ++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/card/swd.js b/card/swd.js
index 3949cadda..dcbbeae34 100755
--- a/card/swd.js
+++ b/card/swd.js
@@ -2045,7 +2045,10 @@ card.swd={
 			ai:{
 				order:10,
 				result:{
-					target:-1
+					target:function(player,target){
+						if(target.isMad()) return 0;
+						return -1;
+					}
 				}
 			}
 		},
diff --git a/character/shenhua.js b/character/shenhua.js
index 6369d94e6..f0b280538 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -515,7 +515,7 @@ character.shenhua={
 			filter:function(event,player){
 				if(player==_status.currentPhase) return false;
 				for(var i=0;i<event.cards.length;i++){
-					if(event.cards[i].original!='j') return true;
+					if(event.cards[i].original&&event.cards[i].original!='j') return true;
 				}
 				return false;
 			},
diff --git a/game/game.js b/game/game.js
index d18ae4f2a..9d5d56dff 100755
--- a/game/game.js
+++ b/game/game.js
@@ -3682,12 +3682,24 @@
                 if(navigator.userAgent.toLowerCase().indexOf('crosswalk')!=-1){
                     lib.crosswalk=true;
                 }
-                if(lib.device&&window.devicePixelRatio>1&&document.documentElement.offsetWidth<900&&!lib.crosswalk){
+                if(lib.device=='android'&&window.devicePixelRatio>1&&document.documentElement.offsetWidth<900&&!lib.crosswalk){
                     game.documentZoom=document.documentElement.offsetWidth/960;
                     game.deviceZoom=game.documentZoom;
                     document.documentElement.style.zoom=game.documentZoom;
                 }
                 else{
+                    if(lib.device=='ios'){
+                        if(document.documentElement.offsetWidth<900){
+                            var zoom=Math.round(document.documentElement.offsetWidth/96)/10;
+                            var metas=document.head.querySelectorAll('meta');
+                            for(var j=0;j<metas.length;j++){
+                                if(metas[j].name=='viewport'){
+                                    metas[j].content="user-scalable=no, initial-scale="+zoom+", maximum-scale="+zoom+", minimum-scale="+zoom+", width=device-width, height=device-height";
+                                    break;
+                                }
+                            }
+                        }
+                    }
                     game.documentZoom=1;
                     game.deviceZoom=1;
                 }
@@ -19424,7 +19436,7 @@
 	                        active._link.remove();
 	                    }
 	                    this.classList.add('active');
-                        if((game.deviceZoom!=1||lib.crosswalk)&&lib.config.layout=='phone'){
+                        if((game.deviceZoom!=1||lib.crosswalk||lib.device=='ios')&&lib.config.layout=='phone'){
                             menuTabBar.style.left=(this.offsetLeft/game.documentZoom)+'px';
                         }
 	                    else{