Fix bugs in card selection

Assets/MD/Scripts/CardDetail.cs

@@ -216,51 +216,58 @@ public class CardDetail : MonoBehaviour
         {
             base_property.bottomAnchor.absolute = -120;
         }
-
-        if (origin.Desc.Contains("Ч"))
+        try
         {
-            string text_pendulum = "";
-            string text_other = "";
-            string temp = origin.Desc.Split("\r\n")[1];
-            if(temp.Split("\r\nЧ\r\n").Length > 1)
+            if (origin.Desc.Contains("【怪兽效果】"))
             {
-                text_pendulum = temp.Split("\r\nЧ\r\n")[0];
-                text_other = temp.Split("\r\nЧ\r\n")[1];
+                string text_pendulum = "";
+                string text_other = "";
+                string temp = origin.Desc.Split("→\r\n")[1];
+                if (temp.Split("\r\n【怪兽效果】\r\n").Length > 1)
+                {
+                    text_pendulum = temp.Split("\r\n【怪兽效果】\r\n")[0];
+                    text_other = temp.Split("\r\n【怪兽效果】\r\n")[1];
+                }
+                else
+                    text_other = temp.Replace("【怪兽效果】\r\n", "");
+                label_pendulum_description.text = text_pendulum;
+                label_description.text = text_other;
+                base_pendulum.alpha = 1f;
+                base_pendulum.bottomAnchor.absolute = -250;
+                base_pendulum.topAnchor.absolute = -20;
             }
-            else
-                text_other = temp.Replace("Ч\r\n", "");
-            label_pendulum_description.text = text_pendulum;
-            label_description.text = text_other;
-            base_pendulum.alpha = 1f;
-            base_pendulum.bottomAnchor.absolute = -250;
-            base_pendulum.topAnchor.absolute = -20;
-        }
-        else if (origin.Desc.Contains(""))
-        {
-            string text_pendulum = "";
-            string text_other = "";
-            string temp = origin.Desc.Split("\r\n")[1];
-            if (temp.Split("\r\n\r\n").Length > 1)
+            else if (origin.Desc.Contains("【怪兽描述】"))
             {
-                text_pendulum = temp.Split("\r\n\r\n")[0];
-                text_other = temp.Split("\r\n\r\n")[1];
+                string text_pendulum = "";
+                string text_other = "";
+                string temp = origin.Desc.Split("→\r\n")[1];
+                if (temp.Split("\r\n【怪兽描述】\r\n").Length > 1)
+                {
+                    text_pendulum = temp.Split("\r\n【怪兽描述】\r\n")[0];
+                    text_other = temp.Split("\r\n【怪兽描述】\r\n")[1];
+                }
+                else
+                    text_other = temp.Replace("【怪兽描述】\r\n", "");
+                label_pendulum_description.text = text_pendulum;
+                label_description.text = text_other;
+                base_pendulum.alpha = 1f;
+                base_pendulum.bottomAnchor.absolute = -250;
+                base_pendulum.topAnchor.absolute = -20;
             }
             else
-                text_other = temp.Replace("\r\n", "");
-            label_pendulum_description.text = text_pendulum;
-            label_description.text = text_other;
-            base_pendulum.alpha = 1f;
-            base_pendulum.bottomAnchor.absolute = -250;
-            base_pendulum.topAnchor.absolute = -20;
+            {
+                base_pendulum.bottomAnchor.absolute = 0;
+                base_pendulum.topAnchor.absolute = 50;
+                base_pendulum.alpha = 0f;
+                label_description.text = origin.Desc;
+            }
         }
-        else
+        catch
         {
-            base_pendulum.bottomAnchor.absolute = 0;
-            base_pendulum.topAnchor.absolute = 50;
-            base_pendulum.alpha = 0f;
-            label_description.text = origin.Desc;
+            Debug.LogError("灵摆效果文本分段失败！！！");
         }
 
