Added fail safes, need to test

Assets/Prefab/GameplayPanel.prefab

@@ -1,5 +1,479 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1399064674785651421
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8853518533412852053}
+  - component: {fileID: 8974717522652312775}
+  - component: {fileID: 7196561184119063763}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8853518533412852053
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1399064674785651421}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3862088377832865129}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 237.1, y: -0.5}
+  m_SizeDelta: {x: 196.51428, y: -3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8974717522652312775
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1399064674785651421}
+  m_CullTransparentMesh: 0
+--- !u!114 &7196561184119063763
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1399064674785651421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7529412, g: 0.8392157, b: 0.9254902, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 385dce3fc9f7d434cb640e4d4d497263, type: 3}
+    m_FontSize: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Switch_01
+--- !u!1 &4716808989185113691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5739861113118089730}
+  - component: {fileID: 1847293459004985172}
+  - component: {fileID: 2082970149860354237}
+  - component: {fileID: 4232169421690341382}
+  - component: {fileID: 6645150066648278333}
+  m_Layer: 5
+  m_Name: TtitleText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5739861113118089730
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4716808989185113691}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2643633776091544438}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -73.3, y: -0.0000076293945}
+  m_SizeDelta: {x: 1474.7, y: 148}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1847293459004985172
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4716808989185113691}
+  m_CullTransparentMesh: 0
+--- !u!114 &2082970149860354237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4716808989185113691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 5e887a426c49a6748a021b8426a3cd53, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 31e9027949eff3b40a1e5d085e0a9935, type: 3}
+    m_FontSize: 120
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 300
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: Enable Banlist - Disables random matchmaking
+--- !u!114 &4232169421690341382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4716808989185113691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0.6165807, b: 1, a: 1}
+  m_EffectDistance: {x: 3, y: -3}
+  m_UseGraphicAlpha: 1
+--- !u!114 &6645150066648278333
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4716808989185113691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7958ec3f63b47324fa381152fb9ef2b2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _fontMaterial_ENG: {fileID: 0}
+  _fontMaterial_JPN: {fileID: 0}
+  _font_ENG: {fileID: 12800000, guid: 31e9027949eff3b40a1e5d085e0a9935, type: 3}
+  _font_JPN: {fileID: 12800000, guid: 2f11c82edd19dad4bab7cebf6c7e61af, type: 3}
+  _fontSize_ENG: 150
+  _fontSize_JPN: 120
+  _text_ENG: Enable Banlist - Disables random matchmaking
+  _text_JPN: "\u7981\u6B62\u30EA\u30B9\u30C8\u3092\u6709\u52B9\u5316 \u2014 \u30E9\u30F3\u30C0\u30E0\u30DE\u30C3\u30C1\u30E1\u30A4\u30AD\u30F3\u30B0\u3092\u7121\u52B9\u306B\u3057\u307E\u3059"
+--- !u!1 &4866768862336323155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 327947588219839728}
+  - component: {fileID: 2211690571409201864}
+  - component: {fileID: 2402828971342875976}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &327947588219839728
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4866768862336323155}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3346079383509508976}
+  m_Father: {fileID: 3862088377832865129}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 120, y: 48}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2211690571409201864
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4866768862336323155}
+  m_CullTransparentMesh: 0
+--- !u!114 &2402828971342875976
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4866768862336323155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0ba5a7c179c59a742979b665a4359f7c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6204511538938132258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3862088377832865129}
+  - component: {fileID: 6605809134732779800}
+  m_Layer: 5
+  m_Name: BanlistToggle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3862088377832865129
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6204511538938132258}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 327947588219839728}
+  - {fileID: 8853518533412852053}
+  m_Father: {fileID: 2643633776091544438}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -157.4, y: 0}
+  m_SizeDelta: {x: 120, y: 48}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6605809134732779800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6204511538938132258}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2402828971342875976}
+  toggleTransition: 1
+  graphic: {fileID: 1264014670078919623}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 1
+--- !u!1 &6701951063145432488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8577515006174853630}
+  - component: {fileID: 1948442450806189145}
+  - component: {fileID: 5552503986355341603}
+  m_Layer: 5
+  m_Name: Icon (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8577515006174853630
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6701951063145432488}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.8, y: 1.8, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2643633776091544438}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -150.8, y: 0}
+  m_SizeDelta: {x: 25, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1948442450806189145
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6701951063145432488}
+  m_CullTransparentMesh: 0
+--- !u!114 &5552503986355341603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6701951063145432488}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 335e4fd0e3499ed4994253ba2f13e079, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7238267468042061028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3100428799753360437}
+  m_Layer: 5
+  m_Name: Banlist Active
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3100428799753360437
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7238267468042061028}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.8999999, y: 0.8999999, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2643633776091544438}
+  m_Father: {fileID: 7928374915483524064}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7928374914713416429
 GameObject:
   m_ObjectHideFlags: 0
@@ -2022,7 +2496,7 @@ CanvasRenderer:
   m_CullTransparentMesh: 0
 --- !u!95 &7928374915095919511
 Animator:
-  serializedVersion: 4
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2039,7 +2513,8 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &7928374915095919513
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2064,6 +2539,7 @@ MonoBehaviour:
   _autoMinDigivolutionCostToggle: {fileID: 7928374915796515123}
   _autoMaxCardCountToggle: {fileID: 7928374916406609952}
   _autoHatchToggle: {fileID: 7928374916028117478}
+  _banlistToggle: {fileID: 6605809134732779800}
 --- !u!1 &7928374915102912128
 GameObject:
   m_ObjectHideFlags: 0
@@ -4627,6 +5103,7 @@ RectTransform:
   - {fileID: 7928374916528301011}
   - {fileID: 7928374914732064316}
   - {fileID: 7928374915230148751}
+  - {fileID: 3100428799753360437}
   m_Father: {fileID: 7928374915564279514}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9818,3 +10295,245 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7984105155246379293
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3346079383509508976}
+  - component: {fileID: 1402619638621006827}
+  - component: {fileID: 1264014670078919623}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3346079383509508976
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7984105155246379293}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 327947588219839728}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 120, y: 48}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1402619638621006827
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7984105155246379293}
+  m_CullTransparentMesh: 0
+--- !u!114 &1264014670078919623
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7984105155246379293}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b3688a350ec035145b44f75dc7e54fd3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8310052256679860245
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2643633776091544438}
+  - component: {fileID: 5076500471585010723}
+  - component: {fileID: 7669067546430629117}
+  - component: {fileID: 5982150575648531567}
+  - component: {fileID: 7826128636079055205}
+  m_Layer: 5
+  m_Name: BanlistButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2643633776091544438
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310052256679860245}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8577515006174853630}
+  - {fileID: 5739861113118089730}
+  - {fileID: 3862088377832865129}
+  m_Father: {fileID: 3100428799753360437}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 502.4, y: 110.4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5076500471585010723
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310052256679860245}
+  m_CullTransparentMesh: 0
+--- !u!114 &7669067546430629117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310052256679860245}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 15, y: 15, z: 15, w: 15}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8bfbfe158974d9d458884d821045f082, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5982150575648531567
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310052256679860245}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 2
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 21300000, guid: 131adcb72d5e7cb47bfe1fe8bba81dff, type: 3}
+    m_PressedSprite: {fileID: 21300000, guid: 131adcb72d5e7cb47bfe1fe8bba81dff, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: 131adcb72d5e7cb47bfe1fe8bba81dff, type: 3}
+    m_DisabledSprite: {fileID: 21300000, guid: 84eaf2858ade3ca4dae1574d04166fc6, type: 3}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7669067546430629117}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 7928374915095919513}
+        m_TargetAssemblyTypeName: GameplayOption, Assembly-CSharp
+        m_MethodName: HandleUseBanlistToggle
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &7826128636079055205
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310052256679860245}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 4
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 0}
+          m_TargetAssemblyTypeName: Opening, Assembly-CSharp
+          m_MethodName: CreateOnClickEffect
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2

Assets/Scenes/Opening.unity

@@ -70837,7 +70837,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1715247868
 RectTransform:
   m_ObjectHideFlags: 0
@@ -92781,6 +92781,7 @@ GameObject:
   - component: {fileID: 3770572172492783824}
   - component: {fileID: 96121763673564827}
   - component: {fileID: 5403112551258770163}
+  - component: {fileID: 5403112551258770164}
   m_Layer: 5
   m_Name: RandomMatch
   m_TagString: Untagged
@@ -94890,7 +94891,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_AnchorMin.x
@@ -94898,15 +94899,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -94938,11 +94939,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: -186
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -99
       objectReference: {fileID: 0}
     - target: {fileID: 2537255268459177726, guid: dfe3b8c9901825e469d97dc0aa0a788b, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -96554,7 +96555,7 @@ MonoBehaviour:
     m_HighlightedSprite: {fileID: 21300000, guid: 5949fbf05cf8c144eb81cf4f2e444548, type: 3}
     m_PressedSprite: {fileID: 21300000, guid: 1aa1f88cd22b407408b8abc1f034d5cc, type: 3}
     m_SelectedSprite: {fileID: 21300000, guid: 5949fbf05cf8c144eb81cf4f2e444548, type: 3}
-    m_DisabledSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 21300000, guid: c1919f74d78e3a84e982ad813a4732a4, type: 3}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
@@ -100168,6 +100169,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9304cb057684aa3448c3c8974edc49bf, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &5403112551258770164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 212399625081886019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e7fc67810ccfd464096476c860a52031, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!222 &5482114191962187318
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -109656,6 +109669,30 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 993687780}
     m_Modifications:
