yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop 

* 'develop' of https://bitbucket.org/usaya/popcorn:
  animation調整
  メイン画面兄弟animation追加
  チュートリアル文章調整
This commit is contained in:
kimura 2021-12-07 15:32:00 +09:00
parent c85a448129 dfa475ed17
commit 7b9b3d429f
7 changed files with 2535 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2458
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_flame.anim
View File

File diff suppressed because it is too large Load Diff

36
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_main_tired.anim
View File

@ -79,7 +79,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 5.016667
time: 5
value: {x: 0, y: 0, z: -0.34600002}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -1359,7 +1359,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.016667
time: 5
value: 0
inSlope: 0
outSlope: 0
@ -1396,7 +1396,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.016667
time: 5
value: 0
inSlope: 0
outSlope: 0
@ -1433,7 +1433,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5.016667
time: 5
value: -0.34600002
inSlope: 0
outSlope: 0
@ -1654,7 +1654,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimationPivot_Blue/Blue/wing/left_c
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
- curve:
@ -1664,17 +1664,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimationPivot_Blue/Blue/wing/left_c
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_Blue/Blue/wing/left_c
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
- curve:
@ -1687,6 +1677,16 @@ AnimationClip:
path: AnimationPivot_Blue/Blue/mouth/down
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimationPivot_Blue/Blue/wing/left_c
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@ -1694,7 +1694,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimationPivot_Blue/Blue/mouth/down
path: AnimationPivot_Blue/Blue/wing/left_c
classID: 4
script: {fileID: 0}
- curve:
@ -1704,7 +1704,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimationPivot_Blue/Blue/mouth/down
path: AnimationPivot_Blue/Blue/wing/left_c
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0

BIN
popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_flame_Dither.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

92
popcorn/Assets/MyGame/Resource/Material/Brother/Main_conversation_Blue_body_flame_Dither.png.meta Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: d9f88f42d16b9b04aab50f1ba5867ff0
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.50000006, y: 0.019321369}
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:

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
rfmuMHDu1iEq43lOHBZb9tyfteF8AEtTORZTom61UTB2BNI5Il0xqF7df1AQ7gUM
wbBbcyNq0tYY1C6Df5RfIAvkiMYxo71PhTnwimf/4Bg1GaIh95DNJiRqgx6jmPSW

2
popcorn/Assets/MyGame/Resources/Data/TutorialData.txt
View File

File diff suppressed because one or more lines are too long

82
popcorn/Assets/MyGame/Scenes/Main/Main.unity
View File

@ -3341,6 +3341,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1201209666}
- {fileID: 2028992897}
m_Father: {fileID: 251891027}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5717,6 +5718,87 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2bee5c60f0f643d4a47973529de9226c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2028992896
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2028992897}
- component: {fileID: 2028992898}
m_Layer: 0
m_Name: flame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &2028992897
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2028992896}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.65, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1124341217}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2028992898
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2028992896}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: d9f88f42d16b9b04aab50f1ba5867ff0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 3.26, y: 3.82}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2055584752
GameObject:
m_ObjectHideFlags: 0