From ae93ed0d8502f38ef3ae74aff9a05db0f22adfa1 Mon Sep 17 00:00:00 2001
From: libccy <widget@widgetdeMacBook-Pro.local>
Date: Thu, 7 Apr 2016 23:54:17 +0800
Subject: [PATCH] w

---
 character/shenhua.js      |  5 +++--
 game/game.js              | 15 +++++++++++----
 game/update.js            | 11 ++++++-----
 layout/default/layout.css |  3 ++-
 mode/connect.js           |  9 +++++++++
 mode/identity.js          |  2 +-
 6 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/character/shenhua.js b/character/shenhua.js
index f28c996c2..13531d965 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1901,8 +1901,9 @@ character.shenhua={
 		wansha2:{
 			mod:{
 				cardSavable:function(card,player){
-					if(_status.currentPhase.skills.contains('wansha')&&_status.currentPhase!=player){
-						if(card.name=='tao'&&_status.dying!=player) return false;
+					if(!_status.currentPhase) return;
+					if(_status.currentPhase.get('s').contains('wansha')&&_status.currentPhase!=player){
+						if(card.name=='tao'&&_status.event.dying!=player) return false;
 					}
 				}
 			}
diff --git a/game/game.js b/game/game.js
index 7227d8155..d3cc5ab84 100755
--- a/game/game.js
+++ b/game/game.js
@@ -11395,9 +11395,9 @@
                             player.classList.add('glow_phase');
                         },player);
 					}
+					_status.currentPhase=player;
                     game.syncState();
 					game.addVideo('phaseChange',player);
-					_status.currentPhase=player;
 					game.log();
 					game.log(player,'的回合开始');
 					game.phaseNumber++;
@@ -11974,7 +11974,13 @@
                         if(game.updateState){
                             game.updateState(state2);
                         }
-                        game.createEvent('game',false).content=lib.init.startOnline;
+                        var next=game.createEvent('game',false);
+                        next.content=lib.init.startOnline;
+                        if(observe){
+                            next.custom.replace.target=function(player){
+                                if(player.isAlive()) game.swapPlayer(player);
+                            }
+                        }
                         game.loop();
                         game.send('reinited');
                         if(!observe&&game.me&&game.me.isDead()){
@@ -12090,9 +12096,10 @@
         },
         syncState:function(){
             if(game.getState&&game.updateState){
-                game.broadcast(function(state){
+                game.broadcast(function(state,current){
     				game.updateState(state);
-    			},game.getState());
+                    _status.currentPhase=current;
+    			},game.getState(),_status.currentPhase);
             }
 		},
         updateWaiting:function(){
diff --git a/game/update.js b/game/update.js
index da474cc80..987472b38 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,9 +1,10 @@
 window.noname_update={
-    version:'1.8.3.5',
+    version:'1.8.3.6',
     changeLog:[
-        '联机可显示弃牌堆数量',
-        '最近连接ip列表',
-        '扩展机制修改',
-        '联机自动禁用扩展',
+        '修复完杀和双将bug',
+        '旁观可切换视角',
+        '聊天手势',
+        '房间信息',
+        '准备阶段可更改设置',
     ]
 }
diff --git a/layout/default/layout.css b/layout/default/layout.css
index a3069376d..fe79e229f 100755
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -535,7 +535,8 @@ margin-bottom: 5px;
 .caption>.text{font-size:16px;text-align:left}
 .caption>.text.center{text-align:center}
 .caption>.text.chat{word-break: break-all;margin-bottom: 3px;margin-left: 10px;width: calc(100% - 20px)}
-.caption>.text.textlink{margin-left: 10px}
+.caption>.text.textlink{margin-left: 10px;}
+.caption>.text.textlink:not(*:first-child){margin-top: 6px;}
 .caption>.text.textlink:hover{text-decoration: underline;}
 .caption>div>div{font-size: 16px;position: relative;width: calc(100% - 70px);vertical-align: top;margin: 0;padding: 0;}
 .skill{left: 0 !important;width: 70px !important;}
diff --git a/mode/connect.js b/mode/connect.js
index aad79ab50..ca9c27fc0 100644
--- a/mode/connect.js
+++ b/mode/connect.js
@@ -67,6 +67,7 @@ mode.connect={
                 return str;
             };
             lib.setPopped(ui.recentIP,function(){
+                if(!lib.config.recentIP.length) return;
                 var uiintro=ui.create.dialog('hidden');
 				uiintro.listen(function(e){
 					e.stopPropagation();
@@ -76,6 +77,14 @@ mode.connect={
                     ui.create.div('.text.textlink',list,clickLink).innerHTML=trimIP(lib.config.recentIP[i]);
                 }
                 uiintro.add(list);
+                var clear=uiintro.add('<div class="text center">清除</div>');
+                clear.style.paddingTop=0;
+                clear.style.paddingBottom='3px';
+                clear.listen(function(){
+                    lib.config.recentIP.length=0;
+                    game.saveConfig('recentIP',[]);
+                    uiintro.delete();
+                });
                 return uiintro;
             },220);
         }
diff --git a/mode/identity.js b/mode/identity.js
index 31111a83b..74cac3321 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -1045,7 +1045,7 @@ mode.identity={
 					}
 				}
 				game.me.chooseButtonOL(list,function(player,result){
-					if(game.online||player==game.me) player.init(result.links[0],null,result.links[1]);
+					if(game.online||player==game.me) player.init(result.links[0],result.links[1]);
 				});
 				"step 2"
 				for(var i in result){