diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FoodStandDialog.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FoodStandDialog.cs index 6a9c741e..68282efa 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FoodStandDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/FoodStandDialog.cs @@ -16,14 +16,10 @@ namespace MyGame.Scenes.WorldMap.Scripts [SerializeField] private Button closeButton; [SerializeField] private Text titleText; [SerializeField] private MarketView marketView; + [SerializeField] private Transform marketBgTarget; private void Start() { - marketView.SetAllItem(); - marketView.transform.FindAllChildrensComponent(r => - { - r.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; - }); var (cityData, onClose) = LocalCacheManager.Load<(CityData, Action)>(CallbackTag); LocalCacheManager.Remove(CallbackTag); closeButton.OnClickAsObservable().Take(1).Subscribe(_ => @@ -36,6 +32,13 @@ namespace MyGame.Scenes.WorldMap.Scripts TransitionManager.Instance.UnloadScene(GameScenes.WorldMap_FoodStand); }); }).AddTo(this); + marketBgTarget.DestroyAllChildrens(); + Instantiate(cityData.GetMarketBgPrefab(), marketBgTarget); + marketView.SetAllItem(); + marketView.transform.FindAllChildrensComponent(r => + { + r.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; + }); titleText.text = cityData.Name; } diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity index b749b585..8e0a101c 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity @@ -129,19 +129,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1002606733} m_PrefabAsset: {fileID: 0} ---- !u!114 &157854121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1984307938} --- !u!1001 &176446250 PrefabInstance: m_ObjectHideFlags: 0 @@ -9068,6 +9055,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5bfa266420af43d6acc01f297b04ba13, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1002606738 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7784620548362450356, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + m_PrefabInstance: {fileID: 1002606733} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1202825163 PrefabInstance: m_ObjectHideFlags: 0 @@ -10294,12 +10287,6 @@ SpriteMask: m_BackSortingOrder: 0 m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 ---- !u!212 &1984307938 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, - type: 3} - m_PrefabInstance: {fileID: 1002606733} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1984848901 PrefabInstance: m_ObjectHideFlags: 0 @@ -10786,6 +10773,7 @@ MonoBehaviour: closeButton: {fileID: 9205686916003356041} titleText: {fileID: 9205686916117522798} marketView: {fileID: 1002606737} + marketBgTarget: {fileID: 1002606738} --- !u!114 &9205686914717556670 MonoBehaviour: m_ObjectHideFlags: 0