From 60394e60f8c5066270b916f5ec1d119ff0f8f02a Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 9 Feb 2022 13:54:05 +0900 Subject: [PATCH] =?UTF-8?q?prefab=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/BulkOrde_heart.anim | 28 ++--- .../BulkOrder/BulkOrde_EarnedCoins.prefab | 2 +- .../Prefabs/BulkOrder/BulkOrde_heart.prefab | 107 ++++++++++++++---- 3 files changed, 101 insertions(+), 36 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/BulkOrde_heart.anim b/popcorn/Assets/MyGame/Resource/Animation/BulkOrde_heart.anim index 64f10581..654d13c8 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/BulkOrde_heart.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/BulkOrde_heart.anim @@ -67,7 +67,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: heart m_FloatCurves: - curve: serializedVersion: 2 @@ -130,7 +130,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_AnchoredPosition.y - path: + path: heart classID: 224 script: {fileID: 0} - curve: @@ -176,7 +176,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: + path: heart classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -204,7 +204,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: SmallHeart + path: heart/SmallHeart classID: 1 script: {fileID: 0} m_PPtrCurves: [] @@ -216,28 +216,28 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1626129382 attribute: 3 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 + path: 1626129382 attribute: 538195251 script: {fileID: 0} typeID: 224 customType: 28 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 + path: 1626129382 attribute: 304273561 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} typeID: 114 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 1424712100 + path: 2573454637 attribute: 2086281974 script: {fileID: 0} typeID: 1 @@ -326,7 +326,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_AnchoredPosition.y - path: + path: heart classID: 224 script: {fileID: 0} - curve: @@ -372,7 +372,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_Color.a - path: + path: heart classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - curve: @@ -427,7 +427,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: + path: heart classID: 224 script: {fileID: 0} - curve: @@ -482,7 +482,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.y - path: + path: heart classID: 224 script: {fileID: 0} - curve: @@ -537,7 +537,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.z - path: + path: heart classID: 224 script: {fileID: 0} - curve: @@ -565,7 +565,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: SmallHeart + path: heart/SmallHeart classID: 1 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_EarnedCoins.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_EarnedCoins.prefab index 14486d1b..7482cde0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_EarnedCoins.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_EarnedCoins.prefab @@ -100,7 +100,7 @@ RectTransform: m_GameObject: {fileID: 3458314235910815692} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8961967046911725342} - {fileID: 9221531424949400608} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_heart.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_heart.prefab index 272a4290..ea02d21c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_heart.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/BulkOrde_heart.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &126035421518750633 +--- !u!1 &1417359761030537907 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,10 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 12448169909947966} - - component: {fileID: 4482199731261469864} - - component: {fileID: 2553748558336668130} - - component: {fileID: 1785161944737651156} + - component: {fileID: 7344697047408078095} + - component: {fileID: 3869965904753799299} + - component: {fileID: 866361024674860121} + - component: {fileID: 1175635745640130010} m_Layer: 5 m_Name: SmallHeart m_TagString: Untagged @@ -19,27 +19,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &12448169909947966 +--- !u!4 &7344697047408078095 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 126035421518750633} + m_GameObject: {fileID: 1417359761030537907} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] - m_Father: {fileID: 4993368112858175913} + m_Father: {fileID: 183093145677880561} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!198 &4482199731261469864 +--- !u!198 &3869965904753799299 ParticleSystem: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 126035421518750633} + m_GameObject: {fileID: 1417359761030537907} serializedVersion: 6 lengthInSec: 1 simulationSpeed: 1 @@ -4709,14 +4709,14 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &2553748558336668130 +--- !u!199 &866361024674860121 ParticleSystemRenderer: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 126035421518750633} + m_GameObject: {fileID: 1417359761030537907} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4773,13 +4773,13 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!114 &1785161944737651156 +--- !u!114 &1175635745640130010 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 126035421518750633} + m_GameObject: {fileID: 1417359761030537907} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3} @@ -4801,7 +4801,6 @@ GameObject: m_Component: - component: {fileID: 4993368112858175913} - component: {fileID: 4552849473547301759} - - component: {fileID: 8050818263968710021} - component: {fileID: 229905824722513163} m_Layer: 5 m_Name: BulkOrde_heart @@ -4821,13 +4820,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 12448169909947966} + - {fileID: 183093145677880561} m_Father: {fileID: 0} m_RootOrder: 0 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: 1171.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4552849473547301759 @@ -4838,14 +4837,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452015854210980963} m_CullTransparentMesh: 0 ---- !u!114 &8050818263968710021 -MonoBehaviour: +--- !u!95 &229905824722513163 +Animator: + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452015854210980963} m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 885dd2f55db3e5848b204ae5edb6e0e7, 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 &7081360328358490285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183093145677880561} + - component: {fileID: 2754455091440814781} + - component: {fileID: 725713318206214669} + - component: {fileID: 5049016751745926364} + m_Layer: 5 + m_Name: heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &183093145677880561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7081360328358490285} + 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: + - {fileID: 7344697047408078095} + m_Father: {fileID: 4993368112858175913} + m_RootOrder: 0 + 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: 54, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2754455091440814781 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7081360328358490285} + m_CullTransparentMesh: 0 +--- !u!114 &725713318206214669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7081360328358490285} + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -4867,14 +4932,14 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!95 &229905824722513163 +--- !u!95 &5049016751745926364 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1452015854210980963} + m_GameObject: {fileID: 7081360328358490285} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 885dd2f55db3e5848b204ae5edb6e0e7, type: 2}