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

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-10-06 19:21:44 +09:00
parent 321e178b2e f6d8145b74
commit 80c53dcb16
8 changed files with 9 additions and 5 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 @@
iC+nFgGNhnVfd2tbxmQ3bcWR1g4BO9c68pFV9Qxf7BW4RcJReW94df2aiP0xUzIa
d6nFPZZhlYdDyGZ6n15DKpArgW5OB8V48w728pljKoWl6CVgQ1rYuvJoYP31pXeG

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

File diff suppressed because one or more lines are too long

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

1
popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
View File

@ -1947,6 +1947,7 @@ MonoBehaviour:
flavorName: {fileID: 707887860}
flavorPrice: {fileID: 498799267}
flavorStock: {fileID: 1109202679}
flavorText: {fileID: 1116792172}
cornAmountText: {fileID: 4654596182167880407}
flavor1AmountText: {fileID: 5352886969301700758}
flavor2AmountText: {fileID: 1408233927}

2
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
View File

@ -21,6 +21,7 @@ public class RecipeDetailView : MonoBehaviour
[SerializeField] private Text flavorName;
[SerializeField] private Text flavorPrice;
[SerializeField] private Text flavorStock;
[SerializeField] private Text flavorText;
[SerializeField] private Text cornAmountText;
[SerializeField] private Text flavor1AmountText;
[SerializeField] private Text flavor2AmountText;
@ -77,6 +78,7 @@ public class RecipeDetailView : MonoBehaviour
flavorStock.text = string.Format(flavorStockFormat, shopStock + tankStock);
flavorName.text = data.name;
flavorPrice.text = data.price.ToString();
flavorText.text = data.text;
cornAmountText.text = string.Format(cornAmountFormat, gameData.CornSeed, data.MaterialList[0].amount);
var flavor1Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id)?.Amount ?? 0;

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

@ -136,6 +136,7 @@ public sealed class ProductData
public int shopLevel;
public int price;
public int volume;
public string text;
public int material1Id;
public int material2Id;
public int material3Id;