Assign ref.

Assets/Prefabs/Ability.meta

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

Assets/Prefabs/CardClasses.meta

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

Assets/Prefabs/CardClasses/ArcherClass.asset

@@ -9,9 +9,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c090164f177918042b3be10f378e9b5f, type: 3}
+  m_Script: {fileID: 11500000, guid: 1bc96940f74c4ce4581f5cdec90d1e0b, type: 3}
-  m_Name: Cavalry
+  m_Name: ArcherClass
   m_EditorClassIdentifier: 
-  name: Cavalry
+  name: 
   description: 
   artwork: {fileID: 0}
+  extraAttackRange: 2

Assets/Prefabs/CardClasses/ArcherClass.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cf728e5d8a62fa3418d2f3daa01f93df
+guid: 9c0ba6b77d1ad844d957f6d66b24dd1f
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/Prefabs/CardClasses/CavalryClass.asset

@@ -9,9 +9,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c090164f177918042b3be10f378e9b5f, type: 3}
+  m_Script: {fileID: 11500000, guid: e099c37da90ac1b46ac0a5ee6f79f507, type: 3}
-  m_Name: Infantry
+  m_Name: CavalryClass
   m_EditorClassIdentifier: 
-  name: Infantry
+  name: 
   description: 
   artwork: {fileID: 0}
+  extraMovement: 1

Assets/Prefabs/CardClasses/CavalryClass.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 099176a69eb9a6d408b4d4dba5232c84
+guid: 2c8cf65dbf365874ca1c1dee59e831c2
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/Prefabs/CardClasses/InfantryClass.asset

@@ -9,9 +9,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c090164f177918042b3be10f378e9b5f, type: 3}
+  m_Script: {fileID: 11500000, guid: 52ce9ab65798e6c46a62ac364d881763, type: 3}
-  m_Name: Archer
+  m_Name: InfantryClass
   m_EditorClassIdentifier: 
-  name: Archer
+  name: 
   description: 
   artwork: {fileID: 0}

Assets/Prefabs/CardClasses/InfantryClass.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 53185ea05ebfbd843b009cb14101377a
+guid: 548b88e44eb600c4fa3a63033e23be30
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/Prefabs/CardDatas/官军弓兵.asset

@@ -18,6 +18,7 @@ MonoBehaviour:
   cost: 1
   attack: 5
   defense: 10
-  movement: 1
+  tags: []
-  cardTags:
+  unitClasses:
-  - {fileID: 11400000, guid: 099176a69eb9a6d408b4d4dba5232c84, type: 2}
+  - {fileID: 11400000, guid: 9c0ba6b77d1ad844d957f6d66b24dd1f, type: 2}
+  abilities: []

Assets/Prefabs/CardDatas/官军步兵.asset

@@ -18,6 +18,7 @@ MonoBehaviour:
   cost: 1
   attack: 5
   defense: 20
-  movement: 1
+  tags: []
-  cardTags:
+  unitClasses:
-  - {fileID: 11400000, guid: cf728e5d8a62fa3418d2f3daa01f93df, type: 2}
+  - {fileID: 11400000, guid: 548b88e44eb600c4fa3a63033e23be30, type: 2}
+  abilities: []

Assets/Prefabs/CardDatas/官军骑兵.asset

@@ -18,5 +18,7 @@ MonoBehaviour:
   cost: 1
   attack: 10
   defense: 10
-  cardTags:
+  tags: []
-  - {fileID: 11400000, guid: 53185ea05ebfbd843b009cb14101377a, type: 2}
+  unitClasses:
+  - {fileID: 11400000, guid: 2c8cf65dbf365874ca1c1dee59e831c2, type: 2}
+  abilities: []

Assets/Prefabs/CardDatas/黄巾弓兵.asset

@@ -18,6 +18,7 @@ MonoBehaviour:
   cost: 1
   attack: 5
   defense: 10
-  movement: 1
+  tags: []
-  cardTags:
+  unitClasses:
-  - {fileID: 11400000, guid: 099176a69eb9a6d408b4d4dba5232c84, type: 2}
+  - {fileID: 11400000, guid: 9c0ba6b77d1ad844d957f6d66b24dd1f, type: 2}
+  abilities: []

