From 2f1bc96e39e8cecf59e066872bbc12a1979a3142 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 11 Nov 2021 11:08:51 +0900 Subject: [PATCH] =?UTF-8?q?=E5=85=84=E7=BE=BD=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/Brother/Brother_blue_sell.anim | 162 +++++++++++++++++- .../marketing_salesclerk_Blue_wing_a.png | Bin 0 -> 3349 bytes .../marketing_salesclerk_Blue_wing_a.png.meta | 92 ++++++++++ .../Assets/MyGame/Scenes/Title/Title.unity | 8 +- .../MyGame/Scenes/marketing/marketing.unity | 8 +- 5 files changed, 261 insertions(+), 9 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_sell.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_sell.anim index f26f7839..16f46e0d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_sell.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_sell.anim @@ -267,7 +267,39 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue/Blue/mouth/down - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.51, y: -0.38, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnimationPivot_Blue/Blue/wing/right_a + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.51, y: -0.3799997, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnimationPivot_Blue/Blue/wing/left_a m_ScaleCurves: - curve: serializedVersion: 2 @@ -467,6 +499,20 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2588344007 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 278549151 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -1625,6 +1671,120 @@ AnimationClip: path: AnimationPivot_Blue/Blue/mouth/down classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.51 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnimationPivot_Blue/Blue/wing/right_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnimationPivot_Blue/Blue/wing/right_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue/Blue/wing/right_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.51 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnimationPivot_Blue/Blue/wing/left_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.3799997 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnimationPivot_Blue/Blue/wing/left_a + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue/Blue/wing/left_a + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png new file mode 100644 index 0000000000000000000000000000000000000000..ad37b58720833c9d7ce6fab2658178e751705b75 GIT binary patch literal 3349 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 literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png.meta new file mode 100644 index 00000000..1e2e0c20 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 405da110489c1144cbfce1eab7ef91e0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 9 + spritePivot: {x: 0.9363001, y: 0.21702342} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index c5a727db..277cc773 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -192,7 +192,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43551119} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.612, y: -0.12600017, z: 0} + m_LocalPosition: {x: 0.51, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1295869894} @@ -237,7 +237,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 220a4cd1fd6dd71498dd134890f458c0, type: 3} + m_Sprite: {fileID: 21300000, guid: 405da110489c1144cbfce1eab7ef91e0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 m_FlipY: 0 @@ -2054,7 +2054,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992145460} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.655, y: -0.12600017, z: 0} + m_LocalPosition: {x: -0.51, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1295869894} @@ -2099,7 +2099,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 220a4cd1fd6dd71498dd134890f458c0, type: 3} + m_Sprite: {fileID: 21300000, guid: 405da110489c1144cbfce1eab7ef91e0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 6c8a1df1..fb3f62f2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -2365,7 +2365,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 966116774} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.612, y: -0.12600017, z: 0} + m_LocalPosition: {x: 0.51, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 286834612} @@ -2410,7 +2410,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 220a4cd1fd6dd71498dd134890f458c0, type: 3} + m_Sprite: {fileID: 21300000, guid: 405da110489c1144cbfce1eab7ef91e0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 m_FlipY: 0 @@ -3966,7 +3966,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563148346} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.655, y: -0.12600017, z: 0} + m_LocalPosition: {x: -0.51, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 286834612} @@ -4011,7 +4011,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 220a4cd1fd6dd71498dd134890f458c0, type: 3} + m_Sprite: {fileID: 21300000, guid: 405da110489c1144cbfce1eab7ef91e0, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0