Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn: ハート演出調整 # Conflicts: # popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab
This commit is contained in:
commit
5fd43f6dc7
|
|
@ -55,7 +55,7 @@ ParticleSystem:
|
||||||
startDelay:
|
startDelay:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
minMaxState: 0
|
minMaxState: 0
|
||||||
scalar: 0
|
scalar: 1
|
||||||
minScalar: 0
|
minScalar: 0
|
||||||
maxCurve:
|
maxCurve:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue