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-06-24 18:22:28 +09:00
commit 6db319ab36
16 changed files with 5115 additions and 9633 deletions

View File

@ -107,15 +107,6 @@ AnimationClip:
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, 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}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -149,7 +140,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 0.26666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -204,15 +195,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -259,15 +241,6 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

View File

@ -13,23 +13,22 @@ AnimationClip:
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 2.8421354, z: 0}
outSlope: {x: 0, y: 2.8421354, z: 0}
inSlope: {x: 0, y: 0, z: -450.5309}
outSlope: {x: 0, y: 0, z: -450.5309}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33866516, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.1992241}
- serializedVersion: 3
time: 0.033333335
value: {x: 0, y: 0.042, z: 0}
value: {x: 0, y: 0, z: -5.215543}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -39,11 +38,64 @@ AnimationClip:
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: -2.3193095, z: 0}
inSlope: {x: 0, y: 0, z: 302.7262}
outSlope: {x: 0, y: 0, z: 188.96901}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.23823436}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.95515746}
- serializedVersion: 3
time: 0.1
value: {x: 0, y: 0, z: 3.144164}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, 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}
- serializedVersion: 3
time: 0.15
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: -191.76634}
outSlope: {x: 0, y: 0, z: -191.76634}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.8283887}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: AnimePivot
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 5.6078634, z: 0}
outSlope: {x: 0, y: 5.6078634, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.2074022, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
value: {x: 0, y: 0.0755617, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, 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}
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: -4.309979, z: 0}
outSlope: {x: 0, y: 1.5750875, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.24411668, z: 0.33333334}
inWeight: {x: 0.33333334, y: 0.21979785, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.45532244, z: 0.33333334}
- serializedVersion: 3
time: 0.1
@ -93,6 +145,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3773036399
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -185,15 +244,15 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
inSlope: 2.8421354
outSlope: 2.8421354
inSlope: 5.6078634
outSlope: 5.6078634
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33866516
outWeight: 0.2074022
- serializedVersion: 3
time: 0.033333335
value: 0.042
value: 0.0755617
inSlope: 0
outSlope: 0
tangentMode: 136
@ -203,11 +262,11 @@ AnimationClip:
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: -2.3193095
inSlope: -4.309979
outSlope: 1.5750875
tangentMode: 1
weightedMode: 0
inWeight: 0.24411668
inWeight: 0.21979785
outWeight: 0.45532244
- serializedVersion: 3
time: 0.1
@ -298,7 +357,202 @@ AnimationClip:
path: AnimePivot
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
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: localEulerAnglesRaw.x
path: AnimePivot
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.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
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: localEulerAnglesRaw.y
path: AnimePivot
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: -450.5309
outSlope: -450.5309
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.1992241
- serializedVersion: 3
time: 0.033333335
value: -5.215543
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: 302.7262
outSlope: 188.96901
tangentMode: 1
weightedMode: 0
inWeight: 0.23823436
outWeight: 0.95515746
- serializedVersion: 3
time: 0.1
value: 3.144164
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0
inSlope: -191.76634
outSlope: -191.76634
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.8283887
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: AnimePivot
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: AnimePivot
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: AnimePivot
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: AnimePivot
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320093620083543226}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: -0.73, z: 0}
m_LocalScale: {x: 1.5, y: 1.5000019, z: 1}
m_Children: []
m_Father: {fileID: 3573890449079331595}
@ -284,7 +284,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.6
scalar: 0.74
minScalar: 1
maxCurve:
serializedVersion: 2
@ -337,7 +337,7 @@ ParticleSystem:
startSizeY:
serializedVersion: 2
minMaxState: 0
scalar: 0.3
scalar: 0.31
minScalar: 1
maxCurve:
serializedVersion: 2
@ -601,7 +601,7 @@ ParticleSystem:
m_RotationOrder: 4
randomizeRotationDirection: 0
maxNumParticles: 1
size3D: 0
size3D: 1
rotation3D: 0
gravityModifier:
serializedVersion: 2
@ -4797,7 +4797,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 57
m_SortingOrder: -3
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
@ -4846,13 +4846,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5317406676302734639}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: 0.43305117, w: 0.90136933}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3573890449079331595}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 51.323}
--- !u!198 &5102800111095069762
ParticleSystem:
m_ObjectHideFlags: 0
@ -4989,8 +4989,8 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 3
scalar: 3
minScalar: 1
scalar: 7.02
minScalar: 32.22
maxCurve:
serializedVersion: 2
m_Curve:
@ -5041,9 +5041,9 @@ ParticleSystem:
m_RotationOrder: 4
startColor:
serializedVersion: 2
minMaxState: 2
minMaxState: 0
minColor: {r: 0.754717, g: 0.5187538, b: 0.252759, a: 1}
maxColor: {r: 0.9150943, g: 0.70561796, b: 0.46186364, a: 1}
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@ -5427,7 +5427,7 @@ ParticleSystem:
gravityModifier:
serializedVersion: 2
minMaxState: 0
scalar: 0.9
scalar: 4.14
minScalar: 0
maxCurve:
serializedVersion: 2
@ -5624,7 +5624,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
arc:
value: 360
value: 74.9
mode: 0
spread: 0
speed:
@ -9606,7 +9606,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 6df680f2823244a6aa5fed141f675186, type: 2}
- {fileID: 2100000, guid: 36a3c810cc4814934b242d640b02a331, type: 2}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
@ -9662,7 +9662,6 @@ GameObject:
- component: {fileID: 3573890449079331595}
- component: {fileID: 4975408134676039328}
- component: {fileID: 3641239145303096372}
- component: {fileID: 3056686354420055072}
- component: {fileID: -2991143500290044821}
m_Layer: 0
m_Name: Pt_Collide
@ -14409,17 +14408,6 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!210 &3056686354420055072
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6144570799026600987}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
--- !u!114 &-2991143500290044821
MonoBehaviour:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 01e0a2064177042158f3505c8e01edea
guid: c99aeaeb56a0b4287969001751819f6f
PrefabImporter:
externalObjects: {}
userData:

View File

@ -190,7 +190,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_SortingOrder: -8
m_Sprite: {fileID: 21300000, guid: f9cd635480d222f42a428758b5be7ede, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -772,7 +772,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -2
m_SortingOrder: -10
m_Sprite: {fileID: 21300000, guid: 267757b8be4e4e24ba872ae78c021570, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -1308,6 +1308,11 @@ PrefabInstance:
propertyPath: m_AngularDrag
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1453251556377932372, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
type: 3}
propertyPath: m_SortingOrder
value: -5
objectReference: {fileID: 0}
- target: {fileID: 1453251556377932374, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
type: 3}
propertyPath: lerpTime