Assets/Prefabs/CardDatas/黄巾步兵.asset

@@ -18,6 +18,7 @@ MonoBehaviour:
   cost: 1
   attack: 3
   defense: 18
-  movement: 1
+  tags: []
-  cardTags:
+  unitClasses:
-  - {fileID: 11400000, guid: cf728e5d8a62fa3418d2f3daa01f93df, type: 2}
+  - {fileID: 11400000, guid: 548b88e44eb600c4fa3a63033e23be30, type: 2}
+  abilities: []

Assets/Prefabs/CardDatas/黄巾骑兵.asset

@@ -18,5 +18,7 @@ MonoBehaviour:
   cost: 1
   attack: 7
   defense: 8
-  cardTags:
+  tags: []
-  - {fileID: 11400000, guid: 53185ea05ebfbd843b009cb14101377a, type: 2}
+  unitClasses:
+  - {fileID: 11400000, guid: 2c8cf65dbf365874ca1c1dee59e831c2, type: 2}
+  abilities: []

Assets/Prefabs/CardTags.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 29138ff75042d784e83244ddb11034ed
+guid: d079f30f575342145b9a2e5b0204e326
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scenes/HandSimulator.unity

@@ -387,54 +387,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1455724355}
     m_Modifications:
-    - target: {fileID: 1368154424702687206, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1368154424702687206, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1368154424702687206, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1368154424702687206, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1368154424702687206, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1368154424702687206, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2224386513268639486, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2224386513268639486, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2224386513268639486, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2224386513268639486, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2224386513268639486, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2224386513268639486, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3351518597856635956, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -519,149 +471,9 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3460461322939268863, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3460461322939268863, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3460461322939268863, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 328
-      objectReference: {fileID: 0}
-    - target: {fileID: 3465344247853958630, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3465344247853958630, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0.00024414062
-      objectReference: {fileID: 0}
-    - target: {fileID: 3949232578393738854, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3949232578393738854, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3949232578393738854, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3949232578393738854, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3949232578393738854, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3949232578393738854, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4683416251428496599, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
       propertyPath: m_Name
       value: UIDeck
       objectReference: {fileID: 0}
-    - target: {fileID: 4951491574161479434, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4951491574161479434, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4951491574161479434, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4951491574161479434, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4951491574161479434, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4951491574161479434, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691872718163008490, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691872718163008490, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691872718163008490, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691872718163008490, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691872718163008490, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6691872718163008490, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6915207597938486102, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6915207597938486102, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6915207597938486102, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6915207597938486102, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6915207597938486102, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6915207597938486102, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299245348046405515, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299245348046405515, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299245348046405515, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299245348046405515, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299245348046405515, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8299245348046405515, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3}

Assets/Scenes/L1 YellowTurban.unity

@@ -321,6 +321,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -688,6 +692,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -823,6 +831,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -1279,6 +1291,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5175 (4)"
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 5d7c6bbedeba24e4f98ea1ca65fc5c0a, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: standingCell
       value: 
@@ -1823,6 +1839,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5175 (3)"
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -2164,6 +2184,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -2249,6 +2273,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -2645,6 +2673,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5175 (2)"
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: adc3952bb833a224895877477b4ce92e, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -3102,6 +3134,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -3297,6 +3333,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5175 (5)"
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -3521,6 +3561,10 @@ PrefabInstance:
       propertyPath: side
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: cardData
       value: 
@@ -3741,6 +3785,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5175 (1)"
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: adc3952bb833a224895877477b4ce92e, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: standingCell
       value: 
@@ -3811,6 +3859,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u5C0F\u5175"
       objectReference: {fileID: 0}
+    - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
+      propertyPath: baseData
+      value: 
+      objectReference: {fileID: 11400000, guid: 5d7c6bbedeba24e4f98ea1ca65fc5c0a, type: 2}
     - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3}
       propertyPath: standingCell
       value: 

Assets/Scripts/Ability.cs

@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Ability : ScriptableObject
+{
+    public new string name;
+    public string description;
+
+    public virtual void OnPlaceUnit(Unit unit) { }
+    public virtual void OnBeginRound(Unit unit) { }
+    public virtual void OnEndRound(Unit unit) { }
+    
+    public virtual void OnBeginMovePhase(Unit unit) { }
+    public virtual void OnMove(Unit unit, int travelDistance) { }
+    public virtual void OnEndMovePhase(Unit unit) { }
+    
+    public virtual void OnBeginAttackPhase(Unit unit) { }
+    public virtual void OnBeginAttack(Unit unit, List<Unit> targets) { }
+    public virtual void OnAttack(Unit unit, List<Unit> targets) { }
+    public virtual void OnEndAttack(Unit unit, List<Unit> targets) { }
+    public virtual void OnEndAttackPhase(Unit unit) { }
+    public virtual void OnExecute(Unit unit, Unit target) { }
+    public virtual void OnAllyDeath(Unit unit) { }
+    public virtual void OnEnemyDeath(Unit unit) { }
+    public virtual void OnAnyDeath(Unit unit) { }
+
+    public virtual void OnCounterAttack(Unit unit, Unit attacker) { }
+    public virtual void OnDamaged(Unit unit, Unit attacker) { }
+    public virtual void OnArmorBreak(Unit unit, Unit attacker) { }
+    public virtual void OnDefeat(Unit unit, Unit attacker) { }
+
+    public virtual void OnEnterBattleGround(Unit unit) { }
+    public virtual void OnExitBattleGround(Unit unit) { }
+    public virtual void OnDraw(Unit unit) { }
+    public virtual void OnRecovered(Unit unit, Unit helper) { }
+    public virtual void OnEquippingArmor(Unit unit, int armorAmount) { }
+    public virtual void OnDiscard(Unit unit) { }
+
+    public virtual void OnCastStragedy(List<Unit> targets) { }
+}

Assets/Scripts/Ability.cs.meta

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

Assets/Scripts/CardClasses.meta

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

Assets/Scripts/CardClasses/ArcherClass.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "ArcherClass", menuName = "Card Class/Archer Class Data")]
+public class ArcherClass : UnitClass
+{
+    public int extraAttackRange = 2;
+    public override void ApplyClassSpecilization(Unit unit)
+    {
+        unit.MeleeAttackRange = 0;
+        unit.RangedAttackRange += extraAttackRange;
+    }
+}

