.vs/FarplaneSpire/xs/UserPrefs.xml

@@ -1,11 +1,11 @@
 <Properties StartupConfiguration="{B77AB08B-7858-869F-D365-1534041FF9A5}|">
   <MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Battle/BattleField.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Card/SepCard.cs">
     <Files>
-      <File FileName="Assets/Scripts/Battle/BattleField.cs" Line="95" Column="25" />
-      <File FileName="Assets/Scripts/ViewManager/BattleGround/OperatePanelManager.cs" Line="55" Column="17" />
-      <File FileName="Assets/Scripts/Card/CardAction.cs" Line="69" Column="42" />
-      <File FileName="Assets/Scripts/Card/CardManager.cs" Line="95" Column="37" />
+      <File FileName="Assets/Scripts/Card/DefCard.cs" Line="52" Column="64" />
+      <File FileName="Assets/Scripts/Card/Card.cs" Line="29" Column="10" />
+      <File FileName="Assets/Scripts/Card/AckCard.cs" Line="68" Column="55" />
+      <File FileName="Assets/Scripts/Card/SepCard.cs" Line="71" Column="55" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />

Assets/Prefabs/CardSub.prefab

@@ -9,18 +9,35 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1475197940733008}
+  m_RootGameObject: {fileID: 1531794351049282}
   m_IsPrefabAsset: 1
---- !u!1 &1006396748954970
+--- !u!1 &1352277818361878
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 224824042759639674}
-  - component: {fileID: 222915962977506926}
-  - component: {fileID: 114196958733880356}
+  - component: {fileID: 224045690021646474}
+  - component: {fileID: 222824530233784930}
+  - component: {fileID: 114999173636884598}
+  m_Layer: 5
+  m_Name: Cost
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1420727380155954
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224087538214138208}
+  - component: {fileID: 222000120038463702}
+  - component: {fileID: 114506865524747128}
   m_Layer: 5
   m_Name: Face
   m_TagString: Untagged
@@ -28,17 +45,17 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1475197940733008
+--- !u!1 &1531794351049282
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 224623426368791478}
-  - component: {fileID: 222270938503827196}
-  - component: {fileID: 114165454814917152}
-  - component: {fileID: 61428528795293844}
+  - component: {fileID: 224516016759325428}
+  - component: {fileID: 222563575817586800}
+  - component: {fileID: 114749168645784388}
+  - component: {fileID: 61284243946714036}
   m_Layer: 5
   m_Name: CardSub
   m_TagString: Untagged
@@ -46,12 +63,46 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!61 &61428528795293844
+--- !u!1 &1640137799610946
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224542863697803620}
+  - component: {fileID: 222310972271833700}
+  - component: {fileID: 114728276813443674}
+  m_Layer: 5
+  m_Name: Buff
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1930831592916334
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224416057383457210}
+  - component: {fileID: 222264285234926780}
+  - component: {fileID: 114876645446570704}
+  m_Layer: 5
+  m_Name: Tenacity
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &61284243946714036
 BoxCollider2D:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1475197940733008}
+  m_GameObject: {fileID: 1531794351049282}
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
@@ -71,12 +122,66 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 100, y: 150}
   m_EdgeRadius: 0
---- !u!114 &114165454814917152
+--- !u!114 &114506865524747128
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1420727380155954}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114728276813443674
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1640137799610946}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114749168645784388
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1475197940733008}
+  m_GameObject: {fileID: 1531794351049282}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -98,12 +203,12 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114196958733880356
+--- !u!114 &114876645446570704
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1006396748954970}
+  m_GameObject: {fileID: 1930831592916334}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -125,31 +230,136 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!222 &222270938503827196
+--- !u!114 &114999173636884598
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1352277818361878}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222000120038463702
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1475197940733008}
+  m_GameObject: {fileID: 1420727380155954}
   m_CullTransparentMesh: 0
---- !u!222 &222915962977506926
+--- !u!222 &222264285234926780
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1006396748954970}
+  m_GameObject: {fileID: 1930831592916334}
   m_CullTransparentMesh: 0
---- !u!224 &224623426368791478
+--- !u!222 &222310972271833700
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1640137799610946}
+  m_CullTransparentMesh: 0
+--- !u!222 &222563575817586800
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1531794351049282}
+  m_CullTransparentMesh: 0
+--- !u!222 &222824530233784930
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1352277818361878}
+  m_CullTransparentMesh: 0
+--- !u!224 &224045690021646474
 RectTransform:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1475197940733008}
+  m_GameObject: {fileID: 1352277818361878}
+  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_Children: []
+  m_Father: {fileID: 224516016759325428}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224087538214138208
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1420727380155954}
+  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_Children: []
+  m_Father: {fileID: 224516016759325428}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224416057383457210
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1930831592916334}
+  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_Children: []
+  m_Father: {fileID: 224516016759325428}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224516016759325428
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1531794351049282}
   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_Children:
-  - {fileID: 224824042759639674}
+  - {fileID: 224087538214138208}
+  - {fileID: 224416057383457210}
+  - {fileID: 224045690021646474}
+  - {fileID: 224542863697803620}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -158,18 +368,18 @@ RectTransform:
   m_AnchoredPosition: {x: 35, y: 104}
   m_SizeDelta: {x: 113.5, y: 154.5}
   m_Pivot: {x: 0.5, y: 0}
---- !u!224 &224824042759639674
+--- !u!224 &224542863697803620
 RectTransform:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1006396748954970}
+  m_GameObject: {fileID: 1640137799610946}
   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_Children: []
-  m_Father: {fileID: 224623426368791478}
-  m_RootOrder: 0
+  m_Father: {fileID: 224516016759325428}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

