Skip to content

Commit 50d010a

Browse files
author
Fatih
committed
added some more ParticleSystem goodies and trigger them with events in our scripts.
1 parent e3cfb14 commit 50d010a

File tree

7 files changed

+1026
-269
lines changed

7 files changed

+1026
-269
lines changed

‎Assets/Scenes/Game.unity

+293
Original file line numberDiff line numberDiff line change
@@ -2293,6 +2293,31 @@ MonoBehaviour:
22932293
m_Name:
22942294
m_EditorClassIdentifier:
22952295
allParticles: []
2296+
--- !u!1 &440759786 stripped
2297+
GameObject:
2298+
m_CorrespondingSourceObject: {fileID: 118434, guid: bb266f46b1cf64146ba6d47074785030,
2299+
type: 3}
2300+
m_PrefabInstance: {fileID: 840913564}
2301+
m_PrefabAsset: {fileID: 0}
2302+
--- !u!4 &440759787 stripped
2303+
Transform:
2304+
m_CorrespondingSourceObject: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030,
2305+
type: 3}
2306+
m_PrefabInstance: {fileID: 840913564}
2307+
m_PrefabAsset: {fileID: 0}
2308+
--- !u!114 &440759788
2309+
MonoBehaviour:
2310+
m_ObjectHideFlags: 0
2311+
m_CorrespondingSourceObject: {fileID: 0}
2312+
m_PrefabInstance: {fileID: 0}
2313+
m_PrefabAsset: {fileID: 0}
2314+
m_GameObject: {fileID: 440759786}
2315+
m_Enabled: 1
2316+
m_EditorHideFlags: 0
2317+
m_Script: {fileID: 11500000, guid: 7ff8b539bc9d14ba58db3fd96f518d66, type: 3}
2318+
m_Name:
2319+
m_EditorClassIdentifier:
2320+
allParticles: []
22962321
--- !u!850595691 &457194337
22972322
LightingSettings:
22982323
m_ObjectHideFlags: 0
@@ -3780,6 +3805,83 @@ Transform:
37803805
type: 3}
37813806
m_PrefabInstance: {fileID: 830659941}
37823807
m_PrefabAsset: {fileID: 0}
3808+
--- !u!1001 &840913564
3809+
PrefabInstance:
3810+
m_ObjectHideFlags: 0
3811+
serializedVersion: 2
3812+
m_Modification:
3813+
m_TransformParent: {fileID: 1560689994}
3814+
m_Modifications:
3815+
- target: {fileID: 118434, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3816+
propertyPath: m_Name
3817+
value: ExplosionFX
3818+
objectReference: {fileID: 0}
3819+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3820+
propertyPath: m_RootOrder
3821+
value: 7
3822+
objectReference: {fileID: 0}
3823+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3824+
propertyPath: m_LocalPosition.x
3825+
value: 5.2
3826+
objectReference: {fileID: 0}
3827+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3828+
propertyPath: m_LocalPosition.y
3829+
value: 9.36
3830+
objectReference: {fileID: 0}
3831+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3832+
propertyPath: m_LocalPosition.z
3833+
value: 20
3834+
objectReference: {fileID: 0}
3835+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3836+
propertyPath: m_LocalRotation.w
3837+
value: 0.7071068
3838+
objectReference: {fileID: 0}
3839+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3840+
propertyPath: m_LocalRotation.x
3841+
value: -0.7071068
3842+
objectReference: {fileID: 0}
3843+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3844+
propertyPath: m_LocalRotation.y
3845+
value: 0
3846+
objectReference: {fileID: 0}
3847+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3848+
propertyPath: m_LocalRotation.z
3849+
value: 0
3850+
objectReference: {fileID: 0}
3851+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3852+
propertyPath: m_LocalEulerAnglesHint.x
3853+
value: 0
3854+
objectReference: {fileID: 0}
3855+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3856+
propertyPath: m_LocalEulerAnglesHint.y
3857+
value: 0
3858+
objectReference: {fileID: 0}
3859+
- target: {fileID: 401066, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3860+
propertyPath: m_LocalEulerAnglesHint.z
3861+
value: 0
3862+
objectReference: {fileID: 0}
3863+
- target: {fileID: 19902258, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3864+
propertyPath: m_Materials.Array.size
3865+
value: 1
3866+
objectReference: {fileID: 0}
3867+
- target: {fileID: 19908038, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3868+
propertyPath: m_Materials.Array.size
3869+
value: 1
3870+
objectReference: {fileID: 0}
3871+
- target: {fileID: 19915894, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3872+
propertyPath: m_Materials.Array.size
3873+
value: 1
3874+
objectReference: {fileID: 0}
3875+
- target: {fileID: 19979792, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3876+
propertyPath: m_Materials.Array.size
3877+
value: 1
3878+
objectReference: {fileID: 0}
3879+
- target: {fileID: 19988800, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
3880+
propertyPath: m_Materials.Array.size
3881+
value: 1
3882+
objectReference: {fileID: 0}
3883+
m_RemovedComponents: []
3884+
m_SourcePrefab: {fileID: 100100000, guid: bb266f46b1cf64146ba6d47074785030, type: 3}
37833885
--- !u!1001 &843083640
37843886
PrefabInstance:
37853887
m_ObjectHideFlags: 0
@@ -4355,6 +4457,7 @@ MonoBehaviour:
43554457
- {fileID: 1563756106}
43564458
- {fileID: 163964326}
43574459
- {fileID: 1042692847}
4460+
m_spawnFx: {fileID: 0}
43584461
--- !u!4 &981810325
43594462
Transform:
43604463
m_ObjectHideFlags: 0
@@ -5536,6 +5639,31 @@ MonoBehaviour:
55365639
m_StringArgument:
55375640
m_BoolArgument: 0
55385641
m_CallState: 2
5642+
--- !u!1 &1253018736 stripped
5643+
GameObject:
5644+
m_CorrespondingSourceObject: {fileID: 181100, guid: 5666303b722e84b51affe16857a54d12,
5645+
type: 3}
5646+
m_PrefabInstance: {fileID: 1827788939}
5647+
m_PrefabAsset: {fileID: 0}
5648+
--- !u!4 &1253018737 stripped
5649+
Transform:
5650+
m_CorrespondingSourceObject: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12,
5651+
type: 3}
5652+
m_PrefabInstance: {fileID: 1827788939}
5653+
m_PrefabAsset: {fileID: 0}
5654+
--- !u!114 &1253018740
5655+
MonoBehaviour:
5656+
m_ObjectHideFlags: 0
5657+
m_CorrespondingSourceObject: {fileID: 0}
5658+
m_PrefabInstance: {fileID: 0}
5659+
m_PrefabAsset: {fileID: 0}
5660+
m_GameObject: {fileID: 1253018736}
5661+
m_Enabled: 1
5662+
m_EditorHideFlags: 0
5663+
m_Script: {fileID: 11500000, guid: 7ff8b539bc9d14ba58db3fd96f518d66, type: 3}
5664+
m_Name:
5665+
m_EditorClassIdentifier:
5666+
allParticles: []
55395667
--- !u!114 &1261332943
55405668
MonoBehaviour:
55415669
m_ObjectHideFlags: 0
@@ -6077,6 +6205,96 @@ CanvasRenderer:
60776205
m_PrefabAsset: {fileID: 0}
60786206
m_GameObject: {fileID: 1357011012}
60796207
m_CullTransparentMesh: 0
6208+
--- !u!1001 &1364257961
6209+
PrefabInstance:
6210+
m_ObjectHideFlags: 0
6211+
serializedVersion: 2
6212+
m_Modification:
6213+
m_TransformParent: {fileID: 1560689994}
6214+
m_Modifications:
6215+
- target: {fileID: 133830, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6216+
propertyPath: m_Name
6217+
value: LevelUpFX
6218+
objectReference: {fileID: 0}
6219+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6220+
propertyPath: m_RootOrder
6221+
value: 6
6222+
objectReference: {fileID: 0}
6223+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6224+
propertyPath: m_LocalPosition.x
6225+
value: 8
6226+
objectReference: {fileID: 0}
6227+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6228+
propertyPath: m_LocalPosition.y
6229+
value: 15
6230+
objectReference: {fileID: 0}
6231+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6232+
propertyPath: m_LocalPosition.z
6233+
value: 15
6234+
objectReference: {fileID: 0}
6235+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6236+
propertyPath: m_LocalRotation.w
6237+
value: 0.7071068
6238+
objectReference: {fileID: 0}
6239+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6240+
propertyPath: m_LocalRotation.x
6241+
value: -0.7071068
6242+
objectReference: {fileID: 0}
6243+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6244+
propertyPath: m_LocalRotation.y
6245+
value: 0
6246+
objectReference: {fileID: 0}
6247+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6248+
propertyPath: m_LocalRotation.z
6249+
value: 0
6250+
objectReference: {fileID: 0}
6251+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6252+
propertyPath: m_LocalEulerAnglesHint.x
6253+
value: 0
6254+
objectReference: {fileID: 0}
6255+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6256+
propertyPath: m_LocalEulerAnglesHint.y
6257+
value: 0
6258+
objectReference: {fileID: 0}
6259+
- target: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6260+
propertyPath: m_LocalEulerAnglesHint.z
6261+
value: 0
6262+
objectReference: {fileID: 0}
6263+
- target: {fileID: 19951566, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6264+
propertyPath: m_Materials.Array.size
6265+
value: 1
6266+
objectReference: {fileID: 0}
6267+
- target: {fileID: 19954430, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6268+
propertyPath: m_Materials.Array.size
6269+
value: 1
6270+
objectReference: {fileID: 0}
6271+
m_RemovedComponents: []
6272+
m_SourcePrefab: {fileID: 100100000, guid: 54dc086887f7d4b9bbc3b88cffa9883c, type: 3}
6273+
--- !u!4 &1364257962 stripped
6274+
Transform:
6275+
m_CorrespondingSourceObject: {fileID: 482298, guid: 54dc086887f7d4b9bbc3b88cffa9883c,
6276+
type: 3}
6277+
m_PrefabInstance: {fileID: 1364257961}
6278+
m_PrefabAsset: {fileID: 0}
6279+
--- !u!1 &1364257963 stripped
6280+
GameObject:
6281+
m_CorrespondingSourceObject: {fileID: 133830, guid: 54dc086887f7d4b9bbc3b88cffa9883c,
6282+
type: 3}
6283+
m_PrefabInstance: {fileID: 1364257961}
6284+
m_PrefabAsset: {fileID: 0}
6285+
--- !u!114 &1364257964
6286+
MonoBehaviour:
6287+
m_ObjectHideFlags: 0
6288+
m_CorrespondingSourceObject: {fileID: 0}
6289+
m_PrefabInstance: {fileID: 0}
6290+
m_PrefabAsset: {fileID: 0}
6291+
m_GameObject: {fileID: 1364257963}
6292+
m_Enabled: 1
6293+
m_EditorHideFlags: 0
6294+
m_Script: {fileID: 11500000, guid: 7ff8b539bc9d14ba58db3fd96f518d66, type: 3}
6295+
m_Name:
6296+
m_EditorClassIdentifier:
6297+
allParticles: []
60806298
--- !u!1 &1394997926
60816299
GameObject:
60826300
m_ObjectHideFlags: 0
@@ -6493,6 +6711,7 @@ MonoBehaviour:
64936711
m_pausePanel: {fileID: 780268270}
64946712
m_isPaused: 0
64956713
m_rotIconTogle: {fileID: 663217209}
6714+
m_gameOverFx: {fileID: 440759788}
64966715
--- !u!4 &1547250705
64976716
Transform:
64986717
m_ObjectHideFlags: 0
@@ -6541,6 +6760,9 @@ Transform:
65416760
- {fileID: 259416747}
65426761
- {fileID: 540271935}
65436762
- {fileID: 368227953}
6763+
- {fileID: 1253018737}
6764+
- {fileID: 1364257962}
6765+
- {fileID: 440759787}
65446766
m_Father: {fileID: 0}
65456767
m_RootOrder: 10
65466768
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7265,6 +7487,7 @@ MonoBehaviour:
72657487
m_levelText: {fileID: 1206301432}
72667488
m_scoreText: {fileID: 1247220148}
72677489
m_didLevelUp: 0
7490+
m_levelUpFx: {fileID: 1364257964}
72687491
--- !u!1 &1677978568
72697492
GameObject:
72707493
m_ObjectHideFlags: 0
@@ -8043,6 +8266,75 @@ PrefabInstance:
80438266
objectReference: {fileID: 0}
80448267
m_RemovedComponents: []
80458268
m_SourcePrefab: {fileID: 100100000, guid: 8e20f99393dad2a48902d9e5197a0e2e, type: 3}
8269+
--- !u!1001 &1827788939
8270+
PrefabInstance:
8271+
m_ObjectHideFlags: 0
8272+
serializedVersion: 2
8273+
m_Modification:
8274+
m_TransformParent: {fileID: 1560689994}
8275+
m_Modifications:
8276+
- target: {fileID: 181100, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8277+
propertyPath: m_Name
8278+
value: SpawnFX
8279+
objectReference: {fileID: 0}
8280+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8281+
propertyPath: m_RootOrder
8282+
value: 5
8283+
objectReference: {fileID: 0}
8284+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8285+
propertyPath: m_LocalPosition.x
8286+
value: 4
8287+
objectReference: {fileID: 0}
8288+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8289+
propertyPath: m_LocalPosition.y
8290+
value: 25
8291+
objectReference: {fileID: 0}
8292+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8293+
propertyPath: m_LocalPosition.z
8294+
value: 20
8295+
objectReference: {fileID: 0}
8296+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8297+
propertyPath: m_LocalRotation.w
8298+
value: 0.7071068
8299+
objectReference: {fileID: 0}
8300+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8301+
propertyPath: m_LocalRotation.x
8302+
value: -0.7071068
8303+
objectReference: {fileID: 0}
8304+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8305+
propertyPath: m_LocalRotation.y
8306+
value: 0
8307+
objectReference: {fileID: 0}
8308+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8309+
propertyPath: m_LocalRotation.z
8310+
value: 0
8311+
objectReference: {fileID: 0}
8312+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8313+
propertyPath: m_LocalEulerAnglesHint.x
8314+
value: 0
8315+
objectReference: {fileID: 0}
8316+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8317+
propertyPath: m_LocalEulerAnglesHint.y
8318+
value: 0
8319+
objectReference: {fileID: 0}
8320+
- target: {fileID: 420496, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8321+
propertyPath: m_LocalEulerAnglesHint.z
8322+
value: 0
8323+
objectReference: {fileID: 0}
8324+
- target: {fileID: 19905850, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8325+
propertyPath: m_Materials.Array.size
8326+
value: 1
8327+
objectReference: {fileID: 0}
8328+
- target: {fileID: 19957116, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8329+
propertyPath: m_Materials.Array.size
8330+
value: 1
8331+
objectReference: {fileID: 0}
8332+
- target: {fileID: 19960918, guid: 5666303b722e84b51affe16857a54d12, type: 3}
8333+
propertyPath: m_Materials.Array.size
8334+
value: 1
8335+
objectReference: {fileID: 0}
8336+
m_RemovedComponents: []
8337+
m_SourcePrefab: {fileID: 100100000, guid: 5666303b722e84b51affe16857a54d12, type: 3}
80468338
--- !u!1 &1832570241
80478339
GameObject:
80488340
m_ObjectHideFlags: 0
@@ -8099,6 +8391,7 @@ MonoBehaviour:
80998391
- {fileID: 1563756106}
81008392
- {fileID: 163964326}
81018393
- {fileID: 1042692847}
8394+
m_spawnFx: {fileID: 1253018740}
81028395
--- !u!1 &1848356551
81038396
GameObject:
81048397
m_ObjectHideFlags: 0

‎Assets/Scripts/Core/Ghost.cs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public void DrawGhost(Shape originalShape, Board gameBoard)
2727
{
2828
m_ghostShape.transform.position = originalShape.transform.position;
2929
m_ghostShape.transform.rotation = originalShape.transform.rotation;
30+
m_ghostShape.transform.localScale = Vector3.one;
3031
}
3132

3233
m_hitBottom = false;

0 commit comments

Comments
 (0)