Assets/Scripts/CardClasses/ArcherClass.cs.meta

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

Assets/Scripts/CardClasses/CavalryClass.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "CavalryClass", menuName = "Card Class/Cavalry Class Data")]
+public class CavalryClass : UnitClass
+{
+    public int extraMovement = 1;
+    public override void ApplyClassSpecilization(Unit unit)
+    {
+        unit.Movement += extraMovement;
+    }
+}

Assets/Scripts/CardClasses/CavalryClass.cs.meta

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

Assets/Scripts/CardClasses/InfantryClass.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "InfantryClass", menuName = "Card Class/Infantry Class Data")]
+public class InfantryClass : UnitClass
+{
+}

Assets/Scripts/CardClasses/InfantryClass.cs.meta

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

Assets/Scripts/CardData.cs

@@ -2,7 +2,6 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-[CreateAssetMenu(fileName = "New Card Data", menuName = "Card/Card Data")]
 public class CardData : ScriptableObject
 {
     public new string name;
@@ -14,5 +13,7 @@ public class CardData : ScriptableObject
     public int attack;
     public int defense;
 
-    public CardTag[] cardTags;
+    public CardTag[] tags;
+    public UnitClass[] unitClasses;
+    public Ability[] abilities;
 }

Assets/Scripts/CardTag.cs

@@ -7,6 +7,4 @@ public class CardTag : ScriptableObject
 {
     public new string name;
     public string description;
-
-    public Sprite artwork;
 }

Assets/Scripts/CellMap.cs

@@ -15,7 +15,6 @@ public class CellMap : MonoBehaviour
     public int column = 0;
     public int row = 0;
 
