Utilisation du UI d'Élia

Assets/Design/UnitUpgrades/Upgrade1.asset

@@ -14,4 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _upgradeUnitCard: {fileID: 11400000, guid: 9ff4b606166b07d4bb3afb15e5a23f41, type: 2}
   _upgradePrefab: {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
-  _upgradeCardArt: {fileID: 21300000, guid: aa033001c3067ea41a2fc684a6320489, type: 3}
+  _upgradeCardArt: {fileID: 21300000, guid: 178d3231a9182834aa1a4394bd40b644, type: 3}

Assets/Prefabs/Sticks/farmersAssociation.prefab

@@ -1240,19 +1240,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: edcd1782caa73a747b1f060d18ce0f18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _upgradeUI: {fileID: 4817988606444742093, guid: 1d481c7093a8d2443a04261fd7c72be2, type: 3}
+  _upgradeUI: {fileID: 2118220733331082121, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-  _upgradeUnitCardList:
-  - {fileID: 11400000, guid: 9ff4b606166b07d4bb3afb15e5a23f41, type: 2}
-  - {fileID: 11400000, guid: ee85fc25d3460c745806649e7f9d166a, type: 2}
-  - {fileID: 11400000, guid: 0334115ab72f6d5449497db1bb50377e, type: 2}
-  _upgradePrefabList:
-  - {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
-  - {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3}
-  - {fileID: 2230360378425099702, guid: ece16a59d4dca2246817fbb1b23f17ba, type: 3}
-  _upgradeImages:
-  - {fileID: 21300000, guid: aa033001c3067ea41a2fc684a6320489, type: 3}
-  - {fileID: 21300000, guid: cc83829c8925f1649879f8fbb02b1d8b, type: 3}
-  - {fileID: 21300000, guid: b98e80d2b7d70264b800b1e6aa98a092, type: 3}
   _upgradeList:
   - {fileID: 11400000, guid: 0c3268393deaed84d87f041b2a4f970c, type: 2}
   - {fileID: 11400000, guid: 1639cd6a5b9ac1f4c96319ebfcac741a, type: 2}

Assets/Prefabs/UI/UnitUpgrade/UnitUpgrade.prefab

@@ -160,6 +160,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2118220732422767659}
     m_Modifications:
+    - target: {fileID: 962025096442550070, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
+      propertyPath: _buttonContainer
+      value: 
+      objectReference: {fileID: 2118220733331082121}
     - target: {fileID: 3013207445655681334, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_text
       value: 0
@@ -174,19 +178,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -26.970634
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532222, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_IsActive
@@ -302,19 +306,19 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -48.94127
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728181, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_IsActive
@@ -322,19 +326,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3921547832887455157, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_SpriteState.m_HighlightedSprite
@@ -354,6 +358,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2118220732422767659}
     m_Modifications:
+    - target: {fileID: 962025096442550070, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
+      propertyPath: _buttonContainer
+      value: 
+      objectReference: {fileID: 2118220733331082121}
     - target: {fileID: 3013207445655681334, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_text
       value: 0
@@ -516,6 +524,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2118220732422767659}
     m_Modifications:
+    - target: {fileID: 962025096442550070, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
+      propertyPath: _buttonContainer
+      value: 
+      objectReference: {fileID: 2118220733331082121}
     - target: {fileID: 3013207445655681334, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_text
       value: 0
@@ -526,19 +538,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -26.970634
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446175879013, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_Sprite
@@ -650,35 +662,35 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -48.94127
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3921547832887455157, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
       propertyPath: m_SpriteState.m_HighlightedSprite

Assets/Prefabs/UI/UnitUpgrade/unitUpgrade_optionButton.prefab

@@ -554,9 +554,9 @@ RectTransform:
   m_Father: {fileID: 3013207447181477519}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 5, y: -26.970634}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3013207446160532220
@@ -857,6 +857,7 @@ GameObject:
   - component: {fileID: 3013207446659063112}
   - component: {fileID: 3013207446659063111}
   - component: {fileID: 3921547832887455157}
+  - component: {fileID: 962025096442550070}
   m_Layer: 5
   m_Name: unitUpgrade_optionButton
   m_TagString: Untagged
@@ -943,6 +944,31 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &962025096442550070
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3013207446659063113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 26a731ab13b65cc4eabb568482ef1832, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _foodLabel: {fileID: 3013207445808733941}
+  _woodLabel: {fileID: 3013207445760102698}
+  _rockLabel: {fileID: 3013207445655681334}
+  _backgroundImage: {fileID: 3013207446705226711}
+  _availableBackgroundImage: {fileID: 21300000, guid: 518e2f9bad4807641a02fc3815fc0033, type: 3}
+  _unavailableBackgroundImage: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3}
+  _backgroundImageHover: {fileID: 3921547832887455157}
+  _availableBackgroundImageHover: {fileID: 21300000, guid: a2f9422294367ee45aad61a14882acd0, type: 3}
+  _unavailableBackgroundImageHover: {fileID: 21300000, guid: 83e9ee3059b8ac742963bc8f2835ff63, type: 3}
+  _unitArt: {fileID: 3013207446175879013}
+  _buttonContainer: {fileID: 0}
+  _prefab: {fileID: 0}
+  _unitCardInformation: {fileID: 0}
 --- !u!1 &3013207446705226713
 GameObject:
   m_ObjectHideFlags: 0
@@ -1053,9 +1079,9 @@ RectTransform:
   m_Father: {fileID: 3013207447181477519}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 5, y: -48.94127}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3013207446742728179
@@ -1106,9 +1132,9 @@ RectTransform:
   m_Father: {fileID: 3013207447181477519}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 5, y: -5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3013207447116908152

Assets/Scenes/Game.unity

@@ -2367,7 +2367,6 @@ RectTransform:
   - {fileID: 405102485}
   - {fileID: 115274809}
   - {fileID: 179679298}
-  - {fileID: 1937287992}
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3773,11 +3772,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1761692192}
   m_CullTransparentMesh: 1
---- !u!224 &1937287992 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-  m_PrefabInstance: {fileID: 2118220733588545726}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2019202046
 GameObject:
   m_ObjectHideFlags: 0
@@ -4144,244 +4138,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2118220733588545726
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1092900232}
-    m_Modifications:
-    - target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -26.970634
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_RootOrder
-      value: 8
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -744.6
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -197.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733331082121, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_Name
-      value: UnitUpgrade
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -48.94127
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}