Assets/Resources/Textures/BattleField/battle_bg_far.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: d86c3244a785a481ba6565d628ee5e42
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/BattleField/battle_bg_ground.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 927717098889e490eb94478d669d02fc
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/BattleField/battle_bg.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cd0c36a6a6b284b2694b8a6f9565e08d
+guid: bddcf9d343b23433ba1ed89fdfe5d5a7
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}

Assets/Resources/Textures/BattleField/battle_bg_vegetation.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 7cfe46d69ed8349d4a47efa52fc6a334
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/BattleField/loading_bg.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6763c7202619f40229e18cb418b20ee6
+guid: decd4a2bdfe2844379917f0baf3c2b73
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}

Assets/Resources/Textures/Cards/Cost.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7947fe64a8ba54f66a7cb41b34b78a1b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Cost/cost_01.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: ea4b9ae3a93914a92ab420f97bb8d0c3
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Cost/cost_02.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 50017bb017b824994943b89144176b85
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Cost/cost_03.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 5f68d4e49828e46bd8c5d6fb052a2dd5
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3b9c2fb948e374f0dba899c8cb650dd6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_01.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 3d2d546ce6d6e42eab36aea8071fcd6e
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_02.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 1a906cd8511d34e1bbfbc29c1a739660
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_03.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: afc291ec71a284ba7965e014d698b42c
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_04.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: e8bd38e642f114f49bcf5af3c403d817
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_05.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: ffa55881862564e689e3ee7fb171658b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_06.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: be137e26f74b945ffb31aae5c0d6c5a6
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_07.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: b19f2c66f7dc14527a839138261f4293
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_08.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 7d69da58a16304fed99fb7a23c26ce21
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_09.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 33fcff7dc2f7545259372021e8eaed56
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Textures/Cards/Tenacity/tenacity_10.png.meta

@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 900d3e5fdacfa4e7185af24f33b2e308
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/BattleGroundScene.unity

@@ -452,7 +452,7 @@ MonoBehaviour:
   enemyLoc: {fileID: 1612319567}
   followPanel: {fileID: 1266454754}
   bloodPre: {fileID: 1377248289381964, guid: 47ec2ad53173941869a9b7bde5f2b3d6, type: 2}
-  cardPrefab: {fileID: 1475197940733008, guid: e5adcfc7295ab4836b8a737e163b6194, type: 2}
+  cardPrefab: {fileID: 1531794351049282, guid: e5adcfc7295ab4836b8a737e163b6194, type: 2}
   cachePlace: {fileID: 1653146835}
 --- !u!1 &160635358
 GameObject:
@@ -856,6 +856,156 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 517788465}
   m_CullTransparentMesh: 0
+--- !u!1 &534609931
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 534609932}
+  - component: {fileID: 534609933}
+  m_Layer: 0
+  m_Name: battle_bg_wall
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &534609932
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 534609931}
+  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_Children: []
+  m_Father: {fileID: 1583365312}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &534609933
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 534609931}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: decd4a2bdfe2844379917f0baf3c2b73, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 19.2, y: 10.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &537806382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 537806383}
+  - component: {fileID: 537806384}
+  m_Layer: 0
+  m_Name: battle_bg_house
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &537806383
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 537806382}
+  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_Children: []
+  m_Father: {fileID: 1583365312}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &537806384
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 537806382}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: bddcf9d343b23433ba1ed89fdfe5d5a7, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 19.2, y: 10.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &634903706
 GameObject:
   m_ObjectHideFlags: 0
@@ -1073,6 +1223,81 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 700875990}
   m_CullTransparentMesh: 0
+--- !u!1 &727355420
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 727355421}
+  - component: {fileID: 727355422}
+  m_Layer: 0
+  m_Name: battle_bg_ground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &727355421
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 727355420}
+  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_Children: []
+  m_Father: {fileID: 1583365312}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &727355422
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 727355420}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 927717098889e490eb94478d669d02fc, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 19.2, y: 10.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &994501153
 GameObject:
   m_ObjectHideFlags: 0
@@ -1448,6 +1673,81 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1190725467}
   m_CullTransparentMesh: 0
+--- !u!1 &1219638505
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1219638506}
+  - component: {fileID: 1219638507}
+  m_Layer: 0
+  m_Name: battle_bg_vegetation
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1219638506
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1219638505}
+  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_Children: []
+  m_Father: {fileID: 1583365312}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1219638507
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1219638505}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 7cfe46d69ed8349d4a47efa52fc6a334, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 19.2, y: 10.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &1266454753
 GameObject:
   m_ObjectHideFlags: 0
@@ -1712,7 +2012,11 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 4.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 727355421}
+  - {fileID: 1219638506}
+  - {fileID: 537806383}
+  - {fileID: 534609932}
   m_Father: {fileID: 148747342}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1751,7 +2055,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: cd0c36a6a6b284b2694b8a6f9565e08d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d86c3244a785a481ba6565d628ee5e42, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

Assets/Scripts/Assist/AssistConfig.cs

@@ -6,6 +6,14 @@ namespace FSAssist {
     // 配置处
     public class AssistConfig {
         public static float RoleSpace = 1.5f;      // 同阵营角色之间的距离
+        public static float CpCardWidthSpace = 100.0f;   // 比较卡片中宽的距离
+        public static float CpCardHeightSpace = 60.0f;   // 比较卡片中高的距离
+
+        public static string Army = "army";        // 我方的字符串
+        public static string Enemy = "enemy";      // 敌方的字符串
+
+        public static float CardScale = 0.6f;      // 卡片的缩放
+        public static float CardRefuseScale = 0.4f;// 卡片拒绝时的缩放
     }
 }
 

