From f7f38de68fdc1ee95f711b7c8a5bf3094a94e06a Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 13 Oct 2022 18:27:11 +0900 Subject: [PATCH] =?UTF-8?q?=E8=B2=A9=E5=A3=B2=E8=83=8C=E6=99=AF=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=89=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/ShopCityBackground/egg.prefab | 2 +- .../Scenes/marketing/Prefabs/marketing.prefab | 5 + .../Scenes/marketing/Scripts/MarketManager.cs | 8 ++ .../MyGame/Scenes/marketing/marketing.unity | 134 ++++++++++++++++-- .../Assets/MyGame/Scripts/SpreadsheetData.cs | 5 + 5 files changed, 145 insertions(+), 9 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab b/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab index eb0b92f6..8b5e3822 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCityBackground/egg.prefab @@ -308,7 +308,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &145155683095498776 Transform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab index 0f6aedb1..e680791f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab @@ -751,6 +751,11 @@ PrefabInstance: propertyPath: m_Name value: egg objectReference: {fileID: 0} + - target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 3a9eed3c..078ba885 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -15,6 +15,7 @@ public class MarketManager : MonoBehaviour [SerializeField] private MarketView marketView; [SerializeField] private GameObject closeSign; private ShopStockView stockView; + [SerializeField] private Transform marketBgTarget; [SerializeField] private MarketCartView cartView; [SerializeField] private BrotherBlueView blueView; [SerializeField] private PartTimerView partTimerView; @@ -51,6 +52,13 @@ public class MarketManager : MonoBehaviour stockView = marketView.GetTarget(ShopCustomizeCategory.Category4).GetComponentInChildren(); stockView.SetTextActive(true); ShopCustomizeCoinManager.Instance.ChangeCoin(globalGameData.ShopCustomizeCoin); + + // 背景 + var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); + var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId); + marketBgTarget.DestroyAllChildrens(); + Instantiate(cityData.GetMarketBgPrefab(), marketBgTarget); + // 最新の都市ではない場合、バイトが有効 if (!market.IsLatestCity) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index a5fc088d..50430a5d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -208,6 +208,38 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &69697573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 69697574} + m_Layer: 0 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &69697574 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 69697573} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1114986197} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &151001427 GameObject: m_ObjectHideFlags: 0 @@ -2211,7 +2243,7 @@ PrefabInstance: - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2859,7 +2891,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &876376901 GameObject: @@ -3408,7 +3440,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1025201118 MonoBehaviour: @@ -3424,6 +3456,7 @@ MonoBehaviour: m_EditorClassIdentifier: marketView: {fileID: 1685069515} closeSign: {fileID: 2022870421} + marketBgTarget: {fileID: 69697574} cartView: {fileID: 1119034882} blueView: {fileID: 1506158581} partTimerView: {fileID: 1930145619} @@ -3596,6 +3629,12 @@ Transform: m_Father: {fileID: 760797061} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1114986197 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + m_PrefabInstance: {fileID: 1208500839} + m_PrefabAsset: {fileID: 0} --- !u!114 &1119034882 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6496262361772707387, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -3865,6 +3904,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1189290112} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1208500839 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 69697574} + m_Modifications: + - target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_Name + value: egg (1) + objectReference: {fileID: 0} + - target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.28 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: adf9d4c1d58d24e4cb5b8d5ee097073b, type: 3} --- !u!1 &1235629312 GameObject: m_ObjectHideFlags: 0 @@ -4563,7 +4676,7 @@ Transform: - {fileID: 1178501604} - {fileID: 1749782974} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1506158581 MonoBehaviour: @@ -9787,7 +9900,7 @@ PrefabInstance: - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} @@ -9849,6 +9962,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6725113440112460160, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} --- !u!114 &1685069515 stripped @@ -15317,7 +15435,7 @@ Transform: - {fileID: 1312496084} - {fileID: 1078117066} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1930145619 MonoBehaviour: @@ -15365,7 +15483,7 @@ Transform: - {fileID: 172087640} - {fileID: 985747655} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2022870421 stripped GameObject: @@ -15516,7 +15634,7 @@ PrefabInstance: - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e, type: 3} diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 9f1d86fa..19f91318 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -633,6 +633,11 @@ public sealed class CityData { return Resources.Load($"CityIcons/{prefabName}"); } + + public Transform GetMarketBgPrefab() + { + return Resources.Load($"ShopCityBackground/{prefabName}"); + } } [Serializable]