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/MD/main.unity

@@ -3510,7 +3510,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 18719174}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -535, y: 32, z: 0}
+  m_LocalPosition: {x: -580, y: 32, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -7307,7 +7307,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 46116145}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -535, y: -38, z: 0}
+  m_LocalPosition: {x: -580, y: -38, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -8722,7 +8722,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
 --- !u!65 &56796430
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -15049,13 +15049,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 1}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 62
   mDepth: 2007
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 18.419355
+  aspectRatio: 19.85484
   mType: 2
   mFillDirection: 4
   mFillAmount: 1
@@ -19308,7 +19308,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 960
+  aspectRatio: 1004.5
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -20825,7 +20825,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -26337,7 +26337,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 2
   mFillDirection: 4
   mFillAmount: 1
@@ -32932,13 +32932,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 62
   mDepth: 2006
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 18.419355
+  aspectRatio: 19.85484
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -54019,7 +54019,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 227250122}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0, y: -0, z: 0}
+  m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 877396273}
@@ -54036,7 +54036,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1920, y: 1080, z: 0}
+  m_Size: {x: 2009, y: 1080, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &227250125
 MonoBehaviour:
@@ -54069,13 +54069,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 0.8}
   mPivot: 4
-  mWidth: 1920
+  mWidth: 2009
   mHeight: 1080
   mDepth: 2001
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -67882,7 +67882,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 324903184}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -551, y: 132, z: 0}
+  m_LocalPosition: {x: -596, y: 132, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 566365005}
@@ -67919,13 +67919,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 0
-  mWidth: 1116
+  mWidth: 1205
   mHeight: 275
   mDepth: 2020
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 4.058182
+  aspectRatio: 4.3818183
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
@@ -70789,7 +70789,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 344379678}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -505, y: 32, z: 0}
+  m_LocalPosition: {x: -550, y: 32, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -71839,7 +71839,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 350768399}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 95, z: 0}
+  m_LocalPosition: {x: -0, y: 95, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 566365005}
@@ -71876,13 +71876,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 6
   mDepth: 2010
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 188.33333
+  aspectRatio: 203.16667
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -91791,7 +91791,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 484626762}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -355, y: 32, z: 0}
+  m_LocalPosition: {x: -400, y: 32, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -94265,13 +94265,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 137
   mDepth: 2006
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 8.335767
+  aspectRatio: 8.985401
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -97931,7 +97931,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 533439341}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -551, y: 25, z: 0}
+  m_LocalPosition: {x: -596, y: 25, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1333285573}
@@ -97968,13 +97968,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 0
-  mWidth: 1116
+  mWidth: 1205
   mHeight: 120
   mDepth: 2020
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 9.3
+  aspectRatio: 10.041667
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: f0cfb8fcae3317e4196a7f6e4c50fbd1, type: 3}
   mFont: {fileID: 0}
@@ -101911,7 +101911,7 @@ Transform:
   - {fileID: 1727442749}
   - {fileID: 1188619071}
   m_Father: {fileID: 877396273}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &566365006
 MonoBehaviour:
@@ -101944,13 +101944,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1170
+  mWidth: 1259
   mHeight: 325
   mDepth: 2005
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.6
+  aspectRatio: 3.873846
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -105985,7 +105985,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 591772094}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -505, y: -38, z: 0}
+  m_LocalPosition: {x: -550, y: -38, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -107284,7 +107284,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 610538404}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -385, y: 32, z: 0}
+  m_LocalPosition: {x: -430, y: 32, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -111088,13 +111088,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 6
   mDepth: 2010
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 188.33333
+  aspectRatio: 203.16667
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -126481,7 +126481,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.009901
+  aspectRatio: 1.0980198
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: f0cfb8fcae3317e4196a7f6e4c50fbd1, type: 3}
   mFont: {fileID: 0}
@@ -137103,13 +137103,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 49
   mDepth: 2009
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 23.061224
+  aspectRatio: 24.87755
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -146940,6 +146940,7 @@ Transform:
   - {fileID: 1309342654}
   - {fileID: 1661358138}
   - {fileID: 1041169191}
+  - {fileID: 1497909055}
   - {fileID: 1366598850}
   - {fileID: 1906718174}
   - {fileID: 1333285573}
@@ -146960,19 +146961,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 826286803}
     relative: 0
     absolute: 0
   rightAnchor:
-    target: {fileID: 0}
+    target: {fileID: 826286803}
     relative: 1
     absolute: 0
   bottomAnchor:
-    target: {fileID: 0}
+    target: {fileID: 826286803}
     relative: 0
     absolute: 0
   topAnchor:
-    target: {fileID: 0}
+    target: {fileID: 826286803}
     relative: 1
     absolute: 0
   updateAnchors: 1
@@ -146988,7 +146989,7 @@ MonoBehaviour:
   mClipTexture: {fileID: 0}
   mAlpha: 0
   mClipping: 4
-  mClipRange: {x: -0.3394165, y: -0.39663696, z: 1919.8658, w: 1080}
+  mClipRange: {x: -0.32424927, y: -0.39663696, z: 2009.4636, w: 1080}
   mClipSoftness: {x: 4, y: 4}
   mDepth: 2000
   mSortingOrder: 0
@@ -150402,7 +150403,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 903660189}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -535, y: 32, z: 0}
+  m_LocalPosition: {x: -580, y: 32, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1906718174}
@@ -158848,7 +158849,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 966468259}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -235, y: 32, z: 0}
+  m_LocalPosition: {x: -280, y: 32, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -160439,13 +160440,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 65
   mDepth: 2009
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 17.384615
+  aspectRatio: 18.753845
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -163917,7 +163918,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -169719,7 +169720,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1041169190}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -645, y: 29, z: 0}
+  m_LocalPosition: {x: -690, y: 29, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 877396273}
@@ -178272,7 +178273,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1102355770}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -335, y: -38, z: 0}
+  m_LocalPosition: {x: -380, y: -38, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -185501,7 +185502,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 2
   mFillDirection: 4
   mFillAmount: 1
@@ -190324,13 +190325,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 297
   mDepth: 2006
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.8451178
+  aspectRatio: 4.144781
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -194661,13 +194662,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 49
   mDepth: 2009
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 23.061224
+  aspectRatio: 24.87755
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -208205,7 +208206,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1309342653}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -480, y: 240, z: 0}
+  m_LocalPosition: {x: -525, y: 240, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 877396273}
@@ -208334,7 +208335,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -209569,7 +209570,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
 --- !u!1 &1318736772
 GameObject:
   m_ObjectHideFlags: 0
@@ -212048,7 +212049,7 @@ Transform:
   - {fileID: 2094583913}
   - {fileID: 1495799857}
   m_Father: {fileID: 877396273}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1333285574
 MonoBehaviour:
@@ -212081,13 +212082,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1170
+  mWidth: 1259
   mHeight: 230
   mDepth: 2005
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 5.0869565
+  aspectRatio: 5.473913
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -215635,7 +215636,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1356031699}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -305, y: -38, z: 0}
+  m_LocalPosition: {x: -350, y: -38, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 473089636}
@@ -216884,7 +216885,7 @@ Transform:
   - {fileID: 90930680}
   - {fileID: 155954797}
   m_Father: {fileID: 877396273}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1366598851
 MonoBehaviour:
@@ -216917,13 +216918,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1170
+  mWidth: 1259
   mHeight: 90
   mDepth: 2005
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 13
+  aspectRatio: 13.988889
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -227883,6 +227884,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Panel: {fileID: 877396274}
   pic: {fileID: 1041169192}
+  limit: {fileID: 1497909056}
   label_name: {fileID: 1850577048}
   label_property: {fileID: 1995733151}
   icon_property: {fileID: 903660191}
@@ -236141,13 +236143,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 0.7490196}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 202
   mDepth: 2006
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 5.6534653
+  aspectRatio: 6.0940595
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -236621,6 +236623,92 @@ MonoBehaviour:
   mFixedAspect: 0
   mPixelSize: 1
   nextSprite: {fileID: 0}
