Преглед на файлове

Fixed the 5 other warnings + more stuff

x89rt2 преди 3 месеца
родител
ревизия
28581b49e8

+ 0 - 1
Assets/Scripts/Script/CEntity_Base.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using WebSocketSharp;
 using UnityEngine;
 
 [CreateAssetMenu(menuName = "Create/CEntity_Base")]

+ 270 - 304
Assets/Scripts/Script/ContinuousController.cs

@@ -152,357 +152,325 @@ public class ContinuousController : MonoBehaviour
 
     async Task CreateTokenData()
     {
-        DiaboromonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.White },
-            PlayCost = 14,
-            Level = 6,
-            CardName_JPN = "ディアボロモン",
-            CardName_ENG = "Diaboromon",
-            Form_JPN = new List<string>() { "究極体" },
-            Form_ENG = new List<string>() { "Mega" },
-            Attribute_JPN = new List<string>() { "不明" },
-            Attribute_ENG = new List<string>() { "Unknown" },
-            Type_JPN = new List<string>() { "種族不明" },
-            Type_ENG = new List<string>() { "Unidentified" },
-            CardSpriteName = "BT2-082-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 3000,
-        };
+        DiaboromonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+
+        DiaboromonToken.cardColors = new List<CardColor>() { CardColor.White };
+        DiaboromonToken.PlayCost = 14;
+        DiaboromonToken.Level = 6;
+        DiaboromonToken.CardName_JPN = "ディアボロモン";
+        DiaboromonToken.CardName_ENG = "Diaboromon";
+        DiaboromonToken.Form_JPN = new List<string>() { "究極体" };
+        DiaboromonToken.Form_ENG = new List<string>() { "Mega" };
+        DiaboromonToken.Attribute_JPN = new List<string>() { "不明" };
+        DiaboromonToken.Attribute_ENG = new List<string>() { "Unknown" };
+        DiaboromonToken.Type_JPN = new List<string>() { "種族不明" };
+        DiaboromonToken.Type_ENG = new List<string>() { "Unidentified" };
+        DiaboromonToken.CardSpriteName = "BT2-082-token";
+        DiaboromonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        DiaboromonToken.DP = 3000;
 
         await DiaboromonToken.GetCardSprite();
 
-        AmonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Red },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "紅炎のアモン",
-            CardName_ENG = "Amon of Crimson Flame",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT14-018-token-red",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000,
-            CardEffectClassName = "BT4_038"
-        };
+        AmonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        AmonToken.cardColors = new List<CardColor>() { CardColor.Red };
+        AmonToken.PlayCost = -1;
+        AmonToken.Level = 0;
+        AmonToken.CardName_JPN = "紅炎のアモン";
+        AmonToken.CardName_ENG = "Amon of Crimson Flame";
+        AmonToken.Form_JPN = new List<string>();
+        AmonToken.Form_ENG = new List<string>();
+        AmonToken.Attribute_JPN = new List<string>();
+        AmonToken.Attribute_ENG = new List<string>();
+        AmonToken.Type_JPN = new List<string>();
+        AmonToken.Type_ENG = new List<string>();
+        AmonToken.CardSpriteName = "BT14-018-token-red";
+        AmonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        AmonToken.DP = 6000;
+        AmonToken.CardEffectClassName = "BT4_038";
 
         await AmonToken.GetCardSprite();
 
-        UmonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Yellow },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "蒼雷のウモン",
-            CardName_ENG = "Umon of Blue Thunder",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT14-018-token-yellow",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000,
-            CardEffectClassName = "BT1_031"
-        };
+        UmonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        UmonToken.cardColors = new List<CardColor>() { CardColor.Yellow };
+        UmonToken.PlayCost = -1;
+        UmonToken.Level = 0;
+        UmonToken.CardName_JPN = "蒼雷のウモン";
+        UmonToken.CardName_ENG = "Umon of Blue Thunder";
+        UmonToken.Form_JPN = new List<string>();
+        UmonToken.Form_ENG = new List<string>();
+        UmonToken.Attribute_JPN = new List<string>();
+        UmonToken.Attribute_ENG = new List<string>();
+        UmonToken.Type_JPN = new List<string>();
+        UmonToken.Type_ENG = new List<string>();
+        UmonToken.CardSpriteName = "BT14-018-token-yellow";
+        UmonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        UmonToken.DP = 6000;
+        UmonToken.CardEffectClassName = "BT1_031";
 
         await UmonToken.GetCardSprite();
 
-        FujitsumonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Purple },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "フジツモン",
-            CardName_ENG = "Fujitsumon",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "EX5-058-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 3000,
-            CardEffectClassName = "EX5_058_token"
-        };
+        FujitsumonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        FujitsumonToken.cardColors = new List<CardColor>() { CardColor.Purple };
+        FujitsumonToken.PlayCost = -1;
+        FujitsumonToken.Level = 0;
+        FujitsumonToken.CardName_JPN = "フジツモン";
+        FujitsumonToken.CardName_ENG = "Fujitsumon";
+        FujitsumonToken.Form_JPN = new List<string>();
+        FujitsumonToken.Form_ENG = new List<string>();
+        FujitsumonToken.Attribute_JPN = new List<string>();
+        FujitsumonToken.Attribute_ENG = new List<string>();
+        FujitsumonToken.Type_JPN = new List<string>();
+        FujitsumonToken.Type_ENG = new List<string>();
+        FujitsumonToken.CardSpriteName = "EX5-058-token";
+        FujitsumonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        FujitsumonToken.DP = 3000;
+        FujitsumonToken.CardEffectClassName = "EX5_058_token";
 
         await FujitsumonToken.GetCardSprite();
 
-        GyuukimonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Purple },
-            PlayCost = 7,
-            Level = 5,
-            CardName_JPN = "ギュウキモン",
-            CardName_ENG = "Gyuukimon",
-            Form_JPN = new List<string>() { "究極の" },
-            Form_ENG = new List<string>() { "Ultimate" },
-            Attribute_JPN = new List<string>() { "ウイルス" },
-            Attribute_ENG = new List<string>() { "Virus" },
-            Type_JPN = new List<string>() { "ダークアニマル" },
-            Type_ENG = new List<string>() { "Dark Animal" },
-            CardSpriteName = "LM-018-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 3000,
-        };
+        GyuukimonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        GyuukimonToken.cardColors = new List<CardColor>() { CardColor.Purple };
+        GyuukimonToken.PlayCost = 7;
+        GyuukimonToken.Level = 5;
+        GyuukimonToken.CardName_JPN = "ギュウキモン";
+        GyuukimonToken.CardName_ENG = "Gyuukimon";
+        GyuukimonToken.Form_JPN = new List<string>() { "究極の" };
+        GyuukimonToken.Form_ENG = new List<string>() { "Ultimate" };
+        GyuukimonToken.Attribute_JPN = new List<string>() { "ウイルス" };
+        GyuukimonToken.Attribute_ENG = new List<string>() { "Virus" };
+        GyuukimonToken.Type_JPN = new List<string>() { "ダークアニマル" };
+        GyuukimonToken.Type_ENG = new List<string>() { "Dark Animal" };
+        GyuukimonToken.CardSpriteName = "LM-018-token";
+        GyuukimonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        GyuukimonToken.DP = 3000;
+        GyuukimonToken.CardEffectClassName = "LM_018_token";
 
         await GyuukimonToken.GetCardSprite();
 
-        KoHagurumonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Black },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "KoHagurumon",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT16-052-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 1000,
-            CardEffectClassName = "BT16_052_token"
-        };
+        KoHagurumonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        KoHagurumonToken.cardColors = new List<CardColor>() { CardColor.Black };
+        KoHagurumonToken.PlayCost = -1;
+        KoHagurumonToken.Level = 0;
+        KoHagurumonToken.CardName_JPN = "";
+        KoHagurumonToken.CardName_ENG = "KoHagurumon";
+        KoHagurumonToken.Form_JPN = new List<string>();
+        KoHagurumonToken.Form_ENG = new List<string>();
+        KoHagurumonToken.Attribute_JPN = new List<string>();
+        KoHagurumonToken.Attribute_ENG = new List<string>();
+        KoHagurumonToken.Type_JPN = new List<string>();
+        KoHagurumonToken.Type_ENG = new List<string>();
+        KoHagurumonToken.CardSpriteName = "BT16-052-token";
+        KoHagurumonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        KoHagurumonToken.DP = 1000;
+        KoHagurumonToken.CardEffectClassName = "BT16_052_token";
 
         await KoHagurumonToken.GetCardSprite();
         
-        FamiliarToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Yellow },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Familiar",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "EX7-030-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 3000,
-            CardEffectClassName = "EX7_030_token"
-        };
+        FamiliarToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        FamiliarToken.cardColors = new List<CardColor>() { CardColor.Yellow };
+        FamiliarToken.PlayCost = -1;
+        FamiliarToken.Level = 0;
+        FamiliarToken.CardName_JPN = "";
+        FamiliarToken.CardName_ENG = "Familiar";
+        FamiliarToken.Form_JPN = new List<string>();
+        FamiliarToken.Form_ENG = new List<string>();
+        FamiliarToken.Attribute_JPN = new List<string>();
+        FamiliarToken.Attribute_ENG = new List<string>();
+        FamiliarToken.Type_JPN = new List<string>();
+        FamiliarToken.Type_ENG = new List<string>();
+        FamiliarToken.CardSpriteName = "EX7-030-token";
+        FamiliarToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        FamiliarToken.DP = 3000;
+        FamiliarToken.CardEffectClassName = "EX7_030_token";
 
         await FamiliarToken.GetCardSprite();
         
-        SelfDeleteFamiliarToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Yellow },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Familiar",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "EX7-030-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 3000,
-            CardEffectClassName = "P_165_token"
-        };
+        SelfDeleteFamiliarToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        SelfDeleteFamiliarToken.cardColors = new List<CardColor>() { CardColor.Yellow };
+        SelfDeleteFamiliarToken.PlayCost = -1;
+        SelfDeleteFamiliarToken.Level = 0;
+        SelfDeleteFamiliarToken.CardName_JPN = "";
+        SelfDeleteFamiliarToken.CardName_ENG = "Familiar";
+        SelfDeleteFamiliarToken.Form_JPN = new List<string>();
+        SelfDeleteFamiliarToken.Form_ENG = new List<string>();
+        SelfDeleteFamiliarToken.Attribute_JPN = new List<string>();
+        SelfDeleteFamiliarToken.Attribute_ENG = new List<string>();
+        SelfDeleteFamiliarToken.Type_JPN = new List<string>();
+        SelfDeleteFamiliarToken.Type_ENG = new List<string>();
+        SelfDeleteFamiliarToken.CardSpriteName = "EX7-030-token";
+        SelfDeleteFamiliarToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        SelfDeleteFamiliarToken.DP = 3000;
+        SelfDeleteFamiliarToken.CardEffectClassName = "P_165_token";
 
         await SelfDeleteFamiliarToken.GetCardSprite();
 
-        VoleeZerdruckenToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Purple },
-            PlayCost = -1,
-            Level = 4,
-            CardName_JPN = "",
-            CardName_ENG = "Volée & Zerdrücken",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "EX7-058-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 5000,
-            CardEffectClassName = "EX7_058_token"
-        };
+        VoleeZerdruckenToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        VoleeZerdruckenToken.cardColors = new List<CardColor>() { CardColor.Purple };
+        VoleeZerdruckenToken.PlayCost = -1;
+        VoleeZerdruckenToken.Level = 4;
+        VoleeZerdruckenToken.CardName_JPN = "";
+        VoleeZerdruckenToken.CardName_ENG = "Volée & Zerdrücken";
+        VoleeZerdruckenToken.Form_JPN = new List<string>();
+        VoleeZerdruckenToken.Form_ENG = new List<string>();
+        VoleeZerdruckenToken.Attribute_JPN = new List<string>();
+        VoleeZerdruckenToken.Attribute_ENG = new List<string>();
+        VoleeZerdruckenToken.Type_JPN = new List<string>();
+        VoleeZerdruckenToken.Type_ENG = new List<string>();
+        VoleeZerdruckenToken.CardSpriteName = "EX7-058-token";
+        VoleeZerdruckenToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        VoleeZerdruckenToken.DP = 5000;
+        VoleeZerdruckenToken.CardEffectClassName = "EX7_058_token";
 
         await VoleeZerdruckenToken.GetCardSprite();
 
-        UkaNoMitamaToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Yellow },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Uka-no-Mitama",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "EX8-037-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 9000,
-            CardEffectClassName = "EX8_037_token"
-        };
+        UkaNoMitamaToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        UkaNoMitamaToken.cardColors = new List<CardColor>() { CardColor.Yellow };
+        UkaNoMitamaToken.PlayCost = -1;
+        UkaNoMitamaToken.Level = 0;
+        UkaNoMitamaToken.CardName_JPN = "";
+        UkaNoMitamaToken.CardName_ENG = "Uka-no-Mitama";
+        UkaNoMitamaToken.Form_JPN = new List<string>();
+        UkaNoMitamaToken.Form_ENG = new List<string>();
+        UkaNoMitamaToken.Attribute_JPN = new List<string>();
+        UkaNoMitamaToken.Attribute_ENG = new List<string>();
+        UkaNoMitamaToken.Type_JPN = new List<string>();
+        UkaNoMitamaToken.Type_ENG = new List<string>();
+        UkaNoMitamaToken.CardSpriteName = "EX8-037-token";
+        UkaNoMitamaToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        UkaNoMitamaToken.DP = 9000;
+        UkaNoMitamaToken.CardEffectClassName = "EX8_037_token";
 
         await UkaNoMitamaToken.GetCardSprite();
 
-        WarGrowlmonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Red },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "WarGrowlmon",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT19-091-token-red",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000
-        };
+        WarGrowlmonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        WarGrowlmonToken.cardColors = new List<CardColor>() { CardColor.Red };
+        WarGrowlmonToken.PlayCost = -1;
+        WarGrowlmonToken.Level = 0;
+        WarGrowlmonToken.CardName_JPN = "";
+        WarGrowlmonToken.CardName_ENG = "WarGrowlmon";
+        WarGrowlmonToken.Form_JPN = new List<string>();
+        WarGrowlmonToken.Form_ENG = new List<string>();
+        WarGrowlmonToken.Attribute_JPN = new List<string>();
+        WarGrowlmonToken.Attribute_ENG = new List<string>();
+        WarGrowlmonToken.Type_JPN = new List<string>();
+        WarGrowlmonToken.Type_ENG = new List<string>();
+        WarGrowlmonToken.CardSpriteName = "BT19-091-token-red";
+        WarGrowlmonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        WarGrowlmonToken.DP = 6000;
 
         await WarGrowlmonToken.GetCardSprite();
 
-        TaomonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Yellow },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Taomon",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT19-091-token-yellow",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000
-        };
+        TaomonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        TaomonToken.cardColors = new List<CardColor>() { CardColor.Yellow };
+        TaomonToken.PlayCost = -1;
+        TaomonToken.Level = 0;
+        TaomonToken.CardName_JPN = "";
+        TaomonToken.CardName_ENG = "Taomon";
+        TaomonToken.Form_JPN = new List<string>();
+        TaomonToken.Form_ENG = new List<string>();
+        TaomonToken.Attribute_JPN = new List<string>();
+        TaomonToken.Attribute_ENG = new List<string>();
+        TaomonToken.Type_JPN = new List<string>();
+        TaomonToken.Type_ENG = new List<string>();
+        TaomonToken.CardSpriteName = "BT19-091-token-yellow";
+        TaomonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        TaomonToken.DP = 6000;
 
         await TaomonToken.GetCardSprite();
         
-        RapidmonToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Green },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Rapidmon",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT19-091-token-green",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000
-        };
+        RapidmonToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        RapidmonToken.cardColors = new List<CardColor>() { CardColor.Green };
+        RapidmonToken.PlayCost = -1;
+        RapidmonToken.Level = 0;
+        RapidmonToken.CardName_JPN = "";
+        RapidmonToken.CardName_ENG = "Rapidmon";
+        RapidmonToken.Form_JPN = new List<string>();
+        RapidmonToken.Form_ENG = new List<string>();
+        RapidmonToken.Attribute_JPN = new List<string>();
+        RapidmonToken.Attribute_ENG = new List<string>();
+        RapidmonToken.Type_JPN = new List<string>();
+        RapidmonToken.Type_ENG = new List<string>();
+        RapidmonToken.CardSpriteName = "BT19-091-token-green";
+        RapidmonToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        RapidmonToken.DP = 6000;
 
         await RapidmonToken.GetCardSprite();
 
-        PipeFoxToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.Yellow },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Pipe-Fox",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT19-040-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000,
-            CardEffectClassName = "BT19_040_token"
-        };
+        PipeFoxToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        PipeFoxToken.cardColors = new List<CardColor>() { CardColor.Yellow };
+        PipeFoxToken.PlayCost = -1;
+        PipeFoxToken.Level = 0;
+        PipeFoxToken.CardName_JPN = "";
+        PipeFoxToken.CardName_ENG = "Pipe-Fox";
+        PipeFoxToken.Form_JPN = new List<string>();
+        PipeFoxToken.Form_ENG = new List<string>();
+        PipeFoxToken.Attribute_JPN = new List<string>();
+        PipeFoxToken.Attribute_ENG = new List<string>();
+        PipeFoxToken.Type_JPN = new List<string>();
+        PipeFoxToken.Type_ENG = new List<string>();
+        PipeFoxToken.CardSpriteName = "BT19-040-token";
+        PipeFoxToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        PipeFoxToken.DP = 6000;
+        PipeFoxToken.CardEffectClassName = "BT19_040_token";
 
         await PipeFoxToken.GetCardSprite();
 
-        AthoRenePorToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.White },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Atho, René & Por",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT20-017-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000,
-            CardEffectClassName = "BT20_017_token"
-        };
+        AthoRenePorToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        AthoRenePorToken.cardColors = new List<CardColor>() { CardColor.White };
+        AthoRenePorToken.PlayCost = -1;
+        AthoRenePorToken.Level = 0;
+        AthoRenePorToken.CardName_JPN = "";
+        AthoRenePorToken.CardName_ENG = "Atho, René & Por";
+        AthoRenePorToken.Form_JPN = new List<string>();
+        AthoRenePorToken.Form_ENG = new List<string>();
+        AthoRenePorToken.Attribute_JPN = new List<string>();
+        AthoRenePorToken.Attribute_ENG = new List<string>();
+        AthoRenePorToken.Type_JPN = new List<string>();
+        AthoRenePorToken.Type_ENG = new List<string>();
+        AthoRenePorToken.CardSpriteName = "BT20-017-token";
+        AthoRenePorToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        AthoRenePorToken.DP = 6000;
+        AthoRenePorToken.CardEffectClassName = "BT20_017_token";
 
         await AthoRenePorToken.GetCardSprite();
 
-        HinukamuyToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.White },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "HinukamuyToken",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT23-057-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 6000,
-            CardEffectClassName = "BT23_057_token"
-        };
+        HinukamuyToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        HinukamuyToken.cardColors = new List<CardColor>() { CardColor.White };
+        HinukamuyToken.PlayCost = -1;
+        HinukamuyToken.Level = 0;
+        HinukamuyToken.CardName_JPN = "";
+        HinukamuyToken.CardName_ENG = "HinukamuyToken";
+        HinukamuyToken.Form_JPN = new List<string>();
+        HinukamuyToken.Form_ENG = new List<string>();
+        HinukamuyToken.Attribute_JPN = new List<string>();
+        HinukamuyToken.Attribute_ENG = new List<string>();
+        HinukamuyToken.Type_JPN = new List<string>();
+        HinukamuyToken.Type_ENG = new List<string>();
+        HinukamuyToken.CardSpriteName = "BT23-057-token";
+        HinukamuyToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        HinukamuyToken.DP = 6000;
+        HinukamuyToken.CardEffectClassName = "BT23_057_token";
 
         await HinukamuyToken.GetCardSprite();
 
         
 
-        PetrificationToken = new CEntity_Base()
-        {
-            cardColors = new List<CardColor>() { CardColor.White },
-            PlayCost = -1,
-            Level = 0,
-            CardName_JPN = "",
-            CardName_ENG = "Petrification",
-            Form_JPN = new List<string>(),
-            Form_ENG = new List<string>(),
-            Attribute_JPN = new List<string>(),
-            Attribute_ENG = new List<string>(),
-            Type_JPN = new List<string>(),
-            Type_ENG = new List<string>(),
-            CardSpriteName = "BT21-029-token",
-            cardKind = new List<CardKind> { CardKind.Digimon },
-            DP = 3000,
-            CardEffectClassName = "BT21_029_token"
-        };
+        PetrificationToken = ScriptableObject.CreateInstance<CEntity_Base>();
+        PetrificationToken.cardColors = new List<CardColor>() { CardColor.White };
+        PetrificationToken.PlayCost = -1;
+        PetrificationToken.Level = 0;
+        PetrificationToken.CardName_JPN = "";
+        PetrificationToken.CardName_ENG = "Petrification";
+        PetrificationToken.Form_JPN = new List<string>();
+        PetrificationToken.Form_ENG = new List<string>();
+        PetrificationToken.Attribute_JPN = new List<string>();
+        PetrificationToken.Attribute_ENG = new List<string>();
+        PetrificationToken.Type_JPN = new List<string>();
+        PetrificationToken.Type_ENG = new List<string>();
+        PetrificationToken.CardSpriteName = "BT21-029-token";
+        PetrificationToken.cardKind = new List<CardKind> { CardKind.Digimon };
+        PetrificationToken.DP = 3000;
+        PetrificationToken.CardEffectClassName = "BT21_029_token";
 
         await PetrificationToken.GetCardSprite();
     }
@@ -1540,9 +1508,7 @@ public static class RandomUtility
             int k = GameRandom.Range(0, n + 1);
 
             // Swap elements at indices n and k
-            CEntity_Base temp = CardDatas[n];
-            CardDatas[n] = CardDatas[k];
-            CardDatas[k] = temp;
+            (CardDatas[k], CardDatas[n]) = (CardDatas[n], CardDatas[k]);
         }
 
 

+ 6 - 6
Assets/Scripts/Script/DeckInfoPanel.cs

@@ -5,15 +5,15 @@ using System;
 using UnityEngine.UI;
 using System.Linq;
 using UnityEngine.Events;
-using System.IO;
-using System.Text;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading.Tasks;
 
 
 
+[RequireComponent(typeof(Animator))]
 public class DeckInfoPanel : MonoBehaviour
 {
+    private static readonly int CloseHash = Animator.StringToHash("Close");
+    private static readonly int OpenHash = Animator.StringToHash("Open");
     [Header("デッキ情報パネルオブジェクト")]
     public GameObject DeckInfoPanelObject;
 
@@ -49,8 +49,8 @@ public class DeckInfoPanel : MonoBehaviour
         {
             if (GetComponent<Animator>() != null)
             {
-                GetComponent<Animator>().SetInteger("Open", 1);
-                GetComponent<Animator>().SetInteger("Close", 0);
+                GetComponent<Animator>().SetInteger(OpenHash, 1);
+                GetComponent<Animator>().SetInteger(CloseHash, 0);
             }
 
             ShowingDeckData = deckData;
@@ -242,7 +242,7 @@ public class DeckInfoPanel : MonoBehaviour
 
         while (text.Length > DeckName.characterLimit)
         {
-            text = text.Substring(0, text.Length - 1);
+            text = text[..^1];
         }
 
         ContinuousController.instance.RenameDeck(ShowingDeckData, text);

+ 1 - 1
Assets/Scripts/Script/EditDeck.cs

@@ -376,7 +376,7 @@ public class EditDeck : MonoBehaviour
 
         else
         {
-            Opening.instance.battle.selectBattleDeck.ResetDeckInfoPanel();
+            yield return Opening.instance.battle.selectBattleDeck.ResetDeckInfoPanel();
 
             yield return ContinuousController.instance.StartCoroutine(Opening.instance.battle.selectBattleDeck.SetDeckList(false));
 

+ 1 - 1
Assets/Scripts/Script/GManager.cs

@@ -229,7 +229,7 @@ public class GManager : MonoBehaviourPun
     
     #endregion
 
-    private async void Awake()
+    private /*async*/ void Awake()
     {
         //return;
 

+ 6 - 4
Assets/Scripts/Script/GraphicsOptionPanel.cs

@@ -7,6 +7,8 @@ using UnityEngine.Events;
 
 public class GraphicsOptionPanel : OffAnimation
 {
+    private static readonly int OpenHash = Animator.StringToHash("Open");
+    private static readonly int CloseHash = Animator.StringToHash("Close");
     [SerializeField] Animator _anim;
     [SerializeField] Toggle _showBackgroundParticleToggle;
 
@@ -30,8 +32,8 @@ public class GraphicsOptionPanel : OffAnimation
             }
         }
 
-        _anim.SetInteger("Open", 0);
-        _anim.SetInteger("Close", 1);
+        _anim.SetInteger(OpenHash, 0);
+        _anim.SetInteger(CloseHash, 1);
     }
 
     public void Init()
@@ -51,8 +53,8 @@ public class GraphicsOptionPanel : OffAnimation
         }
 
         gameObject.SetActive(true);
-        _anim.SetInteger("Open", 1);
-        _anim.SetInteger("Close", 0);
+        _anim.SetInteger(OpenHash, 1);
+        _anim.SetInteger(CloseHash, 0);
     }
 
     #region Auto select mode

+ 7 - 3
Assets/Scripts/Script/LobbyManager_RandomMatch.cs

@@ -8,6 +8,8 @@ using UnityEngine.SceneManagement;
 using System;
 public class LobbyManager_RandomMatch : MonoBehaviourPunCallbacks
 {
+    private static readonly int CloseHash = Animator.StringToHash("Close");
+    private static readonly int OpenHash = Animator.StringToHash("Open");
     private static WaitForSeconds _waitForSeconds0_2 = new WaitForSeconds(0.2f);
     private static WaitForSeconds _waitForSeconds0_1 = new WaitForSeconds(0.1f);
     private static WaitForSeconds _waitForSeconds0_5 = new WaitForSeconds(0.5f);
@@ -63,8 +65,8 @@ public class LobbyManager_RandomMatch : MonoBehaviourPunCallbacks
         //this.battleRule = battleRule;
         ContinuousController.instance.StartCoroutine(ConnectCoroutine());
 
-        anim.SetInteger("Open", 1);
-        anim.SetInteger("Close", 0);
+        anim.SetInteger(OpenHash, 1);
+        anim.SetInteger(CloseHash, 0);
     }
     #endregion
 
@@ -183,7 +185,9 @@ public class LobbyManager_RandomMatch : MonoBehaviourPunCallbacks
 
         if (ContinuousController.instance.BattleDeckData != null)
         {
-            deckInfoPanel.SetUpDeckInfoPanel(ContinuousController.instance.BattleDeckData);
+            _ = deckInfoPanel.SetUpDeckInfoPanel(
+                ContinuousController.instance.BattleDeckData
+            );
         }
 
         if (ReturnButton != null)

+ 7 - 5
Assets/Scripts/Script/ResizeWindow.cs

@@ -8,6 +8,8 @@ using System;
 
 public class ResizeWindow : MonoBehaviour
 {
+    private static readonly int OpenHash = Animator.StringToHash("Open");
+    private static readonly int CloseHash = Animator.StringToHash("Close");
     public Animator anim;
     public Toggle fullScreenToggle;
     public List<Button> switchWindowSizeButtons = new List<Button>();
@@ -20,8 +22,8 @@ public class ResizeWindow : MonoBehaviour
     {
         SetButtonsInteractable();
         gameObject.SetActive(true);
-        anim.SetInteger("Open", 1);
-        anim.SetInteger("Close", 0);
+        anim.SetInteger(OpenHash, 1);
+        anim.SetInteger(CloseHash, 0);
 
         if (fullScreenToggle != null)
         {
@@ -54,8 +56,8 @@ public class ResizeWindow : MonoBehaviour
             }
         }
 
-        anim.SetInteger("Open", 0);
-        anim.SetInteger("Close", 1);
+        anim.SetInteger(OpenHash, 0);
+        anim.SetInteger(CloseHash, 1);
     }
 
     public void SetUpWindowSize(string resolution)
@@ -89,7 +91,7 @@ public class ResizeWindow : MonoBehaviour
         //SetButtonsInteractable();
     }
 
-    public async void SetFullScreen(Toggle isFullScreen)
+    public /*async*/ void SetFullScreen(Toggle isFullScreen)
     {
 #if UNITY_EDITOR || !UNITY_STANDALONE
         Debug.Log(isFullScreen.isOn);

+ 33 - 36
Assets/Scripts/Script/RoomManager.cs

@@ -12,6 +12,8 @@ using UnityEngine.Events;
 
 public class RoomManager : MonoBehaviourPunCallbacks
 {
+    private static WaitForSeconds _waitForSeconds1 = new WaitForSeconds(1f);
+    private static WaitForSeconds _waitForSeconds0_1 = new WaitForSeconds(0.1f);
     [SerializeField] bool _isReady = false;
     int playerCount { get; set; }
 
@@ -125,25 +127,27 @@ public class RoomManager : MonoBehaviourPunCallbacks
         while (true)
         {
             //Setting up the room to be created
-            RoomOptions roomOptions = new RoomOptions();
-            roomOptions.IsVisible = true;   //Make the room visible in the lobby
-            roomOptions.IsOpen = true;      //Allow other players to enter the room
-            roomOptions.PublishUserId = true;
+            RoomOptions roomOptions = new RoomOptions
+            {
+                IsVisible = true,   //Make the room visible in the lobby
+                IsOpen = true,      //Allow other players to enter the room
+                PublishUserId = true,
 
-            roomOptions.MaxPlayers = 2;
+                MaxPlayers = 2,
 
-            //Stores the creator's name to display the room creator in the room's custom properties
-            roomOptions.CustomRoomProperties = new Hashtable()
-            {
-                { "RoomCreator",PhotonNetwork.NickName },
-                { "UseBanlist", ContinuousController.instance.useBanlist }
-            };
+                //Stores the creator's name to display the room creator in the room's custom properties
+                CustomRoomProperties = new Hashtable()
+                {
+                    { "RoomCreator",PhotonNetwork.NickName },
+                    { "UseBanlist", ContinuousController.instance.useBanlist }
+                },
 
-            //Display custom property information in the lobby
-            roomOptions.CustomRoomPropertiesForLobby = new string[]
-            {
-                "RoomCreator",
-                "UseBanlist"
+                //Display custom property information in the lobby
+                CustomRoomPropertiesForLobby = new string[]
+                {
+                    "RoomCreator",
+                    "UseBanlist"
+                }
             };
 
             string RoomName = StringUtils.GeneratePassword_Num(5);
@@ -241,7 +245,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
 
         #region RoomName
         string RoomName = PhotonNetwork.CurrentRoom.Name;
-        RoomIDText.text = RoomName.Substring(0,5);
+        RoomIDText.text = RoomName[..5];
         #endregion
     }
     #endregion
@@ -323,7 +327,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
             Opening.instance.battle.selectBattleMode.StartSelectRoomMatch();
         }
 
-        yield return new WaitForSeconds(0.1f);
+        yield return _waitForSeconds0_1;
 
         yield return ContinuousController.instance.StartCoroutine(disconnectLoadingObject.EndLoading());
     }
@@ -375,9 +379,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
     {
         Hashtable PlayerProp = player.CustomProperties;
 
-        object value;
-
-        if (PlayerProp.TryGetValue(ReadyKey(), out value))
+        if (PlayerProp.TryGetValue(ReadyKey(), out object _))
         {
             PlayerProp[ReadyKey()] = _isReady;
         }
@@ -396,9 +398,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
     {
         foreach (var p in PhotonNetwork.PlayerList)
         {
-            object value;
-
-            if (p.CustomProperties.TryGetValue(ReadyKey(), out value))
+            if (p.CustomProperties.TryGetValue(ReadyKey(), out object value))
             {
                 if (!(bool)value)
                 {
@@ -497,7 +497,6 @@ public class RoomManager : MonoBehaviourPunCallbacks
     IEnumerator GoToBattleSceneCoroutine()
     {
         yield return ContinuousController.instance.StartCoroutine(Opening.instance.LoadingObject_Unload.StartLoading("Now Loading"));
-        object value;
 
         DoneStartBattle = true;
 
@@ -514,14 +513,14 @@ public class RoomManager : MonoBehaviourPunCallbacks
         {
             if (dictionaryEntry.Key.ToString().Contains("PhotonWaitController"))
             {
-                if (PlayerProp.TryGetValue(dictionaryEntry.Key.ToString(), out value))
+                if (PlayerProp.TryGetValue(dictionaryEntry.Key.ToString(), out _))
                 {
                     PlayerProp.Remove(dictionaryEntry.Key.ToString());
                 }
             }
         }
 
-        if (PlayerProp.TryGetValue("isBattle", out value))
+        if (PlayerProp.TryGetValue("isBattle", out _))
         {
             PlayerProp["isBattle"] = true;
         }
@@ -531,7 +530,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
             PlayerProp.Add("isBattle", true);
         }
 
-        if (PlayerProp.TryGetValue(ReadyKey(), out value))
+        if (PlayerProp.TryGetValue(ReadyKey(), out _))
         {
             PlayerProp[ReadyKey()] = false;
         }
@@ -544,7 +543,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
         PlayerProp[ContinuousController.DeckDataPropertyKey] = ContinuousController.instance.BattleDeckData.GetThisDeckCode();
 
         PhotonNetwork.LocalPlayer.SetCustomProperties(PlayerProp);
-        yield return new WaitForSeconds(0.1f);
+        yield return _waitForSeconds0_1;
 
         //Opening.instance.MainCamera.gameObject.SetActive(false);
 
@@ -555,7 +554,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
 
         ContinuousController.instance.StartCoroutine(Opening.instance.OpeningBGM.FadeOut(0.5f));
 
-        yield return new WaitForSeconds(1f);
+        yield return _waitForSeconds1;
 
         SceneManager.LoadSceneAsync("BattleScene", LoadSceneMode.Additive);
         yield return ContinuousController.instance.StartCoroutine(Opening.instance.LoadingObject_Unload.EndLoading());
@@ -575,9 +574,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
         {
             GameObject PlayerElement = Instantiate(PlayerElementPrefab, PlayerParent.transform);
 
-            object value;
-
-            string PlayerName = "Player";
+            string PlayerName;
 
             #region Get player name from custom property
             if (PhotonNetwork.PlayerList[i] == PhotonNetwork.LocalPlayer)
@@ -592,7 +589,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
 
             Hashtable hash = PhotonNetwork.PlayerList[i].CustomProperties;
 
-            if (hash.TryGetValue(ContinuousController.PlayerNameKey, out value))
+            if (hash.TryGetValue(ContinuousController.PlayerNameKey, out object value))
             {
                 PlayerName = (string)value;
             }
@@ -803,7 +800,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
         if (PhotonNetwork.InRoom)
         {
             #region クリップボードにデッキコードをコピー
-            GUIUtility.systemCopyBuffer = PhotonNetwork.CurrentRoom.Name.Substring(0, 5);
+            GUIUtility.systemCopyBuffer = PhotonNetwork.CurrentRoom.Name[..5];
             #endregion
 
             List<UnityAction> Commands = new List<UnityAction>()
@@ -878,7 +875,7 @@ public class RoomManager : MonoBehaviourPunCallbacks
 
         Hashtable RoomProp = PhotonNetwork.CurrentRoom.CustomProperties;
 
-        if (RoomProp.TryGetValue(DataBase.FirstPlayerIndexIdKey, out object value))
+        if (RoomProp.TryGetValue(DataBase.FirstPlayerIndexIdKey, out object _))
         {
             RoomProp[DataBase.FirstPlayerIndexIdKey] = firstPlayerIndexID;
         }

+ 12 - 13
Assets/Scripts/Script/SelectBattleDeck.cs

@@ -1,14 +1,13 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
-using System;
 using UnityEngine.Events;
-using UnityEngine.SceneManagement;
-using System.Linq;
+using System.Threading.Tasks;
 
 public class SelectBattleDeck : MonoBehaviour
 {
+    private static readonly int OpenHash = Animator.StringToHash("Open");
+    private static readonly int CloseHash = Animator.StringToHash("Close");
     private static WaitForSeconds _waitForSeconds1 = new WaitForSeconds(1f);
     [Header("Deck selection object")]
     public GameObject SelectDeckObject;
@@ -146,8 +145,8 @@ public class SelectBattleDeck : MonoBehaviour
 
         SelectDeckObject.SetActive(true);
 
-        anim.SetInteger("Open", 1);
-        anim.SetInteger("Close", 0);
+        anim.SetInteger(OpenHash, 1);
+        anim.SetInteger(CloseHash, 0);
 
         ContinuousController.instance.StartCoroutine(SetDeckList(true));
 
@@ -169,7 +168,7 @@ public class SelectBattleDeck : MonoBehaviour
 
         else
         {
-            ResetDeckInfoPanel();
+            await ResetDeckInfoPanel();
         }
 
         /*
@@ -227,13 +226,13 @@ public class SelectBattleDeck : MonoBehaviour
             Opening.instance.PlayCancelSE();
         }
 
-        anim.SetInteger("Open", 0);
-        anim.SetInteger("Close", 1);
+        anim.SetInteger(OpenHash, 0);
+        anim.SetInteger(CloseHash, 1);
     }
 
-    public void ResetDeckInfoPanel()
+    public async Task ResetDeckInfoPanel()
     {
-        deckInfoPanel.SetUpDeckInfoPanel(null);
+        await deckInfoPanel.SetUpDeckInfoPanel(null);
     }
 
     public IEnumerator SetDeckList(bool open)
@@ -257,9 +256,9 @@ public class SelectBattleDeck : MonoBehaviour
 
             _deckInfoPrefab.transform.localScale = Opening.instance.DeckInfoPrefabStartScale * 1.02f;
 
-            _deckInfoPrefab.OnClickAction = (deckdata) =>
+            _deckInfoPrefab.OnClickAction = async (deckdata) =>
             {
-                deckInfoPanel.SetUpDeckInfoPanel(deckdata);
+                await deckInfoPanel.SetUpDeckInfoPanel(deckdata);
 
                 SetSelectDeckButton();
 

+ 8 - 6
Assets/Scripts/Script/SelectDeck.cs

@@ -7,6 +7,8 @@ using UnityEngine.Events;
 
 public class SelectDeck : OffAnimation
 {
+    private static readonly int CloseHash = Animator.StringToHash("Close");
+    private static readonly int OpenHash = Animator.StringToHash("Open");
     [Header("Select Deck Object")]
     public GameObject SelectDeckObject;
 
@@ -27,8 +29,8 @@ public class SelectDeck : OffAnimation
     public void OffSelectDeck()
     {
         anim.enabled = true;
-        anim.SetInteger("Open", 0);
-        anim.SetInteger("Close", 1);
+        anim.SetInteger(OpenHash, 0);
+        anim.SetInteger(CloseHash, 1);
 
         isOpen = false;
     }
@@ -68,8 +70,8 @@ public class SelectDeck : OffAnimation
 
         SelectDeckObject.SetActive(true);
 
-        anim.SetInteger("Open", 1);
-        anim.SetInteger("Close", 0);
+        anim.SetInteger(OpenHash, 1);
+        anim.SetInteger(CloseHash, 0);
 
         if (ContinuousController.instance.DeckDatas.Count > 0)
         {
@@ -120,9 +122,9 @@ public class SelectDeck : OffAnimation
 
             _deckInfoPrefab.transform.localScale = Opening.instance.DeckInfoPrefabStartScale * 1.02f;
 
-            _deckInfoPrefab.OnClickAction = (deckdata) =>
+            _deckInfoPrefab.OnClickAction = async (deckdata) =>
             {
-                deckInfoPanel.SetUpDeckInfoPanel(deckdata);
+                await deckInfoPanel.SetUpDeckInfoPanel(deckdata);
 
                 Opening.instance.CreateOnClickEffect();
             };