From 5c6f4ee8f868acd0befb67b0059a1ca7c3118ddb Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Sun, 22 Jan 2017 11:22:02 +0800
Subject: [PATCH] 1

---
 character/hearth.js         | 10 +++++++---
 character/sp.js             |  2 ++
 character/xianjian.js       |  4 ++++
 game/server.js              | 30 +++++++++++++++---------------
 game/update.js              | 18 +++++++++---------
 layout/default/layout.css   |  2 +-
 layout/mobile/layout.css    |  4 ++++
 layout/mode/chess.css       |  4 ++++
 layout/newlayout/global.css |  3 +++
 9 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index f3352d2fa..27065af8c 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -4637,7 +4637,7 @@ character.hearth={
 		},
 		fenliu:{
 			enable:'phaseUse',
-			prompt:'流失1点体力并摸两张牌',
+			prompt:'流失1点体力并摸三张牌',
 			usable:1,
 			content:function(){
 				"step 0"
@@ -4649,8 +4649,12 @@ character.hearth={
 				order:4,
 				result:{
 					player:function(player){
-						if(player.num('h')>=player.hp-1) return -1;
-						if(player.hp<3) return -1;
+						var nh=player.num('h');
+						if(nh>=player.hp) return -1;
+						if(player.hp<=2){
+							if(player.hp==2&&nh==0) return 1;
+							return -1;
+						}
 						return 1;
 					}
 				},
diff --git a/character/sp.js b/character/sp.js
index 00225eb23..b0e2b19f4 100644
--- a/character/sp.js
+++ b/character/sp.js
@@ -5070,6 +5070,7 @@ character.sp={
 			forceunique:true,
 			trigger:{player:'phaseBegin'},
 			filter:function(event,player){
+				if(player.storage.fanxiang) return false;
 				for(var i=0;i<game.players.length;i++){
 					if(game.players[i].storage.liangzhu==player&&game.players[i].isDamaged()){
 						return true;
@@ -5079,6 +5080,7 @@ character.sp={
 			},
 			forced:true,
 			content:function(){
+				player.storage.fanxiang=true;
 				player.gainMaxHp();
 				player.recover();
 				player.removeSkill('liangzhu');
diff --git a/character/xianjian.js b/character/xianjian.js
index c712845ac..a841d358e 100644
--- a/character/xianjian.js
+++ b/character/xianjian.js
@@ -101,6 +101,7 @@ character.xianjian={
 				player.gain(list,'draw');
 			},
 			ai:{
+				threaten:1.5,
 				order:5,
 				result:{
 					player:1
@@ -132,6 +133,9 @@ character.xianjian={
 			filter:function(event,player){
 				return player.storage.danqing.length==4;
 			},
+			ai:{
+				threaten:1.2,
+			},
 			content:function(){
 				'step 0'
 				player.storage.danqing.length=0;
diff --git a/game/server.js b/game/server.js
index 69ed26e78..f83681141 100644
--- a/game/server.js
+++ b/game/server.js
@@ -203,25 +203,25 @@
             }
         });
         ws.on('close',function(){
-            if(!clients[this.wsid]) return;
-            if(this.owner){
-                this.owner.sendl('onclose',this.wsid);
-            }
-            else{
-                var room=this.room;
-                if(room&&room.owner==this){
-                    room.owner=null;
-                    room.config=null;
-                    room.servermode=false;
-                    for(var i in clients){
-                        if(clients[i].room==room&&clients[i]!=this){
-                            clients[i].close();
-                            delete clients[i];
+            for(var i=0;i<rooms.length;i++){
+                if(rooms[i].owner==this){
+                    rooms[i].owner=null;
+                    rooms[i].config=null;
+                    rooms[i].servermode=false;
+                    for(var j in clients){
+                        if(clients[j].room==rooms[i]&&clients[j]!=this){
+                            clients[j].close();
+                            delete clients[j];
                         }
                     }
                 }
             }
-            delete clients[this.wsid];
+            if(clients[this.wsid]){
+                if(this.owner){
+                    this.owner.sendl('onclose',this.wsid);
+                }
+                delete clients[this.wsid];
+            }
             util.updaterooms();
         });
     });
diff --git a/game/update.js b/game/update.js
index 40321a768..c3e5e7f23 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,17 +1,17 @@
 window.noname_update={
-    version:'1.9.5',
+    version:'1.9.5.1',
     update:'1.9.5',
     changeLog:[
-        '新外观选项',
-        '塔防模式修复',
+        'bug修复',
     ],
     files:[
-        'game/game.js',
-        'character/gujian.js',
-        'character/swd.js',
-        'character/refresh.js',
+        'game/server.js',
         'character/hearth.js',
-        'character/shenhua.js',
-        'character/rank.js',
+        'character/sp.js',
+        'character/xianjian.js',
+        'layout/default/layout.css',
+        'layout/mobile/layout.css',
+        'layout/mode/chess.css',
+        'layout/newlayout/global.css',
     ]
 }
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 3de20b4be..d803fb52a 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -1963,7 +1963,7 @@ span[data-color="unknownm"]{
 #arena>.skillbar{
     width: 65px;
     height: 65px;
-    border-radius: 100%;
+    border-radius: 100% !important;
     font-size: 55px;
     font-family: 'huangcao';
     top:calc(50% - 110px);
diff --git a/layout/mobile/layout.css b/layout/mobile/layout.css
index 34b0edefb..f7c56f6c6 100644
--- a/layout/mobile/layout.css
+++ b/layout/mobile/layout.css
@@ -301,6 +301,10 @@
     left:0;
     background-size:cover;
 }
+#window[data-radius_size='increase'] #me>.fakeme.avatar,
+#window[data-radius_size='reduce'] #me>.fakeme.avatar{
+    border-radius:0px;
+}
 
 #arena.mobile.oblongcard:not(.chess):not(.textequip) .player[data-position='0']>.equips>.equip1,
 #arena.mobile.oblongcard:not(.chess):not(.textequip) .player[data-position='0']>.equips>.equip2{
diff --git a/layout/mode/chess.css b/layout/mode/chess.css
index 44d565716..d840f8a38 100644
--- a/layout/mode/chess.css
+++ b/layout/mode/chess.css
@@ -97,6 +97,10 @@
     border-radius:0px;
     top:0;
 }
+#window[data-radius_size='increase'] .fakeme,
+#window[data-radius_size='reduce'] .fakeme{
+    border-radius:0px;
+}
 .fakeme.avatar{
     left:0;
     background-size:cover;
diff --git a/layout/newlayout/global.css b/layout/newlayout/global.css
index 2c8e3b2d6..97dec0255 100644
--- a/layout/newlayout/global.css
+++ b/layout/newlayout/global.css
@@ -20,6 +20,7 @@
 	height: 174px;
 	left:3px;
 	top:3px;
+	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
 }
 #window>.player.minskin>.avatar{
 	width: 106px;
@@ -47,6 +48,7 @@
 	height: 114px;
 	left:3px;
 	top:3px;
+	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
 }
 .player.minskin .hp,
 .player.minskin .hp.text{
@@ -136,6 +138,7 @@
 	top:3px;
 	right:3px;
 	height: 174px;
+	box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
 }
 .player .marks,
 .player .judges{