コインエフェクト周り追加

2021-11-25 10:06:56 +09:00 · 2021-11-25 10:06:56 +09:00 · 2936d81823
parent f4ea9a7f0a
commit 2936d81823
5 changed files with 90 additions and 138 deletions
--- a/popcorn/Assets/MyGame/Resource/Animation/ef_EarnedCoins.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/ef_EarnedCoins.controller
@ -1,5 +1,57 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-2518521627445974866
+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: -1836562077577036041}
+  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!1101 &-1836562077577036041
+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: Effect
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 2739171963415893716}
+  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!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@ -8,7 +60,13 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: ef_EarnedCoins
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Effect
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -48,6 +106,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &5527490930439660209
+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: 2739171963415893716}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &6651807166812322707
 AnimatorStateMachine:
  serializedVersion: 5
@ -60,6 +140,9 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: 2739171963415893716}
    m_Position: {x: 200, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2518521627445974866}
+    m_Position: {x: 267.5766, y: 134.3342, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@ -69,4 +152,4 @@ 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: 2739171963415893716}
+  m_DefaultState: {fileID: -2518521627445974866}
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
@ -3098,12 +3098,6 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963,
-        type: 3}
-      propertyPath: coinPrefab
-      value: 
-      objectReference: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-        type: 3}
    - target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963,
        type: 3}
      propertyPath: rootTransform
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
@ -897,7 +897,8 @@ MonoBehaviour:
  coinIconTransform: {fileID: 137127163028694528}
  coinCountText: {fileID: 137127163230790449}
  coinAnimator: {fileID: 4683425562393467656}
-  coinPrefab: {fileID: 0}
+  coinPrefab: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
+    type: 3}
  duration: 0.5
  rootTransform: {fileID: 0}
 --- !u!222 &137127164258565649
--- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab
@ -28,8 +28,7 @@ RectTransform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
-  m_Children:
-  - {fileID: 7842070743953883189}
+  m_Children: []
  m_Father: {fileID: 8159396421809467538}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -326,128 +325,3 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1001 &3939955067166001062
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8159396421177597447}
-    m_Modifications:
-    - target: {fileID: 6519287602467882896, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_Name
-      value: ef_EarnedCoins
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 283c4ac7154b55546841276b29f0e301, type: 3}
--- !u!224 &7842070743953883189 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301,
-    type: 3}
-  m_PrefabInstance: {fileID: 3939955067166001062}
-  m_PrefabAsset: {fileID: 0}
--- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ef_EarnedCoins.prefab
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ef_EarnedCoins.prefab
@ -4939,7 +4939,7 @@ RectTransform:
  m_GameObject: {fileID: 6519287602467882896}
  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_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
  m_Children:
  - {fileID: 6519287601974452488}
  - {fileID: 632672004120521819}
@ -4989,7 +4989,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &632672004120521819
 Transform:
  m_ObjectHideFlags: 0