Informationワールド対応
This commit is contained in:
parent
d4d4211933
commit
328b22d51c
|
|
@ -2,6 +2,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using I2.Loc;
|
using I2.Loc;
|
||||||
|
using MyGame.Scripts;
|
||||||
using UniRx;
|
using UniRx;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
@ -75,36 +76,37 @@ public class Information : MonoBehaviour
|
||||||
scrollRect.verticalNormalizedPosition = 1;
|
scrollRect.verticalNormalizedPosition = 1;
|
||||||
}).AddTo(this);
|
}).AddTo(this);
|
||||||
|
|
||||||
var gameData = GameDataManager.GameData;
|
var globalGameData = GameDataManager.GameData;
|
||||||
|
var cityGameData = GameDataManager.GetCurrentCityGameData();
|
||||||
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
|
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
|
||||||
shopLevelList = shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
|
shopLevelList = shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList();
|
||||||
var shopScriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
|
var shopScriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
|
||||||
var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel) ?? shopLevelList[0];
|
var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == globalGameData.ViewedShopLevel) ?? shopLevelList[0];
|
||||||
var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel + 1);
|
var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == globalGameData.ViewedShopLevel + 1);
|
||||||
var nextLevelHeart = nextShopLevelData?.heart ?? shopLevelData.heart;
|
var nextLevelHeart = nextShopLevelData?.heart ?? shopLevelData.heart;
|
||||||
var shopCustomizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeLevelData>(Const.ShopCustomizeLevelDataSheet);
|
var shopCustomizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeLevelData>(Const.ShopCustomizeLevelDataSheet);
|
||||||
var shopCustomizeData = shopCustomizeLevelList.FirstOrDefault(data => data.level == gameData.ShopCustomizeLevel) ?? shopCustomizeLevelList[0];
|
var shopCustomizeData = shopCustomizeLevelList.FirstOrDefault(data => data.level == globalGameData.ShopCustomizeLevel) ?? shopCustomizeLevelList[0];
|
||||||
var nextShopCustomizeData = shopCustomizeLevelList.FirstOrDefault(data => data.level == gameData.ShopCustomizeLevel + 1);
|
var nextShopCustomizeData = shopCustomizeLevelList.FirstOrDefault(data => data.level == globalGameData.ShopCustomizeLevel + 1);
|
||||||
var nextShopCustomizePoint = nextShopCustomizeData?.point ?? shopCustomizeData.point;
|
var nextShopCustomizePoint = nextShopCustomizeData?.point ?? shopCustomizeData.point;
|
||||||
var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList<AutoCookData>(Const.AutoCookDataSheet);
|
var autoCookDataList = SpreadsheetDataManager.Instance.GetBaseDataList<AutoCookData>(Const.AutoCookDataSheet);
|
||||||
var autoCookData = autoCookDataList.FirstOrDefault(data => data.level == gameData.AutoCookLevel) ?? autoCookDataList[0];
|
var autoCookData = autoCookDataList.FirstOrDefault(data => data.level == cityGameData.AutoCookLevel) ?? autoCookDataList[0];
|
||||||
totalDayText.text = $"{gameData.dailyLoginCount}{ScriptLocalization.Unit.Day}";
|
totalDayText.text = $"{globalGameData.dailyLoginCount}{ScriptLocalization.Unit.Day}";
|
||||||
totalSalesText.text = $"{gameData.TotalSales}{ScriptLocalization.Unit.Amount}";
|
totalSalesText.text = $"{cityGameData.TotalSales}{ScriptLocalization.Unit.Amount}";
|
||||||
totalCoinText.text = gameData.TotalAddCoin.ToString();
|
totalCoinText.text = cityGameData.TotalAddCoin.ToString();
|
||||||
achievementText.text = shopLevelData.Achievement;
|
achievementText.text = shopLevelData.Achievement;
|
||||||
shopLevelText.text = String.Format(shopLevelFormat, gameData.ViewedShopLevel.ToString());
|
shopLevelText.text = String.Format(shopLevelFormat, globalGameData.ViewedShopLevel.ToString());
|
||||||
progressText.text = String.Format(progressFormat, Mathf.Min(gameData.Heart, nextLevelHeart), nextLevelHeart);
|
progressText.text = String.Format(progressFormat, Mathf.Min(GameDataUtils.GetTotalHeart(), nextLevelHeart), nextLevelHeart);
|
||||||
shopCustomizeLevelText.text = String.Format(shopLevelFormat, gameData.ShopCustomizeLevel.ToString());
|
shopCustomizeLevelText.text = String.Format(shopLevelFormat, globalGameData.ShopCustomizeLevel.ToString());
|
||||||
shopCustomizeProgressText.text = String.Format(progressFormat, Mathf.Min(gameData.ShopCustomizePoint, nextShopCustomizePoint), nextShopCustomizePoint);
|
shopCustomizeProgressText.text = String.Format(progressFormat, Mathf.Min(globalGameData.ShopCustomizePoint, nextShopCustomizePoint), nextShopCustomizePoint);
|
||||||
autoCookLevelText.text = String.Format(shopLevelFormat, gameData.AutoCookLevel);
|
autoCookLevelText.text = String.Format(shopLevelFormat, cityGameData.AutoCookLevel);
|
||||||
autoCookProgressText.text = String.Format(progressFormat, Mathf.Min(gameData.AutoCookUsesCount, autoCookData.clearCount), autoCookData.clearCount);
|
autoCookProgressText.text = String.Format(progressFormat, Mathf.Min(cityGameData.AutoCookUsesCount, autoCookData.clearCount), autoCookData.clearCount);
|
||||||
autoCookLevelObject.SetActive(gameData.ViewedShopLevel >= Const.AutoCookAvailableLevel);
|
autoCookLevelObject.SetActive(globalGameData.ViewedShopLevel >= Const.AutoCookAvailableLevel);
|
||||||
autoCookProgressObject.SetActive(gameData.ViewedShopLevel >= Const.AutoCookAvailableLevel);
|
autoCookProgressObject.SetActive(globalGameData.ViewedShopLevel >= Const.AutoCookAvailableLevel);
|
||||||
|
|
||||||
var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
|
var productList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
|
||||||
var materialList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
|
var materialList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
|
||||||
var shopStockList = gameData.ShopStock.Select(data => (data.FlavorId, data.Stock));
|
var shopStockList = cityGameData.ShopStock.Select(data => (data.FlavorId, data.Stock));
|
||||||
var tankStockList = gameData.StorageTanks.Select(data => (data.FlavorId, data.Stock));
|
var tankStockList = cityGameData.StorageTanks.Select(data => (data.FlavorId, data.Stock));
|
||||||
var totalStockList = shopStockList.Concat(tankStockList).ToList();
|
var totalStockList = shopStockList.Concat(tankStockList).ToList();
|
||||||
|
|
||||||
// shopLevel
|
// shopLevel
|
||||||
|
|
@ -126,7 +128,7 @@ public class Information : MonoBehaviour
|
||||||
{
|
{
|
||||||
var levelData = shopLevelList[index];
|
var levelData = shopLevelList[index];
|
||||||
var scriptList = shopScriptList.Where(data => data.id == levelData.shopLevel).ToList();
|
var scriptList = shopScriptList.Where(data => data.id == levelData.shopLevel).ToList();
|
||||||
SetHistory(levelData, scriptList, levelData.shopLevel > gameData.ViewedShopLevel);
|
SetHistory(levelData, scriptList, levelData.shopLevel > globalGameData.ViewedShopLevel);
|
||||||
|
|
||||||
if (index == 6)
|
if (index == 6)
|
||||||
{
|
{
|
||||||
|
|
@ -159,7 +161,7 @@ public class Information : MonoBehaviour
|
||||||
|
|
||||||
// material
|
// material
|
||||||
materialTarget.DestroyAllChildrens();
|
materialTarget.DestroyAllChildrens();
|
||||||
var totalCount = gameData.Material.Sum(data => data.Amount);
|
var totalCount = cityGameData.Material.Sum(data => data.Amount);
|
||||||
if (totalCount == 0)
|
if (totalCount == 0)
|
||||||
{
|
{
|
||||||
var view = Instantiate(materialPrefab, materialTarget);
|
var view = Instantiate(materialPrefab, materialTarget);
|
||||||
|
|
@ -167,7 +169,7 @@ public class Information : MonoBehaviour
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
foreach (var materialData in gameData.Material)
|
foreach (var materialData in cityGameData.Material)
|
||||||
{
|
{
|
||||||
if (materialData.Amount == 0)
|
if (materialData.Amount == 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue