add serials in card description

回滚上一版的改动，在卡片描述中添加系列字段

Assets/MD/main.unity

@@ -3009,7 +3009,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -3742,7 +3742,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -21191,7 +21191,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -39084,7 +39084,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -64220,7 +64220,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -88370,7 +88370,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -104232,7 +104232,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -106232,7 +106232,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -107532,7 +107532,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -124127,7 +124127,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3027
+  startingRenderQueue: 3029
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -133916,7 +133916,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -142815,7 +142815,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -195283,7 +195283,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -202409,7 +202409,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -202576,7 +202576,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -216954,7 +216954,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -222731,7 +222731,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -229365,7 +229365,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -247294,7 +247294,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 0
@@ -261597,7 +261597,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3027
+  startingRenderQueue: 3029
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -276526,7 +276526,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3027
+  startingRenderQueue: 3029
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -304385,7 +304385,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3028
+  startingRenderQueue: 3030
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -332610,7 +332610,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3024
+  startingRenderQueue: 3026
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

Assets/SibylSystem/CardDescription/CardDescription.cs

@@ -229,7 +229,13 @@ public class CardDescription : Servant
 
         description.Clear();
         if (GameStringHelper.attribute(card.Attribute).Length > 1)
-            tail = GameStringHelper.attribute(card.Attribute) + "\n" + tail; 
+            tail = GameStringHelper.attribute(card.Attribute) + "\n" + tail;
+        if(GameStringHelper.getSetName(card.Setcode) != "")
+        {
+            tail += GameStringHelper.xilie;
+            tail += GameStringHelper.getSetName(card.Setcode);
+            tail += "\n";
+        }
         if (tail == "")
             description.Add(card.Desc);
         else

Assets/SibylSystem/Ocgcore/OCGobjects/gameHiddenButton.cs

@@ -481,69 +481,39 @@ public class gameHiddenButton : OCGobject
             {
                 showAll();
 
-            //if(!Program.I().cardSelection.isShowed)
-            //{
-            //    bool spsummon = false;
-            //    bool activate = false;
-            //    for (var i = 0; i < Program.I().ocgcore.cards.Count; i++)
-            //        if (Program.I().ocgcore.cards[i].gameObject.activeInHierarchy)
-            //            if ((Program.I().ocgcore.cards[i].p.location & (uint)location) > 0)
-            //                if (Program.I().ocgcore.cards[i].p.controller == player)
-            //                {
-            //                    if (Program.I().ocgcore.cards[i].buttons.Count > 0)
-            //                    {
-            //                        foreach (var btn in Program.I().ocgcore.cards[i].buttons)
-            //                        {
-            //                            if (btn.type == superButtonType.spsummon)
-            //                                spsummon = true;
-            //                            else if (btn.type == superButtonType.act)
-            //                                activate = true;
-            //                        }
-            //                    }
-            //                }
-            //    var vector_of_begin = gameObject.transform.position;
-            //    vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
-            //    if (spsummon && activate)
-            //    {
-            //        spButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 2, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
-            //        actButton.show(vector_of_begin + new Vector3(gameCard.SortLine(1, 2, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
-            //    }
-            //    else if (spsummon)
-            //        spButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 1, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
-
-            //    else if (activate)
-            //        actButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 1, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
-            //}
-            bool spsummon = false;
-            bool activate = false;
-            for (var i = 0; i < Program.I().ocgcore.cards.Count; i++)
-                if (Program.I().ocgcore.cards[i].gameObject.activeInHierarchy)
-                    if ((Program.I().ocgcore.cards[i].p.location & (uint)location) > 0)
-                        if (Program.I().ocgcore.cards[i].p.controller == player)
-                        {
-                            if (Program.I().ocgcore.cards[i].buttons.Count > 0)
+            if (!Program.I().cardSelection.isShowed)
+            {
+                bool spsummon = false;
+                bool activate = false;
+                for (var i = 0; i < Program.I().ocgcore.cards.Count; i++)
+                    if (Program.I().ocgcore.cards[i].gameObject.activeInHierarchy)
+                        if ((Program.I().ocgcore.cards[i].p.location & (uint)location) > 0)
+                            if (Program.I().ocgcore.cards[i].p.controller == player)
                             {
-                                foreach (var btn in Program.I().ocgcore.cards[i].buttons)
+                                if (Program.I().ocgcore.cards[i].buttons.Count > 0)
                                 {
-                                    if (btn.type == superButtonType.spsummon)
-                                        spsummon = true;
-                                    else if (btn.type == superButtonType.act)
-                                        activate = true;
+                                    foreach (var btn in Program.I().ocgcore.cards[i].buttons)
+                                    {
+                                        if (btn.type == superButtonType.spsummon)
+                                            spsummon = true;
+                                        else if (btn.type == superButtonType.act)
+                                            activate = true;
+                                    }
                                 }
                             }
-                        }
-            var vector_of_begin = gameObject.transform.position;
-            vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
-            if (spsummon && activate)
-            {
-                spButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 2, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
-                actButton.show(vector_of_begin + new Vector3(gameCard.SortLine(1, 2, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
-            }
-            else if (spsummon)
-                spButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 1, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
+                var vector_of_begin = gameObject.transform.position;
+                vector_of_begin = Program.I().main_camera.WorldToScreenPoint(vector_of_begin);
+                if (spsummon && activate)
+                {
+                    spButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 2, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
+                    actButton.show(vector_of_begin + new Vector3(gameCard.SortLine(1, 2, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
+                }
+                else if (spsummon)
+                    spButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 1, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
 
-            else if (activate)
-                actButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 1, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
+                else if (activate)
+                    actButton.show(vector_of_begin + new Vector3(gameCard.SortLine(0, 1, 180 * Screen.height / 1080f), 150f * Screen.height / 1080f, 0f));
+            }
         }
     }