From bbc28bb827a5b52ed7a3c35b153c5d444062eca9 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期一, 01 七月 2019 15:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan

---
 System/MainInterfacePanel/MainInterfaceWin.cs |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 293392d..339ee1c 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -566,7 +566,14 @@
                 m_InGamePusher.gameObject.SetActive(false);
                 IsShowTaskPanel();
                 m_MailObj.SetActive(false);
-                m_MainPositionTween.SwitchFunctions(new MainPositionTween.SwitchParam() { showDefault = true, immediately = true });
+                m_MainPositionTween.SwitchFunctions(
+                    new MainPositionTween.SwitchParam()
+                    {
+                        showDefault = true,
+                        immediately = true,
+                        bottomState = MainPositionTween.RightBottomState.Skill,
+                        manual = true,
+                    });
             }
             else
             {

--
Gitblit v1.8.0