Assets/Scripts/Battle/BattleField.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using FSEvent;
 using FSRole;
 using FSCard;
+using FSAssist;
 
 // 战场相关
 namespace FSBattle {
@@ -213,78 +214,73 @@ namespace FSBattle {
             // 循环遍历两个数组
             int index = 0;
             // 暂定动画为缩小，缩小的尺寸
-            Vector3 scaleSize = new Vector3(0.4f, 0.4f, 0.4f);
+            Vector3 scaleSize = new Vector3(AssistConfig.CardScale, AssistConfig.CardScale, AssistConfig.CardScale);
 
             while (true) {
                 // 首先判断两个数组是否到最大位置
-                if (index < BattleFieldManager.Instance.ArmyCpArray.Count && index < BattleFieldManager.Instance.EnemyCpArray.Count) {
+                if (index < BattleFieldManager.Instance.CpArray.Count) {
+                    Dictionary<string, Transform> info = (Dictionary<string, Transform>)BattleFieldManager.Instance.CpArray[index];
                     // 获取两张卡片
-                    Transform armyTrs = (Transform)BattleFieldManager.Instance.ArmyCpArray[index];
-                    Transform enemyTrs = (Transform)BattleFieldManager.Instance.EnemyCpArray[index];
-                    Card armyCard = armyTrs.GetComponent<Card>();
-                    Card enemyCard = enemyTrs.GetComponent<Card>();
-
-                    // 比较韧性
-                    // 首先比较两张牌类型一样的情况
-                    if (armyCard.Type == enemyCard.Type) {
-                        if (armyCard.Type == CardType.CARD_TYPE_ATTACK) {
-                            // 当都是攻击类型的时候
-                            // 根据韧性来进行比较
-                            if (armyCard.Tenacity > enemyCard.Tenacity) {
-                                executeArray.Add(armyCard);
-                                enemyTrs.localScale = scaleSize;
-                            } else if (armyCard.Tenacity < enemyCard.Tenacity) {
-                                executeArray.Add(enemyCard);
-                                armyTrs.localScale = scaleSize;
-                            } else {
-                                // 当相等的时候，都不处理
-                                armyTrs.localScale = scaleSize;
-                                enemyTrs.localScale = scaleSize;
-                            }
-                        } else if (armyCard.Type == CardType.CARD_TYPE_DEFANCE) {
-                            // 当都是防御类型的时候
-                            if (armyCard.Tenacity > enemyCard.Tenacity) {
-                                executeArray.Add(armyCard);
-                                enemyTrs.localScale = scaleSize;
-                            } else if (armyCard.Tenacity < enemyCard.Tenacity) {
-                                executeArray.Add(enemyCard);
-                                armyTrs.localScale = scaleSize;
+                    // 再比较两张卡片是否存在，有一方不存在则另一方加入比较数组中
+                    if (info.ContainsKey(AssistConfig.Army) && !info.ContainsKey(AssistConfig.Enemy)) {
+                        Transform armyTrs = info[AssistConfig.Army];
+                        executeArray.Add(armyTrs.GetComponent<Card>());
+                    } else if (!info.ContainsKey(AssistConfig.Army) && info.ContainsKey(AssistConfig.Enemy)) {
+                        Transform enemyTrs = info[AssistConfig.Enemy];
+                        executeArray.Add(enemyTrs.GetComponent<Card>());
+                    } else {
+                        Transform armyTrs = info[AssistConfig.Army];
+                        Transform enemyTrs = info[AssistConfig.Enemy];
+                        // 获取两张牌
+                        Card armyCard = armyTrs.GetComponent<Card>();
+                        Card enemyCard = enemyTrs.GetComponent<Card>();
+
+                        // 比较韧性
+                        // 首先比较两张牌类型一样的情况
+                        if (armyCard.Type == enemyCard.Type) {
+                            if (armyCard.Type == CardType.CARD_TYPE_ATTACK) {
+                                // 当都是攻击类型的时候
+                                // 根据韧性来进行比较
+                                if (armyCard.Tenacity > enemyCard.Tenacity) {
+                                    executeArray.Add(armyCard);
+                                    enemyTrs.localScale = scaleSize;
+                                } else if (armyCard.Tenacity < enemyCard.Tenacity) {
+                                    executeArray.Add(enemyCard);
+                                    armyTrs.localScale = scaleSize;
+                                } else {
+                                    // 当相等的时候，都不处理
+                                    armyTrs.localScale = scaleSize;
+                                    enemyTrs.localScale = scaleSize;
+                                }
+                            } else if (armyCard.Type == CardType.CARD_TYPE_DEFANCE) {
+                                // 当都是防御类型的时候
+                                if (armyCard.Tenacity > enemyCard.Tenacity) {
+                                    executeArray.Add(armyCard);
+                                    enemyTrs.localScale = scaleSize;
+                                } else if (armyCard.Tenacity < enemyCard.Tenacity) {
+                                    executeArray.Add(enemyCard);
+                                    armyTrs.localScale = scaleSize;
+                                } else {
+                                    // 当相等的时候，都加入处理
+                                    executeArray.Add(armyCard);
+                                    executeArray.Add(enemyCard);
+                                }
                             } else {
-                                // 当相等的时候，都加入处理
+                                // 特殊牌全部加入处理
                                 executeArray.Add(armyCard);
                                 executeArray.Add(enemyCard);
                             }
                         } else {
-                            // 特殊牌全部加入处理
-                            executeArray.Add(armyCard);
-                            executeArray.Add(enemyCard);
+                            // 当韧性不相等的时候，高的生效
+                                if (armyCard.Tenacity > enemyCard.Tenacity) {
+                                    executeArray.Add(armyCard);
+                                    enemyTrs.localScale = scaleSize;
+                                } else {
+                                    executeArray.Add(enemyCard);
+                                    armyTrs.localScale = scaleSize;
+                                }
                         }
-                    } else {
-                        // 当韧性不相等的时候，高的生效
-                            if (armyCard.Tenacity > enemyCard.Tenacity) {
-                                executeArray.Add(armyCard);
-                                enemyTrs.localScale = scaleSize;
-                            } else {
-                                executeArray.Add(enemyCard);
-                                armyTrs.localScale = scaleSize;
-                            }
-                    }
-                } else if (index < BattleFieldManager.Instance.ArmyCpArray.Count && index >= BattleFieldManager.Instance.EnemyCpArray.Count) {
-                    // 此种是我方比较卡片比较多的情况，将剩下的牌都放入比较数组中
-                    for (; index < BattleFieldManager.Instance.ArmyCpArray.Count; index++) {
-                        Transform trs = (Transform)BattleFieldManager.Instance.ArmyArray[index];
-                        executeArray.Add(trs.GetComponent<Card>());
                     }
-
-                    break;
-                } else if (index >= BattleFieldManager.Instance.ArmyCpArray.Count && index < BattleFieldManager.Instance.EnemyCpArray.Count) {
-                    // 此种是地方比较卡片比较多的情况，将剩下的牌都放入比较数组中
-                    for (; index < BattleFieldManager.Instance.EnemyCpArray.Count; index++) {
-                        Transform trs = (Transform)BattleFieldManager.Instance.EnemyCpArray[index];
-                        executeArray.Add(trs.GetComponent<Card>());
-                    }
-
-                    break;
                 } else {
                     break;
                 }
@@ -307,32 +303,33 @@ namespace FSBattle {
             cardTrs.SetParent(cachePlace);
             cardTrs.localScale = Vector3.zero;
         }
-        /*
-         * 给本类使用的移除方法，需要传入对应的角色
-        */
-        private void EraseCPCard(Transform cardTrs, int index) {
-            cardTrs.SetParent(cachePlace);
-            cardTrs.localScale = Vector3.zero;
-            // 判断角色，同时从对应的比较数组中移除，添加到弃牌堆
-            if (index == 0) {
-                // 首先保证在数组中
-                if (BattleFieldManager.Instance.ArmyCpArray.Contains(cardTrs)) {
-                    BattleFieldManager.Instance.ArmyThrowPool.Add(cardTrs);
-                    BattleFieldManager.Instance.ArmyCpArray.Remove(cardTrs);
-                    // 同时通知更新牌堆数据
-                    Dictionary<string, object> info = new Dictionary<string, object>();
-                    info.Add("index", 1);
-                    info.Add("num", BattleFieldManager.Instance.ArmyThrowPool.Count);
-
-                    EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_TABLE_INFO, info);
-                }
-            } else if (index == 1) {
-                // 首先保证在数组中
-                if (BattleFieldManager.Instance.EnemyCpArray.Contains(cardTrs)) {
-                    BattleFieldManager.Instance.EnemyThrowPool.Add(cardTrs);
-                    BattleFieldManager.Instance.EnemyCpArray.Remove(cardTrs);
-                }
-            }
-        }
+
+        ///*
+        // * 给本类使用的移除方法，需要传入对应的角色
+        //*/
+        //private void EraseCPCard(Transform cardTrs, int index) {
+        //    cardTrs.SetParent(cachePlace);
+        //    cardTrs.localScale = Vector3.zero;
+        //    // 判断角色，同时从对应的比较数组中移除，添加到弃牌堆
+        //    if (index == 0) {
+        //        // 首先保证在数组中
+        //        if (BattleFieldManager.Instance.ArmyCpArray.Contains(cardTrs)) {
+        //            BattleFieldManager.Instance.ArmyThrowPool.Add(cardTrs);
+        //            BattleFieldManager.Instance.ArmyCpArray.Remove(cardTrs);
+        //            // 同时通知更新牌堆数据
+        //            Dictionary<string, object> info = new Dictionary<string, object>();
+        //            info.Add("index", 1);
+        //            info.Add("num", BattleFieldManager.Instance.ArmyThrowPool.Count);
+
+        //            EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_TABLE_INFO, info);
+        //        }
+        //    } else if (index == 1) {
+        //        // 首先保证在数组中
+        //        if (BattleFieldManager.Instance.EnemyCpArray.Contains(cardTrs)) {
+        //            BattleFieldManager.Instance.EnemyThrowPool.Add(cardTrs);
+        //            BattleFieldManager.Instance.EnemyCpArray.Remove(cardTrs);
+        //        }
+        //    }
+        //}
     }
 }

Assets/Scripts/Battle/BattleFieldManager.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using FSAssist;
 
 namespace FSBattle {
     /*
@@ -27,10 +28,12 @@ namespace FSBattle {
         // 敌方弃卡池
         public ArrayList EnemyThrowPool { set; get; }
 
-        // 我方比较牌数组
-        public ArrayList ArmyCpArray { set; get; }
-        // 敌方比较牌数组
-        public ArrayList EnemyCpArray { set; get; }
+        //// 我方比较牌数组
+        //public ArrayList ArmyCpArray { set; get; }
+        //// 敌方比较牌数组
+        //public ArrayList EnemyCpArray { set; get; }
+        // 比较数组
+        public ArrayList CpArray { set; get; }
 
         public BattleFieldManager() {
             // 初始化手牌
@@ -50,9 +53,39 @@ namespace FSBattle {
             ArmyThrowPool = new ArrayList();
             EnemyThrowPool = new ArrayList();
 
-            // 初始化比较手牌
-            ArmyCpArray = new ArrayList();
-            EnemyCpArray = new ArrayList();
+            //// 初始化比较手牌
+            //ArmyCpArray = new ArrayList(10);
+            //EnemyCpArray = new ArrayList(10);
+
+            // 比较数组，每个元素都是一个字典
+            CpArray = new ArrayList();
+        }
+
+        /*
+         * 添加角色到字典中
+        */
+        public void AddCardToCpArray(string key, Transform value) {
+            // 首先创建一个字典
+            Dictionary<string, Transform> info = new Dictionary<string, Transform>();
+            // 把数据添加到字典中
+            info.Add(key, value);
+            CpArray.Add(info);
+        }
+
+        /*
+         * 添加到指定位置
+        */
+        public void AddCardToIndex(string key, int index, Transform value) {
+            // 首先获取指定位置的字典，如果没有则创建一个
+            Dictionary<string, Transform> info = (Dictionary<string, Transform>)CpArray[index];
+            if (info == null) {
+                info = new Dictionary<string, Transform>();
+                CpArray.Add(info);
+            }
+
+            if (!info.ContainsKey(key)) {
+                info.Add(key, value);
+            }
         }
     }
 }

Assets/Scripts/Card/AckCard.cs

@@ -28,11 +28,21 @@ namespace FSCard {
         // 发起者
         public Role Source { set; get; }
         // 卡面
-        public Image Face { set; get; }
+        public Image Face { set; get; }
+        // 韧性
+        public Image TenacityImage { set; get; }
+        // 花费
+        public Image CostImage { set; get; }
+        // Buff
+        public Image BuffImage { set; get; }
 
         // Use this for initialization
         void Start() {
             Face = transform.Find("Face").GetComponent<Image>();
+            TenacityImage = transform.Find("Tenacity").GetComponent<Image>();
+            CostImage = transform.Find("Cost").GetComponent<Image>();
+            BuffImage = transform.Find("Buff").GetComponent<Image>();
+
             if (Face != null) {
                 // 加载图片
                 Image image = gameObject.GetComponent<Image>();
@@ -54,6 +64,12 @@ namespace FSCard {
                     }
                 }
                 Face.sprite = Resources.Load("Textures/Cards/Face/" + ID, typeof(Sprite)) as Sprite;
+
+                string url = string.Format("Textures/Cards/Tenacity/tenacity_{0:d2}", Tenacity);
+                TenacityImage.sprite = Resources.Load(url, typeof(Sprite)) as Sprite;
+                url = string.Format("Textures/Cards/Cost/cost_{0:d2}", Cost);
+                CostImage.sprite = Resources.Load(url, typeof(Sprite)) as Sprite;
+                BuffImage.gameObject.SetActive(false);
             }
         }
 

Assets/Scripts/Card/Card.cs

@@ -61,7 +61,12 @@ namespace FSCard
         Role Source { set; get; }
         // 卡面
         Image Face { set; get; }
-
+        // 韧性
+        Image TenacityImage { set; get; }
+        // 花费
+        Image CostImage { set; get; }
+        // Buff
+        Image BuffImage { set; get; }
         // 执行
         void OnExecute();
     }

Assets/Scripts/Card/CardAction.cs

@@ -5,6 +5,7 @@ using UnityEngine.EventSystems;
 using FSEvent;
 using FSBattle;
 using FSRole;
+using FSAssist;
 
 namespace FSCard {
     /*
@@ -47,50 +48,107 @@ namespace FSCard {
          * 鼠标抬起时的回调
         */
         public void OnPointerUp(PointerEventData eventData) {
-            foreach (Transform trs in BattleFieldManager.Instance.RoleArray) {
-                //Vector3 screenTrs = Camera.main.WorldToScreenPoint(trs.position);
-
-                BoxCollider roleCollider = trs.GetComponent<BoxCollider>();
-                // 再将世界碰撞区域转为屏幕上的
-                Vector2 roleMax = Camera.main.WorldToScreenPoint(roleCollider.bounds.max);
-                Vector2 roleMin = Camera.main.WorldToScreenPoint(roleCollider.bounds.min);
-                Bounds roleBounds = new Bounds();
-                roleBounds.SetMinMax(roleMin, roleMax);
-
-                BoxCollider2D cardBox = transform.GetComponent<BoxCollider2D>();
-                if (roleBounds.Intersects(cardBox.bounds)) {
-
-                    Card card = this.GetComponent<Card>();
-                    if (card != null) {
-                        print("出牌 ... ");
-
-                        Role role = trs.GetComponent<Role>();
-                        if (role != null) {
-                            card.Target = role;
-                            //card.OnExecute();
-
-                            // 需要保证剩下的能量足够
-                            if (role.CurrentAttr.Mp >= card.Cost) {
-                                role.CurrentAttr.Mp -= card.Cost;
-
-                                Dictionary<string, object> info = new Dictionary<string, object>();
-                                info.Add("card", this.transform);
-                                EventListener.Instance.PostEvent(EventEnum.EVENT_ARMY_DEAL_CARD, info);
-
-                                info.Add("role", role);
-                                EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_PLAYER_ENGINE, info);
-                            } else {
-                                // 否则将卡片移回原位
-                                transform.position = StartPos;
-                            }
-
-                            return;
+            for (int i = 0; i < BattleFieldManager.Instance.CpArray.Count; i++) {
+                Dictionary<string, Transform> cpCard = (Dictionary<string, Transform>)BattleFieldManager.Instance.CpArray[i];
+                Transform trs = cpCard[AssistConfig.Enemy];
+
+                // 需要保证敌方卡片存在
+                if (trs != null) {
+                    // 获取碰撞位置
+                    BoxCollider2D enemyBox = trs.GetComponent<BoxCollider2D>();
+                    // 我方碰撞位置
+                    BoxCollider2D roleBox = transform.GetComponent<BoxCollider2D>();
+                    // 当接触时
+                    if (enemyBox.bounds.Intersects(roleBox.bounds)) {
+                        Card myCard = this.GetComponent<Card>();
+                        Card enemyCard = trs.GetComponent<Card>();
+
+                        // 设置目标
+                        myCard.Target = enemyCard.Source;
+                        // 需要保证剩下的能量足够
+                        if (myCard.Source.CurrentAttr.Mp >= myCard.Cost) {
+                            myCard.Source.CurrentAttr.Mp -= myCard.Cost;
+
+                            // 排列新的位置
+                            transform.position = new Vector3(trs.position.x, Screen.height / 2 - AssistConfig.CpCardHeightSpace, 0);
+                            transform.localScale = new Vector3(AssistConfig.CardScale, AssistConfig.CardScale, AssistConfig.CardScale);
+                            transform.rotation = Quaternion.Euler(0, 0, 0);
+
+                            Dictionary<string, object> info = new Dictionary<string, object>();
+                            info.Add("card", this.transform);
+                            info.Add("index", i);
+                            EventListener.Instance.PostEvent(EventEnum.EVENT_ARMY_DEAL_CARD, info);
+
+                            info.Add("role", myCard.Source);
+                            EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_PLAYER_ENGINE, info);
+                        } else {
+                            // 否则将卡片移回原位
+                            transform.position = StartPos;
                         }
+
+                        return;
                     }
                 }
             }
 
-            transform.position = StartPos;
+            //for (int i = 0; i < BattleFieldManager.Instance.EnemyCpArray.Count; i++) {
+            //    Transform trs = (Transform)BattleFieldManager.Instance.EnemyCpArray[i];
+            //    // 获取地方比较牌的碰撞位置
+            //    BoxCollider2D enemyBox = trs.GetComponent<BoxCollider2D>();
+            //    // 我方的碰撞位置
+            //    BoxCollider2D roleBox = transform.GetComponent<BoxCollider2D>();
+
+            //    if (enemyBox.bounds.Intersects(roleBox.bounds)) {
+            //        print("碰撞了，选择它了 ... ");
+
+            //        BattleFieldManager.Instance.ArmyCpArray.Insert(i, transform);
+            //    }
+            //}
+
+            //foreach (Transform trs in BattleFieldManager.Instance.RoleArray) {
+            //    //Vector3 screenTrs = Camera.main.WorldToScreenPoint(trs.position);
+
+            //    BoxCollider roleCollider = trs.GetComponent<BoxCollider>();
+            //    // 再将世界碰撞区域转为屏幕上的
+            //    Vector2 roleMax = Camera.main.WorldToScreenPoint(roleCollider.bounds.max);
+            //    Vector2 roleMin = Camera.main.WorldToScreenPoint(roleCollider.bounds.min);
+            //    Bounds roleBounds = new Bounds();
+            //    roleBounds.SetMinMax(roleMin, roleMax);
+
+            //    BoxCollider2D cardBox = transform.GetComponent<BoxCollider2D>();
+            //    if (roleBounds.Intersects(cardBox.bounds)) {
+
+            //        Card card = this.GetComponent<Card>();
+            //        if (card != null) {
+            //            print("出牌 ... ");
+
+            //            Role role = trs.GetComponent<Role>();
+            //            if (role != null) {
+            //                card.Target = role;
+            //                //card.OnExecute();
+
+            //                // 需要保证剩下的能量足够
+            //                if (role.CurrentAttr.Mp >= card.Cost) {
+            //                    role.CurrentAttr.Mp -= card.Cost;
+
+            //                    Dictionary<string, object> info = new Dictionary<string, object>();
+            //                    info.Add("card", this.transform);
+            //                    EventListener.Instance.PostEvent(EventEnum.EVENT_ARMY_DEAL_CARD, info);
+
+            //                    info.Add("role", role);
+            //                    EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_PLAYER_ENGINE, info);
+            //                } else {
+            //                    // 否则将卡片移回原位
+            //                    transform.position = StartPos;
+            //                }
+
+            //                return;
+            //            }
+            //        }
+            //    }
+            //}
+
+            //transform.position = StartPos;
         }
 
         public void OnBeginDrag(PointerEventData eventData) {

Assets/Scripts/Card/DefCard.cs

@@ -30,10 +30,20 @@ namespace FSCard {
         public Role Source { set; get; }
         // 卡面
         public Image Face { set; get; }
+        // 韧性
+        public Image TenacityImage { set; get; }
+        // 花费
+        public Image CostImage { set; get; }
+        // Buff
+        public Image BuffImage { set; get; }
 
         // Use this for initialization
         void Start() {
             Face = transform.Find("Face").GetComponent<Image>();
+            TenacityImage = transform.Find("Tenacity").GetComponent<Image>();
+            CostImage = transform.Find("Cost").GetComponent<Image>();
+            BuffImage = transform.Find("Buff").GetComponent<Image>();
+
             if (Face != null) {
                 // 加载图片
                 Image image = gameObject.GetComponent<Image>();
@@ -55,6 +65,12 @@ namespace FSCard {
                     }
                 }
                 Face.sprite = Resources.Load("Textures/Cards/Face/" + ID, typeof(Sprite)) as Sprite;
+
+                string url = string.Format("Textures/Cards/Tenacity/tenacity_{0:d2}", Tenacity);
+                TenacityImage.sprite = Resources.Load(url , typeof(Sprite)) as Sprite;
+                url = string.Format("Textures/Cards/Cost/cost_{0:d2}", Cost);
+                CostImage.sprite = Resources.Load(url, typeof(Sprite)) as Sprite;
+                BuffImage.gameObject.SetActive(false);
             }
         }
 

Assets/Scripts/Card/SepCard.cs

@@ -28,10 +28,20 @@ namespace FSCard {
         public Role Source { set; get; }
         // 卡面
         public Image Face { set; get; }
+        // 韧性
+        public Image TenacityImage { set; get; }
+        // 花费
+        public Image CostImage { set; get; }
+        // Buff
+        public Image BuffImage { set; get; }
 
         // Use this for initialization
         void Start() {
             Face = transform.Find("Face").GetComponent<Image>();
+            TenacityImage = transform.Find("Tenacity").GetComponent<Image>();
+            CostImage = transform.Find("Cost").GetComponent<Image>();
+            BuffImage = transform.Find("Buff").GetComponent<Image>();
+
             if (Face != null) {
                 // 加载图片
                 Image image = gameObject.GetComponent<Image>();
@@ -53,6 +63,12 @@ namespace FSCard {
                     }
                 }
                 Face.sprite = Resources.Load("Textures/Cards/Face/" + ID, typeof(Sprite)) as Sprite;
+
+                string url = string.Format("Textures/Cards/Tenacity/tenacity_{0:d2}", Tenacity);
+                TenacityImage.sprite = Resources.Load(url, typeof(Sprite)) as Sprite;
+                url = string.Format("Textures/Cards/Cost/cost_{0:d2}", Cost);
+                CostImage.sprite = Resources.Load(url, typeof(Sprite)) as Sprite;
+                BuffImage.gameObject.SetActive(false);
             }
         }
 

Assets/Scripts/Role/RoleManager.cs

@@ -42,7 +42,6 @@ namespace FSRole {
             ReadRoleData();
             CreateRole("00000");
             CreateRole("10002");
-            CreateRole("10002");
         }
 
         /*
@@ -80,7 +79,6 @@ namespace FSRole {
                     if (cards.IsArray) {
                         for (int i = 0; i < cards.Count; i++) {
                             string cardId = AssistMethods.ReadString(cards, i);
-                            print("从中获取到了卡片数组 ... " + AssistMethods.ReadString(cards, i));
 
                             GameObject cardObj = Instantiate(cardPrefab, cachePlace);
                             // 挂载卡片组件

Assets/Scripts/ViewManager/BattleGround/CardPanelManager.cs

@@ -6,6 +6,7 @@ using FSEvent;
 using FSBattle;
 using FSCard;
 using FSRole;
+using FSAssist;
 
 public class CardPanelManager : MonoBehaviour {
     public Transform cardPanel;
@@ -15,9 +16,6 @@ public class CardPanelManager : MonoBehaviour {
     private int spaceX = 80;
     private int spaceY = 120;
 
-    // 牌缩小的值
-    private float cardScale = 0.6f;
-
 	// Use this for initialization
 	void Start () {
         InitEvents();
@@ -145,7 +143,7 @@ public class CardPanelManager : MonoBehaviour {
             // 从卡池中移除
             BattleFieldManager.Instance.EnemyTakePool.Remove(cardTrs);
             cardTrs.SetParent(cardPanel);
-            cardTrs.localScale = new Vector3(cardScale, cardScale, 1);
+            cardTrs.localScale = new Vector3(AssistConfig.CardScale, AssistConfig.CardScale, 1);
             cardTrs.localPosition = new Vector3(Screen.width / 2, Screen.height / 2 + index * 30, 0);
             // 如果有卡片事件组件，如果有则将事件移除
             //CardAction action = cardTrs.GetComponent<CardAction>();
@@ -200,17 +198,11 @@ public class CardPanelManager : MonoBehaviour {
         int originX = Screen.width / 2 - spaceX / 2 - 30;
         int originY = Screen.height / 2 + 50;
         Transform cardTrs = (Transform)info["card"];
+        int index = (int)info["index"];
+
         // 将传入的牌从手牌数组中移，再加入到比较牌数组中
         BattleFieldManager.Instance.ArmyHandCards.Remove(cardTrs);
-        BattleFieldManager.Instance.ArmyCpArray.Add(cardTrs);
-
-        // 放置位置
-        int line = (BattleFieldManager.Instance.ArmyCpArray.Count - 1) / 3;
-        int row = (BattleFieldManager.Instance.ArmyCpArray.Count - 1) % 3;
-
-        cardTrs.position = new Vector3(originX - row * spaceX, originY - line * spaceY);
-        cardTrs.localScale = new Vector3(cardScale, cardScale, 1);
-        cardTrs.localRotation = Quaternion.Euler(0, 0, 0);
+        BattleFieldManager.Instance.AddCardToIndex(AssistConfig.Army, index, cardTrs);
 
         // 重新排列
         ArrangePlayerCards();
@@ -231,7 +223,7 @@ public class CardPanelManager : MonoBehaviour {
         while (BattleFieldManager.Instance.EnemyHandCards.Count > 0) {
             Transform cardTrs = (Transform)BattleFieldManager.Instance.EnemyHandCards[0];
             // 将此卡牌放入选择数组中
-            BattleFieldManager.Instance.EnemyCpArray.Add(cardTrs);
+            BattleFieldManager.Instance.AddCardToCpArray(AssistConfig.Enemy, cardTrs);
             BattleFieldManager.Instance.EnemyHandCards.Remove(cardTrs);
 
             // 根据卡片的类型来处理如角色这样的属性
@@ -257,16 +249,22 @@ public class CardPanelManager : MonoBehaviour {
                     }
                 }
             }
-
-            // 移动位置
-            int line = index / 3;
-            int row = index % 3;
-
-            cardTrs.position = new Vector3(originX + row * spaceX, originY - line * spaceY);
+            
+            // 第奇数个和偶数个处理
+            if (index % 2 == 0) {
+                // 偶数个
+                cardTrs.position = new Vector3(index / 2 * AssistConfig.CpCardWidthSpace * -1 + Screen.width / 2, Screen.height / 2 + AssistConfig.CpCardHeightSpace, 0);
+            } else {
+                // 奇数个
+                float loc = (float)index / 2 + 0.5f;
+                cardTrs.position = new Vector3(loc * AssistConfig.CpCardWidthSpace + Screen.width / 2, Screen.height / 2 + AssistConfig.CpCardHeightSpace, 0);
+            }
 
             index++;
         }
 
+        print("查看比较牌有 : " + BattleFieldManager.Instance.CpArray.Count + " 张 ... ");
+
         Invoke("NotifyPlayerDeal", 0.2f);
     }
 
@@ -329,33 +327,43 @@ public class CardPanelManager : MonoBehaviour {
      * 清理比较牌
     */
     private void ClearCompaireCards() {
-        // 清理我方比较牌
-        while (BattleFieldManager.Instance.ArmyCpArray.Count > 0) {
-            Transform cardTrs = (Transform)BattleFieldManager.Instance.ArmyCpArray[0];
-            // 将卡片从数组移除，加入弃牌数组
-            BattleFieldManager.Instance.ArmyCpArray.Remove(cardTrs);
-            BattleFieldManager.Instance.ArmyThrowPool.Add(cardTrs);
+        // 清理比较牌
+        while (BattleFieldManager.Instance.CpArray.Count > 0) {
+            Dictionary<string, Transform> cpCard = (Dictionary<string, Transform>)BattleFieldManager.Instance.CpArray[0];
+            // 提取两张牌
+            // 处理我方卡片
+            if (cpCard.ContainsKey(AssistConfig.Army)) {
+                Transform armyCardTrs = cpCard[AssistConfig.Army];
+                // 将卡片移除，加入弃牌数组
+                BattleFieldManager.Instance.ArmyThrowPool.Add(armyCardTrs);
+                cpCard.Remove(AssistConfig.Army);
+
+                Dictionary<string, object> eraseInfo = new Dictionary<string, object>();
+                eraseInfo.Add("card", armyCardTrs);
+                EventListener.Instance.PostEvent(EventEnum.EVENT_ERASE_CARD, eraseInfo);
+            }
 
-            Dictionary<string, object> info = new Dictionary<string, object>();
-            info.Add("card", cardTrs);
-            info.Add("num", BattleFieldManager.Instance.ArmyThrowPool.Count);
-            info.Add("index", 1);
-            EventListener.Instance.PostEvent(EventEnum.EVENT_ERASE_CARD, info);
-            EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_TABLE_INFO, info);
-        }
-        
-        // 清理敌方比较牌
-        while (BattleFieldManager.Instance.EnemyCpArray.Count > 0) {
-            Transform cardTrs = (Transform)BattleFieldManager.Instance.EnemyCpArray[0];
-            // 将卡片从数组移除，放入弃牌卡组中
-            BattleFieldManager.Instance.EnemyCpArray.Remove(cardTrs);
-            BattleFieldManager.Instance.EnemyThrowPool.Add(cardTrs);
-            // 通知更新位置
-            Dictionary<string, object> info = new Dictionary<string, object>();
-            info.Add("card", cardTrs);
-            info.Add("num", BattleFieldManager.Instance.EnemyThrowPool.Count);
-            info.Add("index", 1);
-            EventListener.Instance.PostEvent(EventEnum.EVENT_ERASE_CARD, info);
+            // 清理敌方数据
+            if (cpCard.ContainsKey(AssistConfig.Enemy)) {
+                Transform enemyCardTrs = cpCard[AssistConfig.Enemy];
+                // 将卡片移除，加入弃牌数组
+                BattleFieldManager.Instance.EnemyThrowPool.Add(enemyCardTrs);
+                cpCard.Remove(AssistConfig.Enemy);
+
+                Dictionary<string, object> eraseInfo = new Dictionary<string, object>();
+                eraseInfo.Add("card", enemyCardTrs);
+                EventListener.Instance.PostEvent(EventEnum.EVENT_ERASE_CARD, eraseInfo);
+            }
+
+            BattleFieldManager.Instance.CpArray.RemoveAt(0);
         }
+
+        // 通知更新数据
+        Dictionary<string, object> info = new Dictionary<string, object>();
+        info.Add("num", BattleFieldManager.Instance.ArmyThrowPool.Count);
+        info.Add("index", 1);
+        EventListener.Instance.PostEvent(EventEnum.EVENT_UPDATE_TABLE_INFO, info);
+        // 清理比较牌
+        BattleFieldManager.Instance.CpArray.Clear();
     }
 }

Library/EditorInstance.json

@@ -1,4 +1,4 @@
 {
-	"process_id" : 447,
-	"version" : "2018.2.14f1"
+	"process_id" : 41009,
+	"version" : "2018.2.15f1"
 }

Library/ScriptAssemblies/BuiltinAssemblies.stamp

@@ -1 +1 @@
-08d63b1f94719300.08d63b1f4bb9da00
+08d63dd64639e980.08d63dd5f9561300