Skip to content

Commit 152a8bb

Browse files
authored
fix: revert heart particles (#6113)
* fix: revert heart particles * Revert * Added more hearts
1 parent e35269e commit 152a8bb

File tree

1 file changed

+41
-36
lines changed

1 file changed

+41
-36
lines changed

unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/Prefabs/AvatarExpressionHeart.prefab

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GameObject:
1111
- component: {fileID: 8836422256148970027}
1212
- component: {fileID: 2823796719404257459}
1313
- component: {fileID: 8603952826114518405}
14-
- component: {fileID: -2711576493407760981}
14+
- component: {fileID: -2616842630384997950}
1515
m_Layer: 0
1616
m_Name: AvatarExpressionHeart
1717
m_TagString: Untagged
@@ -26,12 +26,13 @@ Transform:
2626
m_PrefabInstance: {fileID: 0}
2727
m_PrefabAsset: {fileID: 0}
2828
m_GameObject: {fileID: 5040678410500195010}
29+
serializedVersion: 2
2930
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3031
m_LocalPosition: {x: 0, y: 0, z: 0}
3132
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_ConstrainProportionsScale: 0
3234
m_Children: []
3335
m_Father: {fileID: 0}
34-
m_RootOrder: 0
3536
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3637
--- !u!199 &2823796719404257459
3738
ParticleSystemRenderer:
@@ -45,6 +46,7 @@ ParticleSystemRenderer:
4546
m_CastShadows: 0
4647
m_ReceiveShadows: 0
4748
m_DynamicOccludee: 1
49+
m_StaticShadowCaster: 0
4850
m_MotionVectors: 1
4951
m_LightProbeUsage: 0
5052
m_ReflectionProbeUsage: 0
@@ -75,6 +77,7 @@ ParticleSystemRenderer:
7577
m_SortingLayer: 0
7678
m_SortingOrder: 0
7779
m_RenderMode: 0
80+
m_MeshDistribution: 0
7881
m_SortMode: 0
7982
m_MinParticleSize: 0
8083
m_MaxParticleSize: 1.58
@@ -87,17 +90,23 @@ ParticleSystemRenderer:
8790
m_RenderAlignment: 0
8891
m_Pivot: {x: 0, y: 0, z: 0}
8992
m_Flip: {x: 0, y: 0, z: 0}
90-
m_UseCustomVertexStreams: 1
9193
m_EnableGPUInstancing: 1
9294
m_ApplyActiveColorSpace: 0
9395
m_AllowRoll: 1
9496
m_FreeformStretching: 0
9597
m_RotateWithStretchDirection: 1
98+
m_UseCustomVertexStreams: 1
9699
m_VertexStreams: 00010304
100+
m_UseCustomTrailVertexStreams: 0
101+
m_TrailVertexStreams: 00010304
97102
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
98103
m_Mesh1: {fileID: 0}
99104
m_Mesh2: {fileID: 0}
100105
m_Mesh3: {fileID: 0}
106+
m_MeshWeighting: 1
107+
m_MeshWeighting1: 1
108+
m_MeshWeighting2: 1
109+
m_MeshWeighting3: 1
101110
m_MaskInteraction: 0
102111
--- !u!198 &8603952826114518405
103112
ParticleSystem:
@@ -106,19 +115,19 @@ ParticleSystem:
106115
m_PrefabInstance: {fileID: 0}
107116
m_PrefabAsset: {fileID: 0}
108117
m_GameObject: {fileID: 5040678410500195010}
109-
serializedVersion: 7
118+
serializedVersion: 8
110119
lengthInSec: 5
111120
simulationSpeed: 1
112121
stopAction: 0
113122
cullingMode: 0
114123
ringBufferMode: 0
115124
ringBufferLoopRange: {x: 0, y: 1}
125+
emitterVelocityMode: 1
116126
looping: 0
117127
prewarm: 0
118128
playOnAwake: 1
119129
useUnscaledTime: 0
120130
autoRandomSeed: 1
121-
useRigidbodyForVelocity: 1
122131
startDelay:
123132
serializedVersion: 2
124133
minMaxState: 0
@@ -172,7 +181,7 @@ ParticleSystem:
172181
m_PreInfinity: 2
173182
m_PostInfinity: 2
174183
m_RotationOrder: 4
175-
moveWithTransform: 0
184+
moveWithTransform: 1
176185
moveWithCustomTransform: {fileID: 0}
177186
scalingMode: 1
178187
randomSeed: 0
@@ -317,6 +326,7 @@ ParticleSystem:
317326
atime6: 0
318327
atime7: 0
319328
m_Mode: 0
329+
m_ColorSpace: -1
320330
m_NumColorKeys: 2
321331
m_NumAlphaKeys: 2
322332
minGradient:
@@ -346,6 +356,7 @@ ParticleSystem:
346356
atime6: 0
347357
atime7: 0
348358
m_Mode: 0
359+
m_ColorSpace: -1
349360
m_NumColorKeys: 2
350361
m_NumAlphaKeys: 2
351362
startSize:
@@ -667,7 +678,9 @@ ParticleSystem:
667678
m_PostInfinity: 2
668679
m_RotationOrder: 4
669680
randomizeRotationDirection: 0
681+
gravitySource: 0
670682
maxNumParticles: 250
683+
customEmitterVelocity: {x: 0, y: 0, z: 0}
671684
size3D: 0
672685
rotation3D: 0
673686
gravityModifier:
@@ -1042,7 +1055,7 @@ ParticleSystem:
10421055
countCurve:
10431056
serializedVersion: 2
10441057
minMaxState: 0
1045-
scalar: 1
1058+
scalar: 2
10461059
minScalar: 30
10471060
maxCurve:
10481061
serializedVersion: 2
@@ -1462,6 +1475,7 @@ ParticleSystem:
14621475
atime6: 0
14631476
atime7: 0
14641477
m_Mode: 0
1478+
m_ColorSpace: -1
14651479
m_NumColorKeys: 2
14661480
m_NumAlphaKeys: 2
14671481
minGradient:
@@ -1491,13 +1505,14 @@ ParticleSystem:
14911505
atime6: 0
14921506
atime7: 0
14931507
m_Mode: 0
1508+
m_ColorSpace: -1
14941509
m_NumColorKeys: 2
14951510
m_NumAlphaKeys: 2
14961511
UVModule:
14971512
serializedVersion: 2
1498-
enabled: 1
1499-
mode: 1
1500-
timeMode: 1
1513+
enabled: 0
1514+
mode: 0
1515+
timeMode: 0
15011516
fps: 30
15021517
frameOverTime:
15031518
serializedVersion: 2
@@ -1554,8 +1569,8 @@ ParticleSystem:
15541569
m_RotationOrder: 4
15551570
startFrame:
15561571
serializedVersion: 2
1557-
minMaxState: 3
1558-
scalar: 0.9999
1572+
minMaxState: 0
1573+
scalar: 0
15591574
minScalar: 0
15601575
maxCurve:
15611576
serializedVersion: 2
@@ -1605,7 +1620,7 @@ ParticleSystem:
16051620
m_PreInfinity: 2
16061621
m_PostInfinity: 2
16071622
m_RotationOrder: 4
1608-
speedRange: {x: 0, y: 0}
1623+
speedRange: {x: 0, y: 1}
16091624
tilesX: 1
16101625
tilesY: 1
16111626
animationType: 0
@@ -1614,28 +1629,7 @@ ParticleSystem:
16141629
uvChannelMask: -1
16151630
rowMode: 1
16161631
sprites:
1617-
- sprite: {fileID: -5678512871157408403, guid: 442f06e710f18804e8fbbaae7286f8a7,
1618-
type: 3}
1619-
- sprite: {fileID: -6134993809297719219, guid: 442f06e710f18804e8fbbaae7286f8a7,
1620-
type: 3}
1621-
- sprite: {fileID: -5653411428424605918, guid: 442f06e710f18804e8fbbaae7286f8a7,
1622-
type: 3}
1623-
- sprite: {fileID: -6234104402273833510, guid: 442f06e710f18804e8fbbaae7286f8a7,
1624-
type: 3}
1625-
- sprite: {fileID: -23437870716378929, guid: 442f06e710f18804e8fbbaae7286f8a7,
1626-
type: 3}
1627-
- sprite: {fileID: 6726948905552063219, guid: 442f06e710f18804e8fbbaae7286f8a7,
1628-
type: 3}
1629-
- sprite: {fileID: 7065040574335784077, guid: 442f06e710f18804e8fbbaae7286f8a7,
1630-
type: 3}
1631-
- sprite: {fileID: -2592509462476873157, guid: 442f06e710f18804e8fbbaae7286f8a7,
1632-
type: 3}
1633-
- sprite: {fileID: 5026146890834185380, guid: 442f06e710f18804e8fbbaae7286f8a7,
1634-
type: 3}
1635-
- sprite: {fileID: -5677250123261470903, guid: 442f06e710f18804e8fbbaae7286f8a7,
1636-
type: 3}
1637-
- sprite: {fileID: -924287825326529467, guid: 442f06e710f18804e8fbbaae7286f8a7,
1638-
type: 3}
1632+
- sprite: {fileID: 0}
16391633
flipU: 0
16401634
flipV: 0
16411635
VelocityModule:
@@ -3741,6 +3735,7 @@ ParticleSystem:
37413735
atime6: 0
37423736
atime7: 0
37433737
m_Mode: 0
3738+
m_ColorSpace: -1
37443739
m_NumColorKeys: 2
37453740
m_NumAlphaKeys: 2
37463741
minGradient:
@@ -3770,6 +3765,7 @@ ParticleSystem:
37703765
atime6: 0
37713766
atime7: 0
37723767
m_Mode: 0
3768+
m_ColorSpace: -1
37733769
m_NumColorKeys: 2
37743770
m_NumAlphaKeys: 2
37753771
range: {x: 0, y: 1}
@@ -4147,6 +4143,7 @@ ParticleSystem:
41474143
m_RotationOrder: 4
41484144
minVertexDistance: 0.2
41494145
textureMode: 0
4146+
textureScale: {x: 1, y: 1}
41504147
ribbonCount: 1
41514148
shadowBias: 0.5
41524149
worldSpace: 0
@@ -4189,6 +4186,7 @@ ParticleSystem:
41894186
atime6: 0
41904187
atime7: 0
41914188
m_Mode: 0
4189+
m_ColorSpace: -1
41924190
m_NumColorKeys: 2
41934191
m_NumAlphaKeys: 2
41944192
minGradient:
@@ -4218,6 +4216,7 @@ ParticleSystem:
42184216
atime6: 0
42194217
atime7: 0
42204218
m_Mode: 0
4219+
m_ColorSpace: -1
42214220
m_NumColorKeys: 2
42224221
m_NumAlphaKeys: 2
42234222
widthOverTrail:
@@ -4305,6 +4304,7 @@ ParticleSystem:
43054304
atime6: 0
43064305
atime7: 0
43074306
m_Mode: 0
4307+
m_ColorSpace: -1
43084308
m_NumColorKeys: 2
43094309
m_NumAlphaKeys: 2
43104310
minGradient:
@@ -4334,6 +4334,7 @@ ParticleSystem:
43344334
atime6: 0
43354335
atime7: 0
43364336
m_Mode: 0
4337+
m_ColorSpace: -1
43374338
m_NumColorKeys: 2
43384339
m_NumAlphaKeys: 2
43394340
CustomDataModule:
@@ -4372,6 +4373,7 @@ ParticleSystem:
43724373
atime6: 0
43734374
atime7: 0
43744375
m_Mode: 0
4376+
m_ColorSpace: -1
43754377
m_NumColorKeys: 2
43764378
m_NumAlphaKeys: 2
43774379
minGradient:
@@ -4401,6 +4403,7 @@ ParticleSystem:
44014403
atime6: 0
44024404
atime7: 0
44034405
m_Mode: 0
4406+
m_ColorSpace: -1
44044407
m_NumColorKeys: 2
44054408
m_NumAlphaKeys: 2
44064409
colorLabel0: Color
@@ -4654,6 +4657,7 @@ ParticleSystem:
46544657
atime6: 0
46554658
atime7: 0
46564659
m_Mode: 0
4660+
m_ColorSpace: -1
46574661
m_NumColorKeys: 2
46584662
m_NumAlphaKeys: 2
46594663
minGradient:
@@ -4683,6 +4687,7 @@ ParticleSystem:
46834687
atime6: 0
46844688
atime7: 0
46854689
m_Mode: 0
4690+
m_ColorSpace: -1
46864691
m_NumColorKeys: 2
46874692
m_NumAlphaKeys: 2
46884693
colorLabel1: Color
@@ -4902,7 +4907,7 @@ ParticleSystem:
49024907
m_PostInfinity: 2
49034908
m_RotationOrder: 4
49044909
vectorLabel1_3: W
4905-
--- !u!114 &-2711576493407760981
4910+
--- !u!114 &-2616842630384997950
49064911
MonoBehaviour:
49074912
m_ObjectHideFlags: 0
49084913
m_CorrespondingSourceObject: {fileID: 0}

0 commit comments

Comments
 (0)