diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 27d59d93..2114afb8 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -657,18 +657,6 @@ 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!224 &387414334 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689, @@ -863,7 +851,6 @@ GameObject: m_Component: - component: {fileID: 715847676} - component: {fileID: 715847675} - - component: {fileID: 715847678} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -912,24 +899,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !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: 1 - rootTransform: {fileID: 0} --- !u!114 &730756546 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7809777061605929427, guid: caaa748dbeed576499e8cae74d33f689, diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 9fe2734d..50603935 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -3527,7 +3527,6 @@ GameObject: m_Component: - component: {fileID: 1870432534} - component: {fileID: 1870432533} - - component: {fileID: 1870432535} - component: {fileID: 1870432536} m_Layer: 0 m_Name: Manager @@ -3565,24 +3564,6 @@ 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!114 &1870432536 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4597,18 +4578,6 @@ 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!224 &3664916832445709978 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689, diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 5ff1a4a4..d2aed430 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -2019,6 +2019,61 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3664916832844628215} m_Modifications: + - target: {fileID: 137127162547959670, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127162547959670, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_Name @@ -2129,6 +2184,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 137127164258565651, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_SizeDelta.x + 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 + value: + objectReference: {fileID: 3664916832844628215} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} --- !u!224 &3664916834242367713 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 5781dc4f..7a7f78c0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -363,6 +363,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 137127163028694528} + - component: {fileID: 4683425562393467656} m_Layer: 5 m_Name: Icon_Coin m_TagString: Untagged @@ -382,6 +383,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 137127163537145805} + - {fileID: 5192989110466567273} + - {fileID: 6352661063798339839} + - {fileID: 8446457194566633772} + - {fileID: 361167645818356693} + - {fileID: 3988807289296861174} + - {fileID: 3005495916550676559} + - {fileID: 809998964083309134} m_Father: {fileID: 137127164258565651} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -390,6 +398,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 92} m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &4683425562393467656 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127163028694531} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 483d9c381d24f1f47a5cb159dda7c842, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &137127163230790451 GameObject: m_ObjectHideFlags: 0 @@ -954,6 +981,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 137127164258565651} + - component: {fileID: 7885431782403753906} - component: {fileID: 137127164258565649} - component: {fileID: 137127164258565648} - component: {fileID: 137127164258565655} @@ -986,6 +1014,24 @@ RectTransform: m_AnchoredPosition: {x: 26, y: -39} m_SizeDelta: {x: 0, y: 74} m_Pivot: {x: 0, y: 1} +--- !u!114 &7885431782403753906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127164258565650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 137127163028694528} + coinCountText: {fileID: 137127163230790449} + coinAnimator: {fileID: 4683425562393467656} + coinPrefab: {fileID: 0} + duration: 0.5 + rootTransform: {fileID: 0} --- !u!222 &137127164258565649 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1255,6 +1301,228 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1682402780698601102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3988807289296861174} + - component: {fileID: 5459197641702664116} + - component: {fileID: 3448151413456069115} + m_Layer: 5 + m_Name: Image_coin_e + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3988807289296861174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682402780698601102} + 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: 137127163028694528} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5459197641702664116 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682402780698601102} + m_CullTransparentMesh: 0 +--- !u!114 &3448151413456069115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682402780698601102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6b6ef205b1355db4f96c259432351c50, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3190352682026950169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 361167645818356693} + - component: {fileID: 7944778184675655917} + - component: {fileID: 8089263319837516631} + m_Layer: 5 + m_Name: Image_coin_d + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &361167645818356693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3190352682026950169} + 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: 137127163028694528} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7944778184675655917 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3190352682026950169} + m_CullTransparentMesh: 0 +--- !u!114 &8089263319837516631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3190352682026950169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 60ea2603d1de7db439be110aba8e1a06, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3700318879413716858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3005495916550676559} + - component: {fileID: 6753344066014553599} + - component: {fileID: 3508190518858147698} + m_Layer: 5 + m_Name: Image_coin_f + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3005495916550676559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3700318879413716858} + 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: 137127163028694528} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6753344066014553599 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3700318879413716858} + m_CullTransparentMesh: 0 +--- !u!114 &3508190518858147698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3700318879413716858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aa99a8afce5ebe44eb27d3b7863d3b7a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5097575317734896701 GameObject: m_ObjectHideFlags: 0 @@ -1373,3 +1641,299 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &5887459306579115384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5192989110466567273} + - component: {fileID: 7042203978495017607} + - component: {fileID: 5726870976067228893} + m_Layer: 5 + m_Name: Image_coin_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5192989110466567273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5887459306579115384} + 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: 137127163028694528} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7042203978495017607 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5887459306579115384} + m_CullTransparentMesh: 0 +--- !u!114 &5726870976067228893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5887459306579115384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4425aa3ec48519546b72cc0a9448c2ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6573687931001727739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6352661063798339839} + - component: {fileID: 7955418308314733384} + - component: {fileID: 6051088593504592836} + m_Layer: 5 + m_Name: Image_coin_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6352661063798339839 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6573687931001727739} + 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: 137127163028694528} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7955418308314733384 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6573687931001727739} + m_CullTransparentMesh: 0 +--- !u!114 &6051088593504592836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6573687931001727739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d919899659cd2714e8396a059015062b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6710226836618071116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8446457194566633772} + - component: {fileID: 1553537307337056418} + - component: {fileID: 9122253556801634577} + m_Layer: 5 + m_Name: Image_coin_c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8446457194566633772 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6710226836618071116} + 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: 137127163028694528} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1553537307337056418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6710226836618071116} + m_CullTransparentMesh: 0 +--- !u!114 &9122253556801634577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6710226836618071116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bb3bb9ab8a6fdc64a901cd21bf76a87b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8344812374716399794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 809998964083309134} + - component: {fileID: 3171446885968625601} + - component: {fileID: 2339766593651410906} + m_Layer: 5 + m_Name: Image_coin_g + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &809998964083309134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8344812374716399794} + 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: 137127163028694528} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3171446885968625601 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8344812374716399794} + m_CullTransparentMesh: 0 +--- !u!114 &2339766593651410906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8344812374716399794} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2aba0ae42cd9d5a40bbe1235de7494c4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index cf9d80f4..663617fc 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -316,6 +316,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -421,6 +426,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -22 objectReference: {fileID: 0} + - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -621,11 +631,26 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5047569869407099398, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -641,6 +666,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 670 objectReference: {fileID: 0} + - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!224 &219610912 stripped @@ -680,18 +715,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 219610911} m_PrefabAsset: {fileID: 0} ---- !u!114 &219610916 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 219610911} - 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 &493087540 GameObject: m_ObjectHideFlags: 0 @@ -996,7 +1019,6 @@ GameObject: m_Component: - component: {fileID: 586451195} - component: {fileID: 586451196} - - component: {fileID: 586451197} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -1032,24 +1054,6 @@ MonoBehaviour: m_EditorClassIdentifier: tastingButton: {fileID: 1280872481} view: {fileID: 639967259} ---- !u!114 &586451197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 586451194} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} - m_Name: - m_EditorClassIdentifier: - coinIconTransform: {fileID: 0} - coinCountText: {fileID: 219610916} - coinAnimator: {fileID: 0} - coinPrefab: {fileID: 0} - duration: 0.5 - rootTransform: {fileID: 0} --- !u!1 &613202084 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 5c30f1fd..b98bbb2b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; +using TMPro; using UniRx; using UniRx.Triggers; using UnityEngine; @@ -25,6 +26,8 @@ public class Market : MonoBehaviour [SerializeField] private GameObject closeSign; [SerializeField] private GameObject customerPrefab; [SerializeField] private GameObject orderPosisionObject; + [SerializeField] private Transform coinPrefab; + [SerializeField] private Transform rootTransform; private List displayFlavors; private List shuffledOrder; @@ -219,6 +222,7 @@ public class Market : MonoBehaviour } blueView.SellAction(); // コイン獲得 + CoinEffect(coin); CoinManager.Instance.AddCoinWithEffect(coin, () => { }); gameData.Coin = CoinManager.Instance.OwnCoin; gameData.Heart += customers.Count; @@ -505,6 +509,13 @@ public class Market : MonoBehaviour } GameDataManager.SaveGameData(); } + + private void CoinEffect(int count) + { + var effect = Instantiate(coinPrefab, Vector3.zero, Quaternion.identity, rootTransform); + effect.GetComponentInChildren().text = count.ToString(); + Destroy(effect.gameObject, 1f); + } private void CheckAndFixStock() { diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index bbdf9443..30e76d8a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -400,37 +400,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &77455594 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3664916832310506793, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - m_PrefabAsset: {fileID: 0} ---- !u!224 &77455595 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - m_PrefabAsset: {fileID: 0} ---- !u!95 &77455597 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 77455594} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 483d9c381d24f1f47a5cb159dda7c842, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!4 &82988135 stripped Transform: m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, @@ -1336,12 +1305,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5368382573410461785} m_PrefabAsset: {fileID: 0} ---- !u!224 &393700031 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 714437464} - m_PrefabAsset: {fileID: 0} --- !u!1 &438315598 GameObject: m_ObjectHideFlags: 0 @@ -1442,154 +1405,6 @@ MonoBehaviour: popcornImage: {fileID: 53013342} maxPosision: 0.5 minPosision: -1.47 ---- !u!1 &471454546 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 471454547} - - component: {fileID: 471454549} - - component: {fileID: 471454548} - m_Layer: 5 - m_Name: Image_coin_g - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &471454547 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471454546} - 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: 77455595} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &471454548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471454546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2aba0ae42cd9d5a40bbe1235de7494c4, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &471454549 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471454546} - m_CullTransparentMesh: 0 ---- !u!1 &638760963 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 638760964} - - component: {fileID: 638760966} - - component: {fileID: 638760965} - m_Layer: 5 - m_Name: Image_coin_d - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &638760964 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 638760963} - 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: 77455595} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &638760965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 638760963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60ea2603d1de7db439be110aba8e1a06, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &638760966 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 638760963} - m_CullTransparentMesh: 0 --- !u!1 &658354827 GameObject: m_ObjectHideFlags: 0 @@ -2034,6 +1849,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_fontColor.a @@ -2129,6 +1949,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -22 objectReference: {fileID: 0} + - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -2289,15 +2114,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -2316,14 +2136,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3664916833545329524, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: -77.60156 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -2344,6 +2174,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 670 objectReference: {fileID: 0} + - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!1 &757275525 @@ -2591,6 +2431,12 @@ Transform: m_Father: {fileID: 203299121} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &928467735 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + m_PrefabAsset: {fileID: 0} --- !u!1 &966116774 GameObject: m_ObjectHideFlags: 0 @@ -3017,7 +2863,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1025201115} - - component: {fileID: 1025201114} - component: {fileID: 1025201116} m_Layer: 0 m_Name: Manager @@ -3026,25 +2871,6 @@ GameObject: 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 @@ -3079,6 +2905,9 @@ MonoBehaviour: customerPrefab: {fileID: 5409985849651702440, guid: 6fbb038c9aae840f2bea57bce30740f7, type: 3} orderPosisionObject: {fileID: 384574881} + coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, + type: 3} + rootTransform: {fileID: 928467735} --- !u!1 &1035509476 GameObject: m_ObjectHideFlags: 0 @@ -3247,80 +3076,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1066327839 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1066327840} - - component: {fileID: 1066327842} - - component: {fileID: 1066327841} - m_Layer: 5 - m_Name: Image_coin_a - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1066327840 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1066327839} - 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: 77455595} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1066327841 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1066327839} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4425aa3ec48519546b72cc0a9448c2ef, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1066327842 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1066327839} - m_CullTransparentMesh: 0 --- !u!1001 &1075915152 PrefabInstance: m_ObjectHideFlags: 0 @@ -4258,80 +4013,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1472008186 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1472008187} - - component: {fileID: 1472008189} - - component: {fileID: 1472008188} - m_Layer: 5 - m_Name: Image_coin_b - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1472008187 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472008186} - 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: 77455595} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1472008188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472008186} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d919899659cd2714e8396a059015062b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1472008189 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472008186} - m_CullTransparentMesh: 0 --- !u!1 &1482901210 GameObject: m_ObjectHideFlags: 0 @@ -5189,80 +4870,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1686710150 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1686710151} - - component: {fileID: 1686710153} - - component: {fileID: 1686710152} - m_Layer: 5 - m_Name: Image_coin_e - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1686710151 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686710150} - 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: 77455595} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1686710152 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686710150} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6b6ef205b1355db4f96c259432351c50, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1686710153 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686710150} - m_CullTransparentMesh: 0 --- !u!1 &1749782973 GameObject: m_ObjectHideFlags: 0 @@ -5337,6 +4944,7 @@ MonoBehaviour: walkSideBottomPos: -8 pinkWalkSpeed: 4 coolTime: 20 + fewerBorder: 5 --- !u!210 &1749782977 SortingGroup: m_ObjectHideFlags: 0 @@ -5927,18 +5535,6 @@ 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 @@ -6131,12 +5727,6 @@ 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!1001 &2011193247 PrefabInstance: m_ObjectHideFlags: 0 @@ -6224,80 +5814,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2016817760 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2016817761} - - component: {fileID: 2016817763} - - component: {fileID: 2016817762} - m_Layer: 5 - m_Name: Image_coin_f - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2016817761 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2016817760} - 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: 77455595} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2016817762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2016817760} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa99a8afce5ebe44eb27d3b7863d3b7a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2016817763 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2016817760} - m_CullTransparentMesh: 0 --- !u!1 &2031857953 GameObject: m_ObjectHideFlags: 0 @@ -6470,80 +5986,6 @@ Transform: m_Father: {fileID: 2104509456} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2057951083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2057951084} - - component: {fileID: 2057951086} - - component: {fileID: 2057951085} - m_Layer: 5 - m_Name: Image_coin_c - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2057951084 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057951083} - 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: 77455595} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 86, y: 92} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2057951085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057951083} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bb3bb9ab8a6fdc64a901cd21bf76a87b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2057951086 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2057951083} - m_CullTransparentMesh: 0 --- !u!1 &2060155507 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 1817ea05..6a0b8ba3 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -441,7 +441,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 980038345} - - component: {fileID: 980038344} - component: {fileID: 980038343} m_Layer: 0 m_Name: Manager @@ -463,24 +462,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: listView: {fileID: 1188209735} ---- !u!114 &980038344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 980038342} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} - m_Name: - m_EditorClassIdentifier: - coinIconTransform: {fileID: 0} - coinCountText: {fileID: 1098091309} - coinAnimator: {fileID: 0} - coinPrefab: {fileID: 0} - duration: 0.5 - rootTransform: {fileID: 0} --- !u!4 &980038345 Transform: m_ObjectHideFlags: 0 @@ -859,18 +840,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1098091307} m_PrefabAsset: {fileID: 0} ---- !u!114 &1098091309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - 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 &1188209733 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/CoinManager.cs b/popcorn/Assets/MyGame/Scripts/CoinManager.cs index 6dfc3cb9..d925aa9a 100644 --- a/popcorn/Assets/MyGame/Scripts/CoinManager.cs +++ b/popcorn/Assets/MyGame/Scripts/CoinManager.cs @@ -47,23 +47,19 @@ public class CoinManager : SingletonMonoBehaviour // 生成ポジション決め、生成 InstantiateEffeect(coinPrefab, count, Vector3.zero, coinIconTransform.position, () => { - coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration + count * 0.1f); + coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration); callback.Invoke(); }); } private void InstantiateEffeect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback) { - var effect = Instantiate(prefab, Vector3.zero, Quaternion.identity, rootTransform); - effect.GetComponentInChildren().text = count.ToString(); // アニメ50フレーム this.CallWaitForSeconds(1.0f, () => { // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生 VibrationManager.Instance.PlayVibrationOnceWeak(); coinAnimator.SetTrigger(Add); // SoundManager.Instance.PlaySE("se_coin_count"); - // コインは削除 - Destroy(effect.gameObject); callback.Invoke(); }); }