From 1c2673d766ab0951869dfa4fa7a0b1049e9ea89a Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 2 Dec 2022 20:40:08 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=82=A4=E3=83=88=E5=90=9B=E3=81=AE?= =?UTF-8?q?=E7=BE=BD=E3=81=AE=E4=BB=98=E4=B8=8E=E6=9D=A1=E4=BB=B6=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt | 2 +- popcorn/Assets/MyGame/Scripts/PartTimerManager.cs | 2 +- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index b8dfcd05..cd5f425f 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -RiilkyCPOCrg2/yhDwPAi7hseTMhNr0vrK1mCSG3zSfttL0GK0VxKwwqGU3E6KHj \ No newline at end of file +JA9i/njpPBOvMhQ1MeLUS+aHpXj/LMXlWn9L90ECEIyLS09zIq9UqXnrzpAykvgx \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt b/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt index 4363fb9f..0846da5a 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ItemConditionData.txt @@ -1 +1 @@ -YZ+PfuktlJJxlSftwIIxIjxur7EWlQDfvI2GxPTcn1cwHD2lYuqtJ0xjBerGQypF5ZITIOY14CiiXTbxflP+t/nHT8sLQAW2GfcIy04M+SdADxMOrLe2NpyT/RfhY8vR \ No newline at end of file +1Jxl7dVZ5UGgroJN3hnsrvWCRMRwhHJ2kKtlFcp/A8ef5zvWIItPHUBzHY0eEyIGjTIccVCB27QDIWNWHrN46c2xwn5A6b8S/Zbb2bjhPD8Uv4JAywBV8z2tRmpiNrINrXG5JmfsYfRhiUAXrqNU3GJhAYTGGNuuTlh9SDZ2KmXI/v8dERWJ0H6K0Zq5eYeNtgRC1mP5qdhlAcKwPA9AQ3BURU5hywye4uOJ1M1S7Pw= \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/PartTimerManager.cs b/popcorn/Assets/MyGame/Scripts/PartTimerManager.cs index 12f88cc5..5156e607 100644 --- a/popcorn/Assets/MyGame/Scripts/PartTimerManager.cs +++ b/popcorn/Assets/MyGame/Scripts/PartTimerManager.cs @@ -90,7 +90,7 @@ namespace MyGame.Scripts /// checkCountがTargetCount以上になれば受取可能 /// /// - public int CheckEarningsCustomizeCoin() => ItemConditionUtils.GetGlobalList(ItemCondition.TotalHeart, GameDataUtils.GetTotalHeart(), RewardActionType.CustomizeCoin, true).Sum(data => data.value); + public int CheckEarningsCustomizeCoin() => ItemConditionUtils.GetGlobalList(ItemCondition.PartTimerHeart, GameDataUtils.GetPartTimerHeart(Const.DefaultCityId), RewardActionType.CustomizeCoin, true).Sum(data => data.value); public static (int coin, int heart) CalcEarnings(PartTimerData partTimerData, int elapsed) { diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index b7651fbe..d502966c 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -189,6 +189,7 @@ public enum ItemCondition CityUnlock = 4, CityFundingCompleted = 5, FirstVisitCityMarket = 6, + PartTimerHeart = 7, } public enum RewardActionType