first pass 1.4.17

Assets/CardBaseEntity/BT12/Purple/Digimon/ベルゼブモンX抗体-BT12-085.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee0279328ee81c5954993ee968a9ddf0e6a5b2ea0507a3ff327db1a55ee687dc
-size 2479
+oid sha256:e101eb6681c9874d1d4d97074c2d6f39d5c9f3a553489c53d23a66f8e83813aa
+size 2492

Assets/CardBaseEntity/BT12/Purple/Digimon/ベルゼブモンX抗体-BT12-085_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6577d983f2fe8897aa0e5bd6288fe44a42ea415e1afa4eba2d5bfc3cf4b79003
-size 2485
+oid sha256:dc4c48c95dfabe1956bf7328e387a05d801b907fd1c19482c04b26eee13c5093
+size 2498

Assets/CardBaseEntity/BT12/Purple/Option/セブンス・フルクラスター-BT12-110.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df979c65e6abd385099b8df08bb0dfb7ccc51cbfb9fac0d41716e433b5dd1e75
-size 2299
+oid sha256:56c69b9532ad028aec8d65cd4201a5576850913fb810031aed25a9fc3a7a721a
+size 2312

Assets/CardBaseEntity/BT13/Purple/Digimon/ベルフェモン：スリープモード-BT13-088.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba884d2b00343c79a6aeabd8fcc9ed96f1ff0f81cba7765a0bd7eeb56372c7c3
-size 2819
+oid sha256:5964026a14cbdc0a04a294164a795dc64c0f2294487ed92d1035f2d455bd17d5
+size 2832

Assets/CardBaseEntity/BT13/Purple/Digimon/ベルフェモン：レイジモード-BT13-091.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a4680ab4de82a2452bd2f1e95cd536a3259d052f80f8311230959c474119aee
-size 3006
+oid sha256:ea3aea73969a496814a27909de67748cd680225facd3164e50a93275645cffa3
+size 3019

Assets/CardBaseEntity/BT13/Purple/Digimon/ベルフェモン：レイジモード-BT13-091_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0badd6e3f3548797de5387c070014b696b67c7e089b911964cfa2fc9bb34723
-size 3012
+oid sha256:73ae104cfe5935daef9e4fe540f408b8d5dc1b427b6ae4106a8df989121996ef
+size 3025

Assets/CardBaseEntity/BT2/Purple/Digimon/ベルゼブモン-BT2-111.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e373cd3b9980032050b5610426d9c6aac6803dc7e4a31a3081378d206aae8d9
-size 1999
+oid sha256:773cfa35a15e4684a7fbaa80373fb5f4a9cc3c2831c9c7dc29a2f5d8d5b21f82
+size 2012

Assets/CardBaseEntity/BT2/Purple/Digimon/ベルゼブモン-BT2-111_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bcd33f0ff44b18cea7a40fa46cf89aa876e03d9a29516fdc9267757de535120
-size 2005
+oid sha256:b88507dd94b414313b9cbc995facee937c1b65c90f6ba9d66272cd2c7bf3dc82
+size 2018

Assets/CardBaseEntity/BT2/Purple/Digimon/ベルゼブモン-BT2-111_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1729a892f3a4c3b7c48aa5f2eaad166b63922721b78e62b6e51600f12980b4ca
-size 2005
+oid sha256:6ad90ffadae9455354eb1aafd1e44e0e93468146a45480942341b4ea5bfbe18a
+size 2018

Assets/CardBaseEntity/BT3/Purple/Digimon/リリスモン-BT3-091.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ce4b96d83da71e23cf196ff299344578e078077178e04cdc0b181449d9f90eb
-size 2035
+oid sha256:28bb1497cefc143402b782bd0a4ad51139fed7cebc51e0864b2f2a66856c830a
+size 2048

Assets/CardBaseEntity/BT3/Purple/Digimon/リリスモン-BT3-091_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdcada104ace0779aeb2c3a29fcf4ff8463889f0963afe72e5a0b05eac570069
-size 2041
+oid sha256:b66c82952629e04e9c434b08e9700395d4d2a18c65950683950c06ba25eb6bfe
+size 2054

Assets/CardBaseEntity/BT3/Purple/Digimon/リリスモン-BT3-091_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aef14021be399d191eec238fffc7dba156ddaf1744079c8733e829aec85a846f
-size 2041
+oid sha256:8324faaab3f3e6d109ee2298d2abae5efc6f7047642599581c64441f3856107f
+size 2054

Assets/CardBaseEntity/BT3/Purple/Digimon/リリスモン-BT3-091_P3.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1b189ef8aa7e68423d6ea9bc69be2f991dafb6c7286253158016a6df3b1508c
-size 2041
+oid sha256:2303bfc288f27a5d6fabf16602d0f5af72f43d4f8863c51c077a1e017c731759
+size 2054

