UI Update V2

1dbc8248 · 赤子奈落 · b2475232 · 1dbc8248 · 1dbc8248 · 1dbc8248
Commit 1dbc8248 authored Jun 26, 2023 by 赤子奈落
48 changed files
--- a/Assets/ArtSystem/OpenCardOnClick.cs
+++ b/Assets/ArtSystem/OpenCardOnClick.cs
@@ -14,7 +14,7 @@ public class OpenCardOnClick : MonoBehaviour
                var s = lbl.GetUrlAtPosition(UICamera.lastWorldPosition);
                if (string.IsNullOrEmpty(s)) return;
                var code = int.Parse(s);
-                Program.I().cardDescription.setData(CardsManager.Get(code), GameTextureManager.myBack, "", true);
+                //Program.I().cardDescription.setData(CardsManager.Get(code), GameTextureManager.myBack, "", true);
            }
            catch (Exception e)
            {

--- a/Assets/ArtSystem/deckManager/cardPicLoader.cs
+++ b/Assets/ArtSystem/deckManager/cardPicLoader.cs
@@ -10,7 +10,6 @@ public class cardPicLoader : MonoBehaviour
    public UITexture uiTexture;
    public Banlist loaded_banlist;
    public Card data { get; set; }
-
    public int code
    {
        get => _code;
@@ -32,8 +31,8 @@ public class cardPicLoader : MonoBehaviour

    private void Update()
    {        
-        if (coli != null && Program.InputGetMouseButtonDown_0 && Program.pointedCollider == coli)
-            Program.I().cardDescription.setData(CardsManager.Get(_code), GameTextureManager.myBack, "", true);
+        //if (coli != null && Program.InputGetMouseButtonDown_0 && Program.pointedCollider == coli)
+        //    Program.I().cardDescription.setData(CardsManager.Get(_code), GameTextureManager.myBack, "", true);
        if (Program.I().deckManager != null)
        {
            if (loaded_banlist != Program.I().deckManager.currentBanlist)

--- a/Assets/ArtSystem/gameInfo/gameInfo.cs
+++ b/Assets/ArtSystem/gameInfo/gameInfo.cs
@@ -182,8 +182,8 @@ public class gameInfo : MonoBehaviour
        UIHelper.trySetLableText(hashedButton.gameObject, "hint_", hint);
        UIHelper.getRealEventGameObject(hashedButton.gameObject).name = hashString + "----" + hashInt;
        UIHelper.registUIEventTriggerForClick(hashedButton.gameObject, listenerForClicked);
-        hashedButton.gameObject.GetComponent<iconSetForButton>().setTexture(type);
-        hashedButton.gameObject.GetComponent<iconSetForButton>().setText(hint);
+        //hashedButton.gameObject.GetComponent<iconSetForButton>().setTexture(type);
+        //hashedButton.gameObject.GetComponent<iconSetForButton>().setText(hint);
        var Transforms = hashedButton.gameObject.GetComponentsInChildren<Transform>();
        foreach (var child in Transforms) child.gameObject.layer = instance_btnPan.gameObject.layer;
        hashedButton.gameObject.transform.SetParent(instance_btnPan.transform, false);

--- a/Assets/ArtSystem/superButton/iconSetForButton.cs
+++ b/Assets/ArtSystem/superButton/iconSetForButton.cs
@@ -5,20 +5,24 @@ public enum superButtonType
    act,
    attack,
    bp,
-    change,
+    change_atk,
+    change_def,
    ep,
    mp,
    no,
    see,
    set,
+    set_monster,
+    set_spell_trap,
+    set_pendulum,
    spsummon,
    summon,
+    pendulumSummon,
    yes
 }

 public class iconSetForButton : MonoBehaviour
 {
-    public UITexture UITextureInButton;
    public UILabel UILabelInButton;
    public Texture2D act;
    public Texture2D attack;
@@ -33,51 +37,87 @@ public class iconSetForButton : MonoBehaviour
    public Texture2D summon;
    public Texture2D yes;

+    public Sprite[] act_;
+    public Sprite[] attack_;
+    public Sprite[] yes_;
+    public Sprite[] no_;
+    public Sprite[] spsummon_;
+    public Sprite[] summon_;
+    public Sprite[] pendulumSummon_;
+    public Sprite[] set_monster;
+    public Sprite[] set_spell_trap;
+    public Sprite[] set_pendulum;
+    public Sprite[] change_atk;
+    public Sprite[] change_def;
+
+    void SetSpriteSet(Sprite[] sprites)
+    {
+        GetComponent<UIButton>().normalSprite2D = sprites[0];
+        GetComponent<UIButton>().hoverSprite2D = sprites[1];
+        GetComponent<UIButton>().pressedSprite2D = sprites[2];
+        GetComponent<UIButton>().disabledSprite2D = sprites[3];
+    }
+
    public void setTexture(superButtonType type)
    {
        switch (type)
        {
            case superButtonType.act:
-                UITextureInButton.mainTexture = act;
+                SetSpriteSet(act_);
                break;
            case superButtonType.attack:
-                UITextureInButton.mainTexture = attack;
+                SetSpriteSet (attack_);
                break;
-            case superButtonType.bp:
-                UITextureInButton.mainTexture = bp;
+            //case superButtonType.bp:
+            //    UITextureInButton.mainTexture = bp;
+            //    break;
+            case superButtonType.change_atk:
+                SetSpriteSet(change_atk);
                break;
-            case superButtonType.change:
-                UITextureInButton.mainTexture = change;
+            case superButtonType.change_def:
+                SetSpriteSet(change_def);
                break;
-            case superButtonType.ep:
-                UITextureInButton.mainTexture = ep;
+            //case superButtonType.ep:
+            //    UITextureInButton.mainTexture = ep;
+            //    break;
+            //case superButtonType.mp:
+            //    UITextureInButton.mainTexture = mp;
+            //    break;
+            case superButtonType.no:
+                SetSpriteSet(no_);
                break;
-            case superButtonType.mp:
-                UITextureInButton.mainTexture = mp;
+            //case superButtonType.see:
+            //    UITextureInButton.mainTexture = see;
+            //    break;
+            case superButtonType.set:
+                SetSpriteSet(set_spell_trap);
                break;
-            case superButtonType.no:
-                UITextureInButton.mainTexture = no;
+            case superButtonType.set_monster:
+                SetSpriteSet(set_monster);
                break;
-            case superButtonType.see:
-                UITextureInButton.mainTexture = see;
+            case superButtonType.set_spell_trap:
+                SetSpriteSet(set_spell_trap);
                break;
-            case superButtonType.set:
-                UITextureInButton.mainTexture = set;
+            case superButtonType.set_pendulum:
+                SetSpriteSet(set_pendulum);
                break;
            case superButtonType.spsummon:
-                UITextureInButton.mainTexture = spsummon;
+                SetSpriteSet(spsummon_);
                break;
            case superButtonType.summon:
-                UITextureInButton.mainTexture = summon;
+                SetSpriteSet(summon_);
+                break;
+            case superButtonType.pendulumSummon:
+                SetSpriteSet(pendulumSummon_);
                break;
            case superButtonType.yes:
-                UITextureInButton.mainTexture = yes;
+                SetSpriteSet(yes_);
                break;
        }

-        Color c;
-        ColorUtility.TryParseHtmlString(Config.Getui("gameButtonSign.color"), out c);
-        UITextureInButton.color = c;
+        //Color c;
+        //ColorUtility.TryParseHtmlString(Config.Getui("gameButtonSign.color"), out c);
+        //UITextureInButton.color = c;
    }

    public void setText(string hint)

--- a/Assets/ArtSystem/superButton/new_superButton.prefab
+++ b/Assets/ArtSystem/superButton/new_superButton.prefab
--- a/Assets/ArtSystem/superButton/new_superButtonTransparent.prefab
+++ b/Assets/ArtSystem/superButton/new_superButtonTransparent.prefab
@@ -10,7 +10,7 @@ GameObject:
  m_Component:
  - component: {fileID: 426850}
  - component: {fileID: 11432050}
-  m_Layer: 10
+  m_Layer: 5
  m_Name: icon_
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -326,7 +326,7 @@ GameObject:
  m_Component:
  - component: {fileID: 464504}
  - component: {fileID: 11411218}
-  m_Layer: 10
+  m_Layer: 5
  m_Name: hint_
  m_TagString: Untagged
  m_Icon: {fileID: 0}

--- a/Assets/MD/Animation/duelffromexclude.anim
+++ b/Assets/MD/Animation/duelffromexclude.anim
--- a/Assets/MD/Animation/duelffromexclude.anim.meta
+++ b/Assets/MD/Animation/duelffromexclude.anim.meta
+fileFormatVersion: 2
+guid: 31a05ddcfe720084894373ca16b27b0f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/duelffromexclude01.anim
+++ b/Assets/MD/Animation/duelffromexclude01.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: duelffromexclude01
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -90, y: 0, z: 180}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.16666667
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: -0.9, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 0, y: 10, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.38333333
+        value: {x: 0, y: 10, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.25, y: 0.25, z: 0.25}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.16666667
+        value: {x: 0.25, y: 0.25, z: 0.25}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.28333333
+        value: {x: 1.2327238, y: 1.2327238, z: 1.2327238}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.33333334
+        value: {x: 1.002091, y: 1.002091, z: 1.002091}
+        inSlope: {x: -0.08364198, y: -0.08364198, z: -0.08364198}
+        outSlope: {x: -0.08364204, y: -0.08364204, z: -0.08364204}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.38333333
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.38333333
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/MD/Animation/duelffromexclude01.anim.meta
+++ b/Assets/MD/Animation/duelffromexclude01.anim.meta
+fileFormatVersion: 2
+guid: bb2f71f7ad3032e43824e696416a93b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/duelffromgrave.anim
+++ b/Assets/MD/Animation/duelffromgrave.anim
--- a/Assets/MD/Animation/duelffromgrave.anim.meta
+++ b/Assets/MD/Animation/duelffromgrave.anim.meta
+fileFormatVersion: 2
+guid: 01392d6ee73eb8b4ab3c412a0d16ac8b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/duelffromgrave01.anim
+++ b/Assets/MD/Animation/duelffromgrave01.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: duelffromgrave01
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: -90, y: 0, z: 180}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.16666667
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: -0.9, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 0, y: 10, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.38333333
+        value: {x: 0, y: 10, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.5, y: 0.5, z: 0.5}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.16666667
+        value: {x: 0.5, y: 0.5, z: 0.5}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.28333333
+        value: {x: 1.2327238, y: 1.2327238, z: 1.2327238}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.33333334
+        value: {x: 1.002091, y: 1.002091, z: 1.002091}
+        inSlope: {x: -0.08364198, y: -0.08364198, z: -0.08364198}
+        outSlope: {x: -0.08364204, y: -0.08364204, z: -0.08364204}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.38333333
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.38333333
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/MD/Animation/duelffromgrave01.anim.meta
+++ b/Assets/MD/Animation/duelffromgrave01.anim.meta
+fileFormatVersion: 2
+guid: e4c9edbc01f47db489dad78935cf57a2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/dueltoexclude.anim
+++ b/Assets/MD/Animation/dueltoexclude.anim
--- a/Assets/MD/Animation/dueltoexclude.anim.meta
+++ b/Assets/MD/Animation/dueltoexclude.anim.meta
+fileFormatVersion: 2
+guid: db8a1877bef772b448f933119e1c2876
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/dueltoexclude01.anim
+++ b/Assets/MD/Animation/dueltoexclude01.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dueltoexclude01
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.33333334
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: -90, y: 0, z: 180}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.33333334
+        value: {x: 0, y: 10, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0, y: -0.9, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.41666666
+        value: {x: 0.25, y: 0.25, z: 0.25}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0.25, y: 0.25, z: 0.25}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/MD/Animation/dueltoexclude01.anim.meta
+++ b/Assets/MD/Animation/dueltoexclude01.anim.meta
+fileFormatVersion: 2
+guid: 5523775964d78044ba4d7e13c668428e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/dueltograve.anim
+++ b/Assets/MD/Animation/dueltograve.anim
--- a/Assets/MD/Animation/dueltograve.anim.meta
+++ b/Assets/MD/Animation/dueltograve.anim.meta
+fileFormatVersion: 2
+guid: 8e7487897bc75a64fbe3a64150d42889
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Animation/dueltograve01.anim
+++ b/Assets/MD/Animation/dueltograve01.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dueltograve01
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.33333334
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.41666666
+        value: {x: -44.99999, y: 0, z: 180}
+        inSlope: {x: -810.0001, y: 0, z: 0}
+        outSlope: {x: -810.00006, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: -90, y: 0, z: 180}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.33333334
+        value: {x: 0, y: 10, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0, y: -0.9, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.41666666
+        value: {x: 0.5, y: 0.5, z: 0.5}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0.5, y: 0.5, z: 0.5}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/MD/Animation/dueltograve01.anim.meta
+++ b/Assets/MD/Animation/dueltograve01.anim.meta
+fileFormatVersion: 2
+guid: 6dfb822b6309e7f4094989c7db25c28e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/MD/Scripts/AddCardHighlight.cs
+++ b/Assets/MD/Scripts/AddCardHighlight.cs
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class AddCardHighlight : MonoBehaviour
-{
-    Transform chl;
-    void Start()
-    {
-        chl = Instantiate(LoadAssets.cardHighlight.gameObject, this.transform).transform;
-        //chl.SetActive(true);
-        chl.localPosition = new Vector3(0, -0.01f, 0);
-    }
-
-
-    void Update()
-    {
-        if (this.transform.position.y < chl.transform.position.y)
-        {
-            chl.localPosition *= -1f;
-            chl.localEulerAngles = new Vector3(chl.localEulerAngles.x +180, chl.localEulerAngles.y, chl.localEulerAngles.z);
-        }
-    }
-}
--- a/Assets/MD/Scripts/AttributeIcons.cs
+++ b/Assets/MD/Scripts/AttributeIcons.cs
@@ -54,6 +54,9 @@ public class AttributeIcons : MonoBehaviour
            case "陷阱":
                sprite.sprite2D = trap_;
                break;
+            default: 
+                sprite.sprite2D = null_;
+                break;
        }
    }
 }
