new card image save option: all deck

Assets/Main.unity

@@ -50105,7 +50105,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.000030517578}
+  m_AnchoredPosition: {x: 0, y: -0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &702608002
@@ -54023,7 +54023,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 476827028}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.60808754
+  m_Size: 0.5975252
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -77464,7 +77464,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &1117266860
@@ -122766,7 +122766,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -59.99994, y: 0}
+  m_AnchoredPosition: {x: -59.999878, y: 0}
   m_SizeDelta: {x: -1080, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1766834024
@@ -128326,8 +128326,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 1267939043}
-        m_TargetAssemblyTypeName: CardDetail, Assembly-CSharp
-        m_MethodName: GenerateCard
+        m_TargetAssemblyTypeName: MDPro3.CardDetail, Assembly-CSharp
+        m_MethodName: OnCardPictureSave
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

Assets/ScriptableObjects/Items.asset

@@ -4027,7 +4027,7 @@ MonoBehaviour:
   - id: 1000019
     m_name: 
     m_description: 
-    path: Mate/m08732_model
+    path: Mate/M08732_Model_Folder
     functional: 0
     secondFace: 0
     diy: 0
@@ -4293,7 +4293,7 @@ MonoBehaviour:
   - id: 1001024
     m_name: 
     m_description: 
-    path: Mate/m15125_model
+    path: Mate/M15125_Model_Folder
     functional: 0
     secondFace: 0
     diy: 0

Assets/Scripts/MDPro3/Duel/MDPro3.YGOSharp/CardsManager.cs

@@ -174,13 +174,15 @@ namespace MDPro3.YGOSharp
             Card card = new Card(reader);
             if (!render)
             {
-                if (!_cards.ContainsKey(card.Id))
-                    _cards.Add(card.Id, card);
+                //if (!_cards.ContainsKey(card.Id))
+                //    _cards.Add(card.Id, card);
+                _cards[card.Id] = card;
             }
             else
             {
-                if (!_cardsForRender.ContainsKey(card.Id))
-                    _cardsForRender.Add(card.Id, card);
+                //if (!_cardsForRender.ContainsKey(card.Id))
+                //    _cardsForRender.Add(card.Id, card);
+                _cardsForRender[card.Id] = card;
             }
         }
 

Assets/Scripts/MDPro3/Duel/PercyOCG.cs

@@ -59,7 +59,7 @@ namespace MDPro3
             ret.len = 0;
             var fileName2 = fileName.TrimStart('.', '/');
 
-            if (fileName.StartsWith("puzzle"))
+            if (fileName.StartsWith(Program.puzzlePath))
             {
                 if (File.Exists(fileName))
                 {

Assets/Scripts/MDPro3/Helper/ZipHelper.cs

@@ -11,7 +11,6 @@ namespace MDPro3
         public static void Initialize()
         {
             zips.Clear();
-            zips.Add(new ZipFile("Data/script.zip"));
 
             if (!Directory.Exists("Expansions"))
                 Directory.CreateDirectory("Expansions");
@@ -19,6 +18,8 @@ namespace MDPro3
                 zips.Add(new ZipFile(zip));
             foreach (var zip in Directory.GetFiles("Expansions", "*.zip"))
                 zips.Add(new ZipFile(zip));
+
+            zips.Add(new ZipFile("Data/script.zip"));//Make "Data/script.zip" the last one to read.
         }
         public static void Dispose()
         {

Assets/Scripts/MDPro3/Servants/EditDeck.cs

@@ -687,7 +687,7 @@ namespace MDPro3
             detail.Show(cardShowing, cardFace, mat, cardIndex >= 0 ? CardsInDeck() : CardsOnList(), cardIndex);
         }
 
-        List<int> CardsInDeck()
+        public List<int> CardsInDeck()
         {
             var cards = new Dictionary<int, int>();
             foreach (var card in this.cards)

Assets/Scripts/MDPro3/Servants/Online.cs

@@ -789,7 +789,7 @@ namespace MDPro3.Net
                 while (!task.IsCompleted)
                     yield return null;
             }
-            //下载已经有Id的本地较旧卡组
+            //更新已经有Id的本地较旧卡组
             foreach (var deck in decksNeedUpdate2)
             {
                 var od = OnlineDeck.GetDeck(deck.Value.deckId);
@@ -856,7 +856,7 @@ namespace MDPro3.Net
                 return null;
             var oldDeckName = Path.GetFileNameWithoutExtension(deckPath);
             if(oldDeckName == newName )
-                return newName;
+                return deckPath;
             var folderPath = Path.GetDirectoryName(deckPath);
             if (folderPath == null)
                 return null;

Assets/Scripts/MDPro3/Servants/SelectPuzzle.cs

@@ -161,7 +161,7 @@ namespace MDPro3
             if (percy != null)
                 percy.Dispose();
             percy = new PercyOCG();
-            percy.StartPuzzle(Program.puzzlePath.ToLower() + puzzle + ".lua");
+            percy.StartPuzzle(Program.puzzlePath + puzzle + ".lua");
         }
     }
 }

Data/locales/zh-CN/translation.conf

@@ -661,3 +661,5 @@ YDK 内容不合法，主卡组必须满 40 张->YDK 内容不合法，主卡组
 保存所有衍生物卡图->保存所有衍生物卡图
 卡图保存中->卡图保存中
 错误：->错误：
+保存卡组所有卡图->保存卡组所有卡图
+保存卡组卡图->保存卡组卡图