diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index a3e69aaf..6943a99f 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -786,7 +786,7 @@ RectTransform: - {fileID: 1977630791} - {fileID: 698470367} m_Father: {fileID: 2144327477} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -992,6 +992,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720684618} m_CullTransparentMesh: 0 +--- !u!1 &1728771686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1728771687} + - component: {fileID: 1728771689} + - component: {fileID: 1728771688} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1728771687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728771686} + 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_Children: [] + m_Father: {fileID: 2144327477} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1728771688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728771686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1728771689 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728771686} + m_CullTransparentMesh: 0 --- !u!1 &1848874147 GameObject: m_ObjectHideFlags: 0 @@ -1205,6 +1279,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1728771687} - {fileID: 884928058} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs index 4f433112..c92c1906 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs @@ -31,7 +31,6 @@ public class CornFieldReinforcementDetailView : MonoBehaviour { Action callback; var upgradeType = LocalCacheManager.Load(CornFieldReinforcement.CornFieldReinforcementDataTypeTag); - Debug.Log(upgradeType); switch (upgradeType) { case CornFieldUpgradeType.FieldTop: @@ -79,6 +78,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour { ReinforceObject.SetActive(false); ReleaseObject.SetActive(true); + purchaseButton.gameObject.SetActive(false); + releaseButton.gameObject.SetActive(true); releasePriceText.text = price.ToString(); messageText.text = ReleaseFormat; } @@ -86,6 +87,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour { ReinforceObject.SetActive(true); ReleaseObject.SetActive(false); + purchaseButton.gameObject.SetActive(true); + releaseButton.gameObject.SetActive(false); reinforcePriceText.text = price.ToString(); var nextRank = CornFieldReinforcement.GetNextRank(data.Level); var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(data.Type); @@ -103,5 +106,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour { ReinforceObject.SetActive(false); ReleaseObject.SetActive(false); + purchaseButton.gameObject.SetActive(true); + releaseButton.gameObject.SetActive(false); } }