diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index d6cc707e..49f6f6f6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -2867,6 +2867,12 @@ MonoBehaviour: achievementText: {fileID: 6859128402011726531} shopLevelText: {fileID: 6859128402142498446} progressText: {fileID: 6859128401304240213} + shopCustomizeLevelText: {fileID: 4647540558113140737} + shopCustomizeProgressText: {fileID: 1464286224346102131} + autoCookLevelText: {fileID: 5370280550105160089} + autoCookProgressText: {fileID: 8514352163889291120} + autoCookLevelObject: {fileID: 7511167048039374352} + autoCookProgressObject: {fileID: 2207870208245884744} --- !u!1 &6859128401238665809 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index 9763a7eb..b5b33b89 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -41,6 +41,12 @@ public class Information : MonoBehaviour [SerializeField] private Text achievementText; [SerializeField] private Text shopLevelText; [SerializeField] private Text progressText; + [SerializeField] private Text shopCustomizeLevelText; + [SerializeField] private Text shopCustomizeProgressText; + [SerializeField] private Text autoCookLevelText; + [SerializeField] private Text autoCookProgressText; + [SerializeField] private GameObject autoCookLevelObject; + [SerializeField] private GameObject autoCookProgressObject; private bool isOdd; @@ -76,12 +82,26 @@ public class Information : MonoBehaviour var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel) ?? shopLevelList[0]; var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel + 1); var nextLevelHeart = nextShopLevelData?.heart ?? shopLevelData.heart; + var shopCustomizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopCustomizeLevelDataSheet); + var shopCustomizeData = shopCustomizeLevelList.FirstOrDefault(data => data.level == gameData.ShopCustomizeLevel) ?? shopCustomizeLevelList[0]; + var nextShopCustomizeData = shopCustomizeLevelList.FirstOrDefault(data => data.level == gameData.ShopCustomizeLevel + 1); + var nextShopCustomizePoint = nextShopCustomizeData?.point ?? shopCustomizeData.point; + var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.AutoCookDataSheet); + var autoCookData = autoCookDataList.FirstOrDefault(data => data.level == gameData.AutoCookLevel) ?? autoCookDataList[0]; + var nextAutoCookData = autoCookDataList.FirstOrDefault(data => data.level == gameData.AutoCookLevel + 1); + var nextAutoCookCount = nextAutoCookData?.clearCount ?? autoCookData.clearCount; totalDayText.text = $"{gameData.dailyLoginCount}{ScriptLocalization.Unit.Day}"; totalSalesText.text = $"{gameData.TotalSales}{ScriptLocalization.Unit.Amount}"; totalCoinText.text = gameData.TotalAddCoin.ToString(); achievementText.text = shopLevelData.Achievement; shopLevelText.text = String.Format(shopLevelFormat, gameData.ViewedShopLevel.ToString()); progressText.text = String.Format(progressFormat, Mathf.Min(gameData.Heart, nextLevelHeart), nextLevelHeart); + shopCustomizeLevelText.text = String.Format(shopLevelFormat, gameData.ShopCustomizeLevel.ToString()); + shopCustomizeProgressText.text = String.Format(progressFormat, Mathf.Min(gameData.ShopCustomizePoint, nextShopCustomizePoint), nextShopCustomizePoint); + autoCookLevelText.text = String.Format(shopLevelFormat, gameData.AutoCookLevel); + autoCookProgressText.text = String.Format(progressFormat, Mathf.Min(gameData.AutoCookUsesCount, nextAutoCookCount), nextAutoCookCount); + autoCookLevelObject.SetActive(gameData.ViewedShopLevel >= Const.AutoCookAvailableLevel); + autoCookProgressObject.SetActive(gameData.ViewedShopLevel >= Const.AutoCookAvailableLevel); var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var materialList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet);