Merge branch 'develop' into collide

* develop:
  調理コーンを100粒に調整
  Corn演出調整
  ミス数に達してもゲームが続くよう変更
  焦げアニメーション対応
  コイン表示対応
  コーン演出調整
  Cooking corn演出調整
  Mainコーン演出作成

# Conflicts:
#	popcorn/Assets/MyGame/Scenes/shopping/shopping.unity

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

@@ -14,7 +14,59 @@ AnimationClip:
   m_RotationCurves: []
   m_CompressedRotationCurves: []
   m_EulerCurves: []
-  m_PositionCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 13.069473, z: 0}
+        outSlope: {x: 0, y: 13.069473, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.32314852, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.13333334
+        value: {x: 0, y: 0.69589746, 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.28333333
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: -11.486645, z: 0}
+        outSlope: {x: 0, y: 2.7257328, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.3198897, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.7015269, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.4
+        value: {x: 0, y: 0.1393559, 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.10361791, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: -3.9030392, z: 0}
+        outSlope: {x: 0, y: 7.3384047, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.61223245, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.7716861, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: RotationResolver/AnimePivot
   m_ScaleCurves:
   - curve:
       serializedVersion: 2
@@ -29,7 +81,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.11922174, y: 0.10219006, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.016666668
+        time: 0.033333335
         value: {x: 1.2562993, y: 1.2562993, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -38,7 +90,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.05
+        time: 0.06666667
         value: {x: 0.9283737, y: 0.9283737, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -47,7 +99,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.1
+        time: 0.13333334
         value: {x: 1, y: 1, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -59,7 +111,138 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: RotationResolver/AnimePivot
-  m_FloatCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 8
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SortingOrder
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7830189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.r
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7830189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.g
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7830189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.b
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.17
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0.25
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Radius
+    path: 
+    classID: 58
+    script: {fileID: 0}
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -67,14 +250,63 @@ AnimationClip:
     m_Center: {x: 0, y: 0, z: 0}
     m_Extent: {x: 0, y: 0, z: 0}
   m_ClipBindingConstant:
-    genericBindings: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 2384535579
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2384535579
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 3762991556
+      script: {fileID: 0}
+      typeID: 212
+      customType: 26
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 2526845255
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 4215373228
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 2334886179
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 1984117138
+      script: {fileID: 0}
+      typeID: 58
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.1
+    m_StopTime: 0.5
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -103,7 +335,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.11922174
       - serializedVersion: 3
-        time: 0.016666668
+        time: 0.033333335
         value: 1.2562993
         inSlope: 0
         outSlope: 0
@@ -112,7 +344,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.05
+        time: 0.06666667
         value: 0.9283737
         inSlope: 0
         outSlope: 0
@@ -121,7 +353,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.13333334
         value: 1
         inSlope: 0
         outSlope: 0
@@ -149,7 +381,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.10219006
       - serializedVersion: 3
-        time: 0.016666668
+        time: 0.033333335
         value: 1.2562993
         inSlope: 0
         outSlope: 0
@@ -158,7 +390,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.05
+        time: 0.06666667
         value: 0.9283737
         inSlope: 0
         outSlope: 0
@@ -167,7 +399,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.1
+        time: 0.13333334
         value: 1
         inSlope: 0
         outSlope: 0
@@ -182,6 +414,192 @@ AnimationClip:
     path: RotationResolver/AnimePivot
     classID: 4
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 13.069473
+        outSlope: 13.069473
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.32314852
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0.69589746
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.28333333
+        value: 0
+        inSlope: -11.486645
+        outSlope: 2.7257328
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.3198897
+        outWeight: 0.7015269
+      - serializedVersion: 3
+        time: 0.4
+        value: 0.1393559
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.10361791
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: -3.9030392
+        outSlope: 7.3384047
+        tangentMode: 1
+        weightedMode: 0
+        inWeight: 0.61223245
+        outWeight: 0.7716861
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: RotationResolver/AnimePivot
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 8
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_SortingOrder
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7830189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.r
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7830189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.g
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7830189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.b
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.17
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0.25
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Radius
+    path: 
+    classID: 58
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

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

@@ -21,32 +21,32 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: {x: 0, y: 0, z: 0}
-        inSlope: {x: 0, y: 40.792694, z: 0}
+        inSlope: {x: 0, y: 53.98581, z: 0}
-        outSlope: {x: 0, y: 40.792694, z: 0}
+        outSlope: {x: 0, y: 53.98581, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.16102456, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.16982037, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.06666667
-        value: {x: 0, y: 1.59487, z: 0}
+        value: {x: 0, y: 1.6547656, z: 0}
-        inSlope: {x: 0, y: 6.500806, z: 0}
+        inSlope: {x: 0, y: 8.7842655, z: 0}
-        outSlope: {x: 0, y: 6.500806, z: 0}
+        outSlope: {x: 0, y: 8.7842655, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.6828371, z: 0.33333334}
+        inWeight: {x: 0.33333334, y: 0.4905389, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.29422888, z: 0.33333334}
       - serializedVersion: 3
         time: 0.18333334
-        value: {x: 0, y: 1.8051504, z: 0}
+        value: {x: 0, y: 1.9351748, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: -1.8622863, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: -1.8622863, 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}
+        outWeight: {x: 0.33333334, y: 0.9773223, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.28333333
+        time: 0.3
         value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: -35.268112, z: 0}
         outSlope: {x: 0, y: 7.016232, z: 0}
@@ -55,7 +55,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.11653007, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.4663927, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.4
+        time: 0.41666666
         value: {x: 0, y: 0.2941258, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -64,7 +64,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.10361791, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.5
+        time: 0.51666665
         value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: -7.9365587, z: 0}
         outSlope: {x: 0, y: 7.3384047, z: 0}
@@ -91,7 +91,7 @@ AnimationClip:
         outWeight: {x: 0.12765956, y: 0.25531915, z: 0.33333334}
       - serializedVersion: 3
         time: 0.05
-        value: {x: 1.5300072, y: 1.5300072, z: 1}
+        value: {x: 1.6130672, y: 1.6130672, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -99,7 +99,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.11666667
+        time: 0.13333334
         value: {x: 1.2178866, y: 1.2178866, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -108,7 +108,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.18333334
+        time: 0.21666667
         value: {x: 1.3355874, y: 1.3355874, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -117,17 +117,17 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.28333333
+        time: 0.3
-        value: {x: 1, y: 1, z: 1}
+        value: {x: 1.1493454, y: 1.1493454, z: 1}
-        inSlope: {x: -8.902075, y: -8.902075, z: 0}
+        inSlope: {x: -5.4249315, y: -5.7237077, z: 0}
-        outSlope: {x: 2.8993492, y: 3.0516102, z: 0}
+        outSlope: {x: 2.5944061, y: 2.7197673, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.43961123, y: 0.43961123, z: 0.33333334}
+        inWeight: {x: 0.19987461, y: 0.21942899, z: 0.33333334}
-        outWeight: {x: 0.36418316, y: 0.39887562, z: 0.33333334}
+        outWeight: {x: 0.32937226, y: 0.1243904, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.4
+        time: 0.41666666
-        value: {x: 1.119471, y: 1.119471, z: 1}
+        value: {x: 1.2537353, y: 1.2537353, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -135,13 +135,13 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.5
+        time: 0.51666665
-        value: {x: 1, y: 1, z: 1}
+        value: {x: 1.1493454, y: 1.1493454, z: 1}
-        inSlope: {x: -3.1195889, y: -3.4568431, z: 0}
+        inSlope: {x: -2.931119, y: -2.881517, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.44659588, y: 0.4263586, z: 0.33333334}
+        inWeight: {x: 0.37723514, y: 0.14862539, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       m_PreInfinity: 2
       m_PostInfinity: 2
@@ -214,7 +214,126 @@ AnimationClip:
     path: pt_burst
     classID: 1
     script: {fileID: 0}
-  m_PPtrCurves: []
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.17
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0.25
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Radius
+    path: 
+    classID: 58
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.31132078
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        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
+    attribute: m_Color.r
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.3098523
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        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
+    attribute: m_Color.g
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.3098523
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        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
+    attribute: m_Color.b
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2}
+    attribute: m_Materials.Array.data[0]
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
@@ -257,13 +376,49 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
-    pptrCurveMapping: []
+    - serializedVersion: 2
+      path: 0
+      attribute: 1984117138
+      script: {fileID: 0}
+      typeID: 58
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 2526845255
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 4215373228
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 2334886179
+      script: {fileID: 0}
+      typeID: 212
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 3454031445
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 21
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.5
+    m_StopTime: 0.51666665
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -293,7 +448,7 @@ AnimationClip:
         outWeight: 0.12765956
       - serializedVersion: 3
         time: 0.05
-        value: 1.5300072
+        value: 1.6130672
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -301,7 +456,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.11666667
+        time: 0.13333334
         value: 1.2178866
         inSlope: 0
         outSlope: 0
@@ -310,7 +465,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.18333334
+        time: 0.21666667
         value: 1.3355874
         inSlope: 0
         outSlope: 0
@@ -319,17 +474,17 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.28333333
+        time: 0.3
-        value: 1
+        value: 1.1493454
-        inSlope: -8.902075
+        inSlope: -5.4249315
-        outSlope: 2.8993492
+        outSlope: 2.5944061
         tangentMode: 1
         weightedMode: 0
-        inWeight: 0.43961123
+        inWeight: 0.19987461
-        outWeight: 0.36418316
+        outWeight: 0.32937226
       - serializedVersion: 3
-        time: 0.4
+        time: 0.41666666
-        value: 1.119471
+        value: 1.2537353
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -337,13 +492,13 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.5
+        time: 0.51666665
-        value: 1
+        value: 1.1493454
-        inSlope: -3.1195889
+        inSlope: -2.931119
         outSlope: 0
         tangentMode: 1
         weightedMode: 0
-        inWeight: 0.44659588
+        inWeight: 0.37723514
         outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
@@ -366,7 +521,7 @@ AnimationClip:
         outWeight: 0.25531915
       - serializedVersion: 3
         time: 0.05
-        value: 1.5300072
+        value: 1.6130672
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -374,7 +529,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.11666667
+        time: 0.13333334
         value: 1.2178866
         inSlope: 0
         outSlope: 0
@@ -383,7 +538,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.18333334
+        time: 0.21666667
         value: 1.3355874
         inSlope: 0
         outSlope: 0
@@ -392,17 +547,17 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.28333333
+        time: 0.3
-        value: 1
+        value: 1.1493454
-        inSlope: -8.902075
+        inSlope: -5.7237077
-        outSlope: 3.0516102
+        outSlope: 2.7197673
         tangentMode: 1
         weightedMode: 0
-        inWeight: 0.43961123
+        inWeight: 0.21942899
-        outWeight: 0.39887562
+        outWeight: 0.1243904
       - serializedVersion: 3
-        time: 0.4
+        time: 0.41666666
-        value: 1.119471
+        value: 1.2537353
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -410,13 +565,13 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.5
+        time: 0.51666665
-        value: 1
+        value: 1.1493454
-        inSlope: -3.4568431
+        inSlope: -2.881517
         outSlope: 0
         tangentMode: 1
         weightedMode: 0
-        inWeight: 0.4263586
+        inWeight: 0.14862539
         outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
@@ -431,32 +586,32 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 40.792694
+        inSlope: 53.98581
-        outSlope: 40.792694
+        outSlope: 53.98581
         tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.16102456
+        outWeight: 0.16982037
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.06666667
-        value: 1.59487
+        value: 1.6547656
-        inSlope: 6.500806
+        inSlope: 8.7842655
-        outSlope: 6.500806
+        outSlope: 8.7842655
         tangentMode: 0
         weightedMode: 0
-        inWeight: 0.6828371
+        inWeight: 0.4905389
-        outWeight: 0.33333334
+        outWeight: 0.29422888
       - serializedVersion: 3
         time: 0.18333334
-        value: 1.8051504
+        value: 1.9351748
-        inSlope: 0
+        inSlope: -1.8622863
-        outSlope: 0
+        outSlope: -1.8622863
-        tangentMode: 136
+        tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.9773223
       - serializedVersion: 3
-        time: 0.28333333
+        time: 0.3
         value: 0
         inSlope: -35.268112
         outSlope: 7.016232
@@ -465,7 +620,7 @@ AnimationClip:
         inWeight: 0.11653007
         outWeight: 0.4663927
       - serializedVersion: 3
-        time: 0.4
+        time: 0.41666666
         value: 0.2941258
         inSlope: 0
         outSlope: 0
@@ -474,7 +629,7 @@ AnimationClip:
         inWeight: 0.10361791
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.5
+        time: 0.51666665
         value: 0
         inSlope: -7.9365587
         outSlope: 7.3384047
@@ -555,6 +710,118 @@ AnimationClip:
     path: pt_burst
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.17
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.016666668
+        value: 0.25
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Radius
+    path: 
+    classID: 58
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.31132078
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        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
+    attribute: m_Color.r
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.3098523
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        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
+    attribute: m_Color.g
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.3098523
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        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
+    attribute: m_Color.b
+    path: RotationResolver/AnimePivot/Image_corn
+    classID: 212
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

popcorn/Assets/MyGame/Resource/Animation/Icon_Coin.controller

@@ -11,7 +11,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 4475377242917876395}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 240, y: 20, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4433783371595394980}
+    m_Position: {x: 240, y: 130, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -21,7 +24,29 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 4475377242917876395}
+  m_DefaultState: {fileID: 4433783371595394980}
+--- !u!1101 &-3628628858844245727
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.42307693
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -30,7 +55,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: Icon_Coin
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Add
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -44,6 +75,58 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &1600421813888881856
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Add
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4475377242917876395}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &4433783371595394980
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Wait
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1600421813888881856}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &4475377242917876395
 AnimatorState:
   serializedVersion: 5
@@ -54,7 +137,8 @@ AnimatorState:
   m_Name: EffectCoin
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -3628628858844245727}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

popcorn/Assets/MyGame/Resource/Animation/corn.controller

@@ -1,31 +1,55 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-6748263542651040243
+--- !u!1101 &-8797755764172867904
-AnimatorState:
+AnimatorStateTransition:
-  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: CornJump
+  m_Name: 
-  m_Speed: 1
+  m_Conditions:
-  m_CycleOffset: 0
+  - m_ConditionMode: 1
-  m_Transitions: []
+    m_ConditionEvent: CornGrow
-  m_StateMachineBehaviours: []
+    m_EventTreshold: 0
-  m_Position: {x: 50, y: 50, z: 0}
+  m_DstStateMachine: {fileID: 0}
-  m_IKOnFeet: 0
+  m_DstState: {fileID: 6341160211334192665}
-  m_WriteDefaultValues: 1
+  m_Solo: 0
-  m_Mirror: 0
+  m_Mute: 0
-  m_SpeedParameterActive: 0
+  m_IsExit: 0
-  m_MirrorParameterActive: 0
+  serializedVersion: 3
-  m_CycleOffsetParameterActive: 0
+  m_TransitionDuration: 0
-  m_TimeParameterActive: 0
+  m_TransitionOffset: 0
-  m_Motion: {fileID: 7400000, guid: f278d54e955c6364b8c04f96cbf49986, type: 2}
+  m_ExitTime: 0.75
-  m_Tag: 
+  m_HasExitTime: 0
-  m_SpeedParameter: 
+  m_HasFixedDuration: 1
-  m_MirrorParameter: 
+  m_InterruptionSource: 0
-  m_CycleOffsetParameter: 
+  m_OrderedInterruption: 1
-  m_TimeParameter: 
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-8175191986188642306
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: CornBurn
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7193984417312256253}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-6451913813719917424
 AnimatorState:
   serializedVersion: 5
@@ -36,8 +60,7 @@ AnimatorState:
   m_Name: CornWait
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions:
+  m_Transitions: []
-  - {fileID: 5154816746081122088}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -107,73 +130,22 @@ AnimatorStateMachine:
     m_Position: {x: 270, y: 40, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 6341160211334192665}
-    m_Position: {x: 380, y: 120, z: 0}
+    m_Position: {x: 270, y: -100, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 7193984417312256253}
-    m_Position: {x: 270, y: 230, z: 0}
+    m_Position: {x: 270, y: -190, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -6748263542651040243}
-    m_Position: {x: 305, y: 295, z: 0}
   m_ChildStateMachines: []
-  m_AnyStateTransitions: []
+  m_AnyStateTransitions:
+  - {fileID: -8175191986188642306}
+  - {fileID: -8797755764172867904}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: 40, y: -60, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_EntryPosition: {x: 40, y: 40, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ExitPosition: {x: 550, y: 50, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -6451913813719917424}
---- !u!1101 &3570958320764608268
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: CornBurn
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 7193984417312256253}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.3181818
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &5154816746081122088
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: CornGrow
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 6341160211334192665}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &6341160211334192665
 AnimatorState:
   serializedVersion: 5
@@ -184,8 +156,7 @@ AnimatorState:
   m_Name: CornGrow
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions:
+  m_Transitions: []
-  - {fileID: 3570958320764608268}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Corn.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.15
+      scalar: 0.2
       minScalar: 5
       maxCurve:
         serializedVersion: 2

popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn.prefab

@@ -4928,7 +4928,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.15
+      scalar: 0.2
       minScalar: 5
       maxCurve:
         serializedVersion: 2

popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab

@@ -9786,7 +9786,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.15
+      scalar: 0.2
       minScalar: 5
       maxCurve:
         serializedVersion: 2

popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: mt_spriteEmission
+  m_Shader: {fileID: 4800000, guid: 35a8d5b95e0064223ad07f51cd54e73d, type: 3}
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - PixelSnap: 0
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f138cade846eb48a995388422833859d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity

@@ -13692,7 +13692,7 @@ MonoBehaviour:
     type: 3}
   spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc,
     type: 3}
-  cornSpawnCount: 80
+  cornSpawnCount: 100
   maxFailedCornCount: 25
   baseGrowSpeed: 1
   coldGrowSpeed: 0.1

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab

@@ -114,7 +114,7 @@ CircleCollider2D:
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
   serializedVersion: 2
-  m_Radius: 0.2
+  m_Radius: 0.17
 --- !u!1 &3431194784518736845
 GameObject:
   m_ObjectHideFlags: 0
@@ -560,8 +560,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.1
+      scalar: 0.12
-      minScalar: 0.03
+      minScalar: 0.05
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -9894,7 +9894,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 23
+  m_SortingOrder: 30
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/effect_burnt.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 3
       scalar: 0.3
-      minScalar: 0.8
+      minScalar: 0.6
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -168,8 +168,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 15
+      scalar: 1
-      minScalar: 10
+      minScalar: 0.2
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -284,7 +284,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.6
+      scalar: 1
       minScalar: 0.5
       maxCurve:
         serializedVersion: 2
@@ -606,7 +606,7 @@ ParticleSystem:
     gravityModifier:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0
+      scalar: -0.3
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -746,7 +746,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.3
+      value: 0.1
       mode: 0
       spread: 0
       speed:
@@ -2426,7 +2426,7 @@ ParticleSystem:
       m_Bits: 4294967295
     influenceList: []
   ClampVelocityModule:
-    enabled: 1
+    enabled: 0
     x:
       serializedVersion: 2
       minMaxState: 0
@@ -2589,7 +2589,7 @@ ParticleSystem:
     magnitude:
       serializedVersion: 2
       minMaxState: 1
-      scalar: 1
+      scalar: 1.0987246
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -4815,7 +4815,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 59
   m_RenderMode: 0
   m_SortMode: 0
   m_MinParticleSize: 0

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs

@@ -82,12 +82,12 @@ public class CornManager : MonoBehaviour
             }).AddTo(this);
 
         // ミス数上限で失敗
-        missCount
+        // missCount
-            .Where(x => x == maxFailedCornCount)
+        //     .Where(x => x == maxFailedCornCount)
-            .Subscribe(_ =>
+        //     .Subscribe(_ =>
-            {
+        //     {
-                SetResult(CornResult.Failure);
+        //         SetResult(CornResult.Failure);
-            }).AddTo(this);
+        //     }).AddTo(this);
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
         cornCountSlider.wholeNumbers = true;

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs

@@ -1,7 +1,7 @@
 public class CornPopParameters
 {
     public static readonly float[] CornPopTimeArray = {
-	1f,
+1f,
 2.495f,
 3.99f,
 4.841f,
@@ -20,77 +20,117 @@ public class CornPopParameters
 12.864f,
 13.271f,
 13.678f,
-13.906f,
+14.044f,
-14.134f,
+14.41f,
-14.344f,
+14.739f,
-14.554f,
+15.069f,
-14.747f,
+15.366f,
-14.94f,
+15.662f,
-15.119f,
+15.929f,
-15.298f,
+16.196f,
-15.463f,
+16.436f,
-15.628f,
+16.676f,
-15.781f,
+16.892f,
-15.934f,
+17.109f,
-16.077f,
+17.303f,
-16.219f,
+17.498f,
-16.352f,
+17.673f,
-16.484f,
+17.848f,
-16.608f,
+18.006f,
-16.732f,
+18.163f,
-16.848f,
+18.305f,
-16.964f,
+18.447f,
-17.073f,
+18.575f,
-17.182f,
+18.702f,
-17.284f,
+18.817f,
-17.387f,
+18.932f,
-17.484f,
+19.035f,
-17.581f,
+19.139f,
-17.672f,
+19.232f,
-17.764f,
+19.325f,
-17.851f,
+19.409f,
-17.938f,
+19.492f,
-18.02f,
+19.568f,
-18.103f,
+19.643f,
-18.182f,
+19.711f,
-18.261f,
+19.779f,
-18.337f,
+19.84f,
-18.413f,
+19.901f,
-18.485f,
+19.956f,
-18.558f,
+20.011f,
-18.627f,
+20.06f,
-18.697f,
+20.11f,
-18.765f,
+20.154f,
-18.832f,
+20.199f,
-18.897f,
+20.239f,
-18.962f,
+20.279f,
-19.025f,
+20.315f,
-19.088f,
+20.351f,
-19.15f,
+20.383f,
-19.211f,
+20.416f,
-19.271f,
+20.445f,
-19.33f,
+20.474f,
-19.389f,
+20.501f,
-19.447f,
+20.527f,
-19.504f,
+20.551f,
-19.561f,
+20.574f,
-19.616f,
+20.596f,
-19.672f,
+20.617f,
-19.727f,
+20.636f,
-19.782f,
+20.655f,
-19.835f,
+20.672f,
-19.889f,
+20.69f,
-19.942f,
+20.705f,
+20.721f,
+20.735f,
+20.749f,
+20.761f,
+20.774f,
+20.785f,
+20.796f,
+20.807f,
+20.817f,
+20.826f,
+20.835f,
+20.843f,
+20.852f,
+20.859f,
+20.866f,
+20.873f,
+20.88f,
+20.886f,
+20.892f,
+20.897f,
     };
 
     public static readonly float[] CornBurntTimeArray = {
-        10f,
+10f,
+9f,
 8f,
+6.95f,
 5.9f,
+5.1f,
 4.3f,
+3.75f,
 3.2f,
+2.9f,
 2.6f,
+2.55f,
 2.5f,
+2.45f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
 2.4f,
 2.4f,
 2.4f,

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

@@ -768,6 +768,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
+--- !u!114 &387414333 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
+    type: 3}
+  m_PrefabInstance: {fileID: 387414332}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &395704523
 GameObject:
   m_ObjectHideFlags: 0
@@ -1403,6 +1415,7 @@ GameObject:
   - component: {fileID: 715847676}
   - component: {fileID: 715847675}
   - component: {fileID: 715847677}
+  - component: {fileID: 715847678}
   m_Layer: 0
   m_Name: Manager
   m_TagString: Untagged
@@ -1460,6 +1473,24 @@ MonoBehaviour:
   content: {fileID: 2122087243}
   menuButton: {fileID: 1992043646}
   closeButton: {fileID: 1133743353}
+--- !u!114 &715847678
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 715847674}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  coinIconTransform: {fileID: 0}
+  coinCountText: {fileID: 387414333}
+  coinAnimator: {fileID: 0}
+  coinPrefab: {fileID: 0}
+  duration: 0.5
+  rootTransform: {fileID: 0}
 --- !u!114 &730756546 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7809777061605929427, guid: caaa748dbeed576499e8cae74d33f689,

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

@@ -41,8 +41,7 @@ public class CornField : MonoBehaviour
         
         // データ
         var gameData = GameDataManager.GameData;
-        gameData.coin = 1000 + Random.Range(0, 1000);
+        CoinManager.Instance.ChangeCoin(gameData.coin);
-        // Debug.Log(gameData.coin);
         // 解放済みの畑
         gameData.PlantLineTypes = new List<(PlantLineType type, CornFieldRank level)>()
         {

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

@@ -1064,6 +1064,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1870432534}
   - component: {fileID: 1870432533}
+  - component: {fileID: 1870432535}
   m_Layer: 0
   m_Name: Manager
   m_TagString: Untagged
@@ -1098,6 +1099,24 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1870432535
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1870432532}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  coinIconTransform: {fileID: 0}
+  coinCountText: {fileID: 3664916832445709977}
+  coinAnimator: {fileID: 0}
+  coinPrefab: {fileID: 0}
+  duration: 0.5
+  rootTransform: {fileID: 0}
 --- !u!1001 &1914907653
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1821,6 +1840,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
+--- !u!114 &3664916832445709977 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
+    type: 3}
+  m_PrefabInstance: {fileID: 3664916832445709976}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &3665723643790057849
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1828,6 +1859,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1187654216}
     m_Modifications:
+    - target: {fileID: 3072131335653526340, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3665723641945798049, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82,
         type: 3}
       propertyPath: m_RootOrder

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab

@@ -1021,7 +1021,6 @@ RectTransform:
   - {fileID: 320398124}
   - {fileID: 130281750}
   - {fileID: 7545339558603919741}
-  - {fileID: 1174152334443072208}
   m_Father: {fileID: 3664916832564167477}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1672,178 +1671,3 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 3691625806369805098}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &7021272912307370562
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 3664916832844628215}
-    m_Modifications:
-    - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421177597447, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 445
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396421809467539, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_Name
-      value: EarnedCoins
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8159396422412942383, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, type: 3}
---- !u!224 &1174152334443072208 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-    type: 3}
-  m_PrefabInstance: {fileID: 7021272912307370562}
-  m_PrefabAsset: {fileID: 0}

popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs

@@ -17,5 +17,7 @@ public class KitchenManager : MonoBehaviour
             TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe);
         });
         
+        var gameData = GameDataManager.GameData;
+        CoinManager.Instance.ChangeCoin(gameData.coin);
     }
 }

popcorn/Assets/MyGame/Scenes/marketing/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae377568aff6d4d839ee5c4428c2d2ea
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,25 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UniRx;
+using UnityEngine;
+
+public class Market : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        var gameData = GameDataManager.GameData;
+        CoinManager.Instance.ChangeCoin(gameData.coin);
+        Observable.Interval(TimeSpan.FromSeconds(2f)).Subscribe(_ =>
+        {
+            CoinManager.Instance.AddCoinWithEffect(300, () => { });
+        }).AddTo(this);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cf4a253e4bfcb47f18e7d6f28af64b01
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1004,6 +1004,12 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!224 &393700031 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689,
+    type: 3}
+  m_PrefabInstance: {fileID: 714437464}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &424265800 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4886416728471897984, guid: db654393793a67d45a7d0b70a68b73a6,
@@ -1433,32 +1439,32 @@ PrefabInstance:
     - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 91.25
       objectReference: {fileID: 0}
     - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 89.625
       objectReference: {fileID: 0}
     - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -25
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334443072208, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 135.25
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334443072208, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
@@ -1483,7 +1489,7 @@ PrefabInstance:
     - target: {fileID: 1174152334443072209, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334880891972, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
@@ -1493,27 +1499,27 @@ PrefabInstance:
     - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 44
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 1174152334880891973, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -22
       objectReference: {fileID: 0}
     - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
@@ -2169,6 +2175,69 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &1025201113
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1025201115}
+  - component: {fileID: 1025201114}
+  - component: {fileID: 1025201116}
+  m_Layer: 0
+  m_Name: Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1025201114
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025201113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  coinIconTransform: {fileID: 393700031}
+  coinCountText: {fileID: 1898034353}
+  coinAnimator: {fileID: 77455597}
+  coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
+    type: 3}
+  duration: 0.5
+  rootTransform: {fileID: 1991225675}
+--- !u!4 &1025201115
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025201113}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1025201116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025201113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1035509476
 GameObject:
   m_ObjectHideFlags: 0