-
     // Start is called before the first frame update
     void Start()
     {
@@ -42,4 +41,9 @@ public class CellMap : MonoBehaviour
     {
         return cellMapData[y].cells[x];
     }
+
+    public bool IsCellEmpty(int x, int y)
+    {
+        return GetCell(x, y).standingUnit == null;
+    }
 }

Assets/Scripts/CombatManager.cs

@@ -0,0 +1,162 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// Left is Player, right is enemy.
+public enum Side { left = 1, right = -1 }
+
+public class CombatManager : MonoBehaviour
+{
+    [SerializeField] private List<Unit> leftSideUnits = new List<Unit>();
+    [SerializeField] private List<Unit> rightSideUnits = new List<Unit>();
+    [SerializeField] private CellMap cellMap;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        // hack
+        cellMap = FindObjectOfType<CellMap>();
+
+        foreach (var unit in rightSideUnits)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnPlaceUnit(unit);
+            }
+        }
+
+        foreach (var unit in rightSideUnits)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnEnterBattleGround(unit);
+            }
+        }
+    }
+
+    List<Unit> QueryTargets(Unit attacker)
+    {
+        // TO DO:
+        return new List<Unit>();
+    }
+
+    // Called once before drawing cards
+    void BeginFight()
+    {
+
+    }
+
+    void BeginRound(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        foreach (var unit in units)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnBeginRound(unit);
+            }
+        }
+    }
+
+    void BeginMovePhase(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        foreach (var unit in units)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnBeginMovePhase(unit);
+            }
+        }
+    }
+
+    void EndMovePhase(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        foreach (var unit in units)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnEndMovePhase(unit);
+            }
+        }
+    }
+
+    void BeginAttackPhase(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        foreach (var unit in units)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnBeginAttackPhase(unit);
+            }
+        }
+    }
+
+    void UnitAttack(Unit unit, List<Unit> targets)
+    {
+        foreach (var ability in unit.Abilities)
+        {
+            ability.OnBeginAttack(unit, targets);
+        }
+
+        foreach (var ability in unit.Abilities)
+        {
+            ability.OnAttack(unit, targets);
+        }
+
+        foreach (var ability in unit.Abilities)
+        {
+            ability.OnEndAttack(unit, targets);
+        }
+
+        foreach (var target in targets)
+        {
+            foreach (var ability in target.Abilities)
+            {
+                ability.OnCounterAttack(target, unit);
+            }
+        }
+    }
+
+    void Attack(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        
+        foreach (var unit in units)
+        {
+            UnitAttack(unit, QueryTargets(unit));
+        }
+    }
+
+    void EndAttackPhase(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        foreach (var unit in units)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnEndAttackPhase(unit);
+            }
+        }
+    }
+
+    void EndRound(Side side)
+    {
+        List<Unit> units = side == Side.left ? leftSideUnits : rightSideUnits;
+        foreach (var unit in units)
+        {
+            foreach (var ability in unit.Abilities)
+            {
+                ability.OnEndRound(unit);
+            }
+        }
+    }
+
+    // Called once after result
+    void EndFight()
+    {
+
+    }
+}

Assets/Scripts/CombatManager.cs.meta

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

Assets/Scripts/Deck.cs

@@ -2,56 +2,46 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
-using TMPro;
 
 public class Deck : MonoBehaviour
 {
     public List<CardData> cardDataList;
+
+    public List<CardData> drawList;
+    // Control Card Display
+    public List<GameObject> drawDisplayList;
+
+    public List<CardData> handList;
+
+    public List<CardData> discardList;
+    // Control Card Display
+    public List<GameObject> discardDisplayList;
+
+    public List<CardData> wasteList;
     public int randomSeed;
 
-    private GameObject cardTemplate;
+    public GameObject handCardTemplate;
-
+    public GameObject cardDisplayTemplate;
-    private GameObject handListContent;
-    private GameObject drawListContent;
-    private GameObject discardListContent;
-
-    // Card Limit
-    public int maxCardinHandLimit = 10;
-    public int maxCardRemainLimit = 5;
-
-    private GameObject reachCardinHandLimitWarningDisplay;
-    private float warningDisplayCountDown;
-    private float warningDisplayTime = 1.0f;
-
-    private GameObject discardHoldingListContent;
-    private TextMeshProUGUI discardWarningDisplayText;
 
+    public GameObject drawListContent;
+    public GameObject discardListContent;
 
     // Start is called before the first frame update
     void Start()
     {
-        drawListContent = transform.Find("DrawList/Viewport/Content").gameObject;
-        drawListContent.transform.parent.parent.gameObject.SetActive(false);
-        discardListContent = transform.Find("DiscardList/Viewport/Content").gameObject;
-        discardListContent.transform.parent.parent.gameObject.SetActive(false);
-        handListContent = transform.Find("Content/HandList/Viewport/Content").gameObject;
-
-        cardTemplate = transform.Find("CardTemplate").gameObject;
-        reachCardinHandLimitWarningDisplay = transform.Find("Content/LimitWarning").gameObject;
-        reachCardinHandLimitWarningDisplay.SetActive(false);
-        discardHoldingListContent = transform.Find("Content/DiscardHoldingList/Viewport/HoldingListContent").gameObject;
-        discardHoldingListContent.transform.parent.parent.gameObject.SetActive(false);
-        discardWarningDisplayText = transform.Find("Content/DiscardHoldingList/Viewport/DiscardWarning/Text").gameObject.GetComponent<TextMeshProUGUI>();
-
         randomSeed = 200;
         Random.InitState(randomSeed);
         for (int i = 0; i < cardDataList.Count; i++)
         {
-            GameObject tempDrawDisplay = Instantiate(cardTemplate.gameObject, transform.Find("DrawList/Viewport/Content"));
+            drawList.Add(cardDataList[i]);
+            GameObject tempDrawDisplay = Instantiate(cardDisplayTemplate.gameObject, transform.Find("DrawListContent/Viewport/Content"));
             tempDrawDisplay.transform.Find("Card").gameObject.GetComponent<CardDisplay>().SetCardData(cardDataList[i]);
             tempDrawDisplay.transform.Find("Button").gameObject.GetComponent<Image>().sprite = cardDataList[i].artwork;
             tempDrawDisplay.SetActive(true);
+            drawDisplayList.Add(tempDrawDisplay);
         }
+        drawListContent.SetActive(false);
+        discardListContent.SetActive(false);
     }
 
     // Update is called once per frame
@@ -60,37 +50,26 @@ public class Deck : MonoBehaviour
         
     }
 
-    private void FixedUpdate()
-    {
-        if (warningDisplayCountDown >= 0.0f)
-        {
-            warningDisplayCountDown -= Time.deltaTime;
-            if (warningDisplayCountDown <= 0.0f)
-            {
-                DeactivateCardInHandLimitWarning();
-            }
-        }
-    }
-
     public void DrawCards(int amount)
     {
         for (int i = 0; i < amount; i++)
         {
-            if (handListContent.transform.childCount > maxCardinHandLimit - 1)
+            if (drawList.Count == 0)
-            {
-                ActivateCardInHandLimitWarning();
-                return;
-            }
-            if (drawListContent.transform.childCount == 0)
             {
                 Shuffle();
             }
-            if (drawListContent.transform.childCount == 0)
+            if(drawList.Count==0)
             {
                 return;
             }
-            int randomIndex = Random.Range(0, drawListContent.transform.childCount);
+            int randomIndex = Random.Range(0, drawList.Count);
-            drawListContent.transform.GetChild(randomIndex).transform.SetParent(handListContent.transform);
+            GameObject cardObj = Instantiate(handCardTemplate.gameObject, transform.Find("Content/HandList"));
+            cardObj.SetActive(true);
+            cardObj.transform.Find("Card").gameObject.GetComponent<CardDisplay>().SetCardData(drawList[randomIndex]);
+            cardObj.transform.Find("Button").gameObject.GetComponent<Image>().sprite = drawList[randomIndex].artwork;
+            drawList.RemoveAt(randomIndex);
+            Destroy(drawDisplayList[randomIndex]);
+            drawDisplayList.RemoveAt(randomIndex);
         }
     }
 
@@ -104,116 +83,74 @@ public class Deck : MonoBehaviour
         //}
         //else
         //{
-        
+        discardList.Add(handList[index]);
         //}
