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

popcorn/Assets/MyGame/Resource/Animation/BulkOrde_EarnedCoins.anim

@@ -170,7 +170,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 125.8
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -179,16 +179,25 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
-        value: 110.5
+        value: -28
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 0
+        inSlope: 160
+        outSlope: 160
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.36666667
-        value: 132.2
+        value: 8
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -197,7 +206,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6166667
-        value: 125.8
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -206,7 +215,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8666667
-        value: 125.8
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -371,7 +380,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 125.8
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -380,16 +389,25 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
-        value: 110.5
+        value: -28
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 0
+        inSlope: 160
+        outSlope: 160
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.36666667
-        value: 132.2
+        value: 8
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -398,7 +416,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6166667
-        value: 125.8
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -407,7 +425,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8666667
-        value: 125.8
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136

popcorn/Assets/MyGame/Resource/Animation/BulkOrde_heart.anim

@@ -19,6 +19,15 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0, z: 0}
+        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}
       - serializedVersion: 3
         time: 0.16666667
         value: {x: 0, y: 0, z: 0}
@@ -65,7 +74,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -172.49995
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -74,16 +83,25 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
-        value: -184.7
+        value: -28
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 0
+        inSlope: 160
+        outSlope: 160
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.36666667
-        value: -161.1
+        value: 8
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -92,7 +110,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6166667
-        value: -172.49995
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -101,7 +119,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8666667
-        value: -172.49995
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -252,7 +270,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -172.49995
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -261,16 +279,25 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
-        value: -184.7
+        value: -28
         inSlope: 0
         outSlope: 0
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 0
+        inSlope: 160
+        outSlope: 160
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.36666667
-        value: -161.1
+        value: 8
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -279,7 +306,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.6166667
-        value: -172.49995
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -288,7 +315,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.8666667
-        value: -172.49995
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -351,6 +378,15 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0
@@ -397,6 +433,15 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0
@@ -443,6 +488,15 @@ AnimationClip:
   - curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.16666667
         value: 0

popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_EarnedCoins.prefab

@@ -109,7 +109,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: 14.4, y: 125.8}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &7652649814849287505

popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_heart.prefab

@@ -4825,9 +4825,9 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 340.99994, y: -172.49995}
+  m_AnchoredPosition: {x: 0, y: 1171.5}
   m_SizeDelta: {x: 54, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4552849473547301759

popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab

@@ -1518,8 +1518,6 @@ RectTransform:
   - {fileID: 2377818824174324134}
   - {fileID: 2377818824267973770}
   - {fileID: 2377818823068443759}
-  - {fileID: 4186614284942185183}
-  - {fileID: 176900080347467306}
   m_Father: {fileID: 2377818824260807143}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2303,258 +2301,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f6c5a52384784446ae7d757bd7007b88, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &6612657450030229561
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2377818824244898183}
-    m_Modifications:
-    - target: {fileID: 3458314235910815692, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_Name
-      value: BulkOrde_EarnedCoins
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 14.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 125.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f41554a7122e9314ea6c22282d4c7be0, type: 3}
---- !u!224 &176900080347467306 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
-    type: 3}
-  m_PrefabInstance: {fileID: 6612657450030229561}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &9175475476500745078
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2377818824244898183}
-    m_Modifications:
-    - target: {fileID: 1452015854210980963, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_Name
-      value: BulkOrde_heart
-      objectReference: {fileID: 0}
-    - target: {fileID: 1452015854210980963, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 54
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 340.99994
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -172.49995
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 98690cb45240c4c4da24017b44a03e84, type: 3}
---- !u!224 &4186614284942185183 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
-    type: 3}
-  m_PrefabInstance: {fileID: 9175475476500745078}
-  m_PrefabAsset: {fileID: 0}