diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs index 71fed166..b0c5af9f 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs @@ -61,7 +61,7 @@ namespace MyGame.Scenes.WorldMap.Scripts var cityGameData = GameDataManager.GetCityGameData(fundingData.cityId); var fundingCityGameData = GameDataManager.GetCityGameData(fundingData.fundingCityId); var funded = cityGameData.FundingDict[fundingData.fundingCityId]; - var cityData = cityDataList.First(data => data.id == fundingData.cityId); + var fundingCityData = cityDataList.First(data => data.id == fundingData.fundingCityId); if (fundingCityGameData.Coin < fundingUnit) { @@ -73,7 +73,9 @@ namespace MyGame.Scenes.WorldMap.Scripts warnObject.SetActive(false); fundingButtonOff.SetActive(false); fundingButton.gameObject.SetActive(true); - titleText.text = cityData.Name; + iconTarget.DestroyAllChildrens(); + Instantiate(fundingCityData.GetIconPrefab(), iconTarget); + titleText.text = fundingCityData.Name; myCoinText.text = fundingCityGameData.Coin.ToString(); progressBeforeSlider.value = (float)funded / fundingData.needAmount; diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingSelectView.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingSelectView.cs index 702f21be..d7a86b6b 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingSelectView.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingSelectView.cs @@ -23,6 +23,12 @@ namespace MyGame.Scenes.WorldMap.Scripts hideObject.SetActive(!active); } + public void SetCityData(CityData cityData) + { + iconTarget.DestroyAllChildrens(); + Instantiate(cityData.GetIconPrefab(), iconTarget); + } + public void SetData(FundingData fundingData, int funded, Action onComplete = null) { fundButtonOff.SetActive(funded / fundingData.needAmount >= 1); diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs index 7597204f..02a45b4f 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs @@ -144,9 +144,11 @@ namespace MyGame.Scenes.WorldMap.Scripts var filteredFundingList = fundingDataList.Where(data => data.cityId == cityIcon.CityId).ToList(); foreach (var fundingData in filteredFundingList) { + var fundingCityData = cityDataList.First(data => data.id == fundingData.fundingCityId); cityGameData.FundingDict.TryAdd(fundingData.fundingCityId, 0); var view = fundingView.SelectViews[index]; view.SetActive(true); + view.SetCityData(fundingCityData); view.SetData(fundingData, cityGameData.FundingDict[fundingData.fundingCityId]); view.OnFund.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => { diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity index 68ef56cc..ed176fcb 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity @@ -434,6 +434,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155864995} m_CullTransparentMesh: 1 +--- !u!1 &186871168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 186871169} + - component: {fileID: 186871171} + - component: {fileID: 186871170} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &186871169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186871168} + 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: 463592749} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &186871170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186871168} + 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: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f4b695226c17a45449a17f2725c382c6, type: 3} + 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 &186871171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186871168} + m_CullTransparentMesh: 1 --- !u!1 &205016324 GameObject: m_ObjectHideFlags: 0 @@ -1119,9 +1195,8 @@ GameObject: m_Component: - component: {fileID: 463592749} - component: {fileID: 463592751} - - component: {fileID: 463592750} m_Layer: 5 - m_Name: Country_icon + m_Name: IconTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1138,7 +1213,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 186871169} m_Father: {fileID: 338244695} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1147,36 +1223,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 16} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &463592750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 463592748} - 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: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f4b695226c17a45449a17f2725c382c6, type: 3} - 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 &463592751 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3333,7 +3379,7 @@ MonoBehaviour: fundingButton: {fileID: 205016327} upButton: {fileID: 3235806894079851394} downButton: {fileID: 3235806894231659198} - iconTarget: {fileID: 338244695} + iconTarget: {fileID: 463592749} titleText: {fileID: 20687212} myCoinText: {fileID: 979956445} progressCoinText: {fileID: 1405152730}