new ui card detail

Assets/MD/Materials/Mat_sprite_mask_cardDetial.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Mat_sprite_mask_cardDetial
+  m_Shader: {fileID: 4800000, guid: 9300d87db4ad0b0439f6fb97c3ce8ccf, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 2800000, guid: b8c41fb5f9a65cd448e0195fc8770bfa, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _HeightRate: 1
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WidthRate: 1
+    - _WorkflowMode: 1
+    - _XOffset: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &7071352862730582035
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 4

Assets/MD/Materials/Mat_sprite_mask_cardDetial.mat.meta

+fileFormatVersion: 2
+guid: c3a0ec2aae622024f9f1678b2483b8b8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Scripts/Appearance.cs

@@ -62,6 +62,8 @@ public class Appearance : MonoBehaviour
 
         if (Program.I().ocgcore.gameField != null && Program.I().ocgcore.gameField.gameObject != null)
             back.alpha = 0.95f;
+        else if (Program.I().deckManager.isShowed)
+            back.alpha = 0.95f;
         else
             back.alpha = 0f;
 

Assets/MD/Scripts/AttributeIcons.cs

@@ -16,42 +16,36 @@ public class AttributeIcons : MonoBehaviour
     public Sprite trap_;
 
     public void ChangeAttribute(string att)
+    {
+        GetComponent<UI2DSprite>().sprite2D = GetAttribute(att);
+    }
+
+    public Sprite GetAttribute(string att)
     {
         switch (att)
         {
             case "无":
-                GetComponent<UI2DSprite>().sprite2D = null_; 
-                break;
+                return null_;
             case "光":
-                GetComponent<UI2DSprite>().sprite2D = light_;
-                break;
+                return light_;
             case "暗":
-                GetComponent<UI2DSprite>().sprite2D = dark_;
-                break;
+                return dark_;
             case "水":
-                GetComponent<UI2DSprite>().sprite2D = water_;
-                break;
+                return water_;
             case "炎":
-                GetComponent<UI2DSprite>().sprite2D = fire_;
-                break;
+                return fire_;
             case "地":
-                GetComponent<UI2DSprite>().sprite2D = earth_;
-                break;
+                return earth_;
             case "风":
-                GetComponent<UI2DSprite>().sprite2D = wind_;
-                break;
+                return wind_;
             case "神":
-                GetComponent<UI2DSprite>().sprite2D = divine_;
-                break;
+                return divine_;
             case "魔法":
-                GetComponent<UI2DSprite>().sprite2D = spell_;
-                break;
+                return spell_;
             case "陷阱":
-                GetComponent<UI2DSprite>().sprite2D = trap_;
-                break;
+                return trap_;
             default:
-                GetComponent<UI2DSprite>().sprite2D = null_;
-                break;
+                return null_;
         }
     }
 }

