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

大量注文達成ShowDialogに引数追加

This commit is contained in:
kimura 2022-02-09 13:57:49 +09:00
parent 60394e60f8
commit 96b9fe0ecb
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab
View File

@ -153,6 +153,12 @@ MonoBehaviour:
messageText: {fileID: 2377818823780007094} messageText: {fileID: 2377818823780007094}
bulkOrderCharacter: {fileID: 4080359802288886363} bulkOrderCharacter: {fileID: 4080359802288886363}
orderCharacterImage: {fileID: 2377818823009469880} orderCharacterImage: {fileID: 2377818823009469880}
heartIconTransform: {fileID: 2377818824019765601}
coinIconTransform: {fileID: 2377818823916755441}
heartPrefab: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
type: 3}
coinPrefab: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
type: 3}
--- !u!1 &2377818823009469882 --- !u!1 &2377818823009469882
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

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

@ -109,7 +109,7 @@ public class BulkOrder : MonoBehaviour
// 納品 // 納品
deliveredButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => deliveredButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
{ {
BulkOrderAchievedView.ShowDialog(() => BulkOrderAchievedView.ShowDialog((coinPos, heartPos) =>
{ {
// 獲得 // 獲得
var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet); var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);

8
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
View File

@ -19,6 +19,10 @@ public class BulkOrderAchievedView : MonoBehaviour
[SerializeField] private BulkOrderCharacter bulkOrderCharacter; [SerializeField] private BulkOrderCharacter bulkOrderCharacter;
[SerializeField] private Image orderCharacterImage; [SerializeField] private Image orderCharacterImage;
// effect用
[SerializeField] private Transform heartIconTransform;
[SerializeField] private Transform coinIconTransform;
private void Start() private void Start()
{ {
if (LocalCacheManager.Load<BulkOrderData>(BulkOrder.DataTag, null) is BulkOrderData orderData) if (LocalCacheManager.Load<BulkOrderData>(BulkOrder.DataTag, null) is BulkOrderData orderData)
@ -35,7 +39,7 @@ public class BulkOrderAchievedView : MonoBehaviour
} }
closeButton.OnClickAsObservable().Take(1).Subscribe(_ => closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
{ {
LocalCacheManager.Load<Action>(CallbackTag, null)?.Invoke(); LocalCacheManager.Load<Action<Vector3, Vector3>>(CallbackTag, null)?.Invoke(coinIconTransform.position, heartIconTransform.position);
LocalCacheManager.Remove(CallbackTag); LocalCacheManager.Remove(CallbackTag);
transform.parent.SetLocalScale(0); transform.parent.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger); backgroundAnimator.SetTrigger(CloseTrigger);
@ -46,7 +50,7 @@ public class BulkOrderAchievedView : MonoBehaviour
}).AddTo(this); }).AddTo(this);
} }
public static void ShowDialog(Action onComplete = null) public static void ShowDialog(Action<Vector3, Vector3> onComplete = null)
{ {
LocalCacheManager.Save(CallbackTag, onComplete); LocalCacheManager.Save(CallbackTag, onComplete);
TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderAchievement); TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderAchievement);