Merge branch 'master' of http://git.axibug.com/Alienjack/AxibugEmuOnline

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs

@@ -201,6 +201,8 @@ namespace AxibugEmuOnline.Client
 
         public void Pop<T>(List<T> menus, int defaultIndex = 0, Action onClose = null) where T : InternalOptionMenu
         {
+            if (menus == null || menus.Count == 0) return;
+
             if (m_hideTween != null)
             {
                 m_hideTween.Kill(true);

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_SavSlotItem.cs

@@ -46,8 +46,16 @@ namespace AxibugEmuOnline.Client
         }
 
         private void SavFile_OnSavSuccessed()
+        {
+            if (MenuData.SavFile.GetCurrentState() is SaveFile.SyncedState)
+            {
+                //如果原本就处于已经同步状态，那么此处将直接转换到上传本地文档的状态
+                MenuData.SavFile.FSM.ChangeState<SaveFile.UploadingState>();
+            }
+            else
             {
                 MenuData.SavFile.TrySync();
+            }
             RefreshUI();
         }