Assets/CardBaseEntity/BT3/Purple/Digimon/リリスモン-BT3-091_P4.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2655bbf905c083fc9e86e09a051d8537927982fcfc0679de6729015028af58ef
-size 2041
+oid sha256:c7e24bf068cf9c5f8729f0d2db16cff0c3e8486f4895f15d2a9ebd796ad52ea2
+size 2054

Assets/CardBaseEntity/BT7/Purple/Digimon/ルーチェモン：フォールダウンモード-BT7-111.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a538f8e0d6818b4fd19202cbb25a2b07a1ba29b910902a9d9deea0330ce6a979
-size 2434
+oid sha256:5abd6b5528d07ecec55e2956110e20059e05d70b1e5b0bac7575bf5fb05f6b08
+size 2447

Assets/CardBaseEntity/BT7/Purple/Digimon/ルーチェモン：フォールダウンモード-BT7-111_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2188b6a174771cc77d68bea64015fb33d8d2dbc0d342c52ee686968dc904273a
-size 2440
+oid sha256:49600c85d62a176d5beb0657298f0c1c423210abb41fe10e77cc8f6985c0dd3a
+size 2453

Assets/CardBaseEntity/BT8/Purple/Digimon/デーモン-BT8-111.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c6b8ad70f7f727b8a21c92d79dcb90b1cd9d8b1f3af3b3f3c97677e1f1b85a2
-size 2524
+oid sha256:9914c53a959a04ba8520532b5975e1c3a3aa27e6dcb337790f17ce308b9967f5
+size 2537

Assets/CardBaseEntity/BT8/Purple/Digimon/デーモン-BT8-111_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2f90945f6675bd4037cd2f02e2093649f1de7b520ca07e22f8cb17a81aee3b9
-size 2530
+oid sha256:aedf3c9196bee2c3d70b57cd884c94e454fe7c7217e5e2ad332d136517a6d884
+size 2543

Assets/CardBaseEntity/EX2/Purple/Digimon/ベルゼブモン-EX2-044.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e404d8b921733daa8acbbb60dded9008c5a55fce82ac491c95cdd8419c574665
-size 2417
+oid sha256:9b733f08a0172995a22fec43977ab75a5841ae7f286ca8907dc135ca0d1d2b95
+size 2430

Assets/CardBaseEntity/EX2/Purple/Digimon/ベルゼブモン-EX2-044_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:131f9ad22e326839f97b61acc66810d129cf265b8b9d313f120dababb5a7ba02
-size 2423
+oid sha256:5e83747339cc94af47d44f66e5a7289839fb28e29a14c775be0aba04c4cf5289
+size 2436

Assets/CardBaseEntity/ST14/Purple/Digimon/ベルゼブモン-ST14-08.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da84042ed10560fafb9a32279e68bb9884c01c192c33f3eec304787ddc069b68
-size 2510
+oid sha256:f12a11026f25ae9ae13ecd8f49488e8678209c7fab8d5b11c31959b901e0ab58
+size 2523

Assets/CardBaseEntity/ST14/Purple/Digimon/ベルゼブモン-ST14-08_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d276e28e25e82c1c82fe3ff107519a261be7eee5d6821f2f339f9bcdcca67bfd
-size 2516
+oid sha256:0f23c0adf286a28cfce1b82279e227701a29e6c360c88d211e95045c1a0f0f4d
+size 2529

Assets/CardEffect/BT17/White/Greymon_BT17_102.cs

@@ -119,8 +119,8 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if(card.PermanentOfThisCard().TopCard == card)
-                        return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
+                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                        return card.PermanentOfThisCard().TopCard == card;
 
                     return false;
                 }

Assets/CardEffect/BT9/Black/Megadramon_BT9_065.cs

@@ -121,7 +121,7 @@ public class Megadramon_BT9_065 : CEntity_Effect
                         {
                             if (permanent.TopCard.Owner.GetBattleAreaPermanents().Contains(permanent))
                             {
-                                if (permanent.TopCard.GetCostItself <= 3)
+                                if (permanent.TopCard.HasPlayCost && permanent.TopCard.GetCostItself <= 3)
                                 {
                                     if (permanent.IsDigimon)
                                     {

Assets/Image/UI/色ボタン/Full Circle.png.meta

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

Assets/Prefab/HandCard.prefab

@@ -150,7 +150,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: fa1f7607aa4a3c643b9a586e3d9b5b76, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1003,7 +1003,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2409,7 +2409,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8901876938759686218}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3506,7 +3506,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3516,97 +3516,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &2766262793586364140
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3813686469080765503}
-  - component: {fileID: 8212095392790443708}
-  - component: {fileID: 6892496947767657107}
-  - component: {fileID: 8345963468706617822}
-  m_Layer: 5
-  m_Name: mask0 (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &3813686469080765503
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2766262793586364140}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.164706, y: 1.164706, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6008656084656754820}
-  m_Father: {fileID: 8901876938759686218}
-  m_RootOrder: 3
-  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: 59.93, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8212095392790443708
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2766262793586364140}
-  m_CullTransparentMesh: 1
---- !u!114 &6892496947767657107
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2766262793586364140}
-  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: 0.003921569}
-  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: 16658a4ca87e8dd44a721019c3bc61f2, 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!114 &8345963468706617822
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2766262793586364140}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
 --- !u!1 &2960180668201894705
 GameObject:
   m_ObjectHideFlags: 0