+    - target: {fileID: 3100428799753360437, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3100428799753360437, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3100428799753360437, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 3100428799753360437, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 3100428799753360437, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 1380.62
+      objectReference: {fileID: 0}
+    - target: {fileID: 3100428799753360437, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -803.2
+      objectReference: {fileID: 0}
     - target: {fileID: 7928374914713416426, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1

Assets/Scripts/Script/ContinuousController.cs

@@ -120,7 +120,8 @@ public class ContinuousController : MonoBehaviour
     public CEntity_Base AthoRenePorToken { get; private set; }
     public CEntity_Base HinukamuyToken { get; private set; }
     public CEntity_Base PetrificationToken { get; private set; }
-    public CardRestriction BanList { get; private set; } = new CardRestriction(new List<CardLimitCount>(), new List<BannedPair>());
+    //public CardRestriction BanList { get; private set; } = new CardRestriction(new List<CardLimitCount>(), new List<BannedPair>());
+    public BanList BanList { get; private set; } = new BanList();
 
 
     async Task LoadBanListOnline()
@@ -138,11 +139,11 @@ public class ContinuousController : MonoBehaviour
         if (jsonWebRequest.result != UnityWebRequest.Result.Success)
         {
             Debug.Log(jsonWebRequest.error);
+            useBanlist = false;
         }
         else
         {
-            BanList root = JsonUtility.FromJson<BanList>(jsonWebRequest.downloadHandler.text);
-            BanList = root.ConvertToCardRestriction();
+            BanList = JsonUtility.FromJson<BanList>(jsonWebRequest.downloadHandler.text);
         }
     }
 
@@ -876,6 +877,21 @@ public class ContinuousController : MonoBehaviour
     }
     #endregion
 
+    #region Use Banlist
+    public bool useBanlist = true;
+    string _useBanlistKey = "UseBanlist";
+
+    public void SaveUseBanlist()
+    {
+        PlayerPrefsUtil.SetBool(_useBanlistKey, useBanlist);
+        PlayerPrefs.Save();
+    }
+    public void LoadUseBanlist()
+    {
+        useBanlist = PlayerPrefsUtil.GetBool(_useBanlistKey, false);
+    }
+    #endregion
+
     #region Show CutIn Animation
     [HideInInspector] public bool showCutInAnimation = false;
     string _showCutInAnimationKey = "ShowCutInAnimation";

Assets/Scripts/Script/DeckBuildingRule.cs

@@ -1,3 +1,4 @@
+using DCGO.CardEntities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -66,11 +67,11 @@ public class DeckBuildingRule : MonoBehaviour
             //規定枚数以上のカードを抜く
             foreach (CEntity_Base cEntity_Base in DistinctDeckCards1)
             {
-                foreach (CardLimitCount cardLimitCount in ContinuousController.instance.BanList.CardLimitCounts)
+                foreach (Restrictions restriction in ContinuousController.instance.BanList.Restrictions)
                 {
-                    if (cEntity_Base.CardID == cardLimitCount.CardID)
+                    if (cEntity_Base.CardID == restriction.id)
                     {
-                        while (cEntity_Base.SameCardIDCount(deckCards) > cardLimitCount.LimitCount)
+                        while (cEntity_Base.SameCardIDCount(deckCards) > restriction.limit)
                         {
                             CEntity_Base removeCard = deckCards.Find(cEntity_Base1 => cEntity_Base1.CardID == cEntity_Base.CardID);
 
@@ -82,15 +83,14 @@ public class DeckBuildingRule : MonoBehaviour
                     }
                 }
 
-                foreach (BannedPair bannedPair in ContinuousController.instance.BanList.BannedPairs)
+                foreach (Pair bannedPair in ContinuousController.instance.BanList.BannedPair)
                 {
-                    if (cEntity_Base.CardID == bannedPair.CardID_A)
+                    if (cEntity_Base.CardID == bannedPair.id)
                     {
-                        UnityEngine.Debug.Log($"Banned Pair Found: {deckCards.Some(cEntity_Base1 => bannedPair.CardIDs_B.Contains(cEntity_Base1.CardID))}");
-                        while (deckCards.Some(cEntity_Base1 => bannedPair.CardIDs_B.Contains(cEntity_Base1.CardID)))
+                        while (deckCards.Some(cEntity_Base1 => bannedPair.pairs.Contains(cEntity_Base1.CardID)))
                         {
-                            CEntity_Base removeCard = deckCards.Find(cEntity_Base1 => bannedPair.CardIDs_B.Contains(cEntity_Base1.CardID));
-                            UnityEngine.Debug.Log($"Banned Pair: {removeCard.CardID}");
+                            CEntity_Base removeCard = deckCards.Find(cEntity_Base1 => bannedPair.pairs.Contains(cEntity_Base1.CardID));
+
                             if (removeCard != null)
                             {
                                 deckCards.Remove(removeCard);
@@ -98,12 +98,12 @@ public class DeckBuildingRule : MonoBehaviour
                         }
                     }
 
-                    if (bannedPair.CardIDs_B.Contains(cEntity_Base.CardID))
+                    if (bannedPair.pairs.Contains(cEntity_Base.CardID))
                     {
-                        while (deckCards.Some(cEntity_Base1 => cEntity_Base1.CardID == bannedPair.CardID_A))
+                        while (deckCards.Some(cEntity_Base1 => cEntity_Base1.CardID == bannedPair.id))
                         {
-                            CEntity_Base removeCard = deckCards.Find(cEntity_Base1 => bannedPair.CardID_A.Contains(cEntity_Base1.CardID));
-                            UnityEngine.Debug.Log($"Banned Pair: {removeCard.CardID}");
+                            CEntity_Base removeCard = deckCards.Find(cEntity_Base1 => bannedPair.id.Contains(cEntity_Base1.CardID));
+
                             if (removeCard != null)
                             {
                                 deckCards.Remove(removeCard);
@@ -132,11 +132,11 @@ public class DeckBuildingRule : MonoBehaviour
     {
         int count = cEntity_Base.MaxCountInDeck;
 
-        foreach (CardLimitCount cardLimitCount in ContinuousController.instance.BanList.CardLimitCounts)
+        foreach (Restrictions restriction in ContinuousController.instance.BanList.Restrictions)
         {
-            if (cEntity_Base.CardID == cardLimitCount.CardID)
+            if (cEntity_Base.CardID == restriction.id)
             {
-                count = cardLimitCount.LimitCount;
+                count = restriction.limit;
                 break;
             }
         }
@@ -167,30 +167,30 @@ public class DeckBuildingRule : MonoBehaviour
             }
         }
 
-        foreach (CardLimitCount cardLimitCount in ContinuousController.instance.BanList.CardLimitCounts)
+        foreach (Restrictions restriction in ContinuousController.instance.BanList.Restrictions)
         {
-            if (cEntity_Base.CardID == cardLimitCount.CardID)
+            if (cEntity_Base.CardID == restriction.id)
             {
-                if (cEntity_Base.SameCardIDCount(deckData.AllDeckCards()) >= cardLimitCount.LimitCount)
+                if (cEntity_Base.SameCardIDCount(deckData.AllDeckCards()) >= restriction.limit)
                 {
                     return false;
                 }
             }
         }
 
-        foreach (BannedPair bannedPair in ContinuousController.instance.BanList.BannedPairs)
+        foreach (Pair bannedPair in ContinuousController.instance.BanList.BannedPair)
         {
-            if (cEntity_Base.CardID == bannedPair.CardID_A)
+            if (cEntity_Base.CardID == bannedPair.id)
             {
-                if (deckData.AllDeckCards().Some(cEntity_Base1 => bannedPair.CardIDs_B.Contains(cEntity_Base1.CardID)))
+                if (deckData.AllDeckCards().Some(cEntity_Base1 => bannedPair.pairs.Contains(cEntity_Base1.CardID)))
                 {
                     return false;
                 }
             }
 
-            if (bannedPair.CardIDs_B.Contains(cEntity_Base.CardID))
+            if (bannedPair.pairs.Contains(cEntity_Base.CardID))
             {
-                if (deckData.AllDeckCards().Some(cEntity_Base1 => cEntity_Base1.CardID == bannedPair.CardID_A))
+                if (deckData.AllDeckCards().Some(cEntity_Base1 => cEntity_Base1.CardID == bannedPair.id))
                 {
                     return false;
                 }
@@ -208,6 +208,14 @@ public class BanList
     public List<Pair> BannedPair;
     public List<Restrictions> Restrictions;
 
+    public BanList()
+    {
+        BannedPair = new List<Pair>();
+        Restrictions = new List<Restrictions>();
+    }
+
+    
+
     public CardRestriction ConvertToCardRestriction()
     {
         List<CardLimitCount> CardLimit = new List<CardLimitCount>();

Assets/Scripts/Script/EnterRoom.cs

@@ -68,7 +68,7 @@ public class EnterRoom : MonoBehaviourPunCallbacks
     {
         if (CanClickEnterRoomButton() && canClick)
         {
-            PhotonNetwork.JoinRoom(RoomIDInputField.text);
+            PhotonNetwork.JoinRoom(RoomIDInputField.text + "-" + ContinuousController.instance.useBanlist);
         }
     }
 
@@ -105,6 +105,7 @@ public class EnterRoom : MonoBehaviourPunCallbacks
 
     public override void OnJoinRoomFailed(short returnCode, string message)
     {
+        Debug.Log($"{returnCode} - {message}");
         Opening.instance.PlayDecisionSE();
         Opening.instance.SetUpActiveYesNoObject(
             new List<UnityAction>() { null },

Assets/Scripts/Script/GameplayOption.cs

@@ -1,3 +1,4 @@
+using Photon.Pun;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -18,6 +19,7 @@ public class GameplayOption : OffAnimation
     [SerializeField] Toggle _autoMinDigivolutionCostToggle;
     [SerializeField] Toggle _autoMaxCardCountToggle;
     [SerializeField] Toggle _autoHatchToggle;
+    [SerializeField] Toggle _banlistToggle;
 
     public void Close()
     {
@@ -117,6 +119,15 @@ public class GameplayOption : OffAnimation
                 onToggleChanged: OnAutoHatchToggleChanged,
                 value: ContinuousController.instance.autoHatch
             );
+
+            OptionUtility.InitToggle(
+               toggle: _banlistToggle,
+               onToggleChanged: OnUseBanlistToggleChanged,
+               value: ContinuousController.instance.useBanlist
+           );
+
+            if (ContinuousController.instance.BanList.Restrictions.Count == 0 || PhotonNetwork.InRoom)
+                _banlistToggle.interactable = false;
         }
 
         gameObject.SetActive(true);
@@ -351,4 +362,25 @@ public class GameplayOption : OffAnimation
         OnAutoHatchToggleChanged(!_autoHatchToggle.isOn);
     }
     #endregion
+
+    #region Use Banlist
+
+    public void OnUseBanlistToggleChanged(bool value)
+    {
+        if (ContinuousController.instance == null) return;
+
+        OptionUtility.OnToggleChanged(
+            value: value,
+            toggle: _banlistToggle,
+            onToggleChanged: OnUseBanlistToggleChanged,
+            settingRef: ref ContinuousController.instance.useBanlist,
+            saveAction: ContinuousController.instance.SaveUseBanlist
+        );
+    }
+
+    public void HandleUseBanlistToggle()
+    {
+        OnUseBanlistToggleChanged(!_banlistToggle.isOn);
+    }
+    #endregion
 }

Assets/Scripts/Script/Helper Scripts/DisableForBanlist.cs

@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+[RequireComponent(typeof(Button))]
+public class DisableForBanlist : MonoBehaviour
+{
+    private Button _button;
+
+    // Start is called before the first frame update
+    void Awake()
+    {
+        _button = GetComponent<Button>();
+    }
+
+    private void OnEnable()
+    {
+        if (ContinuousController.instance == null)
+            return;
+
+        _button.interactable = ContinuousController.instance.useBanlist;
+    }
+}

Assets/Scripts/Script/Helper Scripts/DisableForBanlist.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e7fc67810ccfd464096476c860a52031
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Script/OptionUtility.cs

@@ -16,6 +16,7 @@ public static class OptionUtility
     public static void OnToggleChanged(bool value, Toggle toggle, UnityAction<bool> onToggleChanged, ref bool settingRef, UnityAction saveAction)
     {
         if (toggle == null) return;
+        if (!toggle.interactable) return;
         if (saveAction == null) return;
 
         toggle.onValueChanged.RemoveAllListeners();

Assets/Scripts/Script/RoomManager.cs

@@ -131,19 +131,20 @@ public class RoomManager : MonoBehaviourPunCallbacks
             roomOptions.CustomRoomProperties = new Hashtable()
             {
                 { "RoomCreator",PhotonNetwork.NickName },
-
+                { "UseBanlist", ContinuousController.instance.useBanlist }
             };
 
             //Display custom property information in the lobby
             roomOptions.CustomRoomPropertiesForLobby = new string[]
             {
                 "RoomCreator",
+                "UseBanlist"
             };
 
             string RoomName = StringUtils.GeneratePassword_Num(5);
 
             //Create Room
-            PhotonNetwork.CreateRoom(RoomName, roomOptions, null);
+            PhotonNetwork.CreateRoom(RoomName + "-" + ContinuousController.instance.useBanlist, roomOptions, null);
 
             while (true)
             {