カスタマイズ機能対応背景

popcorn/Assets/MyGame/Scenes/marketing/Customize.unity

@@ -1419,6 +1419,7 @@ MonoBehaviour:
   marketView: {fileID: 1618662803}
   customizeView: {fileID: 521710306}
   customizeSelector: {fileID: 521710305}
+  marketBgTarget: {fileID: 6725113439449511084}
 --- !u!1 &527833880
 GameObject:
   m_ObjectHideFlags: 0
@@ -5150,6 +5151,12 @@ PrefabInstance:
         type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3}
+--- !u!4 &6725113439449511084 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7784620548362450356, guid: 343971e948dfe44ddab5ab4f736c3f06,
+    type: 3}
+  m_PrefabInstance: {fileID: 6725113439449511083}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7213633219263105217
 PrefabInstance:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab

@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1455954418754164551
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7784620548362450356}
+  m_Layer: 0
+  m_Name: bgTarget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7784620548362450356
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1455954418754164551}
+  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: 6725113440112460167}
+  m_Father: {fileID: 6725113438918222137}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2766514938162068811
 GameObject:
   m_ObjectHideFlags: 0
@@ -93,7 +125,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6725113440112460167}
+  - {fileID: 7784620548362450356}
   - {fileID: 5295231574505592702}
   - {fileID: 5209415119062664250}
   - {fileID: 6725113439892338126}
@@ -744,7 +776,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 6725113438918222137}
+    m_TransformParent: {fileID: 7784620548362450356}
     m_Modifications:
     - target: {fileID: 145155683061950578, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
         type: 3}
@@ -784,17 +816,17 @@ PrefabInstance:
     - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 145155683061950581, guid: adf9d4c1d58d24e4cb5b8d5ee097073b,
         type: 3}

popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopCustomize.cs

@@ -12,6 +12,7 @@ namespace MyGame.Scenes.marketing.Scripts
         [SerializeField] private MarketView marketView;
         [SerializeField] private ShopCustomizeView customizeView;
         [SerializeField] private ShopCustomizeSelector customizeSelector;
+        [SerializeField] private Transform marketBgTarget;
         private void Start()
         {
             SoundManager.Instance.PlayBGM("bgm_marketing");
@@ -23,6 +24,11 @@ coin {gameData.ShopCustomizeCoin}
 myItems {string.Join(",", gameData.ShopCustomizeMyItems.Select(x => x.ToString()))}
 ");
 #endif
+            // 背景
+            var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet);
+            var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId);
+            marketBgTarget.DestroyAllChildrens();
+            Instantiate(cityData.GetMarketBgPrefab(), marketBgTarget);
             
             if (!gameData.FinishedFlags.HasFlag(TutorialFlag.ShopCustomize))
             {

popcorn/Assets/MyGame/Scenes/marketing/marketing.unity

@@ -208,38 +208,6 @@ 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
@@ -2243,7 +2211,7 @@ PrefabInstance:
     - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
@@ -2896,7 +2864,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &876376901
 GameObject:
@@ -3445,7 +3413,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1025201118
 MonoBehaviour:
@@ -3461,7 +3429,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   marketView: {fileID: 1685069515}
   closeSign: {fileID: 2022870421}
-  marketBgTarget: {fileID: 69697574}
+  marketBgTarget: {fileID: 1685069511}
   cartView: {fileID: 1119034882}
   blueView: {fileID: 1506158581}
   partTimerView: {fileID: 1930145619}
@@ -3711,12 +3679,6 @@ 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,
@@ -4088,80 +4050,6 @@ 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 &1217099569
 GameObject:
   m_ObjectHideFlags: 0
@@ -5037,7 +4925,7 @@ Transform:
   - {fileID: 1178501604}
   - {fileID: 1749782974}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1506158581
 MonoBehaviour:
@@ -10261,7 +10149,7 @@ PrefabInstance:
     - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
         type: 3}
@@ -10326,10 +10214,16 @@ PrefabInstance:
     - target: {fileID: 6725113440112460160, guid: 343971e948dfe44ddab5ab4f736c3f06,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3}
+--- !u!4 &1685069511 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7784620548362450356, guid: 343971e948dfe44ddab5ab4f736c3f06,
+    type: 3}
+  m_PrefabInstance: {fileID: 1685069510}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1685069515 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06,
@@ -16024,7 +15918,7 @@ Transform:
   - {fileID: 1312496084}
   - {fileID: 1078117066}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1930145619
 MonoBehaviour:
@@ -16072,7 +15966,7 @@ Transform:
   - {fileID: 172087640}
   - {fileID: 985747655}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2022870421 stripped
 GameObject:
@@ -16223,7 +16117,7 @@ PrefabInstance:
     - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e,
         type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 3667080857874733261, guid: b875e6e94a97840ca8490ce0718fca6e,
         type: 3}