--- a/Assets/MD/Scripts/CardAnimation.cs
+++ b/Assets/MD/Scripts/CardAnimation.cs
@@ -247,4 +247,14 @@ public class CardAnimation : MonoBehaviour
            currentRotation = transform.eulerAngles;
        }
    }
+    public void PlayDelayedAnimation(string name, float time)
+    {
+        StartCoroutine(DelayedAnimation(name, time));
+    }
+
+    IEnumerator DelayedAnimation(string name, float time)
+    {
+        yield return new WaitForSeconds(time);
+        transform.Find("card").GetComponent<Animation>().Play(name);
+    }
 }
--- a/Assets/MD/Scripts/CardHighlightPosition.cs
+++ b/Assets/MD/Scripts/CardHighlightPosition.cs
+using Percy;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CardHighlightPosition : MonoBehaviour
+{
+    public gameCard card;
+
+    void Update()
+    {
+        if(card != null && card.highlightOn)
+        {
+            if ((card.p.position & (uint)CardPosition.FaceDown) > 0 && (card.p.location & (uint)CardLocation.Onfield) > 0)
+                transform.localPosition = new Vector3(0f, 0.1f, 0f);
+            else
+                transform.localPosition = new Vector3(0f, 0f, 0f);
+        }
+    }
+}
--- a/Assets/MD/Scripts/AddCardHighlight.cs.meta
+++ b/Assets/MD/Scripts/AddCardHighlight.cs.meta
 fileFormatVersion: 2