+--- !u!1 &1497909054
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1497909055}
+  - component: {fileID: 1497909056}
+  m_Layer: 11
+  m_Name: limit_
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1497909055
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1497909054}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -945, y: 398, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 877396273}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1497909056
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1497909054}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e96b31ce75e592f45a1cff563a4869db, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 1041169191}
+    relative: 0
+    absolute: -20
+  rightAnchor:
+    target: {fileID: 1041169191}
+    relative: 0
+    absolute: 40
+  bottomAnchor:
+    target: {fileID: 1041169191}
+    relative: 1
+    absolute: -40
+  topAnchor:
+    target: {fileID: 1041169191}
+    relative: 1
+    absolute: 20
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 60
+  mHeight: 60
+  mDepth: 2051
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  mSprite: {fileID: 21300000, guid: c7e213f7e7a3ef54cb677595d754968d, type: 2}
+  mMat: {fileID: 0}
+  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
+  mBorder: {x: 0, y: 0, z: 0, w: 0}
+  mFixedAspect: 0
+  mPixelSize: 1
+  nextSprite: {fileID: 0}
 --- !u!1 &1498238168
 GameObject:
   m_ObjectHideFlags: 0
@@ -240540,7 +240628,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -245772,13 +245860,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 50
   mDepth: 2010
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 22.6
+  aspectRatio: 24.38
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -254744,7 +254832,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1632171226}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -551, y: 85, z: 0}
+  m_LocalPosition: {x: -596, y: 85, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1333285573}
@@ -254781,13 +254869,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 0
-  mWidth: 1116
+  mWidth: 1205
   mHeight: 180
   mDepth: 2020
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 6.2
+  aspectRatio: 6.6944447
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
   mFont: {fileID: 0}
@@ -256728,7 +256816,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1646535182}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -551, y: 72, z: 0}
+  m_LocalPosition: {x: -596, y: 72, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 566365005}
@@ -256765,13 +256853,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 0
-  mWidth: 1116
+  mWidth: 1205
   mHeight: 215
   mDepth: 2020
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 5.1906977
+  aspectRatio: 5.604651
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 12800000, guid: f0cfb8fcae3317e4196a7f6e4c50fbd1, type: 3}
   mFont: {fileID: 0}
@@ -260213,7 +260301,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1661358137}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 896, y: 471, z: 0}
+  m_LocalPosition: {x: 940, y: 471, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 877396273}
@@ -270146,13 +270234,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 297
   mDepth: 2007
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 3.8451178
+  aspectRatio: 4.144781
   mType: 2
   mFillDirection: 4
   mFillAmount: 1
@@ -273674,7 +273762,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1752056656}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 536, y: 0, z: 0}
+  m_LocalPosition: {x: 580, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1366598850}
@@ -288365,15 +288453,15 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1116
+  mWidth: 1205
   mHeight: 50
   mDepth: 2020
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 22.32
+  aspectRatio: 24.1
   keepCrispWhenShrunk: 1
-  mTrueTypeFont: {fileID: 12800000, guid: 154a5b3c6e48fa4448be221e7c4a68de, type: 3}
+  mTrueTypeFont: {fileID: 12800000, guid: d086cc69053abce42a6351765ad88863, type: 3}
   mFont: {fileID: 0}
   mText: "\u4E07\u7269\u521B\u4E16\u9F99"
   mFontSize: 25
@@ -296324,7 +296412,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.7777778
+  aspectRatio: 1.8601851
 --- !u!65 &1902820825
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -296742,7 +296830,7 @@ Transform:
   - {fileID: 2102050843}
   - {fileID: 501001452}
   m_Father: {fileID: 877396273}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1906718175
 MonoBehaviour:
@@ -296775,13 +296863,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1170
+  mWidth: 1259
   mHeight: 165
   mDepth: 2005
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 7.090909
+  aspectRatio: 7.630303
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -309429,7 +309517,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1995733149}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -510, y: 29, z: 0}
+  m_LocalPosition: {x: -555, y: 29, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1906718174}
@@ -319324,13 +319412,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 1130
+  mWidth: 1219
   mHeight: 6
   mDepth: 2010
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 188.33333
+  aspectRatio: 203.16667
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -324120,13 +324208,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 202
   mDepth: 2007
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 5.6534653
+  aspectRatio: 6.0940595
   mType: 2
   mFillDirection: 4
   mFillAmount: 1
@@ -325292,13 +325380,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0, g: 0, b: 0, a: 1}
   mPivot: 4
-  mWidth: 1142
+  mWidth: 1231
   mHeight: 137
   mDepth: 2007
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 8.335767
+  aspectRatio: 8.985401
   mType: 2
   mFillDirection: 4
   mFillAmount: 1

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)