diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab index 4e918dca..1df2bc61 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_investment.prefab @@ -367,6 +367,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1393e6df2e784e87a81e10ec6b6bd6b9, type: 3} m_Name: m_EditorClassIdentifier: + titleText: {fileID: 7712180188729185430} selectViews: - {fileID: 5931497963724294898} - {fileID: 1708093360580060764} diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs index d533f687..71fed166 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingDialog.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using I2.Loc; using TMPro; using UniRx; @@ -40,7 +41,7 @@ namespace MyGame.Scenes.WorldMap.Scripts backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => { - TransitionManager.Instance.UnloadScene(GameScenes.Update); + TransitionManager.Instance.UnloadScene(GameScenes.WorldMapInvestment); }); }).AddTo(this); @@ -48,12 +49,19 @@ namespace MyGame.Scenes.WorldMap.Scripts fundingButton.OnClickAsObservable().Take(1).Subscribe(_ => { onComplete?.Invoke(fundingAmount); + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.WorldMapInvestment); + }); }).AddTo(this); var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); 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); if (fundingCityGameData.Coin < fundingUnit) { @@ -65,7 +73,7 @@ namespace MyGame.Scenes.WorldMap.Scripts warnObject.SetActive(false); fundingButtonOff.SetActive(false); fundingButton.gameObject.SetActive(true); - // titleText.text + titleText.text = cityData.Name; myCoinText.text = fundingCityGameData.Coin.ToString(); progressBeforeSlider.value = (float)funded / fundingData.needAmount; diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingView.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingView.cs index 8f898f20..b0c407ab 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingView.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FundingView.cs @@ -1,9 +1,11 @@ using UnityEngine; +using UnityEngine.UI; namespace MyGame.Scenes.WorldMap.Scripts { public class FundingView : MonoBehaviour { + [SerializeField] private Text titleText; [SerializeField] private FundingSelectView[] selectViews; public FundingSelectView[] SelectViews => selectViews; @@ -14,5 +16,10 @@ namespace MyGame.Scenes.WorldMap.Scripts selectView.SetActive(false); } } + + public void SetData(CityData cityData) + { + titleText.text = cityData.Name; + } } } \ No newline at end of file