StoreLevelシーンのCanvas修正/ 会話シーンのアニメーションLayerをWaterに変更/ 各シーンのMainCameraからWater除外

popcorn/Assets/MyGame/Scenes/CornField/CornField.unity

@@ -1981,7 +1981,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 7
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

popcorn/Assets/MyGame/Scenes/Main/Main.unity

@@ -4650,7 +4650,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 23
+    m_Bits: 7
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

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

@@ -1346,7 +1346,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 23
+    m_Bits: 7
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

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

@@ -211,12 +211,12 @@ PrefabInstance:
     - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
       propertyPath: m_Pivot.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
       propertyPath: m_Pivot.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
@@ -246,12 +246,27 @@ PrefabInstance:
     - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1020.21436
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 2208
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8660695105553703406, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
@@ -318,6 +333,11 @@ PrefabInstance:
       propertyPath: m_Camera
       value: 
       objectReference: {fileID: 1015955096}
+    - target: {fileID: 8660695105553703407, guid: 7a0e45165860f4e5099d690b636937a8,
+        type: 3}
+      propertyPath: m_RenderMode
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8660695105553703407, guid: 7a0e45165860f4e5099d690b636937a8,
         type: 3}
       propertyPath: m_SortingOrder

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

@@ -128,6 +128,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 48
+      objectReference: {fileID: 0}
     - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
         type: 3}
       propertyPath: m_RootOrder
@@ -208,6 +213,51 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 556079819079515921, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1929103738454117438, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4175834931618742362, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7121406970124810731, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132140880132230, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132140883042584, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132140921411081, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132140991209732, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141071550352, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 8326132141119378160, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
         type: 3}
       propertyPath: m_SizeDelta.x
@@ -223,6 +273,31 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8326132141132956787, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141152000579, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141267954191, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141296539805, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141302094835, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
     - target: {fileID: 8326132141332391088, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
         type: 3}
       propertyPath: m_Pivot.x
@@ -338,5 +413,315 @@ PrefabInstance:
       propertyPath: m_Camera
       value: 
       objectReference: {fileID: 2042574237}
+    - target: {fileID: 8326132141334795078, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141385936840, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141478229068, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141504684790, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141510797057, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141567865693, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141571715826, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141572152555, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141577481188, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141606188410, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141608364531, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141641515376, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141676049584, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141698139125, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141715923809, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141724331753, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141744221204, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141749845572, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141777197484, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141795236620, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141810833639, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141818718233, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141840838974, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141884556178, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141892762132, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141911565868, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141925733327, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141932638736, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141974392995, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142014058221, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142018351618, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142026856297, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142028446232, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142047786580, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142065893231, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142089885686, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142100206110, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142103454363, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142129191920, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142168276541, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142198031919, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142207212056, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142228314397, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142233745823, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142304899119, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142376114441, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142418878642, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142419760716, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142471785826, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142516391794, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142529065748, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142542952827, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142635387055, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142672591563, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142698926957, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142743140534, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142750289223, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142758377140, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142799556440, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142810994891, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132142831832560, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8581848325464979469, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_Layer
+      value: 4
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dcd945ce96b2149a0a5f9f2be4b2fbea, type: 3}

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

@@ -1111,7 +1111,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 23
+    m_Bits: 7
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

popcorn/Assets/MyGame/Scenes/shopping/shopping.unity

@@ -244,7 +244,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 23
+    m_Bits: 7
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0