From 8101cf89f89e25877a1a9803a67d4e32f2c0900c Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 16 May 2021 14:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4=E8=A1=8C?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E8=BE=93=E5=85=A5=E6=8A=A5=E9=94=99=20closes?=
 =?UTF-8?q?=20#63?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player/player.lua      | 2 +-
 parts/scenes/app_console.lua | 3 +--
 parts/updateLog.lua          | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/parts/player/player.lua b/parts/player/player.lua
index e3dd4a21..31c1d1fe 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1727,7 +1727,7 @@ function Player:lose(force)
 				for i=A.strength+1,4 do
 					if A.badge>=ROYALEDATA.powerUp[i]then
 						A.strength=i
-						A:setFrameColor(A.strength)
+						A:setFrameColor(i)
 					end
 				end
 				self.lastRecv=A
diff --git a/parts/scenes/app_console.lua b/parts/scenes/app_console.lua
index 3cb406ee..bc71bbdc 100644
--- a/parts/scenes/app_console.lua
+++ b/parts/scenes/app_console.lua
@@ -687,7 +687,7 @@ end
 
 function scene.keyDown(k)
 	if k=="return"then
-		local input=inputBox:getText()
+		local input=STRING.trim(inputBox:getText())
 		if input==""then return end
 
 		--Write History
@@ -699,7 +699,6 @@ function scene.keyDown(k)
 		log""
 
 		--Execute
-		input=input:sub((input:find("%S")))
 		if input:byte()==35 then
 			--Execute lua code
 			log{C.lC,"> "..input}
diff --git a/parts/updateLog.lua b/parts/updateLog.lua
index 95be5f38..962e0074 100644
--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -27,12 +27,17 @@ return STRING.split([=[
 0.14.9: 下午茶 Teatime
 		新增:
 				主菜单按钮行为更容易理解,添加连接音效和连接成功音效
+				重新启用Margin Time机制,但基于帧而不是时间
 		改动:
 				词典添加游戏官网词条
+				聊天窗交互更自然
 		代码:
 				升级控件模块
 		修复:
-				修改默认空用户名，修复结算时显示胜利者可能报错
+				修改默认空用户名,修复结算时显示胜利者可能报错
+				对战房间内按钮会触发聊天框
+				[服务端]有人在连接时退出或掉线会损坏房间无法开局
+				[服务端]在线人数统计错误
 
 0.14.8: 冰激凌 Icecream
 		新增: