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:
  会話兄弟修正
This commit is contained in:
kimura 2021-11-12 10:43:49 +09:00
parent 62294ce784 2a0d35c563
commit c2ce96544a
7 changed files with 207 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_conversation_Question.anim
View File

@ -87,7 +87,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: -75.05}
value: {x: 0, y: 0, z: -57.136}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -172,7 +172,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.877, y: -1.046, z: 0}
value: {x: 0.67, y: -1.02, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -1628,7 +1628,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.877
value: 0.67
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1647,7 +1647,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.046
value: -1.02
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1723,7 +1723,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -75.05
value: -57.136
inSlope: 0
outSlope: 0
tangentMode: 136

24
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_blue_conversation_Sweat.anim
View File

@ -51,7 +51,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: -73.315}
value: {x: 0, y: 0, z: -45.319004}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -67,7 +67,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 65.202}
value: {x: 0, y: 0, z: 45.319}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -116,7 +116,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.966, y: -1.005, z: 0}
value: {x: 0.693, y: -0.986, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -132,7 +132,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.97527, y: -0.99716, z: 0}
value: {x: -0.739, y: -0.997, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -1551,7 +1551,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.966
value: 0.693
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1570,7 +1570,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.005
value: -0.986
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1646,7 +1646,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -73.315
value: -45.319004
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1665,7 +1665,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.97527
value: -0.739
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1684,7 +1684,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.99716
value: -0.997
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1760,7 +1760,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 65.202
value: 45.319
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1955,7 +1955,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
attribute: m_LocalEulerAngles.z
path: AnimationPivot_Blue/Blue/wing/right_c
classID: 4
script: {fileID: 0}
@ -1975,7 +1975,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
attribute: m_LocalEulerAngles.x
path: AnimationPivot_Blue/Blue/wing/right_c
classID: 4
script: {fileID: 0}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

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

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: dec6f8f16bc6997499bf7f07db701ccd
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: 0
spritePivot: {x: 0.5, y: 0.5}
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:

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 1ea43fe399bd9964e86d84a1d7c8338f
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: 0
spritePivot: {x: 0.5, y: 0.5}
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:

12
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab
View File

@ -940,7 +940,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326132140991209732}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.5, y: -0.45000005, z: 0}
m_LocalPosition: {x: 1, y: -0.37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8326132142516391795}
@ -985,7 +985,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: 81b380123676f884cb7ca9cb95ae29ab, type: 3}
m_Sprite: {fileID: 21300000, guid: dec6f8f16bc6997499bf7f07db701ccd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1
m_FlipY: 0
@ -1147,7 +1147,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326132141132956787}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.52, y: -0.45, z: 0}
m_LocalPosition: {x: -1, y: -0.37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8326132142516391795}
@ -1192,7 +1192,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: 81b380123676f884cb7ca9cb95ae29ab, type: 3}
m_Sprite: {fileID: 21300000, guid: dec6f8f16bc6997499bf7f07db701ccd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -2812,7 +2812,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 30
m_Sprite: {fileID: 21300000, guid: 3b2af36eaeaff5c459042ec3842e2260, type: 3}
m_Sprite: {fileID: 21300000, guid: 1ea43fe399bd9964e86d84a1d7c8338f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -3683,7 +3683,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 30
m_Sprite: {fileID: 21300000, guid: 3b2af36eaeaff5c459042ec3842e2260, type: 3}
m_Sprite: {fileID: 21300000, guid: 1ea43fe399bd9964e86d84a1d7c8338f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1
m_FlipY: 0