rider model and base animation replaced

Merge branch 'dev/knightOnHorse' into art/knightOnHorse
charge damage and cooldown implemented
2025-06-26 15:17:14 -04:00 · 2025-06-26 14:35:09 -04:00 · 2025-06-26 14:32:44 -04:00 · 2025-06-23 21:13:36 -04:00 · 2025-05-28 19:16:04 -04:00 · 2025-05-28 13:38:52 -04:00
16 changed files with 2555 additions and 61 deletions
--- a/Assets/Animations/Sticks/KnightOnHorse/animator_KOH.overrideController
+++ b/Assets/Animations/Sticks/KnightOnHorse/animator_KOH.overrideController
@ -11,3 +11,5 @@ AnimatorOverrideController:
  m_Clips:
  - m_OriginalClip: {fileID: 7400000, guid: ff0a07b8a8691ba4390094d6fb771bef, type: 2}
    m_OverrideClip: {fileID: 7400000, guid: dcb0ef447fba68e49a4e1280d3589f6b, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: 0d8966546e9711f49a44b76e694e60dd, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 0d8966546e9711f49a44b76e694e60dd, type: 2}
--- a/Assets/Art/Sprites/UI/cards/icons/icon_card_rider.png
+++ b/Assets/Art/Sprites/UI/cards/icons/icon_card_rider.png
--- a/Assets/Art/Sprites/UI/cards/icons/icon_card_rider.png.meta
+++ b/Assets/Art/Sprites/UI/cards/icons/icon_card_rider.png.meta
@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 0f9488183cb57b242b27a65ea48f8dcb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Design/UnitCards/Rider.asset
+++ b/Assets/Design/UnitCards/Rider.asset
@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a92d696df7037b44585aaac56ec9ed98, type: 3}
+  m_Name: Rider
+  m_EditorClassIdentifier: 
+  _wood: 0
+  _rock: 0
+  _food: 10
+  _cooldownInSeconds: 1
--- a/Assets/Design/UnitCards/Rider.asset.meta
+++ b/Assets/Design/UnitCards/Rider.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4855deb66869b934bb7a63c02d4442fe
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Design/UnitUpgrades/Upgrade_Rider.asset
+++ b/Assets/Design/UnitUpgrades/Upgrade_Rider.asset
@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d1391306ffe53984bb2bc314f1d2919f, type: 3}
+  m_Name: Upgrade_Rider
+  m_EditorClassIdentifier: 
+  _upgradeUnitCard: {fileID: 11400000, guid: 4855deb66869b934bb7a63c02d4442fe, type: 2}
+  _upgradePrefab: {fileID: 2230360378425099702, guid: a857e93871a186749879c021675f5a13, type: 3}
+  _upgradeCardArt: {fileID: 21300000, guid: 2e5707f47d1b6024494204411e9ced5f, type: 3}
--- a/Assets/Design/UnitUpgrades/Upgrade_Rider.asset.meta
+++ b/Assets/Design/UnitUpgrades/Upgrade_Rider.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9c0d637186327a544bad3f9cbccebd42
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Sticks/knightOnHorse.prefab
+++ b/Assets/Prefabs/Sticks/knightOnHorse.prefab
@ -911,7 +911,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c0fbd934c179894458914437255781c4, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _entity: {fileID: 682208058972047871}
+  _entity: {fileID: -5330839660088382680}
  _projectile: {fileID: 0}
  _projectileSpawn: {fileID: 0}
 --- !u!1 &2230360378261608744
@ -956,7 +956,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2230360378425099703}
-  - component: {fileID: 682208058972047871}
+  - component: {fileID: -5330839660088382680}
  - component: {fileID: 3032268583489863936}
  - component: {fileID: 1521752234217958423}
  - component: {fileID: 7579822520172569173}
@ -984,11 +984,12 @@ Transform:
  - {fileID: 2230360378000122420}
  - {fileID: 2230360378127571587}
  - {fileID: 9128510391006626171}
+  - {fileID: 5365821957670728708}
  - {fileID: 7758425403302365699}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &682208058972047871
+--- !u!114 &-5330839660088382680
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -997,15 +998,22 @@ MonoBehaviour:
  m_GameObject: {fileID: 2230360378425099702}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 27e69fa6018bf654196267d829031f1a, type: 3}