Assets/MD/Scripts/CardDetail.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using YGOSharp;
+using YGOSharp.OCGWrapper.Enums;
+
+public class CardDetail : MonoBehaviour
+{
+    public UIWidget widge;
+    public UITexture pic;
+    public UILabel label_name;
+    public UILabel label_property;
+    public UI2DSprite icon_property;
+    public UILabel label_description;
+    public UILabel label_pendulum_description;
+    public UILabel label_type;
+
+    public UI2DSprite base_name;
+    public UI2DSprite base_property;
+    public UI2DSprite base_pendulum;
+    public UI2DSprite base_description;
+
+    public UI2DSprite back_name;
+    public UI2DSprite back_property;
+    public UI2DSprite back_pendulum;
+    public UI2DSprite back_description;
+
+    public UIWidget icons_;
+    public UI2DSprite icon_lv;
+    public UILabel label_lv;
+    public UI2DSprite icon_pendulum;
+    public UILabel label_pendulum;
+    public UI2DSprite icon_race;
+    public UILabel label_atk;
+    public UI2DSprite icon_def;
+    public UILabel label_def;
+
+    public UI2DSprite icon_name;
+
+    public bool isShowed;
+
+    private void Start()
+    {
+        widge.alpha = 0f;
+        UIHelper.registEvent(gameObject, "exit_", Hide);
+
+        widge.alpha = 1f;
+        gameObject.SetActive(false);
+    }
+
+    public void Show(Card card)
+    {
+        if (card.Id == 0)
+            return;
+        Card origin = CardsManager.Get(card.Id);
+        isShowed = true;
+        widge.alpha = 1f;
+        SEHandler.PlayInternalAudio("se_sys/SE_DECK_WINDOW_OPEN");
+        pic.mainTexture = GameTextureManager.GetCardPictureNow(origin.Id);
+        label_name.text = origin.Name;
+        label_property.text = GameStringHelper.GetType(origin);
+        label_type.text = GameStringHelper.GetType(origin);
+
+        if ((origin.Type & (uint)CardType.Monster) > 0)
+        {
+            icon_name.sprite2D = Program.I().cardDescription.ai.GetAttribute(GameStringHelper.attribute(origin.Attribute));
+
+            icon_property.alpha = 0f;
+            label_property.alpha = 0f;
+            icons_.alpha = 1f;
+
+            if ((origin.Type & (uint)CardType.Link) > 0)
+            {
+                icon_lv.sprite2D = Program.I().cardDescription.pi.link;
+                icon_pendulum.leftAnchor.absolute = 0;
+                icon_pendulum.rightAnchor.absolute = 0;
+                icon_pendulum.alpha = 0f;
+                label_pendulum.alpha = 0f;
+                icon_def.alpha = 0f;
+                label_def.alpha = 0f;
+            }
+            else if ((origin.Type & (uint)CardType.Pendulum) > 0)
+            {
+                if ((origin.Type & (uint)CardType.Xyz) > 0)
+                    icon_lv.sprite2D = Program.I().cardDescription.pi.rank;
+                else
+                    icon_lv.sprite2D = Program.I().cardDescription.pi.lv;
+                icon_pendulum.leftAnchor.absolute = 150;
+                icon_pendulum.rightAnchor.absolute = 150;
+                icon_pendulum.alpha = 1f;
+                label_pendulum.alpha = 1f;
+                label_pendulum.text = origin.LScale.ToString();
+                icon_def.alpha = 1f;
+                label_def.alpha = 1f;
+            }
+            else if ((origin.Type & (uint)CardType.Xyz) > 0)
+            {
+                icon_lv.sprite2D = Program.I().cardDescription.pi.rank;
+                icon_pendulum.leftAnchor.absolute = 0;
+                icon_pendulum.rightAnchor.absolute = 0;
+                icon_pendulum.alpha = 0f;
+                label_pendulum.alpha = 0f;
+                icon_def.alpha = 1f;
+                label_def.alpha = 1f;
+            }
+            else
+            {
+                icon_lv.sprite2D = Program.I().cardDescription.pi.lv;
+                icon_pendulum.leftAnchor.absolute = 0;
+                icon_pendulum.rightAnchor.absolute = 0;
+                icon_pendulum.alpha = 0f;
+                label_pendulum.alpha = 0f;
+                icon_def.alpha = 1f;
+                label_def.alpha = 1f;
+            }
+
+            label_lv.text = origin.Level.ToString();
+            Program.I().cardDescription.SetRaceIcon(icon_race, GameStringHelper.race(origin.Race));
+            if (origin.Attack == -2)
+                label_atk.text = "?";
+            else
+                label_atk.text = origin.Attack.ToString();
+            if (origin.Defense == -2)
+                label_def.text = "?";
+            else
+                label_def.text = origin.Defense.ToString();
+        }
+        else if ((origin.Type & (uint)CardType.Spell) > 0)
+        {
+            icon_name.sprite2D = Program.I().cardDescription.ai.GetAttribute("ħ");
+
+            icon_property.alpha = 1f;
+            label_property.alpha = 1f;
+            icons_.alpha = 0f;
+
+            label_property.leftAnchor.absolute = 5;
+            string type = "";
+            if ((origin.Type & (uint)CardType.Continuous) > 0)
+            {
+                type += "";
+                icon_property.sprite2D = Program.I().cardDescription.pi.continuous;
+            }
+            else if ((origin.Type & (uint)CardType.Equip) > 0)
+            {
+                type += "װ";
+                icon_property.sprite2D = Program.I().cardDescription.pi.equip;
+            }
+            else if ((origin.Type & (uint)CardType.Field) > 0)
+            {
+                type += "";
+                icon_property.sprite2D = Program.I().cardDescription.pi.field;
+            }
+            else if ((origin.Type & (uint)CardType.QuickPlay) > 0)
+            {
+                type += "ٹ";
+                icon_property.sprite2D = Program.I().cardDescription.pi.quick_play;
+            }
+            else if ((origin.Type & (uint)CardType.Ritual) > 0)
+            {
+                type += "ʽ";
+                icon_property.sprite2D = Program.I().cardDescription.pi.ritual;
+            }
+            else
+            {
+                type += "ͨ";
+                icon_property.alpha = 0f;
+                label_property.leftAnchor.absolute = -40;
+            }
+            type += "ħ";
+
+            label_property.text = type;
+
+        }
+        else if ((origin.Type & (uint)CardType.Trap) > 0)
+        {
+            icon_name.sprite2D = Program.I().cardDescription.ai.GetAttribute("");
+
+            icon_property.alpha = 1f;
+            label_property.alpha = 1f;
+            icons_.alpha = 0f;
+
+            label_property.leftAnchor.absolute = 5;
+
+            string type = "";
+            if ((origin.Type & (uint)CardType.Continuous) > 0)
+            {
+                type += "";
+                icon_property.sprite2D = Program.I().cardDescription.pi.continuous;
+            }
+            else if ((origin.Type & (uint)CardType.Counter) > 0)
+            {
+                type += "";
+                icon_property.sprite2D = Program.I().cardDescription.pi.counter;
+            }
+            else
+            {
+                type += "ͨ";
+                icon_property.alpha = 0f;
+                label_property.leftAnchor.absolute = -40;
+            }
+            type += "";
+
+            label_property.text = type;
+        }
+
+        if ((origin.Type & (uint)CardType.Monster) > 0)
+        {
+            base_property.bottomAnchor.absolute = -185;
+        }
+        else
+        {
+            base_property.bottomAnchor.absolute = -120;
+        }
+
+        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)
+            {
+                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 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)
+            {
+                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
+        {
+            base_pendulum.bottomAnchor.absolute = 0;
+            base_pendulum.topAnchor.absolute = 50;
+            base_pendulum.alpha = 0f;
+            label_description.text = origin.Desc;
+        }
+
+        Program.I().cardDescription.FrameColor(origin, false);
+        back_name.color = Program.I().cardDescription.color1;
+        back_property.color = Program.I().cardDescription.color1;
+        back_description.color = Program.I().cardDescription.color1;
+        back_pendulum.color = Program.I().cardDescription.color2;
+    }
+
+    public void Hide() 
+    {
+        isShowed = false;
+        widge.alpha=0f;
+        gameObject.SetActive(false);
+        SEHandler.PlayInternalAudio("se_sys/SE_MENU_CANCEL");
+    }
+}

Assets/MD/Scripts/CardDetail.cs.meta

+fileFormatVersion: 2
+guid: 83032ebfb7f77e041a37b6e31f87e441
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Scripts/Shortcuts.cs

@@ -40,6 +40,8 @@ public class Shortcuts : MonoBehaviour
                 Program.I().setting.hide();
             else if (PhaseUIBehaviour.isShowed)
                 PhaseUIBehaviour.hide();
+            else if (Program.I().cardDetail.isShowed)
+                Program.I().cardDetail.Hide();
             else if (Program.I().aiRoom.isShowed)
             {
                 Program.I().shiftToServant(Program.I().menu);
@@ -56,6 +58,10 @@ public class Shortcuts : MonoBehaviour
         if(Program.I().ocgcore.gameField != null && Program.I().ocgcore.gameField.gameObject != null)
         {
 
+        }
+        else if (Program.I().deckManager.isShowed)
+        {
+
         }
         else
         {
@@ -71,6 +77,8 @@ public class Shortcuts : MonoBehaviour
                     Program.I().cardSelection.hide();
                 else if (PhaseUIBehaviour.isShowed)
                     PhaseUIBehaviour.hide();
+                else if (Program.I().cardDetail.isShowed)
+                    Program.I().cardDetail.Hide();
                 else if (Program.I().aiRoom.isShowed)
                 {
                     Program.I().shiftToServant(Program.I().menu);

Assets/MD/Scripts/TimelineSEControl.cs

@@ -139,6 +139,10 @@ public class TimelineSEControl : MonoBehaviour
     {
         if (Input.GetMouseButtonUp(0) && director.time < (showUnlitCardFrames + summonFrames1) / 60f && director.time > 0.1f)
         {
+            if (Program.I().setting.isShowed)
+                return;
+            if (Program.I().cardDetail.isShowed)
+                return;
             CutinLoader cl = GameObject.Find("Program").GetComponent<CutinLoader>();
             cl.LoadCutin();
             cutinPlayed = true;

Assets/MD/Texture/mask_card detail.png.meta

+fileFormatVersion: 2
+guid: b8c41fb5f9a65cd448e0195fc8770bfa
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/icon_1.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5690241711044997232
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5690241711044997233}
+  - component: {fileID: 5690241711044997238}
+  m_Layer: 8
+  m_Name: icon_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5690241711044997233
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5690241711044997232}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -580, y: 32, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5690241711044997238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5690241711044997232}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e96b31ce75e592f45a1cff563a4869db, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 30
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 70
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: -70
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: -30
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 40
+  mHeight: 40
+  mDepth: 10005
+  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: 09dc7978b81155b44983890468205eec, 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}

Assets/MD/icon_1.prefab.meta

+fileFormatVersion: 2
+guid: 49f544b2bc615ca42831ec5e420adada
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/SibylSystem/CardDescription/CardDescription.cs

@@ -52,9 +52,10 @@ public class CardDescription : Servant
     private UIWidget property;
     private UILabel id_label;
     private UIButton id_button;
-    PropertyIcons pi;
-    AttributeIcons ai;
-    LimitIcons li;
+    private UIButton pic_button;
+    public PropertyIcons pi;
+    public AttributeIcons ai;
+    public LimitIcons li;
 
     Card card;
 
@@ -85,7 +86,9 @@ public class CardDescription : Servant
         property = UIHelper.getByName<UIWidget>(gameObject, "property_");
         id_label = UIHelper.getByName<UILabel>(gameObject, "id_card_description");
         id_button = id_label.GetComponent<UIButton>();
+        pic_button = UIHelper.getByName<UIButton>(gameObject, "pic_button");
         EventDelegate.Add(id_button.onClick, IdChange);
+        EventDelegate.Add(pic_button.onClick, ShowDetail);
 
         pi = UIHelper.getByName<PropertyIcons>(gameObject, "property_");
         ai = UIHelper.getByName<AttributeIcons>(gameObject, "attribute_");
@@ -115,6 +118,11 @@ public class CardDescription : Servant
         monitor.gameObject.SetActive(false);
     }
 
+    private void ShowDetail()
+    {
+        Program.I().cardDetail.gameObject.SetActive(true);
+        Program.I().cardDetail.Show(card);
+    }
 
     bool showId;
     private void IdChange()
@@ -506,7 +514,7 @@ public class CardDescription : Servant
             property_.SetActive(true);
     }
 
-    private void SetRaceIcon(UI2DSprite sprite , string race)
+    public void SetRaceIcon(UI2DSprite sprite , string race)
     {
         switch (race)
         {
@@ -591,7 +599,10 @@ public class CardDescription : Servant
         }
     }
 
-    private void FrameColor(Card data)
+    public Color color1 = Color.white;
+    public Color color2 = Color.white;
+
+    public void FrameColor(Card data, bool change = true)
     {
         Color color1 = new Color(0.7764f, 0.6784f, 0.6274f, 1f);
         Color color2 = color1;
@@ -720,9 +731,14 @@ public class CardDescription : Servant
                 color2 = color1;
             }
         }
+        if (change)
+        {
             name_base.color = color1;
             type_base.color = color2;
         }
+        this.color1 = color1;
+        this.color2 = color2;
+    }
 
     public void shiftCardShower(bool show)
     {

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -8735,6 +8735,18 @@ public class Ocgcore : ServantWithCardDescription
     public override void ES_mouseUpRight()
     {
         base.ES_mouseUpRight();
+
+        if (Program.I().setting.isShowed)
+        {
+            Program.I().setting.hide();
+            return;
+        }
+        if (Program.I().cardDetail.isShowed)
+        {
+            Program.I().cardDetail.Hide();
+            return;
+        }
+
         if (rightExcited)
             if (Input.GetKey(KeyCode.S) == false)
                 rightExcited = false;

Assets/SibylSystem/Program.cs

@@ -32,6 +32,7 @@ public class Program : MonoBehaviour
     public CardListHandler new_ui_cardList;
     public CardSelectionHandler cardSelection;
     public gameInfo new_ui_gameInfo;
+    public CardDetail cardDetail;
 
     [Header("ui_windows_2d")] 
     public Camera camera_windows_2d;

Assets/SibylSystem/deckManager/DeckManager.cs

@@ -232,6 +232,26 @@ public class DeckManager : ServantWithCardDescription
 
     public override void ES_mouseUpRight()
     {
+        if (Program.I().cardDetail.isShowed)
+        {
+            Program.I().cardDetail.Hide();
+            return;
+        }
+        else if (Program.I().appearance.isShowed)
+        {
+            Program.I().appearance.Hide();
+            return;
+        }
+        else if (Program.I().character.isShowed)
+        {
+            Program.I().character.Hide();
+            return;
+        }
+        else if (Program.I().setting.isShowed)
+        {
+            Program.I().setting.hide();
+            return;
+        }
         if (Program.pointedGameObject != null)
         {
             if (condition == Condition.editDeck)