+
         Program.I().cardDescription.FrameColor(origin, false);
         back_name.color = Program.I().cardDescription.color1;
         back_property.color = Program.I().cardDescription.color1;

Assets/MD/Scripts/CardSelectionHandler.cs

@@ -44,6 +44,7 @@ public class CardSelectionHandler : MonoBehaviour
     public bool exitable;
     public bool finishable;
     bool tempHide;
+    public bool hideByRMS;
     private void Start()
     {
         base_cardSelect = transform.GetChild(0).GetChild(0).GetComponent<UI2DSprite>();
@@ -69,8 +70,6 @@ public class CardSelectionHandler : MonoBehaviour
             Debug.Log("没有卡需要选择，请检查。");
             return;
         }
-
-        //初始化
         list.localPosition = Vector3.zero;
         isShowed = true;
         gameObject.transform.DOLocalMoveY(-340, 0.2f);
@@ -81,6 +80,7 @@ public class CardSelectionHandler : MonoBehaviour
         this.ES_max = ES_max;
         this.exitable = exitable;
         tempHide = false;
+        hideByRMS = false;
 
         if (Program.I().setting.setting.confirmLeft.value)
         {
@@ -128,13 +128,17 @@ public class CardSelectionHandler : MonoBehaviour
         }
 
         cardsOnSelection.Clear();
-        for(int i = 0; i < cards.Count; i++)
+        List<gameCard> cleaned = new List<gameCard>();
+        foreach (var card in cards)
+        {
+            if (!cleaned.Contains(card))
+                cleaned.Add(card);
+        }
+
+        cards = cleaned;
+
+        for (int i = 0; i < cards.Count; i++)
         {
-            if(i >= 1)
-            {
-                if (cards[i] == cards[i - 1])
-                    return;
-            }
             bool theFirst = false;
             bool theLast = false;
             if(i == 0)
@@ -225,6 +229,14 @@ public class CardSelectionHandler : MonoBehaviour
             Destroy(card.arrow);
     }
 
+    public void ShowWithoutAction()
+    {
+        core.Sleep(12);
+        isShowed = true;
+        hideByRMS = false;
+        gameObject.transform.DOLocalMoveY(-340, 0.2f);
+    }
+
     void TempHide()
     {
         if(!tempHide)
@@ -303,6 +315,7 @@ public class CardSelectionHandler : MonoBehaviour
 
                         values.Add(new messageSystemValue { hint = InterString.Get("取消"), value = "hide" });
                         core.RMSshow_singleChoice("return", values);
+                        hideByRMS = true;
                     }
                 }
                 break;

Assets/MD/main.unity

@@ -270962,6 +270962,7 @@ MonoBehaviour:
   alreadySelected: 0
   exitable: 0
   finishable: 0
+  hideByRMS: 0
 --- !u!1 &1731746415
 GameObject:
   m_ObjectHideFlags: 0

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -5822,7 +5822,6 @@ public class Ocgcore : ServantWithCardDescription
 
                         break;
                     case GameMessage.SelectSum:
-                        Debug.Log("SelectSum");
                         if (cardsSelectable.Count <= ES_min)
                         {
                             autoSendCards();
@@ -8434,7 +8433,11 @@ public class Ocgcore : ServantWithCardDescription
                     {
                         Debug.Log(e);
                     }
-
+                else
+                {
+                    if(Program.I().cardSelection.hideByRMS)
+                        Program.I().cardSelection.ShowWithoutAction();
+                }
                 break;
             case "autoForceChainHandler":
                 if (result[0].value != "hide")
@@ -8792,6 +8795,11 @@ public class Ocgcore : ServantWithCardDescription
             Program.I().cardDetail.Hide();
             return;
         }
+        else if (PhaseUIBehaviour.isShowed)
+        {
+            PhaseUIBehaviour.hide();
+            return;
+        }
         else if(Program.I().cardSelection.isShowed && Program.I().cardSelection.exitable)
         {
             Program.I().cardSelection.hide();