diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 8899bd16..014df60f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -183,7 +183,7 @@ RectTransform: - {fileID: 118497225} - {fileID: 2041305254} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -282,7 +282,7 @@ RectTransform: - {fileID: 1462604263} - {fileID: 1453424321} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1240,80 +1240,6 @@ MonoBehaviour: m_EditorClassIdentifier: headerObject: {fileID: 3664916834242367712} footerObject: {fileID: 3664916833752817996} ---- !u!1 &1527155573937108630 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2931499691381414806} - - component: {fileID: 4809247392571370159} - - component: {fileID: 7315224665257597391} - m_Layer: 0 - m_Name: title_logo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2931499691381414806 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1527155573937108630} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7085694195965496252} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.04, y: 8.51} - m_SizeDelta: {x: 466, y: 54} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4809247392571370159 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1527155573937108630} - m_CullTransparentMesh: 0 ---- !u!114 &7315224665257597391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1527155573937108630} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2322867894675920669 GameObject: m_ObjectHideFlags: 0 @@ -1419,7 +1345,7 @@ RectTransform: - {fileID: 655651630893765691} - {fileID: 8136363072906095234} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1441,43 +1367,6 @@ MonoBehaviour: rewardButton: {fileID: 8545829044125670743} DisableObject: {fileID: 8559323780514547720} remainTimeText: {fileID: 4542360576964296986} ---- !u!1 &3213111080442531914 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7010126276251737949} - m_Layer: 0 - m_Name: shopping - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7010126276251737949 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3213111080442531914} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1674431630079185179} - - {fileID: 7085694195965496252} - m_Father: {fileID: 3664916832844628215} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -1020, y: -2208} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3664916832564167473 GameObject: m_ObjectHideFlags: 0 @@ -1619,7 +1508,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7010126276251737949} - {fileID: 2946332702762786804} - {fileID: 3664916834242367713} - {fileID: 3664916833752817997} @@ -1759,7 +1647,7 @@ RectTransform: m_Children: - {fileID: 3664916833050583563} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1862,80 +1750,6 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 ---- !u!1 &4233181358770764633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1674431630079185179} - - component: {fileID: 6377654529412332931} - - component: {fileID: 7212131415134415334} - m_Layer: 0 - m_Name: BackGround - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1674431630079185179 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4233181358770764633} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7010126276251737949} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1765.9999, y: 2208.039} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6377654529412332931 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4233181358770764633} - m_CullTransparentMesh: 0 ---- !u!114 &7212131415134415334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4233181358770764633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 28a88afc3eafafd46836fc0a92d784ca, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4527791912016219838 GameObject: m_ObjectHideFlags: 0 @@ -2158,43 +1972,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6308156613143906323 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7085694195965496252} - m_Layer: 0 - m_Name: title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7085694195965496252 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6308156613143906323} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5584497718062398763} - - {fileID: 2931499691381414806} - m_Father: {fileID: 7010126276251737949} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 823} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6455975542244611677 GameObject: m_ObjectHideFlags: 0 @@ -2376,7 +2153,7 @@ RectTransform: - {fileID: 8795892939542330791} - {fileID: 5138547402979269831} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2461,80 +2238,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 00:00 ---- !u!1 &8241562427572723412 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5584497718062398763} - - component: {fileID: 4302358617439404518} - - component: {fileID: 8551326360146391195} - m_Layer: 0 - m_Name: title_Frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5584497718062398763 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8241562427572723412} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} - m_Children: [] - m_Father: {fileID: 7085694195965496252} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 8.47} - m_SizeDelta: {x: 700, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4302358617439404518 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8241562427572723412} - m_CullTransparentMesh: 0 ---- !u!114 &8551326360146391195 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8241562427572723412} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3536ca1b52bdfa142a0d2dea94b66b8a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8559323780514547720 GameObject: m_ObjectHideFlags: 0 @@ -2651,7 +2354,7 @@ PrefabInstance: - target: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} @@ -2862,7 +2565,7 @@ PrefabInstance: - target: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} @@ -3010,7 +2713,7 @@ PrefabInstance: - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index eba4eb4f..e251225c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -69,7 +69,6 @@ public class Information : MonoBehaviour var gameData = GameDataManager.GameData; var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); var shopScriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); - Debug.Log(gameData.ViewedShopLevel); var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel) ?? shopLevelList[0]; var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel + 1); var nextLevelHeart = nextShopLevelData?.heart ?? shopLevelData.heart; diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index ab3a1729..e8976fde 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -102,8 +102,7 @@ public class ProductManagement : MonoBehaviour tankList[tankView.TankNumber].SetState(TankState.Lock); } }; - LocalCacheManager.Save(ShopItemPurchaseView.ItemPurchaseTag, (shopData, 0, purchaseAction)); - TransitionManager.Instance.LoadSceneAdditive(GameScenes.Purchase); + ShopItemPurchaseView.ShowDialog((shopData, 0), purchaseAction); }).AddTo(tankView); } else diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs index 929189f8..68b67b5d 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderView.cs @@ -25,4 +25,9 @@ public class ShopHeaderView : MonoBehaviour tab.Value = tabName; }).AddTo(this); } + + public void SetTab(ItemCategory category) + { + tab.SetValueAndForceNotify(category); + } } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs index dd137835..d4b5f4b8 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs @@ -1,11 +1,14 @@ using System; +using MyGame.Scripts; using UniRx; using UnityEngine; using UnityEngine.UI; public class ShopItemPurchaseView : MonoBehaviour { - public static readonly string ItemPurchaseTag = "ItemPurcahse"; + private static readonly string ItemPurchaseTag = "ItemPurcahse"; + private static readonly string PurchaseCallbackTag = "ShopItemPurchaseViewPurchaseCallbackTag"; + private static readonly string CloseCallbackTag = "ShopItemPurchaseViewCloseCallbackTag"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); private static readonly int MaxPurchaseCount = 999; @@ -37,11 +40,12 @@ public class ShopItemPurchaseView : MonoBehaviour defaultColor = totalPrice.color; ColorUtility.TryParseHtmlString(Const.RedColorString, out redColor); // 表示データを受け取る - var data = LocalCacheManager.Load<(ShopData shopData, int stockCount, Action callback)>(ItemPurchaseTag); + var data = LocalCacheManager.Load<(ShopData shopData, int stockCount)>(ItemPurchaseTag); LocalCacheManager.Remove(ItemPurchaseTag); SetData(data.shopData, data.stockCount); closeButton.OnClickAsObservable().Subscribe(_ => { + LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => @@ -51,7 +55,7 @@ public class ShopItemPurchaseView : MonoBehaviour }).AddTo(this); purchaseOnButton.OnClickAsObservable().Subscribe(_ => { - data.callback.Invoke(currentCount.Value); + LocalCacheManager.Load>(PurchaseCallbackTag, null)?.Invoke(currentCount.Value); transform.SetLocalScale(0); backgroundAnimator.SetTrigger(CloseTrigger); this.CallWaitForSeconds(.25f, () => @@ -85,6 +89,16 @@ public class ShopItemPurchaseView : MonoBehaviour { currentCount.Value = 1; } + + if (GameDataManager.GameData.isFirstPlay) + { + // マスク表示 + var go = TutorialManager.Instance.ShowTutorialMask(transform.parent, purchaseOnButton.transform as RectTransform); + purchaseOnButton.OnClickAsObservable().Take(1).Subscribe(_ => + { + DestroyImmediate(go); + }).AddTo(this); + } } private void SetData(ShopData shopData, int count) @@ -102,4 +116,12 @@ public class ShopItemPurchaseView : MonoBehaviour purchaseOnButton.gameObject.SetActive(active); purchaseOffButton.SetActive(!active); } + + public static void ShowDialog((ShopData shopData, int stockCount) data, Action onPurchase, Action onClose = null) + { + LocalCacheManager.Save(ItemPurchaseTag, data); + LocalCacheManager.Save(PurchaseCallbackTag, onPurchase); + LocalCacheManager.Save(CloseCallbackTag, onClose); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.Purchase); + } } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs index fd4c679d..bc2be981 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopListView.cs @@ -10,6 +10,7 @@ public class ShopListView : MonoBehaviour [SerializeField] private ShopItemView itemViewPrefab; [SerializeField] private ShopHeaderView headerView; private readonly List<(ItemCategory category, RectTransform content)> tabs = new List<(ItemCategory, RectTransform)>(); + public ScrollRect ScrollRect => scrollRect; private void Awake() { @@ -37,6 +38,11 @@ public class ShopListView : MonoBehaviour }).AddTo(this); } + public void SetTab(ItemCategory category) + { + headerView.SetTab(category); + } + public ShopItemView AddItemView(ShopData shopData) { var tabCategory = GetTabCategory(shopData.Category); @@ -62,4 +68,10 @@ public class ShopListView : MonoBehaviour throw new ArgumentOutOfRangeException(nameof(category), category, null); } } + + public void ForceRebuildContent() + { + LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content); + scrollRect.verticalNormalizedPosition = 1; + } } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 70e49592..09646ea0 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; +using MyGame.Scripts; using UniRx; using UnityEngine; @@ -59,8 +60,21 @@ public class Shopping : MonoBehaviour .Where(_ => shopData.price <= CoinManager.Instance.OwnCoin) .Subscribe(_ => { - LocalCacheManager.Save(ShopItemPurchaseView.ItemPurchaseTag, (shopData, GetItemAmount(shopData), new Action(x => purchaseSubject.OnNext(x)))); - TransitionManager.Instance.LoadSceneAdditive(GameScenes.Purchase); + ShopItemPurchaseView.ShowDialog((shopData, GetItemAmount(shopData)), x => + { + purchaseSubject.OnNext(x); + if (gameData.isFirstPlay) + { + TutorialManager.Instance.ShowTutorialConversation(6, () => + { + var go = FindObjectOfType().transform; + go.transform.FindChildByName("Button_Main", t => + { + TutorialManager.Instance.ShowTutorialMask(go.parent, t as RectTransform); + }); + }); + } + }); }).AddTo(itemView); // show detail view itemView.DetailButtonObservable.Subscribe(_ => @@ -69,7 +83,24 @@ public class Shopping : MonoBehaviour TransitionManager.Instance.LoadSceneAdditive(GameScenes.ShoppingExplanation); }).AddTo(itemView); } + listView.SetTab(ItemCategory.Material); changeCoinSubject.OnNext(CoinManager.Instance.OwnCoin); + + if (gameData.isFirstPlay) + { + listView.ScrollRect.vertical = false; + TutorialManager.Instance.ShowTutorialConversation(5, () => + { + // マスク表示 + var view = listView.ScrollRect.content.GetChild(0).GetComponent(); + var viewRectTransform = view.transform as RectTransform; + var go = TutorialManager.Instance.ShowTutorialMask(listView.transform.parent, viewRectTransform); + view.PurchaseButtonObservable.Take(1).Subscribe(_ => + { + DestroyImmediate(go); + }).AddTo(this); + }); + } } private int GetItemAmount(ShopData shopData) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index d3e25038..8d34b937 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -185,7 +185,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &553363513 GameObject: @@ -270,6 +270,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &715888784 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, + type: 3} + m_PrefabInstance: {fileID: 3078490422721459368} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f77652346b24cc9b0d5da516979f736, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &980038342 GameObject: m_ObjectHideFlags: 0 @@ -299,7 +311,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7b7e1a23513042b0bbac3c91ccab081, type: 3} m_Name: m_EditorClassIdentifier: - listView: {fileID: 1188209735} + listView: {fileID: 715888784} --- !u!4 &980038345 Transform: m_ObjectHideFlags: 0 @@ -312,7 +324,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1098091307 PrefabInstance: @@ -479,6 +491,11 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3664916832564167476, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Camera @@ -609,6 +626,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -622,7 +644,7 @@ PrefabInstance: - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -631,472 +653,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} ---- !u!224 &1098091308 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1188209733 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1098091308} - m_Modifications: - - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418098885678, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418112398164, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418112398164, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418112398164, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418150870077, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684490, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Name - value: Window - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.x - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: -1058 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -64 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418702301919, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418702301919, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418702301919, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418828803474, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418828803474, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418828803474, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042418828803474, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042419150224393, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042419150224393, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042419150224393, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042419150224393, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 2912042419203209778, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2912042419340105156, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 8ef7cbdaee9f8a04ab649c2c4f873893, - type: 3} - - target: {fileID: 2912042419340105159, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.x - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 2912042419340105159, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: 102 - objectReference: {fileID: 0} - - target: {fileID: 2912042419340105159, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 17 - objectReference: {fileID: 0} - - target: {fileID: 2912042419614313712, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: ad9ae5d09441c554180805fcf11377eb, - type: 3} - - target: {fileID: 2912042419614313715, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.x - value: 249 - objectReference: {fileID: 0} - - target: {fileID: 2912042419614313715, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: 125 - objectReference: {fileID: 0} - - target: {fileID: 2912042419614313715, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 2912042419696265076, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: 124 - objectReference: {fileID: 0} - - target: {fileID: 2912042419696265076, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 2912042419696265077, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: fc80702fa5c486e439772818d5df56b8, - type: 3} - - target: {fileID: 2912042419872848609, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 2912042419872848609, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2912042419872848622, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 9f684ecfa18fc134ab2c3955d200a8d7, - type: 3} - - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.x - value: 1028 - objectReference: {fileID: 0} - - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_SizeDelta.y - value: 1150 - objectReference: {fileID: 0} - - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392265446442, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392265446442, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392265446442, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392265446442, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392476026602, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392476026602, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392476026602, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392476026602, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} ---- !u!114 &1188209735 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7513283637877447830, guid: 2ceb27afa38c74b76b130f23621f7f50, - type: 3} - m_PrefabInstance: {fileID: 1188209733} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f77652346b24cc9b0d5da516979f736, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -1172,3 +728,408 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3078490422721459368 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 203041984901209186, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041984901209186, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041984901209186, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041984901209186, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985003178990, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985003178990, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985003178990, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985029719175, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985587704421, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985587704421, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985587704421, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985727542568, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985727542568, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985727542568, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985727542568, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 203041985727542575, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 203041986045686963, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697754891812348, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995760, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995761, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1450416388} + - target: {fileID: 1757697755521995761, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SortingOrder + value: 124 + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995764, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Name + value: MainCanvas + objectReference: {fileID: 0} + - target: {fileID: 1757697755521995764, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1757697755800806895, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755800806895, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755800806895, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755800806895, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755868717279, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755868717279, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755868717279, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755868717279, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697755868717279, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697756267918489, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1757697756267918489, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1798728548449351146, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_SortingOrder + value: 107 + objectReference: {fileID: 0} + - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789154774160, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789154774160, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789154774160, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789154774160, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 2722941485091053189, guid: 667a93fb2929943078b944050cddd464, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 667a93fb2929943078b944050cddd464, type: 3}