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 00000000..ad37b587 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_Blue_wing_a.png differ 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