Assets/Scripts/Ally/AllyUpgrade.cs

@@ -47,12 +47,13 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
 
     private void AssignUpgrades(Canvas canvas)
     {
-        Debug.Log("Upgrade count: " + _instance.transform.childCount);
+        GameObject _firstChildren = _instance.transform.GetChild(1).gameObject;
+        Debug.Log("Upgrade count: " + _firstChildren.transform.childCount);
         // Assign upgrade Prefabs
-        for (int i = 0; i < _instance.transform.childCount - 1; i++)
+        for (int i = 0; i < _firstChildren.transform.childCount - 1; i++)
         {
             Debug.Log(i);
-            GameObject upgradeEnfant = _instance.transform.GetChild(i).gameObject;
+            GameObject upgradeEnfant = _firstChildren.transform.GetChild(i).gameObject;
             UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
             button.Initialize(_upgradeList[i], gameObject, canvas);
         }

Assets/Scripts/UnitTree/UpgradePlacementButton.cs

@@ -8,11 +8,6 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
 {
     private Button _button;
 
-    [SerializeField]
-    private Material _outlineMaterial;
-    [SerializeField]
-    protected UnitCard _unitCardInformation;
-
     [SerializeField]
     private TMP_Text _foodLabel;
     [SerializeField]
@@ -20,25 +15,35 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
     [SerializeField]
     private TMP_Text _rockLabel;
     [SerializeField]
-    private GameObject _prefab;
+    private Image _backgroundImage;
     [SerializeField]
-    private Image _image;
+    protected Sprite _availableBackgroundImage;
+    [SerializeField]
+    private Sprite _unavailableBackgroundImage;
+    [SerializeField]
+    private Button _backgroundImageHover;
+    [SerializeField]
+    protected Sprite _availableBackgroundImageHover;
+    [SerializeField]
+    private Sprite _unavailableBackgroundImageHover;
     [SerializeField]
     private Image _unitArt;
     [SerializeField]
     private GameObject _buttonContainer;
+    [SerializeField]
+    private GameObject _prefab;
+    [SerializeField]
+    protected UnitCard _unitCardInformation;
     private GameObject _unitGameObject;
     private Canvas _canvas;
 
 
     public Button Button => _button;
-    public Material OutlineMaterial => _outlineMaterial;
 
     void Start()
     {
         _button = GetComponent<Button>();
         _button.enabled = true;
-        Debug.Log("Upgrade instantiated...");
     }
     
     void Update()
@@ -48,10 +53,20 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
             _button.interactable = CanUse();
             if (CanUse())
             {
-                _image.color = Color.green;
+                _backgroundImage.sprite = _availableBackgroundImage;
+                SpriteState spriteState = new SpriteState
+                {
+                    highlightedSprite = _availableBackgroundImageHover
+                };
+                _backgroundImageHover.spriteState = spriteState;
             } else
             {
-                _image.color = Color.red;
+                _backgroundImage.sprite = _unavailableBackgroundImage;
+                SpriteState spriteState = new SpriteState
+                {
+                    highlightedSprite = _unavailableBackgroundImageHover
+                };
+                _backgroundImageHover.spriteState = spriteState;
             }
         }
     }
@@ -69,8 +84,10 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
     
     public void OnPointerClick(PointerEventData eventData)
     {
+        Debug.Log("-----CLICKED----");
         if (CanUse())
         {
+            Debug.Log("-----INSTANCIATING----");
             //Change parent GameObject
             Vector3 instantiatePosition = _unitGameObject.transform.position;
             Debug.Log("Upgrade clicked...");
@@ -85,11 +102,10 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
 
     public void Initialize(UnitUpgrade unitUpgrade, GameObject parentGameObject, Canvas canvas)
     {
-        Debug.Log("Upgrade initialized...");
-        SetTextFor(_foodLabel, unitUpgrade.UpgradeUnitCard.Food);
-        SetTextFor(_woodLabel, unitUpgrade.UpgradeUnitCard.Wood);
-        SetTextFor(_rockLabel, unitUpgrade.UpgradeUnitCard.Rock);
         _unitCardInformation = unitUpgrade.UpgradeUnitCard;
+        SetTextFor(_foodLabel, _unitCardInformation.Food);
+        SetTextFor(_woodLabel, _unitCardInformation.Wood);
+        SetTextFor(_rockLabel, _unitCardInformation.Rock);
         _prefab = unitUpgrade.UpgradePrefab;
         _unitGameObject = parentGameObject;
         _canvas = canvas;