+  m_Script: {fileID: 11500000, guid: a0092e8a906da7a4fa0aca6e274a8c5e, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  _lifeBar: {fileID: 5807970101048976302}
  _hp: 80
-  _speed: 0
+  _speed: 2
  _attack_damage: 6
  _attack_interval: 2
  _enemy: {fileID: 0}
+  _chargeAttackDamage: 3
+  _chargeCooldown: 10
+  _maxChargeHitCount: 3
+  _maxChargeDistance: 10
+  _detection: {fileID: 9048754633958631738}
+  _chargeDetection: {fileID: 3062706309015911873}
+  _root: {fileID: 2230360378127571586}
 --- !u!1839735485 &3032268583489863936
 Tilemap:
  m_ObjectHideFlags: 0
@ -1201,6 +1209,78 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+--- !u!1 &3062706309015911873
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5365821957670728708}
+  - component: {fileID: 1080875801764588868}
+  - component: {fileID: 5850107427616902080}
+  m_Layer: 6
+  m_Name: charge_detection
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5365821957670728708
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3062706309015911873}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2230360378425099703}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1080875801764588868
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3062706309015911873}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 1.7083191, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.5, y: 0.5}
+  m_EdgeRadius: 0
+--- !u!114 &5850107427616902080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3062706309015911873}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _entityLinked: {fileID: -5330839660088382680}
 --- !u!1 &3238480627747328347
 GameObject:
  m_ObjectHideFlags: 0
@ -1921,7 +2001,7 @@ Transform:
  m_Children:
  - {fileID: 430301385815424918}
  m_Father: {fileID: 2230360378425099703}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5807970101048976302
 MonoBehaviour:
@ -2741,7 +2821,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _entityLinked: {fileID: 682208058972047871}
+  _entityLinked: {fileID: -5330839660088382680}
 --- !u!1 &9102431412097219544
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Sticks/riderStick.prefab
+++ b/Assets/Prefabs/Sticks/riderStick.prefab
--- a/Assets/Prefabs/Sticks/riderStick.prefab.meta
+++ b/Assets/Prefabs/Sticks/riderStick.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d57d97357919087419f8097e907c7a7e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab
+++ b/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab
@ -252,6 +252,7 @@ RectTransform:
  - {fileID: 5639720393060989426}
  - {fileID: 907652127262489358}
  - {fileID: 4911214996900807424}
+  - {fileID: 6666883114332643056}
  m_Father: {fileID: 4817988606444742094}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -791,19 +792,6 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
  m_PrefabInstance: {fileID: 1255702544}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &1825274587757073426
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 907652128862280226}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4640c30390a17784990af92ddf341312, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _warningAnimator: {fileID: 1335203379556626542}
 --- !u!95 &1335203379556626542
 Animator:
  serializedVersion: 5
@ -825,6 +813,19 @@ Animator:
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &1825274587757073426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 907652128862280226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4640c30390a17784990af92ddf341312, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _warningAnimator: {fileID: 1335203379556626542}
 --- !u!224 &907652128862280229 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
@ -859,7 +860,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.x
@ -867,7 +868,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_SizeDelta.x
@ -911,7 +912,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -201.6
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -931,11 +932,11 @@ PrefabInstance:
      objectReference: {fileID: 21300000, guid: 178d3231a9182834aa1a4394bd40b644, type: 3}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -943,15 +944,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -47.711605
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -959,15 +960,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -26.874405
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -975,7 +976,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -6.0372024
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: _food
@ -1585,7 +1586,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.x
@ -1593,7 +1594,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_SizeDelta.x
@ -1637,7 +1638,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -5
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -1653,11 +1654,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -1665,15 +1666,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -47.711605
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -1681,15 +1682,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -26.874405
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -1697,7 +1698,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -6.0372024
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: _food
@ -1920,6 +1921,208 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
  m_PrefabInstance: {fileID: 5237832369539782965}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5772812162661008581
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4817988606957756069}
+    m_Modifications:
+    - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Name
+      value: Rider
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 201.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 125.396
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.65528
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.65528
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.65528
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -3.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -2.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: b98e80d2b7d70264b800b1e6aa98a092, type: 3}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -47.711605
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -26.874405
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.0372024
+      objectReference: {fileID: 0}
+    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: _food
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: _wood
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: _prefab
+      value: 
+      objectReference: {fileID: 2230360378425099702, guid: d57d97357919087419f8097e907c7a7e, type: 3}
+    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: _unitCardInformation
+      value: 
+      objectReference: {fileID: 11400000, guid: 4855deb66869b934bb7a63c02d4442fe, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+--- !u!224 &6666883114332643056 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+  m_PrefabInstance: {fileID: 5772812162661008581}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6880333787458075169
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2151,7 +2354,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.x
@ -2159,7 +2362,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_SizeDelta.x
@ -2203,7 +2406,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -103.3
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -2251,11 +2454,11 @@ PrefabInstance:
      objectReference: {fileID: 21300000, guid: 7f013ea28cc038c4794a38dc2f1b0685, type: 3}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -2263,15 +2466,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -47.711605
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -2279,15 +2482,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -26.874405
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.x
@ -2295,7 +2498,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -6.0372024
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: _food
--- a/Assets/Scenes/Game.unity
+++ b/Assets/Scenes/Game.unity
@ -3241,6 +3241,22 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -26.874405
      objectReference: {fileID: 0}
+    - target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -47.711605
+      objectReference: {fileID: 0}
    - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
      propertyPath: m_AnchorMax.y
      value: 1
@ -3353,6 +3369,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -26.874405
      objectReference: {fileID: 0}
+    - target: {fileID: 2671006930051035827, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: _prefab
+      value: 
+      objectReference: {fileID: 2230360378425099702, guid: a857e93871a186749879c021675f5a13, type: 3}
    - target: {fileID: 3028311141574704260, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
      propertyPath: m_AnchorMax.y
      value: 1
@ -3389,6 +3409,38 @@ PrefabInstance:
      propertyPath: _unitCardInformation
      value: 
      objectReference: {fileID: 11400000, guid: b326df01bdba895448b1df3f2918fa9b, type: 2}
+    - target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.0372024
+      objectReference: {fileID: 0}
+    - target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -26.874405
+      objectReference: {fileID: 0}
    - target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
      propertyPath: m_AnchorMax.y
      value: 1
@ -3685,6 +3737,26 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -201.6
      objectReference: {fileID: 0}
+    - target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -299.90002
+      objectReference: {fileID: 0}
+    - target: {fileID: 6666883114610284081, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 2e5707f47d1b6024494204411e9ced5f, type: 3}
    - target: {fileID: 6772290102801599907, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
      propertyPath: _unitCardInformation
      value: 
--- a/Assets/Scripts/Ally/Rider.cs
+++ b/Assets/Scripts/Ally/Rider.cs
@ -0,0 +1,119 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Rider : Ally
+{
+    [SerializeField]
+    private int _chargeAttackDamage;
+    [SerializeField]
+    private int _chargeCooldown;
+    [SerializeField]
+    private int _maxChargeHitCount;
+    [SerializeField]
+    private int _maxChargeDistance;
+    [SerializeField]
+    private GameObject _detection;
+    [SerializeField]
+    private GameObject _chargeDetection;
+    [SerializeField]
+    private GameObject _root;
+
+    private Detection _chargeDetectionScript;
+    private Root _rootScript;
+
+    private Vector3 _originalPos;
+    private Vector2 _movementVector = Vector2.zero;
+    private bool _isCharging;
+    private float _timeSinceLastCharge;
+    private List<Entity> _opponentsHit = new List<Entity>();
+
+    public override void Start()
+    {
+        base.Start();
+
+        _chargeDetectionScript = _chargeDetection.GetComponent<Detection>();
+        _rootScript = _root.GetComponent<Root>();
+
+        _originalPos = transform.position;
+        _isCharging = true;
+    }
+
+    public override void Update()
+    {
+
+        // check for charge cooldown
+        if (_timeSinceLastCharge > _chargeCooldown)
+        {
+            _isCharging = true;
+        }
+
+        if (_isCharging)
+        {
+            // toggle charge detection
+            _detection.SetActive(false);
+            _chargeDetection.SetActive(true);
+
+            // movement
+            _movementVector.x = Time.deltaTime * Speed;
+            transform.position += (Vector3)_movementVector;
+
+            Debug.Log(IsEnemyDetected);
+            // attack
+            if (IsEnemyDetected && !_opponentsHit.Contains(Enemy))
+            {
+                AttackEnemyRiding();
+            }
+
+            // reset
+            if (transform.position.x - _originalPos.x >= _maxChargeDistance || _opponentsHit.Count >= _maxChargeHitCount)
+            {
+                // position
+                _movementVector = Vector2.zero;
+                transform.position = _originalPos;
+
+                // charge state
+                _isCharging = false;
+                _timeSinceLastCharge = 0;
+                _opponentsHit.Clear();
+                
+                // detection state
+                IsEnemyDetected = false;
+                Enemy = null;
+
+                // toggle detection
+                _detection.SetActive(true);
+                _chargeDetection.SetActive(false);
+            }
+        }
+        else
+        {
+            _timeSinceLastCharge += Time.deltaTime;
+            if (IsEnemyDetected)
+            {
+                AttackEnemy();
+            }
+        }
+    }
+
+    void AttackEnemyRiding()
+    {
+        Debug.Log("Attack Riding");
+        _rootScript.AttackWithCustomDamage(_chargeAttackDamage);
+        _opponentsHit.Add(Enemy);
+    }
+
+    void AttackEnemy()
+    {
+        //Attack Cooldown
+        if (AttackSpeedWait > AttackInterval)
+        {
+
+            Animation.PlayAttackAnim();
+
+            AttackSpeedWait = 0f;
+        }
+
+        AttackSpeedWait += Time.deltaTime;
+    }
+}
--- a/Assets/Scripts/Ally/Rider.cs.meta
+++ b/Assets/Scripts/Ally/Rider.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a0092e8a906da7a4fa0aca6e274a8c5e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Detection.cs
+++ b/Assets/Scripts/Detection.cs
@ -15,16 +15,31 @@ public class Detection : MonoBehaviour
    // If it's a projectile damage > 0
    private int _projectileDamage = 0;

+    private bool _hasStartBeenCalled = false;
+
    protected virtual void Start()
    {
        _collider = GetComponent<BoxCollider2D>();
        detectionRange = _collider.size;

        StartCoroutine(C_DetectCoroutine());
+
+        _hasStartBeenCalled = true;
+    }
+
+    // Checks if Start ran once already.
+    // onEnable runs by default before Start so not everything is initialized.
+    // And I don't want to reinitialize the collider everytime I re-enable a unit's detection.
+    protected void OnEnable()
+    {
+        if (_hasStartBeenCalled)
+        {
+            StartCoroutine(C_DetectCoroutine());
+        }
    }

    // Looped detection every 'delay' amount
-    private IEnumerator C_DetectCoroutine() 
+    private IEnumerator C_DetectCoroutine()
    {
        // Can happen if unit dies
        if (_entityLinked == null) yield break;
@ -66,12 +81,12 @@ public class Detection : MonoBehaviour
        }
    }

-    private void OnTriggerStay2D(Collider2D other) 
+    private void OnTriggerStay2D(Collider2D other)
    {
-        if(_entityLinked != null && _projectileDamage == 0) 
+        if (_entityLinked != null && _projectileDamage == 0)
        {
            GameObject detected = other.gameObject;
-            string tagToCheck = 
+            string tagToCheck =
                (_entityLinked.gameObject.tag == "Ally") ? "Opponent" : "Ally";

            if (detected.tag == tagToCheck)
@ -82,7 +97,25 @@ public class Detection : MonoBehaviour
                    detectedEntities.Add(entity);
                }
            }
-        }            
+        }
+    }
+
+    private void OnTriggerExit2D(Collider2D other)
+    {
+        if (_entityLinked != null)
+        {
+            GameObject detected = other.gameObject;
+            string tagToCheck =
+                (_entityLinked.gameObject.tag == "Ally") ? "Opponent" : "Ally";
+            if (detected.tag == tagToCheck)
+            {
+                Entity entity = other.GetComponent<Entity>();
+                if (detectedEntities.Contains(entity))
+                {
+                    detectedEntities.Remove(entity);
+                }
+            }
+        }
    }

    public Entity GetClosest()
--- a/Assets/Scripts/Root.cs
+++ b/Assets/Scripts/Root.cs
@ -24,6 +24,18 @@ public class Root : MonoBehaviour
        }
    }

+    public void AttackWithCustomDamage(int damage)
+    {
+        if (_entity == null || _entity.Enemy == null) return;
+
+        _entity.Enemy.Hit(damage);
+        if (_entity.Enemy.Hp <= 0)
+        {
+            _entity.Enemy.Death();
+            _entity.IsEnemyDetected = false;
+        }
+    }
+
    public void ShotProjectile()
    {
        Rigidbody2D _rigidbodyAlly;
Author	SHA1	Message	Date
Adam Hamid Salah Salah	7148263214	rider model and base animation replaced	2025-06-26 15:17:14 -04:00
Adam Hamid Salah Salah	f83d26e35c	Merge branch 'dev/knightOnHorse' into art/knightOnHorse	2025-06-26 14:35:09 -04:00
Adam Hamid Salah Salah	228e16b2b4	charge damage and cooldown implemented	2025-06-26 14:32:44 -04:00
Adam	f28e57eeb7	charging implemented	2025-06-23 21:13:36 -04:00
Adam Hamid Salah Salah	23ecdd6ab4	Added a OnTriggerExit2D to stop attack when entity not detected	2025-05-28 19:16:04 -04:00
Adam	b46d8b66e8	created Rider prefab and assets + added test spawn button	2025-05-28 13:38:52 -04:00