From 13dfbd6a93938353c6a45140e06d25371608a4e5 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 13 Sep 2021 12:21:50 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BB=95=E5=85=A5=E3=82=8C=E8=B3=BC=E5=85=A5?= =?UTF-8?q?=E3=80=81=E8=A9=B3=E7=B4=B0POP=E6=96=87=E5=AD=97=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/Brother.controller | 31 ++++++++++- .../Resource/Animation/Brother_blue_main.anim | 53 +++++++++++++++++++ .../Animation/Brother_blue_main.anim.meta | 8 +++ .../MyGame/Scenes/shopping/Purchase.unity | 40 ++++++++++++++ .../Scenes/shopping/ShoppingExplanation.unity | 35 ++++++++++++ 5 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim create mode 100644 popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother.controller index 0d7100f6..2214cc20 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother.controller @@ -37,6 +37,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 8164371926150459515} m_Position: {x: 290, y: 30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2123996942653153202} + m_Position: {x: 325, y: 95, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 6442717320784534736} @@ -74,6 +77,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-2123996942653153202 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Brother_blue_main + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 7400000, guid: 60e8163ec0846f0498f97c56f76c7eac, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -88,7 +117,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim new file mode 100644 index 00000000..3903d53b --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Brother_blue_main + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim.meta b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim.meta new file mode 100644 index 00000000..ef781929 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_main.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60e8163ec0846f0498f97c56f76c7eac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity index c784adcb..02e6699a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity @@ -128,6 +128,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 9133304335334808081, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -75 + objectReference: {fileID: 0} - target: {fileID: 9133304336623725415, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_Name @@ -238,5 +243,40 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9133304336883555433, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_FontData.m_BestFit + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133304336883555433, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 9133304336883555433, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 9133304336883555446, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_SizeDelta.x + value: 570 + objectReference: {fileID: 0} + - target: {fileID: 9133304336944246770, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_SizeDelta.x + value: 580 + objectReference: {fileID: 0} + - target: {fileID: 9133304336944246773, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9133304337032816943, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_SizeDelta.x + value: 570 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index 1b7e9ee6..1d74ce21 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -128,6 +128,41 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3033445368460925996, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_SizeDelta.x + value: 510 + objectReference: {fileID: 0} + - target: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_FontData.m_BestFit + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 3033445368573299218, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3033445368573299219, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_SizeDelta.x + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 3033445369412931226, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_SizeDelta.x + value: 512 + objectReference: {fileID: 0} - target: {fileID: 3033445369676262432, guid: a1b406baf09004616b436c242e3a474f, type: 3} propertyPath: m_Name