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

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

This commit is contained in:
atusi 2022-03-16 19:31:06 +09:00
parent 26ce951bfd 5515acb31f
commit f34b6058d1
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1 +1 @@
LhZlT7iqc5Y1fJqNFQ51fTkBxTGgnr15l0pQb7awmIf/IMrrrM/NePVO5frY65cy 2qnMRdPKwVr8IYeSEFCnSn9irYNhuyVxDnTi9sgB3AYBdNlnJSB3PE4UeirM2gSc

4
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
View File

@ -114,7 +114,7 @@ public class BulkOrder : MonoBehaviour
// 獲得 // 獲得
var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.rewardHeart); var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.rewardHeart);
CoinManager.Instance.AddCoinForBulkOrder(bulkOrderData.retryCondition + bonus, coinPos); CoinManager.Instance.AddCoinForBulkOrder(bulkOrderData.rewardCoin + bonus, coinPos);
gameData.Coin = CoinManager.Instance.OwnCoin; gameData.Coin = CoinManager.Instance.OwnCoin;
/* /*
* アニメーション終了後にハートを加算する * アニメーション終了後にハートを加算する
@ -255,6 +255,6 @@ public class BulkOrder : MonoBehaviour
var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0; var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0;
totalBonus += bonusRate * heart; totalBonus += bonusRate * heart;
} }
return Mathf.CeilToInt(totalBonus / hasRarityList.Count); return Mathf.CeilToInt(totalBonus / resultData.Count);
} }
} }

10
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs
View File

@ -91,14 +91,8 @@ public class BulkOrderItemView : MonoBehaviour
{ {
cookingButton.gameObject.SetActive(false); cookingButton.gameObject.SetActive(false);
disabledObject.SetActive(false); disabledObject.SetActive(false);
if (rarity == ProductRarity.Normal) cookedObject.SetActive(rarity == ProductRarity.Normal);
{ perfectCookedObject.SetActive(!cookedObject.activeSelf);
cookedObject.SetActive(true);
}
else
{
perfectCookedObject.SetActive(true);
rarityView.SetRarity(rarity); rarityView.SetRarity(rarity);
} }
} }
}