From 4a2ece28330964e04e8b457e2c2891c6dc1a337b Mon Sep 17 00:00:00 2001 From: Ader Alisma 01 Date: Sun, 9 Jun 2024 15:41:26 -0400 Subject: [PATCH] =?UTF-8?q?Rendu=20UpgradePlacementButton.cs=20ind=C3=A9pe?= =?UTF-8?q?ndant=20des=20h=C3=A9ritages=20de=20UnitPlacementButtons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Interface d'amélioration s'affiche onClick pour FarmersAssociation Interface n'est présentement pas rétroactive des infos de l'unité --- .../UnitPlacementButtons.prefab | 30 +- .../UI/BuyableUnitsView/UpgradeButtons.prefab | 382 ++++++++---------- Assets/Scripts/Ally/AllyUpgrade.cs | 24 +- .../UnitTree/UpgradePlacementButton.cs | 113 +++--- 4 files changed, 259 insertions(+), 290 deletions(-) diff --git a/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab b/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab index 3c8e5a2..6bd4687 100644 --- a/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab +++ b/Assets/Prefabs/UI/BuyableUnitsView/UnitPlacementButtons.prefab @@ -193,7 +193,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 128.4, y: -161} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4817988606444742080 @@ -1221,19 +1221,23 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: bc54d5d5ac69f334daf7b36882bd5199, type: 3} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 + objectReference: {fileID: 0} + - target: {fileID: 5501162456977524028, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_RootOrder + value: 5 objectReference: {fileID: 0} - target: {fileID: 5756421746364435501, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_IsActive @@ -1241,35 +1245,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: _food diff --git a/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab b/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab index 6d30dc1..7bcc813 100644 --- a/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab +++ b/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab @@ -30,13 +30,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6716417799655040460} + - {fileID: 7628964284593499177} + - {fileID: 1691244495608687713} - {fileID: 4817988606957756069} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 128.4, y: -161} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1088.4, y: 379} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4817988606444742080 @@ -77,7 +80,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4817988606957756069 RectTransform: m_ObjectHideFlags: 0 @@ -89,16 +92,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5639720393720315369} - - {fileID: 8992921944992653498} - - {fileID: 5639720393060989426} + m_Children: [] m_Father: {fileID: 4817988606444742094} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 5.2, y: -23} + m_AnchoredPosition: {x: 5.200012, y: -23} m_SizeDelta: {x: 10, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4817988606957756070 @@ -127,525 +127,497 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1001 &4817988605156991943 +--- !u!1001 &2008641878076503636 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4817988606957756069} + m_TransformParent: {fileID: 4817988606444742094} m_Modifications: - - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947826, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Name value: Upgrade3 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 203 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -28 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652128235033332, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 178d3231a9182834aa1a4394bd40b644, type: 3} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.g + value: 0.069076404 + objectReference: {fileID: 0} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _food - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _wood - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _prefab - value: - objectReference: {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} ---- !u!224 &5639720393060989426 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} +--- !u!224 &1691244495608687713 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - m_PrefabInstance: {fileID: 4817988605156991943} + m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + m_PrefabInstance: {fileID: 2008641878076503636} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4817988606638925788 +--- !u!1001 &5885398403682320377 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4817988606957756069} + m_TransformParent: {fileID: 4817988606444742094} m_Modifications: - - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947826, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Name value: Upgrade1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 5.2000732 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 135 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652128235033331, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_IsActive + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.b + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.g value: 1 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.r + value: 0.43529412 + objectReference: {fileID: 0} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _food - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _prefab - value: - objectReference: {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} ---- !u!224 &5639720393720315369 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} +--- !u!224 &6716417799655040460 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - m_PrefabInstance: {fileID: 4817988606638925788} + m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + m_PrefabInstance: {fileID: 5885398403682320377} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8094628869760629391 +--- !u!1001 &7297843871482410524 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 4817988606957756069} + m_TransformParent: {fileID: 4817988606444742094} m_Modifications: - - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947826, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Name value: Upgrade2 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 179 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 83 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_SizeDelta.x - value: 153 - objectReference: {fileID: 0} - - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_SizeDelta.y - value: 130 - 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: -8.5 - objectReference: {fileID: 0} - - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: m_AnchoredPosition.y - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 907652128235033332, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 7f013ea28cc038c4794a38dc2f1b0685, type: 3} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - propertyPath: _food - value: 10 - 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: 6962989255644195630, guid: e4a4754288971e949a74f90737193702, type: 3} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} ---- !u!224 &8992921944992653498 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} +--- !u!224 &7628964284593499177 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} - m_PrefabInstance: {fileID: 8094628869760629391} + m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + m_PrefabInstance: {fileID: 7297843871482410524} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Ally/AllyUpgrade.cs b/Assets/Scripts/Ally/AllyUpgrade.cs index 6b6f483..04e9de2 100644 --- a/Assets/Scripts/Ally/AllyUpgrade.cs +++ b/Assets/Scripts/Ally/AllyUpgrade.cs @@ -8,8 +8,11 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler [SerializeField] private GameObject upgradeUI; [SerializeField] - private List upgradeList = new List(); + private List upgradeUnitCardList = new List(); + [SerializeField] + private List upgradePrefabList = new List(); private GameObject _instance = null; + public void OnPointerClick(PointerEventData eventData) { if (eventData.button == 0) //Left click @@ -17,13 +20,26 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler Debug.Log("Event clicked..."); if (!_instance) { - Debug.Log(transform.position); - _instance = Instantiate(upgradeUI, transform.position, Quaternion.identity); + GameObject sceneCanvas = GameObject.Find("Canvas"); + if (sceneCanvas != null) + { + Canvas canvas = sceneCanvas.GetComponent(); + if (canvas == null) + { + Debug.Log("Canvas introuvable..."); + } + else + { + _instance = Instantiate(upgradeUI, Camera.main.WorldToScreenPoint(transform.position), Quaternion.identity, canvas.transform); + } + } + Debug.Log(_instance.transform.position); + Debug.Log(Camera.main.WorldToScreenPoint(transform.position)); + GameObject upgradeParent = _instance.transform.GetChild(0).gameObject; for (int i = 0; i < upgradeParent.transform.childCount; i++) { GameObject upgradeEnfant = upgradeParent.transform.GetChild(i).gameObject; - } } else diff --git a/Assets/Scripts/UnitTree/UpgradePlacementButton.cs b/Assets/Scripts/UnitTree/UpgradePlacementButton.cs index eab212d..f6b4cdf 100644 --- a/Assets/Scripts/UnitTree/UpgradePlacementButton.cs +++ b/Assets/Scripts/UnitTree/UpgradePlacementButton.cs @@ -1,84 +1,61 @@ -using System.ComponentModel; -using System.Linq; -using UnityEditor; +using TMPro; using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; -public class UpgradePlacementButton : UnitPlacementButton +public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler { + private Button _button; + + [SerializeField] + private Material _outlineMaterial; + [SerializeField] + protected UnitCard _unitCardInformation; + + [SerializeField] + private TMP_Text _foodLabel; + [SerializeField] + private TMP_Text _woodLabel; + [SerializeField] + private TMP_Text _rockLabel; [SerializeField] private GameObject _prefab; - protected override bool CanPlace() + + public Button Button => _button; + public Material OutlineMaterial => _outlineMaterial; + + void Start() { - var isBuilding = _prefab.GetComponent(); - var defaultPopCost = GlobalConfig.Instance.Current.populationCostPerUnit; - var hasEnoughPopulation = isBuilding || ResourceManager.Instance.EnoughPopulationFor(defaultPopCost); - return ResourceManager.Instance.EnoughFor(_unitCardInformation.Rock, _unitCardInformation.Wood, _unitCardInformation.Food) - && hasEnoughPopulation - && base.CanPlace(); + _button = GetComponent