diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim index 1b533169..7cefde8f 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornBurn.anim @@ -136,7 +136,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -164,7 +164,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -192,7 +192,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -493,7 +493,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -521,7 +521,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -549,7 +549,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4811321 + value: 0.7830189 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim index 822d5e4e..b9cc7596 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/CornGrow.anim @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.16982037, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0, y: 1.6081347, z: 0} + value: {x: 0, y: 1.6547656, z: 0} inSlope: {x: 0, y: 8.7842655, z: 0} outSlope: {x: 0, y: 8.7842655, z: 0} tangentMode: 0 @@ -38,13 +38,13 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.29422888, z: 0.33333334} - serializedVersion: 3 time: 0.18333334 - value: {x: 0, y: 1.9818014, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: 1.9351748, z: 0} + inSlope: {x: 0, y: -1.8622863, z: 0} + outSlope: {x: 0, y: -1.8622863, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.9773223, z: 0.33333334} - serializedVersion: 3 time: 0.3 value: {x: 0, y: 0, z: 0} @@ -242,7 +242,98 @@ AnimationClip: path: classID: 58 script: {fileID: 0} - m_PPtrCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.31132078 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2} + attribute: m_Materials.Array.data[0] + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -292,7 +383,36 @@ AnimationClip: typeID: 58 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: [] + - serializedVersion: 2 + path: 3454031445 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3454031445 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -474,7 +594,7 @@ AnimationClip: outWeight: 0.16982037 - serializedVersion: 3 time: 0.06666667 - value: 1.6081347 + value: 1.6547656 inSlope: 8.7842655 outSlope: 8.7842655 tangentMode: 0 @@ -483,13 +603,13 @@ AnimationClip: outWeight: 0.29422888 - serializedVersion: 3 time: 0.18333334 - value: 1.9818014 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1.9351748 + inSlope: -1.8622863 + outSlope: -1.8622863 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.9773223 - serializedVersion: 3 time: 0.3 value: 0 @@ -618,6 +738,90 @@ AnimationClip: path: classID: 58 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.31132078 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3098523 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: RotationResolver/AnimePivot/Image_corn + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat new file mode 100644 index 00000000..44960c52 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: mt_spriteEmission + m_Shader: {fileID: 4800000, guid: 35a8d5b95e0064223ad07f51cd54e73d, type: 3} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta new file mode 100644 index 00000000..6d8299dc --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/popcorn/mt_spriteEmission.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f138cade846eb48a995388422833859d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: