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

収益報告にエフェクト追加

This commit is contained in:
kimura 2022-09-28 14:56:40 +09:00
parent ce3aef53ed
commit eae6932364
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
popcorn/Assets/MyGame/Scenes/Main/EarningsReport.unity
View File

@ -1263,6 +1263,9 @@ MonoBehaviour:
coinText: {fileID: 3565416525567727735} coinText: {fileID: 3565416525567727735}
heartText: {fileID: 3565416527223446235} heartText: {fileID: 3565416527223446235}
shopCustomizeCoinText: {fileID: 3565416527311284399} shopCustomizeCoinText: {fileID: 3565416527311284399}
shopCustomizeObject: {fileID: 1127196281}
coinIcon: {fileID: 3565416525613993359}
heartIcon: {fileID: 3565416525515160863}
--- !u!1 &3565416526696996279 --- !u!1 &3565416526696996279
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -20,10 +20,13 @@ namespace MyGame.Scenes.Main.Scripts
[SerializeField] private Text coinText; [SerializeField] private Text coinText;
[SerializeField] private Text heartText; [SerializeField] private Text heartText;
[SerializeField] private Text shopCustomizeCoinText; [SerializeField] private Text shopCustomizeCoinText;
[SerializeField] private GameObject shopCustomizeObject;
[SerializeField] private Transform coinIcon;
[SerializeField] private Transform heartIcon;
private void Start() private void Start()
{ {
var onClose = LocalCacheManager.Load<Action>(CallbackTag, default); var onClose = LocalCacheManager.Load<Action<Vector3, Vector3>>(CallbackTag, default);
LocalCacheManager.Remove(CallbackTag); LocalCacheManager.Remove(CallbackTag);
var cityGameData = GameDataManager.GetCurrentCityGameData(); var cityGameData = GameDataManager.GetCurrentCityGameData();
@ -33,10 +36,11 @@ namespace MyGame.Scenes.Main.Scripts
coinText.text = coin.ToString(); coinText.text = coin.ToString();
heartText.text = heart.ToString(); heartText.text = heart.ToString();
shopCustomizeCoinText.text = 0.ToString(); shopCustomizeCoinText.text = 0.ToString();
shopCustomizeObject.SetActive(false);
closeButton.OnClickAsObservable().Take(1).Subscribe(_ => closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{ {
onClose?.Invoke(); onClose?.Invoke(coinIcon.position, heartIcon.position);
transform.parent.SetLocalScale(0); transform.parent.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger); backgroundAnimator.SetTrigger(CloseTrigger);
this.CallWaitForSeconds(.25f, () => this.CallWaitForSeconds(.25f, () =>
@ -46,7 +50,7 @@ namespace MyGame.Scenes.Main.Scripts
}).AddTo(this); }).AddTo(this);
} }
public static void ShowDialog(Action onClose = null) public static void ShowDialog(Action<Vector3, Vector3> onClose = null)
{ {
LocalCacheManager.Save(CallbackTag, onClose); LocalCacheManager.Save(CallbackTag, onClose);
TransitionManager.Instance.LoadSceneAdditive(SceneName); TransitionManager.Instance.LoadSceneAdditive(SceneName);

11
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -76,13 +76,16 @@ public class KitchenManager : MonoBehaviour
var partTimerElapsed = cityGameData.PartTimerElapsed; var partTimerElapsed = cityGameData.PartTimerElapsed;
if (partTimerElapsed > 10) if (partTimerElapsed > 10)
{ {
EarningsReportDialog.ShowDialog(() => EarningsReportDialog.ShowDialog((coinPos, heartPos) =>
{ {
var partTimerData = partTimersData.First(data => data.level == cityGameData.PartTimerLevel); var partTimerData = partTimersData.First(data => data.level == cityGameData.PartTimerLevel);
var (coin, heart) = PartTimerManager.CalcEarnings(partTimerData, partTimerElapsed); var (coin, heart) = PartTimerManager.CalcEarnings(partTimerData, partTimerElapsed);
HeartMeter.Instance.AddHeart(heart); cityGameData.WaitAddHeart += heart;
cityGameData.Heart += heart; HeartMeter.Instance.AddHeartForBulkOrder(heartPos, () =>
CoinManager.Instance.AddCoin(coin); {
cityGameData.MoveHeart(heart);
});
CoinManager.Instance.AddCoinForBulkOrder(coin, coinPos);
cityGameData.Coin = CoinManager.Instance.OwnCoin; cityGameData.Coin = CoinManager.Instance.OwnCoin;
cityGameData.PartTimerElapsed -= partTimerElapsed; cityGameData.PartTimerElapsed -= partTimerElapsed;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();