yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

データ構造変更

This commit is contained in:
kimura 2021-10-07 16:11:23 +09:00
parent f229a9fff5
commit 1fb6cdfa70
8 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
DG6up9orSeH3ovydPZZH0/qgmkTfS+5nkvFvi/LynNAaP9+9LdwoaqMDJQOZQwqy
DH/brbZswHxm1FXtLfhjp/6y1ufI9CTrzvSHJj5ZRtRvQIcbB8HO/RSDW8VB9YY9

2
popcorn/Assets/MyGame/Resources/Data/MaterialData.txt
View File

@ -1 +1 @@
5blTNqjDfYUmR3TFHFyw8lBrlHozUyW5c7th/Xr/HNe0/lVr+dl7zIl1rql3kvqgo+JpDNqGXcK0roK3OU/ifn/u5U226p8MEOWEe77G7OPbcdVzuVuKkn+87qItifzpG2jHFBarUbJ+jxXiVGCvD7IzO9dx39vSXUFn38VNjOopBY2a/tWBYI6zfip8C8Vgg5+qG0xZz/WvSrf3nivK2iGpUf/r47JTuDTaQwbjawQ+rrxJqs/jhP2TyF8ZfMCDrVvg3YjEjuuWgLGEbANlSLn5fv8ecS1k52cbfBUDgIOxDBhSviL908sXTV9Awgo6q7HmJZ+XnmLMM+M90DmybaOyMacLhqHNFLbY9xgNeG3/2wFUY8hWw+OkC7GmnuqTxe46ykguCLxRPVC+RF/9tl/n1mHw4A4SrSLO5cD4nBUEovqkK1k4rX6UMjNyRV6rcTcX9A6+di2/cnZeODaGaclBU0WNrTBHt8+LK8NYZWCvDCNHZkkWi4jYKarVgJNOjRlG8Kc688sOgxBu2Pjwy/dSU8ya8UYcVPRSb5nkEB0CNa8LsekusAyc6n7m7pBr6dzB+is7bjn10/4S0yrVCQCCLYTofSOiFDCIhfFuVV5QCHXtPmLxVR7AHOsIT/TXId2BevRquerIh7NRAzB+6HakGB8bsZggO39tdk1PKO4hopESleRZvtlS+ZyRqWmT1kRVj+A8ztTjunB/sWRGeMBai595XO8E3RwX6tETTHHdsC/TljAq2eUE/PAk8UP+LHRL2z3jt0TLz3QaLcgnxoJIzP4Uk5wwaWyfK1DeGYvLwlUtJ8oJVcaMbYizAdYf
+P0BjuyeArhrYpb8n/S9qWfwSyXQsm/AKXtgIeZyJjJTmUGxgp+ZxdReNKLmOLq5QCLyF0g5qechMNW9n0pGDwHmDdU0WdzLo2EKYc8qrgtMQfEyLKL6hYeyVfwz4OKtYjQQnICdf58i3Id8nwz+06NPT6f9SYnnhiwpilQZNxUI2EZz6+2cDlv8eja2CiL6wpW5rDLUom1VWGKg2g7h6G2LlUaI4zxTOkDiMvQE16c8/fRKBCdF7ovtZYAKqG2O/+ekO7qYzYHlTheqwDJaShT4852f6/ShjF5HClkqPUsPT7GKBkr4e/VDLl5OzhnAH/c78j0H8n0RXbr+8QCe2IpujPL/JM69c9OCv+F6FQkmWthiP9yTm1xj0bkIc8K+jTZDWtZ5Yz5HthT2itw1mtHj1oqDSPPMOJvNGtDJ0mq/ORr0AuGUhMeeo7dLypAI8EVXt/D/RX5F21RG9ESuzIm7GpRMfSz0/95ZTh4SZA3QZAq/ML++5uWMS5xqJhfX4Cib6YEUXxBAYq+hKsGClFBZ96L3uAIaYESmpyPAVxpcDHocoabCfUX8uyHIx/KDQJmtqFajsqEXdEbewbnSWw6R6neO4MliKhXccn2xGH87+U4PmKvio/6DXxgNKF4+sQU/EMsI47GK1raXBIyADCQ8TMA3FIak8IuLZV5Y5+2GVN1+MArLUPeQcxVjKJh+W83+ajulWvr8kUT4GyyjXNnQi/jFL3AT2ZokR9A0p5ZYIM536MuqYvTEfZf0Ax4nkJMqhbvb0lSuE70ldwWqpoNJ8ATEe2G7ELVSBNoxR3DsVoPUgw84WZrqmNGeLns0u1egMGrcfxg34zPfh9cVFeD46UdojZIUtZgOYfqbVUASrQqMp8WjDhG5vHgCXlNg0ZQDmHKXjy+L5P1o9XQFcLbqH5czljEcFVG3oX/MncI15emWgyn6u7fYawQURWZme3eCBk8jB0tBnpQYLoKMg9pb7fqTN/+XJ3DWvLCMJIYnRAeYkWg9I/UQNRb4r8pN7WUDYTN0Jbcq3mVe83L2sQ==

2
popcorn/Assets/MyGame/Resources/Data/PanData.txt
View File

@ -1 +1 @@
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

2
popcorn/Assets/MyGame/Resources/Data/ProductData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Resources/Data/ShopData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs
View File

@ -48,7 +48,7 @@ public class MarketCartView : MonoBehaviour
public void Refill(int index, ProductStockData stockData, bool animate = true)
{
popcornPositions[index].DestroyAllChildrens();
if (productDataList.FirstOrDefault(data => data.id == stockData.FlavorId)?.GetProductPrefab() is MarketPopcornView prefab)
if (productDataList.FirstOrDefault(data => data.id == stockData.FlavorId)?.GetMarketPrefab() is MarketPopcornView prefab)
{
var view = Instantiate(prefab, popcornPositions[index]);
view.ChangeRarity(stockData.Rarity);

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
View File

@ -159,7 +159,7 @@ public class MarketManager : MonoBehaviour
.SkipLatestValueOnSubscribe()
.Subscribe(wantData =>
{
if (productDataList.FirstOrDefault(data => data.id == wantData.FlavorId)?.GetProductPrefab() is MarketPopcornView prefab)
if (productDataList.FirstOrDefault(data => data.id == wantData.FlavorId)?.GetMarketPrefab() is MarketPopcornView prefab)
{
customerAnimator.SetWantFlavor(prefab, wantData.Rarity);
}

34
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -88,7 +88,16 @@ public sealed class PanData
public string name;
public string text;
public int rarity;
public string prefabName;
public ProductRarity Rarity => (ProductRarity)rarity;
public RectTransform GetPrefab()
{
return Resources.Load<RectTransform>("Pans/" + prefabName);
}
public RectTransform GetIconPrefab()
{
return Resources.Load<RectTransform>("MaterialIcons/" + prefabName);
}
}
[Serializable]
@ -98,13 +107,12 @@ public sealed class FieldUpgradeData
public int level;
public int price;
public int harvested;
public string iconPrefabName;
public string prefabName;
public CornFieldUpgradeType Type => (CornFieldUpgradeType) type;
public RectTransform GetIconPrefab()
{
return Resources.Load<RectTransform>("MachineIcons/" + iconPrefabName);
return Resources.Load<RectTransform>("MachineIcons/" + prefabName);
}
public Animator GetPrefab()
@ -142,7 +150,6 @@ public sealed class ProductData
public int material3Id;
// public int cookingType;
public string prefabName;
public string productPrefabName;
private List<(int id, int amount)> materialList;
public List<(int id, int amount)> MaterialList
{
@ -166,14 +173,18 @@ public sealed class ProductData
return materialList.Count(material => material.id != Const.NotSetMaterialId);
}
public Animator GetRecipePrefab()
public Transform GetIconPrefab()
{
return Resources.Load<Animator>("Popcorns/" + (string.IsNullOrEmpty(prefabName) ? "package_salt" : prefabName));
return Resources.Load<Transform>("PopcornIcons/" + (string.IsNullOrEmpty(prefabName) ? "package_salt" : prefabName));
}
public Transform GetLargePrefab()
{
return Resources.Load<Transform>("PopcornIcons/" + (string.IsNullOrEmpty(prefabName) ? "package_salt" : prefabName));
}
public MarketPopcornView GetProductPrefab()
public MarketPopcornView GetMarketPrefab()
{
return Resources.Load<MarketPopcornView>("Popcorns/" + (string.IsNullOrEmpty(productPrefabName) ? "package_salt" : productPrefabName));
return Resources.Load<MarketPopcornView>("Popcorns/" + (string.IsNullOrEmpty(prefabName) ? "package_salt" : prefabName));
}
}
@ -228,4 +239,13 @@ public sealed class ShopData {
public string prefabName;
public ItemCategory Category => (ItemCategory)category;
public ShopItemType ConsumeType => (ShopItemType)consumeType;
public Transform GetPrefab()
{
return Resources.Load<Transform>("Materials/" + (string.IsNullOrEmpty(prefabName) ? "corn" : prefabName));
}
public Transform GetIconPrefab()
{
return Resources.Load<Transform>("MaterialIcons/" + (string.IsNullOrEmpty(prefabName) ? "corn" : prefabName));
}
}