タイトルをカスタマイズ表示に対応

popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using MyGame.Scenes.marketing.Scripts;
 using UniRx;
 using UniRx.Triggers;
 using UnityEngine;
@@ -12,6 +13,7 @@ public class Title : MonoBehaviour
     [SerializeField] private GameObject startObject;
     [SerializeField] private CustomerData customerData;
     [SerializeField] private CustomerController customerControllerPrefab;
+    [SerializeField] private MarketView marketView;
     // Start is called before the first frame update
     void Start()
     {
@@ -39,6 +41,9 @@ public class Title : MonoBehaviour
             });
         });
         
+        // カスタマイズ読み込み
+        marketView.SetAllItem();
+        
         // お客さん
         customerInterval.Select(f => 
             Observable.Interval(TimeSpan.FromSeconds(f)))

popcorn/Assets/MyGame/Scenes/Title/Title.unity

@@ -246,7 +246,7 @@ Transform:
   - {fileID: 515514730}
   - {fileID: 1769147131}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &42222366
 GameObject:
@@ -502,7 +502,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &113260712
 GameObject:
@@ -1291,7 +1291,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.049, y: 0.203, z: 0}
   m_LocalScale: {x: 1.52, y: 1.62, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 1824782782}
   m_Father: {fileID: 1526919379}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1373,7 +1374,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1526919379}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &363740314
 SpriteRenderer:
@@ -1618,6 +1619,91 @@ Transform:
   m_Father: {fileID: 1670200044}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &445182873
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: f46abf72670f570469e3612d368201be,
+        type: 3}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.33
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222138, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      propertyPath: m_Name
+      value: marketing (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 6725113438918222138, guid: 343971e948dfe44ddab5ab4f736c3f06,
+        type: 3}
+      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!1 &445344162
 GameObject:
   m_ObjectHideFlags: 0
@@ -2044,6 +2130,18 @@ Transform:
   m_Father: {fileID: 40632224}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &526008900 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06,
+    type: 3}
+  m_PrefabInstance: {fileID: 445182873}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5bfa266420af43d6acc01f297b04ba13, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &643040597
 GameObject:
   m_ObjectHideFlags: 0
@@ -2350,7 +2448,7 @@ Transform:
   - {fileID: 344846041}
   - {fileID: 1297296470}
   m_Father: {fileID: 1868499504}
-  m_RootOrder: 4
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &794270195
 MonoBehaviour:
@@ -2883,7 +2981,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 465288, guid: a9d27d37bab3c447b8eb7a2a6756e952, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 465288, guid: a9d27d37bab3c447b8eb7a2a6756e952, type: 3}
       propertyPath: m_LocalPosition.x
@@ -3830,7 +3928,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1129719413
 Transform:
   m_ObjectHideFlags: 0
@@ -4243,7 +4341,7 @@ Transform:
   m_Children:
   - {fileID: 1526919379}
   m_Father: {fileID: 1868499504}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1295869893
 GameObject:
@@ -4588,7 +4686,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1361506309}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: -0.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -4599,7 +4697,7 @@ Transform:
   - {fileID: 195025467}
   - {fileID: 1670200044}
   - {fileID: 1557076277}
-  m_Father: {fileID: 1868499504}
+  m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1361506311
@@ -5033,7 +5131,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 351699461}
-  - {fileID: 1824782782}
   - {fileID: 363740313}
   m_Father: {fileID: 1258179547}
   m_RootOrder: 0
@@ -9972,14 +10069,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1559522524}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 7.54, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1650380470}
   - {fileID: 1363440381}
-  m_Father: {fileID: 1868499504}
+  m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1559522526
 Animator:
@@ -10142,6 +10239,7 @@ MonoBehaviour:
   startObject: {fileID: 1863899077}
   customerData: {fileID: 1628914680}
   customerControllerPrefab: {fileID: 1165589899}
+  marketView: {fileID: 526008900}
 --- !u!4 &1628914679
 Transform:
   m_ObjectHideFlags: 0
@@ -10155,7 +10253,7 @@ Transform:
   m_Children:
   - {fileID: 1165589900}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1628914680
 MonoBehaviour:
@@ -15871,11 +15969,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1824782781}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.58, z: 0}
+  m_LocalPosition: {x: 0.032236844, y: -0.4833333, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6578948, y: 0.61728394, z: 1}
   m_Children: []
-  m_Father: {fileID: 1526919379}
+  m_Father: {fileID: 351699461}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1824782783
 SpriteRenderer:
@@ -16111,13 +16209,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1863899077}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: -1.27, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 471624820}
   - {fileID: 947610808}
-  m_Father: {fileID: 1868499504}
+  m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1863899079
@@ -16235,7 +16333,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1868499504
 Transform:
   m_ObjectHideFlags: 0
@@ -16247,13 +16345,10 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1559522525}
-  - {fileID: 1863899078}
-  - {fileID: 1361506310}
   - {fileID: 1258179547}
   - {fileID: 794270194}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1880579204
 GameObject:
@@ -16445,7 +16540,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1987905219
 MonoBehaviour:

popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Stock.prefab

@@ -25,7 +25,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2644414539543520232}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.07, y: 0.45, z: 0}
+  m_LocalPosition: {x: -0.07, y: -0.48, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5004154229686053151}