update ui (card detail) and fix shortcuts bug

Assets/MD/Scripts/CardDetail.cs

@@ -8,6 +8,7 @@ public class CardDetail : MonoBehaviour
 {
     public UIPanel Panel;
     public UITexture pic;
+    public UI2DSprite limit;
     public UILabel label_name;
     public UILabel label_property;
     public UI2DSprite icon_property;
@@ -57,9 +58,13 @@ public class CardDetail : MonoBehaviour
         Panel.alpha = 1f;
         SEHandler.PlayInternalAudio("se_sys/SE_DECK_WINDOW_OPEN");
         pic.mainTexture = GameTextureManager.GetCardPictureNow(origin.Id);
+        limit.sprite2D = Program.I().cardDescription.li.GetComponent<UI2DSprite>().sprite2D;
         label_name.text = origin.Name;
         label_property.text = GameStringHelper.GetType(origin);
-        label_type.text = GameStringHelper.GetType(origin);
+        if (GameStringHelper.getSetName(origin.Setcode) != "")
+            label_type.text = GameStringHelper.GetType(origin) + "" + GameStringHelper.getSetName(origin.Setcode) + "" + "" + (origin.Alias == 0 ? origin.Id.ToString() : origin.Alias.ToString()) + "";
+        else
+            label_type.text = GameStringHelper.GetType(origin) + "" + (origin.Alias == 0 ? origin.Id.ToString() : origin.Alias.ToString()) + "";
 
         if ((origin.Type & (uint)CardType.Monster) > 0)
         {

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -8748,16 +8748,31 @@ public class Ocgcore : ServantWithCardDescription
     {
         base.ES_mouseUpRight();
 
-        if (Program.I().setting.isShowed)
+        if (Program.I().character.isShowed)
+        {
+            Program.I().character.Hide();
+            return;
+        }
+        else if (Program.I().appearance.isShowed)
+        {
+            Program.I().appearance.Hide();
+            return;
+        }
+        else if (Program.I().setting.isShowed)
         {
             Program.I().setting.hide();
             return;
         }
-        if (Program.I().cardDetail.isShowed)
+        else if (Program.I().cardDetail.isShowed)
         {
             Program.I().cardDetail.Hide();
             return;
         }
+        else if(Program.I().cardSelection.isShowed && Program.I().cardSelection.exitable)
+        {
+            Program.I().cardSelection.hide();
+            return;
+        }
 
         if (rightExcited)
             if (Input.GetKey(KeyCode.S) == false)