Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop

* 'develop' of https://bitbucket.org/usaya/popcorn: 背景縦が足りない分書き足し POPの位置調整矢印アニメーション修正
2021-10-27 20:14:17 +09:00 · 2021-10-27 20:14:17 +09:00 · be1d8e4a78
parent 82474e0d28 cc4446cbc3
commit be1d8e4a78
11 changed files with 128 additions and 14 deletions
--- a/popcorn/Assets/MyGame/Resource/Animation/tutorial_Arrow_under.anim
+++ b/popcorn/Assets/MyGame/Resource/Animation/tutorial_Arrow_under.anim
@ -24,8 +24,17 @@ AnimationClip:
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
        weightedMode: 0
-        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 1
+        value: {x: 0, y: 0, z: 180}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -54,6 +63,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -89,7 +107,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.5
+    m_StopTime: 1
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -115,8 +133,17 @@ AnimationClip:
        outSlope: 0
        tangentMode: 136
        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -134,8 +161,17 @@ AnimationClip:
        outSlope: 0
        tangentMode: 136
        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -153,8 +189,17 @@ AnimationClip:
        outSlope: 0
        tangentMode: 136
        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 180
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -183,6 +228,15 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
--- a/popcorn/Assets/MyGame/Resource/Material/shopping/shopping_background_Dither.png
+++ b/popcorn/Assets/MyGame/Resource/Material/shopping/shopping_background_Dither.png
--- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity
+++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity
@ -1060,7 +1060,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 50}
  m_SizeDelta: {x: 705, y: 705}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &916321398
--- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity
@ -284,6 +284,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 2660639678609988585, guid: 66c0408cd45e7422cb6d59d2bdf4e998,
        type: 3}
      propertyPath: m_AnchorMax.y
--- a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity
@ -318,6 +318,11 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7864277047233171550, guid: a2309e5e619554230b1f6d3d9426ed51,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 250
+      objectReference: {fileID: 0}
    - target: {fileID: 7864277048177254394, guid: a2309e5e619554230b1f6d3d9426ed51,
        type: 3}
      propertyPath: m_AnchoredPosition.y
--- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity
@ -1420,7 +1420,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 57}
+  m_AnchoredPosition: {x: 0, y: 72}
  m_SizeDelta: {x: 705, y: 550}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1336838853
@ -1480,7 +1480,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.00012207031, y: -0.00012207031}
+  m_AnchoredPosition: {x: 0, y: 30}
  m_SizeDelta: {x: 705, y: 450}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1469609942
--- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity
+++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity
@ -418,6 +418,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3856012874794846574, guid: 6592613d31e034734bea16833d6345c1,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 3856012875358022744, guid: 6592613d31e034734bea16833d6345c1,
        type: 3}
      propertyPath: m_Name
--- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity
+++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity
@ -578,7 +578,7 @@ PrefabInstance:
    - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
        type: 3}
      propertyPath: m_RootOrder
-      value: 6
+      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689,
        type: 3}
@ -1804,6 +1804,21 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3614969982694527390, guid: 0b1e1a744f3d5447d88970ba4f22d761,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 300
+      objectReference: {fileID: 0}
+    - target: {fileID: 3614969982694527390, guid: 0b1e1a744f3d5447d88970ba4f22d761,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -20
+      objectReference: {fileID: 0}
+    - target: {fileID: 5505851828519651022, guid: 0b1e1a744f3d5447d88970ba4f22d761,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -240
+      objectReference: {fileID: 0}
    - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761,
        type: 3}
      propertyPath: m_AnchorMax.y
@ -1984,6 +1999,11 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8157765726200260526, guid: 0b1e1a744f3d5447d88970ba4f22d761,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -236.00012
+      objectReference: {fileID: 0}
    - target: {fileID: 8908151885642361585, guid: 0b1e1a744f3d5447d88970ba4f22d761,
        type: 3}
      propertyPath: m_SizeDelta.x
--- a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity
+++ b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity
@ -128,6 +128,11 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 9133304335168602039, guid: 3ea48dc60c16147799619e2fb9fe1cd9,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 9133304335334808081, guid: 3ea48dc60c16147799619e2fb9fe1cd9,
        type: 3}
      propertyPath: m_AnchoredPosition.x
--- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity
+++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity
@ -158,6 +158,11 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 512
      objectReference: {fileID: 0}
+    - target: {fileID: 3033445369043120722, guid: a1b406baf09004616b436c242e3a474f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 3033445369412931226, guid: a1b406baf09004616b436c242e3a474f,
        type: 3}
      propertyPath: m_SizeDelta.x
--- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
+++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
@ -644,7 +644,7 @@ PrefabInstance:
    - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
        type: 3}
      propertyPath: m_RootOrder
-      value: 6
+      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689,
        type: 3}
@ -995,6 +995,21 @@ PrefabInstance:
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1766
+      objectReference: {fileID: 0}
+    - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 2250.6333
+      objectReference: {fileID: 0}
+    - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 21
+      objectReference: {fileID: 0}
    - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464,
        type: 3}
      propertyPath: m_AnchorMax.y