-guid: 5f710761c257dd9429a8505ee44adab6
+guid: 37d2700546989e7468b1c7d6d98b2220
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2

--- a/Assets/MD/Scripts/LoadAssets.cs
+++ b/Assets/MD/Scripts/LoadAssets.cs
@@ -22,8 +22,6 @@ public class LoadAssets : MonoBehaviour
    public static Transform grave1_;
    public static Transform grave2_;

-    public static Transform cardHighlight;
-
    public static BoxCollider fieldCollider1;
    public static BoxCollider fieldCollider2;
    public static BoxCollider mateCollider1;
@@ -37,6 +35,7 @@ public class LoadAssets : MonoBehaviour

    public static GameObject guide_near;
    public static GameObject guide_far;
+
    void Start()
    {
        ac = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<AnimationControl>();
@@ -312,31 +311,6 @@ public class LoadAssets : MonoBehaviour
        }
    }

-    public static void LoadSFX()
-    {
-        cardHighlight = ABLoader.LoadAB("effects/summonfusionshowunitcard01").transform;
-        cardHighlight.gameObject.SetActive(false);
-        var ts = cardHighlight.GetComponentsInChildren<Transform>(true);
-        foreach (Transform t in ts)
-        {
-            if (t.gameObject.name == "CardBack01") cardHighlight = t;
-        }
-
-        var particles = cardHighlight.GetComponentsInChildren<ParticleSystem>();
-        foreach (ParticleSystem particle in particles)
-        {
-            particle.Stop();
-            var main = particle.main;
-            main.duration = 100f;
-            main.startLifetime = 100f;
-            main.loop = true;
-            var col = particle.colorOverLifetime;
-            Gradient grad = new Gradient();
-            grad.SetKeys(new GradientColorKey[] { new GradientColorKey(Color.white, 0.0f), new GradientColorKey(Color.white, 1.0f) }, new GradientAlphaKey[] { new GradientAlphaKey(0.0f, 0.0f), new GradientAlphaKey(1.0f, 0.01f) });
-            col.color = new ParticleSystem.MinMaxGradient(grad);
-        }
-    }
-
    public static GameObject LoadCDMate(string name)
    {
        var la = GameObject.Find("new_gameField(Clone)/Assets_Loader").GetComponent<LoadAssets>();

--- a/Assets/MD/Scripts/LoadSFX.cs
+++ b/Assets/MD/Scripts/LoadSFX.cs
--- a/Assets/MD/Scripts/PhaseButtonHandler.cs
+++ b/Assets/MD/Scripts/PhaseButtonHandler.cs
@@ -64,7 +64,10 @@ public class PhaseButtonHandler : MonoBehaviour
            playerMaterial.SetFloat("_Active", 1);
            //Click
            if (Program.pointedCollider == collider_ && Input.GetMouseButtonUp(0))
+            {
                PhaseUIBehaviour.show();
+                SEHandler.PlayInternalAudio("se_sys/SE_MENU_DECIDE");
+            }
            if (Program.pointedCollider == collider_ && Input.GetMouseButton(0))
                playerMaterial.SetFloat("_PressButton", 1);
            else

--- a/Assets/MD/Scripts/PhaseUIBehaviour.cs
+++ b/Assets/MD/Scripts/PhaseUIBehaviour.cs
--- a/Assets/MD/Scripts/upMode.cs
+++ b/Assets/MD/Scripts/upMode.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

-public class upMode : MonoBehaviour
+public class Shortcuts : MonoBehaviour
 {
    public static bool upmode;
    public static bool lockCamera;
@@ -34,7 +34,18 @@ public class upMode : MonoBehaviour
        {
            if (Program.I().setting.isShowed)
                Program.I().setting.hide();
-            if (PhaseUIBehaviour.isShowed)
+            else if (PhaseUIBehaviour.isShowed)
+                PhaseUIBehaviour.hide();
+            else
+            {
+                Program.I().setting.show();
+            }
+        }
+        if (Input.GetMouseButtonUp(1))
+        {
+            if (Program.I().setting.isShowed)
+                Program.I().setting.hide();
+            else if (PhaseUIBehaviour.isShowed)
                PhaseUIBehaviour.hide();
        }


--- a/Assets/MD/Scripts/upMode.cs.meta
+++ b/Assets/MD/Scripts/upMode.cs.meta
--- a/Assets/MD/Scripts/TimerHandler.cs
+++ b/Assets/MD/Scripts/TimerHandler.cs
@@ -25,6 +25,8 @@ public class TimerHandler : MonoBehaviour

    public static void SetTime(int player , int time)
    {
+        if (tmp == null)
+            return;
        if(player == 0)
        {
            tmp.text = time.ToString();

--- a/Assets/MD/Test/TestLoad.cs
+++ b/Assets/MD/Test/TestLoad.cs
--- a/Assets/MD/main.unity
+++ b/Assets/MD/main.unity
--- a/Assets/SibylSystem/CardDescription/CardDescription.cs
+++ b/Assets/SibylSystem/CardDescription/CardDescription.cs
--- a/Assets/SibylSystem/Ocgcore/OCGobjects/gameButton.cs
+++ b/Assets/SibylSystem/Ocgcore/OCGobjects/gameButton.cs
--- a/Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs
+++ b/Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs
--- a/Assets/SibylSystem/Ocgcore/OCGobjects/gameHiddenButton.cs
+++ b/Assets/SibylSystem/Ocgcore/OCGobjects/gameHiddenButton.cs
--- a/Assets/SibylSystem/Ocgcore/Ocgcore.cs
+++ b/Assets/SibylSystem/Ocgcore/Ocgcore.cs
--- a/Assets/SibylSystem/Program.cs
+++ b/Assets/SibylSystem/Program.cs
--- a/Assets/SibylSystem/ResourceManagers/GameStringHelper.cs
+++ b/Assets/SibylSystem/ResourceManagers/GameStringHelper.cs
--- a/Assets/SibylSystem/deckManager/DeckManager.cs
+++ b/Assets/SibylSystem/deckManager/DeckManager.cs
--- a/Assets/old/Ocgcore/button/select/mat_select.mat
+++ b/Assets/old/Ocgcore/button/select/mat_select.mat
--- a/Assets/old/Ocgcore/button/select/mod_ocgcore_selecting.prefab
+++ b/Assets/old/Ocgcore/button/select/mod_ocgcore_selecting.prefab
--- a/Assets/old/Ocgcore/card/mod_ocgcore_card.prefab
+++ b/Assets/old/Ocgcore/card/mod_ocgcore_card.prefab
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset