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

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

This commit is contained in:
koya_15 2022-07-06 11:03:07 +09:00
parent c1348bd26a 77836e075c
commit 1f73398176
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
View File

@ -193,9 +193,11 @@ public class Shopping : MonoBehaviour
public static bool CheckEarnedRecipe() public static bool CheckEarnedRecipe()
{ {
var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet); var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet)
.Where(data => !data.IsHide)
.Where(data => data.Category == ItemCategory.Recipe);
var adCount = GameDataManager.GameData.adCount; var adCount = GameDataManager.GameData.adCount;
foreach (var shopData in shopDataList.Where(data => data.Category == ItemCategory.Recipe)) foreach (var shopData in shopDataList)
{ {
if (GetItemAmount(shopData) > 0) continue; if (GetItemAmount(shopData) > 0) continue;
if (shopData.price <= adCount) if (shopData.price <= adCount)

16
popcorn/Assets/Resources/I2Languages.asset
View File

@ -1683,10 +1683,10 @@ MonoBehaviour:
Description: Description:
Languages: Languages:
- ui_button_icon_Footer_MaterialProcurement_logo - ui_button_icon_Footer_MaterialProcurement_logo
- Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] -
- Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] -
- Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko[ui_button_icon_Footer_MaterialProcurement_logo_ko] -
- Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en[ui_button_icon_Footer_MaterialProcurement_logo_en] -
Flags: 0000000000 Flags: 0000000000
Languages_Touch: [] Languages_Touch: []
- Term: ui_button_icon_Footer_MaterialProcurement_logo_key - Term: ui_button_icon_Footer_MaterialProcurement_logo_key
@ -1694,10 +1694,10 @@ MonoBehaviour:
Description: Description:
Languages: Languages:
- ui_button_icon_Footer_MaterialProcurement_logo_key - ui_button_icon_Footer_MaterialProcurement_logo_key
- Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] -
- Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] -
- Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko[ui_button_icon_Footer_MaterialProcurement_logo_key_ko] -
- Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en[ui_button_icon_Footer_MaterialProcurement_logo_key_en] -
Flags: 0000000000 Flags: 0000000000
Languages_Touch: [] Languages_Touch: []
- Term: ui_button_icon_movie_logo_Procurement - Term: ui_button_icon_movie_logo_Procurement