@@ -4067,6 +4136,18 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &1898034353 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
+    type: 3}
+  m_PrefabInstance: {fileID: 714437464}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1898891707
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4259,6 +4340,12 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1959722117}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &1991225675 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689,
+    type: 3}
+  m_PrefabInstance: {fileID: 714437464}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2016817760
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/shopping/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 218ec1e5576e74f079b70f1999eaf01f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Shopping : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        var gameData = GameDataManager.GameData;
+        CoinManager.Instance.ChangeCoin(gameData.coin);
+    }
+}

popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e7b7e1a23513042b0bbac3c91ccab081
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scripts/CoinManager.cs

@@ -6,6 +6,8 @@ using UnityEngine.UI;
 
 public class CoinManager : SingletonMonoBehaviour<CoinManager>
 {
+    private static readonly int Add = Animator.StringToHash("Add");
+    
     // CoinView
     [SerializeField] private RectTransform coinIconTransform;
     [SerializeField] private TextWithCountUpInt coinCountText;
@@ -52,31 +54,16 @@ public class CoinManager : SingletonMonoBehaviour<CoinManager>
 
     private void InstantiateEffeect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback)
     {
-        var baseAngle = UnityEngine.Random.value * 360.0f;
+        var effect = Instantiate(prefab, Vector3.zero, Quaternion.identity, rootTransform);
-        var angle = -360.0f / count;
+        // アニメ50フレーム
-        //コインアニメーション 
+        this.CallWaitForSeconds(1.0f, () => {
-        for(int i = 0; i < count; ++i){
+            // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
-            var index = i;
+            VibrationManager.Instance.PlayVibrationOnceWeak();
-            // 円状にバラけてた位置を生成
+            coinAnimator.SetTrigger(Add);
-            var tempPosition = from + (Vector3)Vector2.up.RotateDeg(baseAngle + i * angle + angle * UnityEngine.Random.value * 0.5f) * (0.2f + UnityEngine.Random.value * 0.8f);
+            // SoundManager.Instance.PlaySE("se_coin_count");
-            // 0.1秒ごとにコインを生成
+            // コインは削除
-            this.CallWaitForSeconds(index * 0.1f, () => {
+            Destroy(effect.gameObject);
-                var effect = Instantiate(prefab, tempPosition, Quaternion.identity, rootTransform);
+            callback.Invoke();
-                // 表示から1秒経ったら0.2秒かけてコイン表示部分に飛んでいく
+        });
-                this.CallWaitForSeconds(1.0f, () => {
-                    this.CallLerp(0.2f, t => {
-                        effect.position = Vector3.Lerp(tempPosition, to, t * t);
-                    }, () => {
-                        // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
-                        VibrationManager.Instance.PlayVibrationOnceWeak();
-                        coinAnimator.SetTrigger("Add");
-                        SoundManager.Instance.PlaySE("se_coin_count");
-                        // コインは削除
-                        Destroy(effect.gameObject);
-                    });
-                });
-            });
-        }
-        this.CallWaitForSeconds(1.0f + 0.2f, callback);
     }
 }