@@ -3673,7 +3582,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4212,82 +4121,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3706056289124151595
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6008656084656754820}
-  - component: {fileID: 7541674583901445252}
-  - component: {fileID: 5973842980977250530}
-  m_Layer: 5
-  m_Name: LevelIcon_background_0
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6008656084656754820
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3706056289124151595}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.8585858, y: 0.8585858, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3813686469080765503}
-  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: 59.93, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7541674583901445252
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3706056289124151595}
-  m_CullTransparentMesh: 1
---- !u!114 &5973842980977250530
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3706056289124151595}
-  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: 0.9254902, g: 0.9254902, b: 0.9254902, a: 0.92941177}
-  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: 1f80e278c6c466a41917eb28c13fd5ad, 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 &3762313274725180008
 GameObject:
   m_ObjectHideFlags: 0
@@ -4411,8 +4244,6 @@ RectTransform:
   - {fileID: 3621970401115610617}
   - {fileID: 8115273591629742340}
   - {fileID: 5192054203829517624}
-  - {fileID: 3813686469080765503}
-  - {fileID: 5169421248020609577}
   - {fileID: 8654937410423240315}
   m_Father: {fileID: 7114728606150196611}
   m_RootOrder: 8
@@ -5138,7 +4969,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5442,7 +5273,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5717,82 +5548,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &5230963798721750405
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8246931925035384641}
-  - component: {fileID: 5652436107081103415}
-  - component: {fileID: 7194906993618190087}
-  m_Layer: 5
-  m_Name: LevelIcon_background_1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8246931925035384641
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230963798721750405}
-  m_LocalRotation: {x: -0.008726558, y: 0, z: 0, w: 0.999962}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: -0.8585858, y: 0.8586399, z: 0.99993473}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5169421248020609577}
-  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: 59.93, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5652436107081103415
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230963798721750405}
-  m_CullTransparentMesh: 1
---- !u!114 &7194906993618190087
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230963798721750405}
-  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: 0.9254902, g: 0.9254902, b: 0.9254902, a: 0.92941177}
-  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: 1fe2ecbfa2b40d247adc420a46b6db20, 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 &5514209713545658681
 GameObject:
   m_ObjectHideFlags: 0
@@ -7919,7 +7674,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8220,7 +7975,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d7ff34c2eb3a16e408ce949d94bb863d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a04ac08a957328540940efd553e6b385, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10713,97 +10468,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &8853526165359842624
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5169421248020609577}
-  - component: {fileID: 8399883776976709197}
-  - component: {fileID: 4979721975482315512}
-  - component: {fileID: 2535464578686168255}
-  m_Layer: 5
-  m_Name: mask1 (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &5169421248020609577
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8853526165359842624}
-  m_LocalRotation: {x: 0.008726558, y: -0, z: -0, w: 0.999962}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: -1.164706, y: 1.1646827, z: 1.0000151}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8246931925035384641}
-  m_Father: {fileID: 8901876938759686218}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 1, 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: 59.93, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8399883776976709197
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8853526165359842624}
-  m_CullTransparentMesh: 1
---- !u!114 &4979721975482315512
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8853526165359842624}
-  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: 0.003921569}
-  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: 16658a4ca87e8dd44a721019c3bc61f2, 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!114 &2535464578686168255
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8853526165359842624}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
 --- !u!1 &8936050704229063300
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/CardController.cs

@@ -3568,16 +3568,6 @@ public class IBattle
                 hashtable["LoserPermanents"] = _LoserPermanents;
                 hashtable["LoserPermanents_real"] = LoserPermanents;
 
-                #region effect when determine whether to do security check
-                List<SkillInfo> skillInfos_Pierce = AutoProcessing.GetSkillInfos(hashtable, EffectTiming.OnDetermineDoSecurityCheck)
-                    .Filter(skillInfo => skillInfo.CardEffect != null && skillInfo.CardEffect.CanActivate(skillInfo.Hashtable));
-
-                if (skillInfos_Pierce.Count >= 1)
-                {
-                    GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
-                }
-                #endregion
-
                 // "At the end of battle" effect
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(hashtable, EffectTiming.OnEndBattle));
 
@@ -3587,6 +3577,16 @@ public class IBattle
                     yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.ShrinkSecurityDigimonDisplay());
                 }
                 #endregion
+
+                #region effect when determine whether to do security check
+                List<SkillInfo> skillInfos_Pierce = AutoProcessing.GetSkillInfos(hashtable, EffectTiming.OnDetermineDoSecurityCheck)
+                    .Filter(skillInfo => skillInfo.CardEffect != null && skillInfo.CardEffect.CanActivate(skillInfo.Hashtable));
+
+                if (skillInfos_Pierce.Count >= 1)
+                {
+                    GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
+                }
+                #endregion
             }
         }
 

Assets/Scripts/CardPrefab_CreateDeck.cs

@@ -207,17 +207,16 @@ public class CardPrefab_CreateDeck : MonoBehaviour
             {
                 if (cEntity_Base.cardKind != CardKind.DigiEgg)
                 {
-                    for (int i = 0; i < CostIcons.Count; i++)
+                    for (int i = CostIcons.Count-1; i > -1; i--)
                     {
                         CardColor cardColor = CardColor.None;
+                        int value = CostIcons.Count - i - 1;
 
-                        CostIcons[i].color = DataBase.CardColor_ColorDarkDictionary[cardColor];
-
-                        if (i < cEntity_Base.cardColors.Count)
+                        if (i >= CostIcons.Count - cEntity_Base.cardColors.Count)
                         {
-                            float fillAmount = (float)((i + 1) / (float)cEntity_Base.cardColors.Count);
+                            float fillAmount = (float)((CostIcons.Count - i) / (float)cEntity_Base.cardColors.Count);
 
-                            cardColor = cEntity_Base.cardColors[i];
+                            cardColor = cEntity_Base.cardColors[value];
                             CostIcons[i].color = DataBase.CardColor_ColorDarkDictionary[cardColor];
                             CostIcons[i].fillAmount = fillAmount;
                             CostIcons[i].gameObject.SetActive(true);
@@ -252,7 +251,16 @@ public class CardPrefab_CreateDeck : MonoBehaviour
                             int cardColorIndex = i < cEntity_Base.cardColors.Count ? i : 0;
                             CardColor cardColor = cEntity_Base.cardColors[cardColorIndex];
 
-                            LevelIcons[i].sprite = DataBase.instance.ColorIcons_bar[(int)cardColor];
+                            if (i < cEntity_Base.cardColors.Count)
+                            {
+                                cardColor = cEntity_Base.cardColors[i];
+                                LevelIcons[i].color = DataBase.CardColor_ColorDarkDictionary[cardColor];
+                                LevelIcons[i].gameObject.SetActive(true);
+                            }
+                            else
+                            {
+                                LevelIcons[i].gameObject.SetActive(false);
+                            }
                         }
 
                         LevelText.color = Color.white;

Assets/Scripts/EditDeck.cs

@@ -208,6 +208,7 @@ public class EditDeck : MonoBehaviour
         }
         #endregion
 
+        //TODO: need to find a better way, this shouldn't happen every 3rd frame, should only happen on changes. MikeB
         ShowOnlyVisibleObjects();
 
         if (EdittingDeckData != null)

Assets/Scripts/HandCard.cs

@@ -679,15 +679,16 @@ public class HandCard : MonoBehaviour
     {
         if (CostText != null)
         {
-            for (int i = 0; i < CostIcons.Count; i++)
+            for (int i = CostIcons.Count - 1; i > -1; i--)
             {
                 CardColor cardColor = CardColor.None;
-                
-                if (i < cardSource.CardColors.Count)
+                int value = CostIcons.Count - i - 1;
+
+                if (i >= CostIcons.Count - cardSource.CardColors.Count)
                 {
-                    float fillAmount = (float)((i + 1) / (float)cardSource.CardColors.Count);
+                    float fillAmount = (float)((CostIcons.Count - i) / (float)cardSource.CardColors.Count);
 
-                    cardColor = cardSource.CardColors[i];
+                    cardColor = cardSource.CardColors[value];
                     CostIcons[i].color = DataBase.CardColor_ColorDarkDictionary[cardColor];
                     CostIcons[i].fillAmount = fillAmount;
                     CostIcons[i].gameObject.SetActive(true);

Assets/Scripts/PermanentDetail.cs

@@ -299,12 +299,6 @@ public class PermanentDetail : MonoBehaviour
         {
             CardInfo cardInfo = Instantiate(cardInfoPrefab, pokemonScroll.content);
             cardInfo.SetUpCardInfo(cardSource);
-
-            foreach (ScrollRect scrollRect in cardInfo.scrollRects)
-            {
-                scrollRect.content = pokemonScroll.content;
-                scrollRect.viewport = pokemonScroll.viewport;
-            }
         }
 
         Vector3 targetPositon = Vector3.zero;