Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame
This commit is contained in:
commit
1f73398176
|
|
@ -193,9 +193,11 @@ public class Shopping : MonoBehaviour
|
|||
|
||||
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;
|
||||
foreach (var shopData in shopDataList.Where(data => data.Category == ItemCategory.Recipe))
|
||||
foreach (var shopData in shopDataList)
|
||||
{
|
||||
if (GetItemAmount(shopData) > 0) continue;
|
||||
if (shopData.price <= adCount)
|
||||
|
|
|
|||
|
|
@ -1683,10 +1683,10 @@ MonoBehaviour:
|
|||
Description:
|
||||
Languages:
|
||||
- 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
|
||||
Languages_Touch: []
|
||||
- Term: ui_button_icon_Footer_MaterialProcurement_logo_key
|
||||
|
|
@ -1694,10 +1694,10 @@ MonoBehaviour:
|
|||
Description:
|
||||
Languages:
|
||||
- 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
|
||||
Languages_Touch: []
|
||||
- Term: ui_button_icon_movie_logo_Procurement
|
||||
|
|
|
|||
Loading…
Reference in New Issue