bug fix

Assets/Scripts/MDPro3/Duel/CoreWrapper.cs

@@ -822,25 +822,25 @@ namespace Percy
                     Move(2);
                     break;
                 case GameMessage.Move:
-                    var raw = currentReader.ReadBytes(16);
-                    int pc = raw[4];
-                    int pl = raw[5];
-                    int cc = raw[8];
-                    int cl = raw[9];
-                    int cs = raw[10];
-                    int cp = raw[11];
-
-
-                    if (!Convert.ToBoolean(cl & ((int)CardLocation.Grave + (int)CardLocation.Overlay)) &&
-                        Convert.ToBoolean(cl & ((int)CardLocation.Deck + (int)CardLocation.Hand))
-                        || Convert.ToBoolean(cp & (int)CardPosition.FaceDown))
-                    {
-                        raw[0] = 0;
-                        raw[1] = 0;
-                        raw[2] = 0;
-                        raw[3] = 0;
-                    }
-                    currentWriter.Write(raw);
+                    //var raw = currentReader.ReadBytes(16);
+                    //int pc = raw[4];
+                    //int pl = raw[5];
+                    //int cc = raw[8];
+                    //int cl = raw[9];
+                    //int cs = raw[10];
+                    //int cp = raw[11];
+
+
+                    //if (!Convert.ToBoolean(cl & ((int)CardLocation.Grave + (int)CardLocation.Overlay)) &&
+                    //    Convert.ToBoolean(cl & ((int)CardLocation.Deck + (int)CardLocation.Hand))
+                    //    || Convert.ToBoolean(cp & (int)CardPosition.FaceDown))
+                    //{
+                    //    raw[0] = 0;
+                    //    raw[1] = 0;
+                    //    raw[2] = 0;
+                    //    raw[3] = 0;
+                    //}
+                    //currentWriter.Write(raw);
                     break;
                 case GameMessage.PosChange:
                     Move(9);

Assets/Scripts/MDPro3/Net/OnlineDeck.cs

@@ -234,6 +234,8 @@ namespace MDPro3.Net
                     deckYdk = decks[i].GetYDK(),
                     //timeStamp = ((DateTimeOffset)DateTime.UtcNow).ToUnixTimeMilliseconds()
                 };
+                if (body.decks[i].deckType == "/")
+                    body.decks[i].deckType = string.Empty;
 
                 decks[i].deckId = ids[i];
                 decks[i].userId = MyCard.account.user.id.ToString();
@@ -444,7 +446,7 @@ namespace MDPro3.Net
         {
             if (decks == null)
                 return false;
-            return decks.Any(deck => !deck.isDelete && deck.deckName == deckName && deck.deckType == deckType);
+            return decks.Any(deck => !deck.isDelete && deck.deckName == deckName && deck.GetType() == deckType);
         }
 
         #endregion
@@ -490,6 +492,13 @@ namespace MDPro3.Net
                 var dataTimeOffset = DateTimeOffset.FromUnixTimeMilliseconds(lastDate);
                 return dataTimeOffset.LocalDateTime;
             }
+
+            public new string GetType()
+            {
+                if (string.IsNullOrEmpty(deckType) || deckType == "/")
+                    return string.Empty;
+                return deckType;
+            }
         }
 
         [Serializable]
@@ -597,6 +606,8 @@ namespace MDPro3.Net
                 this.deckId = deckId;
                 this.deckName = deckName;
                 deckType = deck.type;
+                if(deckType == "/")
+                    deckType = string.Empty;
                 if (deck.Pickup.Count > 0)
                     deckCoverCard1 = deck.Pickup[0];
                 if (deck.Pickup.Count > 1)

Assets/Scripts/MDPro3/Servant/OnlineServant.cs

@@ -334,9 +334,13 @@ namespace MDPro3.Servant
                                 else
                                     decksNeedUpdateFromServer.Add(deckName, decks[i]);
                             }
-                            if((Path.GetFileName(deckName) != od.deckName || GetDeckTypeFromName(deckName) != od.deckType)
-                                && !decksNeedUpdateFromServer.Keys.Contains(deckName))
+                            if((Path.GetFileName(deckName) != od.deckName || GetDeckTypeFromName(deckName) != od.GetType())
+                                && !decksNeedUpdateFromServer.Keys.Contains(deckName)
+                                && !decksNeedUpdateToServer.Keys.Contains(deckName))
+                            {
+                                //Debug.Log($"[{Path.GetFileName(deckName)}] [{od.deckName}] [{GetDeckTypeFromName(deckName)}] [{od.GetType()}]");
                                 decksNeedUpdateFromServer.Add(deckName, decks[i]);
+                            }
                         }
                         break;
                     }
@@ -362,9 +366,9 @@ namespace MDPro3.Servant
 
                 var od = OnlineDeck.GetByID(deck.Value.deckId);
                 var oldPath = Program.PATH_DECK + deck.Key + Program.EXPANSION_YDK;
-                if (Path.GetFileName(deck.Key) != od.deckName || deck.Value.type != od.deckType)
+                if (Path.GetFileName(deck.Key) != od.deckName || deck.Value.type != od.GetType())
                     File.Delete(oldPath);
-                var newPath = Program.PATH_DECK + (od.deckType == string.Empty ? string.Empty : $"{od.deckType}/") + od.deckName + Program.EXPANSION_YDK;
+                var newPath = Program.PATH_DECK + (od.GetType() == string.Empty ? string.Empty : $"{od.GetType()}/") + od.deckName + Program.EXPANSION_YDK;
                 if(!Directory.Exists(Path.GetDirectoryName(newPath)))
                     Directory.CreateDirectory(Path.GetDirectoryName(newPath));
                 File.WriteAllText(newPath, od.deckYdk);
@@ -377,18 +381,18 @@ namespace MDPro3.Servant
                 .Where(od => !od.isDelete && !localFoundIds.Contains(od.deckId));
             foreach (var deck in odtd)
             {
-                var path = Program.PATH_DECK + (deck.deckType == string.Empty ? string.Empty : $"{deck.deckType}/") + deck.deckName + Program.EXPANSION_YDK;
+                var path = Program.PATH_DECK + (deck.GetType() == string.Empty ? string.Empty : $"{deck.GetType()}/") + deck.deckName + Program.EXPANSION_YDK;
                 if (File.Exists(path))
                 {
-                    Debug.Log($"删除服务器同名卡组 [{deck.deckType}/{deck.deckName}]  [{deck.deckId}]。");
+                    Debug.Log($"删除服务器同名卡组 [{deck.GetType()}/{deck.deckName}]  [{deck.deckId}]。");
                     _ = OnlineDeck.DeleteDecks(new List<string> { deck.deckId });
                     continue;
                 }
-                Debug.Log($"卡组[{deck.deckType} / {deck.deckName}] [{deck.deckId}]需要下载。");
+                Debug.Log($"卡组[{deck.GetType()} / {deck.deckName}] [{deck.deckId}]需要下载。");
 
                 var d = new Deck(deck.deckYdk, deck.deckId, MyCard.account.user.username)
                 {
-                    type = deck.deckType
+                    type = deck.GetType()
                 };
                 d.Save(Path.GetFileName(deck.deckName), deck.GetUpdateUtcTime(), false);
             }

ProjectSettings/ProjectSettings.asset

@@ -140,7 +140,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 1.3.8
+  bundleVersion: 1.3.8.1
   preloadedAssets:
   - {fileID: 11400000, guid: 5fb02d2098f52054b89ce4a9f63ba9ee, type: 2}
   - {fileID: -944628639613478452, guid: a916821eb5eea2842a69be6041bcdb82, type: 3}