diff --git a/Assets/Prefabs/Buildings/Blacksmith.prefab b/Assets/Prefabs/Buildings/Blacksmith.prefab index 10605d2..ce7d8bd 100644 --- a/Assets/Prefabs/Buildings/Blacksmith.prefab +++ b/Assets/Prefabs/Buildings/Blacksmith.prefab @@ -102,7 +102,8 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} - _range: 1 + rangeOutline: {fileID: 4877144423808268021} + _range: 3 _multiplier: 10 --- !u!1 &5799165302180276253 GameObject: @@ -161,7 +162,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3, y: 3} + m_Size: {x: 7, y: 7} m_EdgeRadius: 0 --- !u!114 &2468754937282593442 MonoBehaviour: diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab index cd31566..51236f5 100644 --- a/Assets/Prefabs/Buildings/House.prefab +++ b/Assets/Prefabs/Buildings/House.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3583371971866016829} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8050872027781041876 SpriteRenderer: @@ -84,6 +84,64 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3883539808097606027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3455724894200012604} + - component: {fileID: 8496940952803090096} + m_Layer: 6 + m_Name: range_outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3455724894200012604 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3883539808097606027} + 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: 3583371971866016829} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &8496940952803090096 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3883539808097606027} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3.26, y: 4.88} + newSize: {x: 3.26, y: 4.88} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3, y: 3} + m_EdgeRadius: 0 --- !u!1 &6208366596957312446 GameObject: m_ObjectHideFlags: 0 @@ -117,6 +175,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3455724894200012604} - {fileID: 1903134349826740869} - {fileID: 1107632845531990882} m_Father: {fileID: 0} @@ -205,6 +264,7 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} + rangeOutline: {fileID: 8496940952803090096} --- !u!114 &6252103591577139412 MonoBehaviour: m_ObjectHideFlags: 0 @@ -226,7 +286,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Prefabs/Buildings/Mill.prefab b/Assets/Prefabs/Buildings/Mill.prefab index 69cdd3b..4952e0b 100644 --- a/Assets/Prefabs/Buildings/Mill.prefab +++ b/Assets/Prefabs/Buildings/Mill.prefab @@ -102,6 +102,7 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} + rangeOutline: {fileID: 4877144423808268021} _range: 1 _multiplier: 10 --- !u!1 &1371331378727130647 diff --git a/Assets/Prefabs/Buildings/Workshop.prefab b/Assets/Prefabs/Buildings/Workshop.prefab index c7c9d1c..4fbc118 100644 --- a/Assets/Prefabs/Buildings/Workshop.prefab +++ b/Assets/Prefabs/Buildings/Workshop.prefab @@ -102,7 +102,8 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} - _range: 1 + rangeOutline: {fileID: 4877144423808268021} + _range: 2 _multiplier: 10 --- !u!1 &5799165302180276253 GameObject: @@ -161,7 +162,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3, y: 3} + m_Size: {x: 5, y: 5} m_EdgeRadius: 0 --- !u!114 &2468754937282593442 MonoBehaviour: diff --git a/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab b/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab index e81bfa1..293ec35 100644 --- a/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab +++ b/Assets/Prefabs/UI/BuyableUnitsView/UpgradeButtons.prefab @@ -134,6 +134,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4817988606444742094} m_Modifications: + - target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: _rangeSprite + value: + objectReference: {fileID: 21300000, guid: b14c454dd8569ab4780d0f8a904a110b, type: 3} - target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: _buttonContainer value: @@ -244,11 +248,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -256,15 +260,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -272,15 +276,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -288,7 +292,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} @@ -304,6 +308,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4817988606444742094} m_Modifications: + - target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: _rangeSprite + value: + objectReference: {fileID: 21300000, guid: b14c454dd8569ab4780d0f8a904a110b, type: 3} - target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: _buttonContainer value: @@ -410,11 +418,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -422,15 +430,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -438,15 +446,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -454,7 +462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} @@ -470,6 +478,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4817988606444742094} m_Modifications: + - target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} + propertyPath: _rangeSprite + value: + objectReference: {fileID: 21300000, guid: b14c454dd8569ab4780d0f8a904a110b, type: 3} - target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: _buttonContainer value: @@ -580,11 +592,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -592,15 +604,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -608,15 +620,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.x @@ -624,7 +636,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3} diff --git a/Assets/Prefabs/UI/BuyableUnitsView/UpgradePlacementButton.prefab b/Assets/Prefabs/UI/BuyableUnitsView/UpgradePlacementButton.prefab index 325ec51..04cdc2b 100644 --- a/Assets/Prefabs/UI/BuyableUnitsView/UpgradePlacementButton.prefab +++ b/Assets/Prefabs/UI/BuyableUnitsView/UpgradePlacementButton.prefab @@ -206,6 +206,7 @@ MonoBehaviour: _buttonContainer: {fileID: 0} _prefab: {fileID: 0} _unitCardInformation: {fileID: 0} + rangeSprite: {fileID: 21300000, guid: b14c454dd8569ab4780d0f8a904a110b, type: 3} --- !u!225 &6913755812382793111 CanvasGroup: m_ObjectHideFlags: 0 @@ -489,9 +490,9 @@ RectTransform: m_Father: {fileID: 7424225105167539335} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -47.711605} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3554999546265944515 @@ -1211,9 +1212,9 @@ RectTransform: m_Father: {fileID: 7424225105167539335} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -26.874405} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3610034570124512254 diff --git a/Assets/Prefabs/UI/UnitUpgrade/UnitUpgrade.prefab b/Assets/Prefabs/UI/UnitUpgrade/UnitUpgrade.prefab index f580a4c..f6101e9 100644 --- a/Assets/Prefabs/UI/UnitUpgrade/UnitUpgrade.prefab +++ b/Assets/Prefabs/UI/UnitUpgrade/UnitUpgrade.prefab @@ -178,19 +178,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.970634 objectReference: {fileID: 0} - target: {fileID: 3013207446160532222, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_IsActive @@ -306,19 +306,19 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.94127 objectReference: {fileID: 0} - target: {fileID: 3013207446742728181, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_IsActive @@ -326,19 +326,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} - target: {fileID: 3921547832887455157, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite @@ -376,19 +376,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.970634 objectReference: {fileID: 0} - target: {fileID: 3013207446659063112, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_Pivot.x @@ -480,35 +480,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.94127 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} @@ -538,19 +538,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.970634 objectReference: {fileID: 0} - target: {fileID: 3013207446175879013, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_Sprite @@ -662,35 +662,35 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -48.94127 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} - target: {fileID: 3921547832887455157, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 50f2f48..43fbc85 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -3127,11 +3127,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3139,15 +3139,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 objectReference: {fileID: 0} - target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3155,7 +3155,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 objectReference: {fileID: 0} - target: {fileID: 703543387231767793, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3231,59 +3231,75 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} - target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -26.874405 + objectReference: {fileID: 0} + - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3291,15 +3307,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} - target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3307,15 +3323,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} - target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3323,15 +3339,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3339,7 +3355,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 3181429381540750253, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3359,17 +3375,49 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -47.711605 + objectReference: {fileID: 0} + - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} @@ -3495,11 +3543,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3507,15 +3555,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3523,15 +3571,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3539,55 +3587,75 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 - objectReference: {fileID: 0} - - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -201.6 + objectReference: {fileID: 0} + - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x value: 5 objectReference: {fileID: 0} - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -103.3 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6044811384361869331, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478087422172, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3607,11 +3675,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3619,7 +3687,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892479944355554, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3671,11 +3739,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3683,7 +3751,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7488888111208117106, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_IsActive @@ -3707,11 +3775,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3719,15 +3787,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3735,7 +3803,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -103.3 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} diff --git a/Assets/Scripts/Ally/House.cs b/Assets/Scripts/Ally/House.cs index 0a3788a..9701fea 100644 --- a/Assets/Scripts/Ally/House.cs +++ b/Assets/Scripts/Ally/House.cs @@ -1,6 +1,13 @@ -public class House : Building +using UnityEngine; + +public class House : Building { + [SerializeField] + private BoxCollider2D rangeOutline; + public virtual float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouse; + public BoxCollider2D RangeOutline { get => rangeOutline; set => rangeOutline = value; } + public override void LevelStart() { ResourceManager.Instance.MaximumPopulation += PopulationGiven; diff --git a/Assets/Scripts/Ally/ProductionBuilding.cs b/Assets/Scripts/Ally/ProductionBuilding.cs index d1dd136..14f040f 100644 --- a/Assets/Scripts/Ally/ProductionBuilding.cs +++ b/Assets/Scripts/Ally/ProductionBuilding.cs @@ -9,6 +9,8 @@ public abstract class ProductionBuilding : House public override float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouseUpgrade; protected abstract Enum.ResourceNodeType RessourceNodeType { get; } + public int Range { get => _range; set => _range = value; } + private Vector3 _position; public override void Start() @@ -31,7 +33,6 @@ public abstract class ProductionBuilding : House private void ApplyMultiplier(float multiplier) { - int x = 0; for (int i = -_range; i <= _range; i++) { for (int j = -_range; j <= _range; j++) @@ -44,9 +45,7 @@ public abstract class ProductionBuilding : House if (checkResourceType != RessourceNodeType) continue; tile.YieldSpeedMultiplier *= multiplier; - x++; } } - Debug.Log(x); } } \ No newline at end of file diff --git a/Assets/Scripts/UnitTree/UpgradePlacementButton.cs b/Assets/Scripts/UnitTree/UpgradePlacementButton.cs index 75e4623..a10595c 100644 --- a/Assets/Scripts/UnitTree/UpgradePlacementButton.cs +++ b/Assets/Scripts/UnitTree/UpgradePlacementButton.cs @@ -3,6 +3,7 @@ using TMPro; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +using static PlasticGui.LaunchDiffParameters; public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler { @@ -24,9 +25,11 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPoin private GameObject _prefab; [SerializeField] protected UnitCard _unitCardInformation; + [SerializeField] + protected Sprite _rangeSprite; private GameObject _unitGameObject; private Canvas _canvas; - + private static GameObject _outline; public Button Button => _button; @@ -37,8 +40,19 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPoin { Destroy(gameObject); } + + if (!_outline && _unitGameObject.TryGetComponent(out House currentBuilding)) + { + _outline = new GameObject("Outline"); + + var rend = _outline.AddComponent(); + rend.sprite = _rangeSprite; + rend.sortingLayerName = "Character"; + rend.sortingOrder = 1; + rend.color = new Color(1, 1, 1, 0.2f); + } } - + void Update() { if (_unitCardInformation != null) @@ -65,7 +79,7 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPoin label.transform.parent.gameObject.SetActive(value > 0); label.text = "" + value; } - + public void OnPointerClick(PointerEventData eventData) { if (CanUse()) @@ -79,7 +93,6 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPoin Destroy(_buttonContainer); HideTooltip(); } - } public void Initialize(UnitUpgrade unitUpgrade, GameObject parentGameObject, Canvas canvas) @@ -98,11 +111,29 @@ public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPoin { Ally allyObj = _prefab.GetComponent(); TooltipManager.Instance.ShowTooltip(_unitCardInformation, allyObj.Hp.ToString(), allyObj.AttackDamage.ToString(), allyObj.AttackInterval.ToString()); + if (_prefab.TryGetComponent(out ProductionBuilding hoveredBuilding)) + { + if (_unitGameObject.TryGetComponent(out House currentBuilding)) + { + var range = hoveredBuilding.Range * 2 + 1; + currentBuilding.RangeOutline.size = new Vector2(range, range); + + foreach (var rend in currentBuilding.GetAllComponents()) + { + _outline.SetActive(true); + _outline.transform.SetParent(currentBuilding.transform); + _outline.transform.localPosition = new Vector3(); + _outline.transform.localScale = currentBuilding.RangeOutline.size; + rend.material.SetColor("_OutlineColor", Color.blue); + } + } + } } public void OnPointerExit(PointerEventData eventData) { HideTooltip(); + _outline.SetActive(false); } private void HideTooltip()