+        handList.RemoveAt(index);
     }
 
     public void UseThisCard(GameObject card)
     {
-        if(card.transform.parent == handListContent.transform)
+        GameObject tempDiscardDisplay = Instantiate(cardDisplayTemplate.gameObject, transform.Find("DiscardListContent/Viewport/Content"));
-        {
+        tempDiscardDisplay.SetActive(true);
-            if (!discardHoldingListContent.transform.parent.parent.gameObject.activeSelf)
+        tempDiscardDisplay.transform.Find("Card").gameObject.GetComponent<CardDisplay>().SetCardData(card.transform.Find("Card").gameObject.gameObject.GetComponent<CardDisplay>().cardData);
-            {
+        tempDiscardDisplay.transform.Find("Button").gameObject.GetComponent<Image>().sprite = card.transform.Find("Card").gameObject.gameObject.GetComponent<CardDisplay>().cardData.artwork;
-                // Use card in hand
+        discardDisplayList.Add(tempDiscardDisplay);
-                card.transform.SetParent(discardListContent.transform);
+        discardList.Add(card.transform.Find("Card").gameObject.gameObject.GetComponent<CardDisplay>().cardData);
-            }
+        Destroy(card);
-            else if (handListContent.transform.childCount > maxCardRemainLimit) 
-            {
-                // Put card in discard holding list
-                card.transform.SetParent(discardHoldingListContent.transform);
-            }
-
-        }
-        else if (card.transform.parent == discardHoldingListContent.transform)
-        {
-            card.transform.SetParent(handListContent.transform);
-        }
-        else if (card.transform.parent == drawListContent.transform)
-        {
-            // card in draw list
-            Debug.Log("Card in Draw list");
-        }
-        else if (card.transform.parent == discardListContent.transform)
-        {
-            // card in discard list
-            Debug.Log("Card in Discard list");
-        }
     }
 
     // When unit dead
     public void AddACardIntoDiscardList(CardData card)
     {
-
+        discardList.Add(card);
     }
 
     public void Shuffle()
     {
-        while (drawListContent.transform.childCount != 0)
+        // Put all cards in drawList into discardList
+        for (int i = 0; i < drawList.Count; i++)
         {
-            drawListContent.transform.GetChild(drawListContent.transform.childCount - 1).SetParent(discardListContent.transform);
+            discardList.Add(drawList[i]);
+            Destroy(drawDisplayList[i]);
         }
+        drawDisplayList.Clear();
+        drawList.Clear();
 
-        while (discardListContent.transform.childCount != 0)
+        while (discardList.Count != 0)
         {
-            int index = Random.Range(0, discardListContent.transform.childCount);
+            int index = Random.Range(0, discardList.Count);
-            discardListContent.transform.GetChild(index).transform.SetParent(drawListContent.transform);
+            drawList.Add(discardList[index]);
+            GameObject tempCardDisplay = Instantiate(cardDisplayTemplate.gameObject, transform.Find("DrawListContent/Viewport/Content"));
+            tempCardDisplay.transform.Find("Card").gameObject.GetComponent<CardDisplay>().SetCardData(discardList[index]);
+            tempCardDisplay.transform.Find("Button").gameObject.GetComponent<Image>().sprite = discardList[index].artwork;
+            tempCardDisplay.SetActive(true);
+            drawDisplayList.Add(tempCardDisplay);
+            discardList[index] = discardList[discardList.Count - 1];
+            discardList.RemoveAt(discardList.Count - 1);
         };
+        for (int i = 0; i < discardDisplayList.Count; i++)
+        {
+            Destroy(discardDisplayList[i]);
+        }
     }
 
     public void ActivateDisplayDrawList()
     {
-        drawListContent.transform.parent.parent.gameObject.SetActive(true);
+        drawListContent.SetActive(true);
     }
 
     public void DeactivateDisplayDrawList()
     {
-        drawListContent.transform.parent.parent.gameObject.SetActive(false);
+        drawListContent.SetActive(false);
     }
 
     public void ActivateDisplayDiscardList()
     {
-        discardListContent.transform.parent.parent.gameObject.SetActive(true);
+        discardListContent.SetActive(true);
     }
 
     public void DeactivateDisplayDiscardList()
     {
-        discardListContent.transform.parent.parent.gameObject.SetActive(false);
+        discardListContent.SetActive(false);
-    }
-
-    private void ActivateCardInHandLimitWarning()
-    {
-        reachCardinHandLimitWarningDisplay.SetActive(true);
-        warningDisplayCountDown = warningDisplayTime;
-    }
-
-    private void DeactivateCardInHandLimitWarning()
-    {
-        reachCardinHandLimitWarningDisplay.SetActive(false);
-    }
-
-    public void EndRound()
-    {
-        if (handListContent.transform.childCount > maxCardRemainLimit)
-        {
-            ActivateDiscardWarning();
-        }
-    }
-
-    private void ActivateDiscardWarning()
-    {
-        discardHoldingListContent.transform.parent.parent.gameObject.SetActive(true);
-        discardWarningDisplayText.text = string.Format("Choose {0} Card(s) to Discard", handListContent.transform.childCount - maxCardRemainLimit);
-    }
-
-    public void DiscardHoldingListCards()
-    {
-        while (discardHoldingListContent.transform.childCount != 0)
-        {
-            discardHoldingListContent.transform.GetChild(discardHoldingListContent.transform.childCount - 1).SetParent(discardListContent.transform);
-        }
-        if (handListContent.transform.childCount <= maxCardRemainLimit)
-        {
-            discardHoldingListContent.transform.parent.parent.gameObject.SetActive(false);
-        }
     }
 }

Assets/Scripts/Unit.cs

@@ -7,13 +7,10 @@ using TMPro;
 
 public enum CurrentCommand { defend, moveForward, retreat }
 
-// Left is Player, Enemy is right.
-public enum Side { left = 1, right = -1 }
-
 public class Unit : MonoBehaviour
 {
     public string unitName;
-    public CardData cardData;
+    public CardData baseData;
 
     [SerializeField]
     private int basicAttack;
@@ -27,12 +24,42 @@ public class Unit : MonoBehaviour
     private int finalMaxDefense;
 
     [SerializeField]
-    private CardTag[] cardTags;
+    private List<CardTag> cardTags;
 
     [SerializeField]
-    private int attackRange = 1;
+    private List<UnitClass> unitClasses;
+
+    [SerializeField]
+    private List<Ability> abilities;
+    public List<Ability> Abilities
+    {
+        get { return abilities; }
+        set { abilities = value; }
+    }
+
+    [SerializeField]
+    private int meleeAttackRange = 1;
+    public int MeleeAttackRange
+    {
+        get { return meleeAttackRange; }
+        set { meleeAttackRange = value; }
+    }
+
+    [SerializeField]
+    private int rangedAttackRange = 1;
+    public int RangedAttackRange
+    {
+        get { return rangedAttackRange; }
+        set { rangedAttackRange = value; }
+    }
+
     [SerializeField]
     private int movement = 1;
+    public int Movement
+    {
+        get { return movement; }
+        set { movement = value; }
+    }
 
     [SerializeField]
     private CurrentCommand currentCommand;
@@ -53,6 +80,11 @@ public class Unit : MonoBehaviour
     Camp allyCamp;
     Camp enemyCamp;
 
+    public bool isUnitAlive()
+    {
+        return currentDefense > 0;
+    }
+
     // Start is called before the first frame update
     void Start()
     {
@@ -61,24 +93,19 @@ public class Unit : MonoBehaviour
         transform.position = new Vector3(transform.position.x, transform.position.y, -1);
         standingCell.standingUnit = this;
 
-        basicAttack = cardData.attack;
+        basicAttack = baseData.attack;
-        basicMaxDefense = cardData.defense;
+        basicMaxDefense = baseData.defense;
         currentDefense = basicMaxDefense;
-        cardTags = cardData.cardTags;
+        cardTags = baseData.tags.ToList();
+        unitClasses = baseData.unitClasses.ToList();
+        abilities = baseData.abilities.ToList();
 
-        foreach (var tag in cardData.cardTags)
+        foreach (var unitClass in unitClasses)
         {
-            if (tag.name == "Archer")
+            unitClass.ApplyClassSpecilization(this);
-            {
-                attackRange += 2;
-            }
-            else if (tag.name == "Cavalry")
-            {
-                movement += 1;
-            }
         }
 
-        modelArt.GetComponent<SpriteRenderer>().sprite = cardData.artwork;
+        modelArt.GetComponent<SpriteRenderer>().sprite = baseData.artwork;
 
         var camps = FindObjectsOfType<Camp>();
         foreach (var camp  in camps)
@@ -94,8 +121,7 @@ public class Unit : MonoBehaviour
         }
     }
 
-    // Update is called once per frame
+    void UpdateAnimation()
-    void Update()
     {
         if (walkingToDestination && destinationCell && transform.position != destinationCell.transform.position)
         {
@@ -114,13 +140,22 @@ public class Unit : MonoBehaviour
                 //Debug.Log("Arrived.");
             }
         }
+    }
 
-        finalAttack = basicAttack; // For now.
+    void UpdateText()
-
+    {
         attackText.GetComponent<TextMeshProUGUI>().text = finalAttack.ToString();
         defenseText.GetComponent<TextMeshProUGUI>().text = currentDefense.ToString();
     }
 
+    // Update is called once per frame
+    void Update()
+    {
+        UpdateAnimation();
+        finalAttack = basicAttack; // For now.
+        UpdateText();
+    }
+
     public void MoveAndAttack()
     {
         MoveAction();
@@ -133,11 +168,10 @@ public class Unit : MonoBehaviour
         {
             return;
         }
-        foreach (var tag in cardData.cardTags)
+        // hack
+        if (rangedAttackRange > 0)
         {
-            if (tag.name == "Archer")
+            for (int i = 0; i < rangedAttackRange; ++i)
-            {
-                for (int i = 0; i < attackRange; ++i)
             {
                 int attackXPos = standingCell.xPos + (i + 1) * (int)side;
                 if (attackXPos >= cellMap.column || attackXPos < 0)
@@ -161,11 +195,7 @@ public class Unit : MonoBehaviour
 
                 currentCommand = CurrentCommand.moveForward;
             }
-                break;
         }
-        }
-
-       
         //Debug.Log("Call MoveAction().");
         switch (currentCommand)
         {
@@ -233,21 +263,14 @@ public class Unit : MonoBehaviour
 
     public void AttackAction()
     {
-        // Check Attack Range
+        // Check if this unit is ranged unit
-        if (inDogFight(this))
+        if (rangedAttackRange > 0)
         {
-            foreach (var tag in cardData.cardTags)
-            {
-                if (tag.name == "Archer")
-                {
-                    // Archer can't dog fight.
             return;
         }
-            }
-        }
 
         List<Unit> unitsInRange = new List<Unit>();
-        for (int i = 0; i < attackRange; ++i)
+        for (int i = 0; i < meleeAttackRange; ++i)
         {
             int attackXPos = standingCell.xPos + (i+1) * (int)side;
             if (attackXPos >= cellMap.column || attackXPos < 0)
@@ -307,11 +330,6 @@ public class Unit : MonoBehaviour
         }
     }
 
-    public bool isUnitAlive()
-    {
-        return currentDefense > 0;
-    }
-
     bool checkDestinationCellEmpty(bool retreat = false)
     {
         int currentXPos = standingCell.xPos;

Assets/Scripts/UnitClass.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UnitClass : ScriptableObject
+{
+    public new string name;
+    public string description;
+
+    public Sprite artwork;
+    public virtual void ApplyClassSpecilization(Unit unit) { }
+}

Assets/Scripts/UnitClass.cs.meta

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

Assets/Scripts/UnitManager.cs

@@ -25,12 +25,6 @@ public class UnitManager : MonoBehaviour
         }
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
     public void handleDiedUnit(Unit unit)
     {
         if (unit.side == Side.left)
@@ -39,7 +33,7 @@ public class UnitManager : MonoBehaviour
         }
         else if (unit.side == Side.right)
         {
-            leftSideUnits.Remove(unit);
+            rightSideUnits.Remove(unit);
         }
     }