From a543a89d076d525e783c9348304b4ecdc806dfab Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 1 Sep 2016 18:59:52 +0800
Subject: [PATCH] 1.9.0.2

---
 character/gujian.js |  2 +-
 game/game.js        | 37 ++++++++++++++++++++++---------------
 game/update.js      | 14 ++++++--------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/character/gujian.js b/character/gujian.js
index 9c6df936a..af1cf6a05 100644
--- a/character/gujian.js
+++ b/character/gujian.js
@@ -1116,7 +1116,7 @@ character.gujian={
 		yangming:'养命',
 		yangming2:'养命',
 		xuanning_info:'出牌阶段，你可以弃置一基本牌，获得至多3个玄凝标记。当你受到伤害时，若你有玄凝标记，你须弃置一个玄凝标记并弃置伤害来源一张牌',
-		liuguang_info:'回合开始阶段，若你有玄凝标记，你可以弃置一枚玄凝标记，选择至多三名角色依次令其弃置一张牌或受到一点伤害，若有角色受到伤害则终止结算',
+		liuguang_info:'回合开始阶段，若你有玄凝标记，你可以弃置一枚玄凝标记，选择至多三名角色依次令其选择一项：弃置一张牌，或受到一点伤害，并终止流光结算',
 		yangming_info:'出牌阶段，你可以弃置一张红色牌，并在下个出牌阶段结束时令距离1以内的任意名角色回复一点体力，在此之前不可再次发动',
 		zhaolu:'朝露',
 		jiehuo:'劫火',
diff --git a/game/game.js b/game/game.js
index 7fcb6d8d4..6a84abed1 100644
--- a/game/game.js
+++ b/game/game.js
@@ -449,6 +449,12 @@
 						else{
 							map.round_menu_func.show();
 						}
+                        if(lib.device=='ios'||lib.device=='android'){
+                            map.confirm_exit.show();
+                        }
+                        else{
+                            map.confirm_exit.hide();
+                        }
 					}
 				}
 			},
@@ -1565,7 +1571,7 @@
 						onclick:function(){
 							if(this.innerHTML!='已隐藏'){
 								this.innerHTML='已隐藏';
-								game.saveConfig('hiddenModePack',['stone','chess','boss']);
+								game.saveConfig('hiddenModePack',['stone','chess','boss','tafang']);
 								game.saveConfig('hiddenCardPack',['zhenfa','yunchou','swd','shenqi','hearth','compensate']);
 								game.saveConfig('hiddenCharacterPack',['diy','yxs','hearth','swd','gujian','xianjian','xiake','boss','ow']);
 								var that=this;
@@ -3642,7 +3648,12 @@
                         }
                     };
                     game.download=function(url,folder,onsuccess,onerror){
-                        url=get.url()+url;
+                        if(url.indexOf('web/')==0){
+                            url='http://'+lib.hallURL+'/'+url;
+                        }
+                        else{
+                            url=get.url()+url;
+                        }
                         game.print(url);
                         var dir=folder.split('/');
                         var str='';
@@ -28053,17 +28064,13 @@
 					e.stopPropagation();
 				});
 
-				var rows=Math.ceil(lib.config.all.mode.length/3);
+				var rows=Math.floor(lib.config.all.mode.length/3);
 				uiintro.type='config';
                 var modes=lib.config.modeorder||lib.config.all.mode.slice(0);
                 for(var i=0;i<modes.length;i++){
                     if(!lib.config.all.mode.contains(modes[i])){
                         modes.splice(i--,1);
                     }
-                }
-                if(modes.length==7){
-                    modes.pop();
-                    rows--;
                 }
 				for(var k=0;k<rows;k++){
 					var node=ui.create.div('.newgame');
@@ -33335,12 +33342,12 @@
 			document.ontouchend=ui.click.windowtouchend;
 			document.ontouchmove=ui.click.windowtouchmove;
 		}
-		window.onbeforeunload=function(){
-			if(lib.config.confirm_exit&&!_status.reloading){
-				return '是否离开游戏？'
-			}
-			else{
-				return null;
-			}
-		}
+		// window.onbeforeunload=function(){
+		// 	if(lib.config.confirm_exit&&!_status.reloading){
+		// 		return '是否离开游戏？'
+		// 	}
+		// 	else{
+		// 		return null;
+		// 	}
+		// }
 }());
diff --git a/game/update.js b/game/update.js
index 502a35596..09f580f19 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,21 +1,19 @@
 window.noname_update={
-    version:'1.9.0.1',
+    version:'1.9.0.2',
     changeLog:[
         'bug修复',
     ],
     files:{
         global:[
             'game/game.js',
-            'game/config.js',
-            'card/standard.js',
-            'character/hearth.js',
+            'card/extra.js',
+            'card/swd.js',
             'character/ow.js',
-            'character/yijiang.js',
+            'character/gujian.js',
             'mode/brawl.js',
-            'layout/mode/chess.css',
+            'mode/tafang.js',
             'layout/default/layout.css',
-            'layout/mobile/layout.css',
         ],
-        '1.9.0':[]
+        '1.9.0.1':[]
     }
 }