bug fix

Assets/Scripts/MDPro3/UI/Popup/PopupSelection.cs

@@ -68,6 +68,7 @@ namespace MDPro3.UI.Popup
             }
             else
             {
+                handler.color = string.Empty;
                 handler.selection = task[0];
             }
             handler.clickAction = OnClick;

Assets/Scripts/MDPro3/UI/UIWidget/Deck/DeckView.cs

@@ -316,7 +316,7 @@ namespace MDPro3.UI
         public List<SelectionButton_CardInDeck> cards;
         public Deck Deck { get; set; }
 
-        protected string deckName;
+        protected string deckNameWithType;
         protected string deckFileName;
         protected string deckType;
         protected bool needSave;
@@ -328,11 +328,11 @@ namespace MDPro3.UI
         public void PrintDeck(Deck deck, string deckName, Condition condition)
         {
             Deck = deck;
-            this.deckName = deckName;
+            deckNameWithType = deckName;
             if (Path.GetFileName(deckName) == deckName)
                 deckType = string.Empty;
             else
-                deckType = Path.GetDirectoryName(deckName);
+                deckType = Path.GetFileName(Path.GetDirectoryName(deckName));
             deckFileName = Path.GetFileName(deckName);
 
             this.condition = condition;
@@ -851,7 +851,7 @@ namespace MDPro3.UI
             if(condition != Condition.ChangeSide)
                 if (!CanEditCard()) return;
 
-            PrintDeck(Deck, deckName, condition);
+            PrintDeck(Deck, deckNameWithType, condition);
         }
 
         public void Sort()
@@ -946,7 +946,7 @@ namespace MDPro3.UI
 
             SetDirty(true);
 
-            deckName += " - " + InterString.Get("复制");
+            deckNameWithType += " - " + InterString.Get("复制");
             deckFileName += " - " + InterString.Get("复制");
             InputDeckName.text = deckFileName;
             Deck.deckId = string.Empty;
@@ -956,7 +956,7 @@ namespace MDPro3.UI
         {
             if (!deckLoaded) return;
             if (!CanEditCard()) return;
-            if (GetDirty() || !File.Exists(Program.PATH_DECK + deckName + Program.EXPANSION_YDK))
+            if (GetDirty() || !File.Exists(Program.PATH_DECK + deckNameWithType + Program.EXPANSION_YDK))
             {
                 if(condition != Condition.ChangeSide)
                     MessageManager.Toast(InterString.Get("请先保存卡组"));
@@ -1005,10 +1005,10 @@ namespace MDPro3.UI
             deck.deckId = Deck.deckId;
             deck.userId = Deck.userId;
 
-            if(Path.GetFileName(deckName) == deckName)
+            if(Path.GetFileName(deckNameWithType) == deckNameWithType)
                 deck.type = string.Empty;
             else
-                deck.type = Path.GetDirectoryName(deckName);
+                deck.type = Path.GetDirectoryName(deckNameWithType);
 
             return deck;
         }
@@ -1296,10 +1296,13 @@ namespace MDPro3.UI
             try
             {
                 var deckName = GetDeckName();
+                // TODO: 检查违法字符。
+                Deck.type = deckType;
                 Deck.Save(deckName, DateTime.UtcNow);
-                if (deckName != this.deckName)
-                    File.Delete(Program.PATH_DECK + this.deckName + Program.EXPANSION_YDK);
-                this.deckName = deckName;
+                if (deckName != deckFileName)
+                    File.Delete(Program.PATH_DECK + this.deckNameWithType + Program.EXPANSION_YDK);
+                deckFileName = deckName;
+                deckNameWithType = deckType == string.Empty ? string.Empty : $"/{deckType}" + deckName;
                 MessageManager.Toast(InterString.Get("本地卡组「[?]」已保存。", deckName));
                 Config.SetConfigDeck(deckName, true);
                 SetDirty(false);