bug fix

Assets/Prefabs/ServantUI/DeckEditorUI.prefab

@@ -11056,7 +11056,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 24.1
+  m_fontSize: 22.55
   m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -37843,7 +37843,6 @@ GameObject:
   - component: {fileID: 5315510817956826711}
   - component: {fileID: 3274540644380176956}
   - component: {fileID: 906025198269504621}
-  - component: {fileID: 4446575165176767442}
   m_Layer: 5
   m_Name: ClearButton
   m_TagString: Button
@@ -37965,20 +37964,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &4446575165176767442
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7404067708666033214}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ef21ca88a806d6247a54747514f8b5e9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  InputField: {fileID: 7344254557480248162}
-  button: {fileID: 0}
 --- !u!1 &7442909848032924217
 GameObject:
   m_ObjectHideFlags: 0
@@ -47195,6 +47180,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4085827274738278036, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_Size
+      value: 0.6923077
+      objectReference: {fileID: 0}
     - target: {fileID: 4620406112505620196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
       propertyPath: m_SizeDelta.y
       value: 0
@@ -47335,6 +47324,38 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5323500144287940196, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5344270362151448201, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -47667,6 +47688,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: CardActionMenu
       objectReference: {fileID: 0}
+    - target: {fileID: 7711732159369003727, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
+      propertyPath: m_Size
+      value: 0.64285713
+      objectReference: {fileID: 0}
     - target: {fileID: 8097478310667340662, guid: 33907426eea5ee34b8d64f1ed059155e, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0

Assets/Prefabs/ServantUI/DeckSelectorUI.prefab

@@ -7512,7 +7512,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 120, y: 0}
-  m_SizeDelta: {x: 380, y: 60}
+  m_SizeDelta: {x: 500, y: 60}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &5077836730995045875
 MonoBehaviour:
@@ -7544,8 +7544,8 @@ MonoBehaviour:
     m_DefaultValue: {x: 120, y: 0}
     m_MobileValue: {x: 140, y: 0}
   m_SizeDelta:
-    m_DefaultValue: {x: 340, y: 60}
-    m_MobileValue: {x: 340, y: 80}
+    m_DefaultValue: {x: 500, y: 60}
+    m_MobileValue: {x: 500, y: 80}
   debug: 0
 --- !u!222 &6424861730954287887
 CanvasRenderer:

Assets/Scripts/MDPro3/Duel/GameCard.cs

@@ -90,7 +90,7 @@ namespace MDPro3
     public class GameCard : MonoBehaviour
     {
         private Card data = new ();
-        private Card cachedData = new();
+        private readonly Card lastValidData = new();
         public GPS p;
         private bool m_disabled;
         public bool Disabled
@@ -407,20 +407,21 @@ namespace MDPro3
             return data;
         }
 
-        public Card CacheData()
+        public Card GetValidData()
         {
-            if(data.Id > 0)
-                cachedData = data.Clone();
-            return cachedData;
-        }
-
-        public Card GetCachedData()
-        {
-            return cachedData;
+            if (data.Id > 0)
+                return data;
+            else
+                return lastValidData;
         }
 
         public void SetData(Card d)
         {
+            if (d.Id > 0)
+                d.CloneTo(lastValidData);
+            else if (data.Id > 0)
+                data.CloneTo(lastValidData);
+
             if (d.Attack < 0)
                 d.Attack = 0;
             if (d.Defense < 0)

Assets/Scripts/MDPro3/Duel/Message/DuelMessage.cs

@@ -711,9 +711,7 @@ namespace MDPro3.Duel
             var reason = reader.ReadUInt32();
 
             var card = Core.GCS_Get(from);
-            if(card != null)
-                card.CacheData();
-            else
+            if(card == null)
             {
                 //DebugNoCard();
                 card = Core.GCS_Create(from);

Assets/Scripts/MDPro3/Helper/TimelineHelper.cs

@@ -167,7 +167,7 @@ namespace MDPro3
                 var renderer = dummyCard.GetElement<MeshRenderer>("DummyCardModel_front");
                 var code = materials[i].GetData().Id;
                 if (code == 0)
-                    code = materials[i].GetCachedData().Id;
+                    code = materials[i].GetValidData().Id;
                 _ = RefreshCardFace(renderer, code);
 
                 if (data.HasType(CardType.Synchro))
@@ -455,7 +455,7 @@ namespace MDPro3
             {
                 var code = materials[i + order].GetData().Id;
                 if (code == 0)
-                    code = materials[i + order].GetCachedData().Id;
+                    code = materials[i + order].GetValidData().Id;
 
                 var cardTex = await CardImageLoader.LoadCardAsync(code, false, face.GetCancellationTokenOnDestroy());
                 face.material.SetTexture("_CardFrame" + (char)('A' + i), cardTex);
@@ -487,12 +487,12 @@ namespace MDPro3
             {
                 foreach (var material in materials)
                 {
-                    var data = material.GetCachedData();
+                    var data = material.GetValidData();
                     if (data.HasType(CardType.Tuner))
                         tunerLevel += data.Level;
                 }
                 if (tunerLevel == 0)
-                    tunerLevel = materials[0].GetCachedData().Level;
+                    tunerLevel = materials[0].GetValidData().Level;
             }
             return tunerLevel;
         }

Assets/Scripts/MDPro3/Servant/OnlineServant.cs

@@ -361,7 +361,7 @@ namespace MDPro3.Servant
                     _ = OnlineDeck.DeleteDecks(new List<string> { deck.deckId });
                     continue;
                 }
-                Debug.Log($"卡组[{deck.deckName}] [{deck.deckId}]需要下载。");
+                Debug.Log($"卡组[{deck.deckType} / {deck.deckName}] [{deck.deckId}]需要下载。");
 
                 var d = new Deck(deck.deckYdk, deck.deckId, MyCard.account.user.username)
                 {

Assets/Scripts/MDPro3/UI/Popup/Old/PopupDuelSelectCardItem.cs

@@ -47,7 +47,7 @@ namespace MDPro3.UI
 
         private void Start()
         {
-            _ = RefreshCard(card.GetData().Id);
+            _ = RefreshCard(card.GetValidData().Id);
 
             if ((card.p.location & (uint)CardLocation.Search) > 0)
             {

Assets/Scripts/MDPro3/UI/SelectionButton/SelectionButton_DeckSelector.cs

@@ -115,7 +115,7 @@ namespace MDPro3.UI
                 SetDeck(new Deck(path), configDeck);
         }
 
-        public void SetDeck(Deck deck,string deckName) 
+        public void SetDeck(Deck deck, string deckName)
         {
             this.deck = deck;
             this.deckName = deckName;
@@ -126,6 +126,9 @@ namespace MDPro3.UI
 
         private void SetDeckInteral()
         {
+            if(deckName.StartsWith("/"))
+                TextDeckName.text = Path.GetFileNameWithoutExtension(deckName);
+            else
                 TextDeckName.text = deckName;
             if(deck == null)
                 _ = RefreshAsync();