diff --git a/assets/_Game/Prefabs/Gacha/Flip_Card.prefab b/assets/_Game/Prefabs/Gacha/Flip_Card.prefab index 5040205..1a81ac2 100644 --- a/assets/_Game/Prefabs/Gacha/Flip_Card.prefab +++ b/assets/_Game/Prefabs/Gacha/Flip_Card.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 44 + "__id__": 56 }, { - "__id__": 46 + "__id__": 58 }, { - "__id__": 48 + "__id__": 60 } ], "_prefab": { - "__id__": 50 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,23 +85,23 @@ "__id__": 17 }, { - "__id__": 25 + "__id__": 31 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 45 }, { - "__id__": 35 + "__id__": 47 }, { - "__id__": 41 + "__id__": 53 } ], "_prefab": { - "__id__": 43 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -490,21 +490,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 18 + } + ], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 24 }, { - "__id__": 20 + "__id__": 26 }, { - "__id__": 22 + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -535,6 +539,168 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "81asytc6xIyr209jBvHZWv" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "58YOFBxVpMBpFEAYt2y/Ja" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "71T2oJlkNDW70+JmfHnm2Z", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -545,7 +711,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -573,7 +739,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -615,7 +781,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 29 }, "_id": "" }, @@ -644,21 +810,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 32 + } + ], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 38 }, { - "__id__": 28 + "__id__": 40 }, { - "__id__": 30 + "__id__": 42 } ], "_prefab": { - "__id__": 32 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -689,17 +859,179 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 31 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5eoeNXjvFOPYXSMrTfRQ9o" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f6Zruw65JO5Z34y8RBL9QQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "aflkjd9wJCcZl2dqmv9B8g", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -723,11 +1055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 41 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -765,11 +1097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 43 }, "_id": "" }, @@ -800,7 +1132,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -828,7 +1160,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -852,16 +1184,16 @@ "_cacheMode": 0, "_sockets": [ { - "__id__": 37 + "__id__": 49 }, { - "__id__": 38 + "__id__": 50 }, { - "__id__": 39 + "__id__": 51 }, { - "__id__": 40 + "__id__": 52 } ], "_useTint": false, @@ -901,7 +1233,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/card2/card2-flip", "target": { - "__id__": 25 + "__id__": 31 } }, { @@ -914,7 +1246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 54 }, "ignoreTimeScale": true, "_id": "" @@ -946,7 +1278,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -974,10 +1306,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 59 }, "skeleton": { - "__id__": 35 + "__id__": 47 }, "_flipX": false, "_flipY": false, @@ -997,20 +1329,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 61 }, "animationHandler": { - "__id__": 46 + "__id__": 58 }, "spineRoot": { "__id__": 2 }, "cards": [ { - "__id__": 20 + "__id__": 26 }, { - "__id__": 28 + "__id__": 40 } ], "showSfx": { @@ -1040,7 +1372,6 @@ "__id__": 0 }, "fileId": "244TXoUqdKA4qqvhPODAbd", - "instance": null, "targetOverrides": [] } ] \ No newline at end of file diff --git a/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Ball.prefab b/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Ball.prefab index cca2cad..4457ac7 100644 --- a/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Ball.prefab +++ b/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Ball.prefab @@ -898,13 +898,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 72, - "height": 80.33229702970294 + "width": 77.75700934579439, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0.52 }, "_id": "" }, @@ -935,7 +935,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "529dfc95-199f-47e5-b1c3-480ce84797df@f9941", + "__uuid__": "40ab076b-cfad-4474-8a5e-6c21fbc15e66@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -966,8 +966,6 @@ "__id__": 0 }, "fileId": "90kGo41etGuZGVdRbBtRfz", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/_Game/Prefabs/Themes/Chocolate/Gacha/Chocolate_Flip_Card.prefab b/assets/_Game/Prefabs/Themes/Chocolate/Gacha/Chocolate_Flip_Card.prefab index ff99850..4afc7df 100644 --- a/assets/_Game/Prefabs/Themes/Chocolate/Gacha/Chocolate_Flip_Card.prefab +++ b/assets/_Game/Prefabs/Themes/Chocolate/Gacha/Chocolate_Flip_Card.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 44 + "__id__": 56 }, { - "__id__": 193 + "__id__": 205 } ], "_active": true, "_components": [ { - "__id__": 387 + "__id__": 399 }, { - "__id__": 389 + "__id__": 401 }, { - "__id__": 391 + "__id__": 403 } ], "_prefab": { - "__id__": 393 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,23 +91,23 @@ "__id__": 17 }, { - "__id__": 25 + "__id__": 31 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 45 }, { - "__id__": 35 + "__id__": 47 }, { - "__id__": 41 + "__id__": 53 } ], "_prefab": { - "__id__": 43 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -496,21 +496,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 18 + } + ], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 24 }, { - "__id__": 20 + "__id__": 26 }, { - "__id__": 22 + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -541,6 +545,168 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "10P2/tdFVPh78bDiFOdToL" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4fq2M6gMlLOqbj4WaY2blB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "79OWK0+p5MMpuzDQ9A18Ai", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -551,7 +717,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -579,7 +745,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -621,7 +787,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 29 }, "_id": "" }, @@ -650,21 +816,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 32 + } + ], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 38 }, { - "__id__": 28 + "__id__": 40 }, { - "__id__": 30 + "__id__": 42 } ], "_prefab": { - "__id__": 32 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -695,17 +865,179 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 31 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2sGL5Nq5Ck5plqL5J7Ncs" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "17Z+j2iaZHnb24k4A0UXht" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b0584bbx9Cp41UFK7Bsnun", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -729,11 +1061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 41 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -771,11 +1103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 43 }, "_id": "" }, @@ -806,7 +1138,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -834,7 +1166,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -858,16 +1190,16 @@ "_cacheMode": 0, "_sockets": [ { - "__id__": 37 + "__id__": 49 }, { - "__id__": 38 + "__id__": 50 }, { - "__id__": 39 + "__id__": 51 }, { - "__id__": 40 + "__id__": 52 } ], "_useTint": false, @@ -907,7 +1239,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/card2/card2-flip", "target": { - "__id__": 25 + "__id__": 31 } }, { @@ -920,7 +1252,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 54 }, "ignoreTimeScale": true, "_id": "" @@ -949,14 +1281,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 57 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 56 }, "asset": { "__uuid__": "be9a071d-e57c-4d5e-8ddc-e1e3ac5621d9", @@ -964,7 +1296,7 @@ }, "fileId": "046d5q9CdJjamL7XJbiko2", "instance": { - "__id__": 46 + "__id__": 58 }, "targetOverrides": null }, @@ -977,27 +1309,27 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 47 + "__id__": 59 }, { - "__id__": 51 + "__id__": 63 }, { - "__id__": 119 + "__id__": 131 } ], "propertyOverrides": [ { - "__id__": 188 + "__id__": 200 }, { - "__id__": 190 + "__id__": 202 }, { - "__id__": 191 + "__id__": 203 }, { - "__id__": 192 + "__id__": 204 } ], "removedComponents": [] @@ -1005,11 +1337,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 48 + "__id__": 60 }, "components": [ { - "__id__": 49 + "__id__": 61 } ] }, @@ -1025,15 +1357,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 44 + "__id__": 56 } }, "node": { - "__id__": 44 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 62 }, "_id": "" }, @@ -1044,11 +1376,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 52 + "__id__": 64 }, "components": [ { - "__id__": 53 + "__id__": 65 } ] }, @@ -1064,15 +1396,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 44 + "__id__": 56 } }, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 130 }, "_id": "" }, @@ -1082,26 +1414,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 56 }, "_children": [], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 67 }, { - "__id__": 113 + "__id__": 125 }, { - "__id__": 115 + "__id__": 127 }, { - "__id__": 53 + "__id__": 65 } ], "_prefab": { - "__id__": 117 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -1138,11 +1470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 68 }, "_materials": [ { @@ -1152,56 +1484,56 @@ ], "_visFlags": 0, "startColor": { - "__id__": 57 + "__id__": 69 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 58 + "__id__": 70 }, "startSize": { - "__id__": 58 + "__id__": 70 }, "startSizeY": { - "__id__": 59 + "__id__": 71 }, "startSizeZ": { - "__id__": 60 + "__id__": 72 }, "startSpeed": { - "__id__": 61 + "__id__": 73 }, "startRotation3D": false, "startRotationX": { - "__id__": 62 + "__id__": 74 }, "startRotationY": { - "__id__": 63 + "__id__": 75 }, "startRotationZ": { - "__id__": 64 + "__id__": 76 }, "startRotation": { - "__id__": 64 + "__id__": 76 }, "startDelay": { - "__id__": 65 + "__id__": 77 }, "startLifetime": { - "__id__": 66 + "__id__": 78 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 67 + "__id__": 79 }, "rateOverTime": { - "__id__": 68 + "__id__": 80 }, "rateOverDistance": { - "__id__": 69 + "__id__": 81 }, "bursts": [], "_renderCulling": false, @@ -1212,37 +1544,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 70 + "__id__": 82 }, "_shapeModule": { - "__id__": 76 + "__id__": 88 }, "_sizeOvertimeModule": { - "__id__": 78 + "__id__": 90 }, "_velocityOvertimeModule": { - "__id__": 84 + "__id__": 96 }, "_forceOvertimeModule": { - "__id__": 89 + "__id__": 101 }, "_limitVelocityOvertimeModule": { - "__id__": 93 + "__id__": 105 }, "_rotationOvertimeModule": { - "__id__": 98 + "__id__": 110 }, "_textureAnimationModule": { - "__id__": 102 + "__id__": 114 }, "_noiseModule": { - "__id__": 106 + "__id__": 118 }, "_trailModule": { - "__id__": 107 + "__id__": 119 }, "renderer": { - "__id__": 112 + "__id__": 124 }, "_prewarm": false, "_capacity": 100, @@ -1343,29 +1675,29 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 71 + "__id__": 83 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 72 + "__id__": 84 } }, { "__type__": "cc.Gradient", "colorKeys": [ { - "__id__": 73 + "__id__": 85 } ], "alphaKeys": [ { - "__id__": 74 + "__id__": 86 }, { - "__id__": 75 + "__id__": 87 } ], "mode": 0 @@ -1406,7 +1738,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 77 + "__id__": 89 }, "length": 5, "boxThickness": { @@ -1447,23 +1779,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 79 + "__id__": 91 }, "x": { - "__id__": 81 + "__id__": 93 }, "y": { - "__id__": 82 + "__id__": 94 }, "z": { - "__id__": 83 + "__id__": 95 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 80 + "__id__": 92 }, "multiplier": 1 }, @@ -1524,16 +1856,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 85 + "__id__": 97 }, "y": { - "__id__": 86 + "__id__": 98 }, "z": { - "__id__": 87 + "__id__": 99 }, "speedModifier": { - "__id__": 88 + "__id__": 100 }, "space": 1 }, @@ -1565,13 +1897,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 90 + "__id__": 102 }, "y": { - "__id__": 91 + "__id__": 103 }, "z": { - "__id__": 92 + "__id__": 104 }, "space": 1 }, @@ -1597,16 +1929,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 94 + "__id__": 106 }, "limitY": { - "__id__": 95 + "__id__": 107 }, "limitZ": { - "__id__": 96 + "__id__": 108 }, "limit": { - "__id__": 97 + "__id__": 109 }, "dampen": 0.1, "separateAxes": false, @@ -1641,13 +1973,13 @@ "_enable": true, "_separateAxes": true, "x": { - "__id__": 99 + "__id__": 111 }, "y": { - "__id__": 100 + "__id__": 112 }, "z": { - "__id__": 101 + "__id__": 113 } }, { @@ -1678,10 +2010,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 103 + "__id__": 115 }, "startFrame": { - "__id__": 105 + "__id__": 117 }, "cycleCount": 0, "_flipU": 0, @@ -1694,7 +2026,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 104 + "__id__": 116 }, "multiplier": 1 }, @@ -1761,25 +2093,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 108 + "__id__": 120 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 109 + "__id__": 121 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 110 + "__id__": 122 }, "colorOvertime": { - "__id__": 111 + "__id__": 123 }, "_space": 0, "_particleSystem": { - "__id__": 55 + "__id__": 67 } }, { @@ -1840,11 +2172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 126 }, "_id": "" }, @@ -1858,11 +2190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -1900,11 +2232,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 120 + "__id__": 132 }, "components": [ { - "__id__": 121 + "__id__": 133 } ] }, @@ -1920,15 +2252,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 44 + "__id__": 56 } }, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 199 }, "_id": "" }, @@ -1938,26 +2270,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 56 }, "_children": [], "_active": true, "_components": [ { - "__id__": 123 + "__id__": 135 }, { - "__id__": 182 + "__id__": 194 }, { - "__id__": 184 + "__id__": 196 }, { - "__id__": 121 + "__id__": 133 } ], "_prefab": { - "__id__": 186 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -1994,11 +2326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 136 }, "_materials": [ { @@ -2008,60 +2340,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 125 + "__id__": 137 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 126 + "__id__": 138 }, "startSize": { - "__id__": 126 + "__id__": 138 }, "startSizeY": { - "__id__": 127 + "__id__": 139 }, "startSizeZ": { - "__id__": 128 + "__id__": 140 }, "startSpeed": { - "__id__": 129 + "__id__": 141 }, "startRotation3D": false, "startRotationX": { - "__id__": 130 + "__id__": 142 }, "startRotationY": { - "__id__": 131 + "__id__": 143 }, "startRotationZ": { - "__id__": 132 + "__id__": 144 }, "startRotation": { - "__id__": 132 + "__id__": 144 }, "startDelay": { - "__id__": 133 + "__id__": 145 }, "startLifetime": { - "__id__": 134 + "__id__": 146 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 135 + "__id__": 147 }, "rateOverTime": { - "__id__": 136 + "__id__": 148 }, "rateOverDistance": { - "__id__": 137 + "__id__": 149 }, "bursts": [ { - "__id__": 138 + "__id__": 150 } ], "_renderCulling": false, @@ -2072,37 +2404,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 140 + "__id__": 152 }, "_shapeModule": { - "__id__": 146 - }, - "_sizeOvertimeModule": { - "__id__": 148 - }, - "_velocityOvertimeModule": { - "__id__": 153 - }, - "_forceOvertimeModule": { "__id__": 158 }, + "_sizeOvertimeModule": { + "__id__": 160 + }, + "_velocityOvertimeModule": { + "__id__": 165 + }, + "_forceOvertimeModule": { + "__id__": 170 + }, "_limitVelocityOvertimeModule": { - "__id__": 162 + "__id__": 174 }, "_rotationOvertimeModule": { - "__id__": 167 + "__id__": 179 }, "_textureAnimationModule": { - "__id__": 171 + "__id__": 183 }, "_noiseModule": { - "__id__": 175 + "__id__": 187 }, "_trailModule": { - "__id__": 176 + "__id__": 188 }, "renderer": { - "__id__": 181 + "__id__": 193 }, "_prewarm": false, "_capacity": 100, @@ -2202,7 +2534,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 139 + "__id__": 151 } }, { @@ -2215,14 +2547,14 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 141 + "__id__": 153 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 142 + "__id__": 154 } }, { @@ -2230,13 +2562,13 @@ "colorKeys": [], "alphaKeys": [ { - "__id__": 143 + "__id__": 155 }, { - "__id__": 144 + "__id__": 156 }, { - "__id__": 145 + "__id__": 157 } ], "mode": 0 @@ -2271,7 +2603,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 147 + "__id__": 159 }, "length": 5, "boxThickness": { @@ -2312,16 +2644,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 149 + "__id__": 161 }, "x": { - "__id__": 150 + "__id__": 162 }, "y": { - "__id__": 151 + "__id__": 163 }, "z": { - "__id__": 152 + "__id__": 164 } }, { @@ -2352,16 +2684,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 154 + "__id__": 166 }, "y": { - "__id__": 155 + "__id__": 167 }, "z": { - "__id__": 156 + "__id__": 168 }, "speedModifier": { - "__id__": 157 + "__id__": 169 }, "space": 1 }, @@ -2393,13 +2725,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 159 + "__id__": 171 }, "y": { - "__id__": 160 + "__id__": 172 }, "z": { - "__id__": 161 + "__id__": 173 }, "space": 1 }, @@ -2425,16 +2757,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 163 + "__id__": 175 }, "limitY": { - "__id__": 164 + "__id__": 176 }, "limitZ": { - "__id__": 165 + "__id__": 177 }, "limit": { - "__id__": 166 + "__id__": 178 }, "dampen": 3, "separateAxes": false, @@ -2469,13 +2801,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 168 + "__id__": 180 }, "y": { - "__id__": 169 + "__id__": 181 }, "z": { - "__id__": 170 + "__id__": 182 } }, { @@ -2506,10 +2838,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 172 + "__id__": 184 }, "startFrame": { - "__id__": 174 + "__id__": 186 }, "cycleCount": 0, "_flipU": 0, @@ -2522,7 +2854,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 173 + "__id__": 185 }, "multiplier": 1 }, @@ -2589,25 +2921,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 177 + "__id__": 189 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 178 + "__id__": 190 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 179 + "__id__": 191 }, "colorOvertime": { - "__id__": 180 + "__id__": 192 }, "_space": 0, "_particleSystem": { - "__id__": 123 + "__id__": 135 } }, { @@ -2668,11 +3000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 195 }, "_id": "" }, @@ -2686,11 +3018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -2728,7 +3060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_name" @@ -2744,7 +3076,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_lpos" @@ -2759,7 +3091,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_lrot" @@ -2775,7 +3107,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_euler" @@ -2797,29 +3129,29 @@ }, "_children": [ { - "__id__": 194 + "__id__": 206 }, { - "__id__": 260 + "__id__": 272 } ], "_active": true, "_components": [ { - "__id__": 327 + "__id__": 339 }, { - "__id__": 380 + "__id__": 392 }, { - "__id__": 382 + "__id__": 394 }, { - "__id__": 384 + "__id__": 396 } ], "_prefab": { - "__id__": 386 + "__id__": 398 }, "_lpos": { "__type__": "cc.Vec3", @@ -2856,26 +3188,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 207 }, { - "__id__": 253 + "__id__": 265 }, { - "__id__": 255 + "__id__": 267 }, { - "__id__": 257 + "__id__": 269 } ], "_prefab": { - "__id__": 259 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -2912,11 +3244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 208 }, "_materials": [ { @@ -2926,56 +3258,56 @@ ], "_visFlags": 0, "startColor": { - "__id__": 197 + "__id__": 209 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 198 + "__id__": 210 }, "startSize": { - "__id__": 198 + "__id__": 210 }, "startSizeY": { - "__id__": 199 + "__id__": 211 }, "startSizeZ": { - "__id__": 200 + "__id__": 212 }, "startSpeed": { - "__id__": 201 + "__id__": 213 }, "startRotation3D": false, "startRotationX": { - "__id__": 202 + "__id__": 214 }, "startRotationY": { - "__id__": 203 + "__id__": 215 }, "startRotationZ": { - "__id__": 204 + "__id__": 216 }, "startRotation": { - "__id__": 204 + "__id__": 216 }, "startDelay": { - "__id__": 205 + "__id__": 217 }, "startLifetime": { - "__id__": 206 + "__id__": 218 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 207 + "__id__": 219 }, "rateOverTime": { - "__id__": 208 + "__id__": 220 }, "rateOverDistance": { - "__id__": 209 + "__id__": 221 }, "bursts": [], "_renderCulling": false, @@ -2986,37 +3318,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 210 + "__id__": 222 }, "_shapeModule": { - "__id__": 216 + "__id__": 228 }, "_sizeOvertimeModule": { - "__id__": 218 + "__id__": 230 }, "_velocityOvertimeModule": { - "__id__": 224 + "__id__": 236 }, "_forceOvertimeModule": { - "__id__": 229 + "__id__": 241 }, "_limitVelocityOvertimeModule": { - "__id__": 233 + "__id__": 245 }, "_rotationOvertimeModule": { - "__id__": 238 + "__id__": 250 }, "_textureAnimationModule": { - "__id__": 242 + "__id__": 254 }, "_noiseModule": { - "__id__": 246 + "__id__": 258 }, "_trailModule": { - "__id__": 247 + "__id__": 259 }, "renderer": { - "__id__": 252 + "__id__": 264 }, "_prewarm": false, "_capacity": 100, @@ -3117,29 +3449,29 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 211 + "__id__": 223 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 212 + "__id__": 224 } }, { "__type__": "cc.Gradient", "colorKeys": [ { - "__id__": 213 + "__id__": 225 } ], "alphaKeys": [ { - "__id__": 214 + "__id__": 226 }, { - "__id__": 215 + "__id__": 227 } ], "mode": 0 @@ -3180,7 +3512,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 217 + "__id__": 229 }, "length": 5, "boxThickness": { @@ -3221,23 +3553,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 219 + "__id__": 231 }, "x": { - "__id__": 221 + "__id__": 233 }, "y": { - "__id__": 222 + "__id__": 234 }, "z": { - "__id__": 223 + "__id__": 235 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 220 + "__id__": 232 }, "multiplier": 1 }, @@ -3298,16 +3630,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 225 + "__id__": 237 }, "y": { - "__id__": 226 + "__id__": 238 }, "z": { - "__id__": 227 + "__id__": 239 }, "speedModifier": { - "__id__": 228 + "__id__": 240 }, "space": 1 }, @@ -3339,13 +3671,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 230 + "__id__": 242 }, "y": { - "__id__": 231 + "__id__": 243 }, "z": { - "__id__": 232 + "__id__": 244 }, "space": 1 }, @@ -3371,16 +3703,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 234 + "__id__": 246 }, "limitY": { - "__id__": 235 + "__id__": 247 }, "limitZ": { - "__id__": 236 + "__id__": 248 }, "limit": { - "__id__": 237 + "__id__": 249 }, "dampen": 0.1, "separateAxes": false, @@ -3415,13 +3747,13 @@ "_enable": true, "_separateAxes": true, "x": { - "__id__": 239 + "__id__": 251 }, "y": { - "__id__": 240 + "__id__": 252 }, "z": { - "__id__": 241 + "__id__": 253 } }, { @@ -3452,10 +3784,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 243 + "__id__": 255 }, "startFrame": { - "__id__": 245 + "__id__": 257 }, "cycleCount": 0, "_flipU": 0, @@ -3468,7 +3800,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 244 + "__id__": 256 }, "multiplier": 1 }, @@ -3535,25 +3867,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 248 + "__id__": 260 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 249 + "__id__": 261 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 250 + "__id__": 262 }, "colorOvertime": { - "__id__": 251 + "__id__": 263 }, "_space": 0, "_particleSystem": { - "__id__": 195 + "__id__": 207 } }, { @@ -3614,11 +3946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 266 }, "_id": "" }, @@ -3632,11 +3964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -3660,11 +3992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 270 }, "_id": "" }, @@ -3691,26 +4023,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 261 + "__id__": 273 }, { - "__id__": 320 + "__id__": 332 }, { - "__id__": 322 + "__id__": 334 }, { - "__id__": 324 + "__id__": 336 } ], "_prefab": { - "__id__": 326 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -3747,11 +4079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 274 }, "_materials": [ { @@ -3761,60 +4093,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 263 + "__id__": 275 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 264 + "__id__": 276 }, "startSize": { - "__id__": 264 + "__id__": 276 }, "startSizeY": { - "__id__": 265 + "__id__": 277 }, "startSizeZ": { - "__id__": 266 + "__id__": 278 }, "startSpeed": { - "__id__": 267 + "__id__": 279 }, "startRotation3D": false, "startRotationX": { - "__id__": 268 + "__id__": 280 }, "startRotationY": { - "__id__": 269 + "__id__": 281 }, "startRotationZ": { - "__id__": 270 + "__id__": 282 }, "startRotation": { - "__id__": 270 + "__id__": 282 }, "startDelay": { - "__id__": 271 + "__id__": 283 }, "startLifetime": { - "__id__": 272 + "__id__": 284 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 273 + "__id__": 285 }, "rateOverTime": { - "__id__": 274 + "__id__": 286 }, "rateOverDistance": { - "__id__": 275 + "__id__": 287 }, "bursts": [ { - "__id__": 276 + "__id__": 288 } ], "_renderCulling": false, @@ -3825,37 +4157,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 278 + "__id__": 290 }, "_shapeModule": { - "__id__": 284 - }, - "_sizeOvertimeModule": { - "__id__": 286 - }, - "_velocityOvertimeModule": { - "__id__": 291 - }, - "_forceOvertimeModule": { "__id__": 296 }, + "_sizeOvertimeModule": { + "__id__": 298 + }, + "_velocityOvertimeModule": { + "__id__": 303 + }, + "_forceOvertimeModule": { + "__id__": 308 + }, "_limitVelocityOvertimeModule": { - "__id__": 300 + "__id__": 312 }, "_rotationOvertimeModule": { - "__id__": 305 + "__id__": 317 }, "_textureAnimationModule": { - "__id__": 309 + "__id__": 321 }, "_noiseModule": { - "__id__": 313 + "__id__": 325 }, "_trailModule": { - "__id__": 314 + "__id__": 326 }, "renderer": { - "__id__": 319 + "__id__": 331 }, "_prewarm": false, "_capacity": 100, @@ -3955,7 +4287,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 277 + "__id__": 289 } }, { @@ -3968,14 +4300,14 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 279 + "__id__": 291 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 280 + "__id__": 292 } }, { @@ -3983,13 +4315,13 @@ "colorKeys": [], "alphaKeys": [ { - "__id__": 281 + "__id__": 293 }, { - "__id__": 282 + "__id__": 294 }, { - "__id__": 283 + "__id__": 295 } ], "mode": 0 @@ -4024,7 +4356,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 285 + "__id__": 297 }, "length": 5, "boxThickness": { @@ -4065,16 +4397,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 287 + "__id__": 299 }, "x": { - "__id__": 288 + "__id__": 300 }, "y": { - "__id__": 289 + "__id__": 301 }, "z": { - "__id__": 290 + "__id__": 302 } }, { @@ -4105,16 +4437,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 292 + "__id__": 304 }, "y": { - "__id__": 293 + "__id__": 305 }, "z": { - "__id__": 294 + "__id__": 306 }, "speedModifier": { - "__id__": 295 + "__id__": 307 }, "space": 1 }, @@ -4146,13 +4478,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 297 + "__id__": 309 }, "y": { - "__id__": 298 + "__id__": 310 }, "z": { - "__id__": 299 + "__id__": 311 }, "space": 1 }, @@ -4178,16 +4510,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 301 + "__id__": 313 }, "limitY": { - "__id__": 302 + "__id__": 314 }, "limitZ": { - "__id__": 303 + "__id__": 315 }, "limit": { - "__id__": 304 + "__id__": 316 }, "dampen": 3, "separateAxes": false, @@ -4222,13 +4554,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 306 + "__id__": 318 }, "y": { - "__id__": 307 + "__id__": 319 }, "z": { - "__id__": 308 + "__id__": 320 } }, { @@ -4259,10 +4591,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 310 + "__id__": 322 }, "startFrame": { - "__id__": 312 + "__id__": 324 }, "cycleCount": 0, "_flipU": 0, @@ -4275,7 +4607,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 311 + "__id__": 323 }, "multiplier": 1 }, @@ -4342,25 +4674,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 315 + "__id__": 327 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 316 + "__id__": 328 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 317 + "__id__": 329 }, "colorOvertime": { - "__id__": 318 + "__id__": 330 }, "_space": 0, "_particleSystem": { - "__id__": 261 + "__id__": 273 } }, { @@ -4421,11 +4753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 333 }, "_id": "" }, @@ -4439,11 +4771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", @@ -4467,11 +4799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 337 }, "_id": "" }, @@ -4498,11 +4830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 340 }, "_materials": [ { @@ -4513,56 +4845,56 @@ ], "_visFlags": 0, "startColor": { - "__id__": 329 + "__id__": 341 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 330 + "__id__": 342 }, "startSize": { - "__id__": 330 + "__id__": 342 }, "startSizeY": { - "__id__": 331 + "__id__": 343 }, "startSizeZ": { - "__id__": 332 + "__id__": 344 }, "startSpeed": { - "__id__": 333 + "__id__": 345 }, "startRotation3D": false, "startRotationX": { - "__id__": 334 + "__id__": 346 }, "startRotationY": { - "__id__": 335 + "__id__": 347 }, "startRotationZ": { - "__id__": 336 + "__id__": 348 }, "startRotation": { - "__id__": 336 + "__id__": 348 }, "startDelay": { - "__id__": 337 + "__id__": 349 }, "startLifetime": { - "__id__": 338 + "__id__": 350 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 339 + "__id__": 351 }, "rateOverTime": { - "__id__": 340 + "__id__": 352 }, "rateOverDistance": { - "__id__": 341 + "__id__": 353 }, "bursts": [], "_renderCulling": false, @@ -4573,37 +4905,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 342 + "__id__": 354 }, "_shapeModule": { - "__id__": 344 - }, - "_sizeOvertimeModule": { - "__id__": 346 - }, - "_velocityOvertimeModule": { - "__id__": 351 - }, - "_forceOvertimeModule": { "__id__": 356 }, + "_sizeOvertimeModule": { + "__id__": 358 + }, + "_velocityOvertimeModule": { + "__id__": 363 + }, + "_forceOvertimeModule": { + "__id__": 368 + }, "_limitVelocityOvertimeModule": { - "__id__": 360 + "__id__": 372 }, "_rotationOvertimeModule": { - "__id__": 365 + "__id__": 377 }, "_textureAnimationModule": { - "__id__": 369 + "__id__": 381 }, "_noiseModule": { - "__id__": 373 + "__id__": 385 }, "_trailModule": { - "__id__": 374 + "__id__": 386 }, "renderer": { - "__id__": 379 + "__id__": 391 }, "_prewarm": false, "_capacity": 100, @@ -4701,7 +5033,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 343 + "__id__": 355 } }, { @@ -4730,7 +5062,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 345 + "__id__": 357 }, "length": 5, "boxThickness": { @@ -4771,16 +5103,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 347 + "__id__": 359 }, "x": { - "__id__": 348 + "__id__": 360 }, "y": { - "__id__": 349 + "__id__": 361 }, "z": { - "__id__": 350 + "__id__": 362 } }, { @@ -4811,16 +5143,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 352 + "__id__": 364 }, "y": { - "__id__": 353 + "__id__": 365 }, "z": { - "__id__": 354 + "__id__": 366 }, "speedModifier": { - "__id__": 355 + "__id__": 367 }, "space": 1 }, @@ -4852,13 +5184,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 357 + "__id__": 369 }, "y": { - "__id__": 358 + "__id__": 370 }, "z": { - "__id__": 359 + "__id__": 371 }, "space": 1 }, @@ -4884,16 +5216,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 361 + "__id__": 373 }, "limitY": { - "__id__": 362 + "__id__": 374 }, "limitZ": { - "__id__": 363 + "__id__": 375 }, "limit": { - "__id__": 364 + "__id__": 376 }, "dampen": 3, "separateAxes": false, @@ -4928,13 +5260,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 366 + "__id__": 378 }, "y": { - "__id__": 367 + "__id__": 379 }, "z": { - "__id__": 368 + "__id__": 380 } }, { @@ -4965,10 +5297,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 370 + "__id__": 382 }, "startFrame": { - "__id__": 372 + "__id__": 384 }, "cycleCount": 0, "_flipU": 0, @@ -4981,7 +5313,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 371 + "__id__": 383 }, "multiplier": 1 }, @@ -5048,25 +5380,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 375 + "__id__": 387 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 376 + "__id__": 388 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 377 + "__id__": 389 }, "colorOvertime": { - "__id__": 378 + "__id__": 390 }, "_space": 0, "_particleSystem": { - "__id__": 327 + "__id__": 339 } }, { @@ -5127,11 +5459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 393 }, "_id": "" }, @@ -5145,11 +5477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 395 }, "_contentSize": { "__type__": "cc.Size", @@ -5173,11 +5505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 397 }, "_id": "" }, @@ -5208,7 +5540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 400 }, "_contentSize": { "__type__": "cc.Size", @@ -5236,10 +5568,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 402 }, "skeleton": { - "__id__": 35 + "__id__": 47 }, "_flipX": false, "_flipY": false, @@ -5259,20 +5591,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 404 }, "animationHandler": { - "__id__": 389 + "__id__": 401 }, "spineRoot": { "__id__": 2 }, "cards": [ { - "__id__": 20 + "__id__": 26 }, { - "__id__": 28 + "__id__": 40 } ], "showSfx": { @@ -5306,7 +5638,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 56 } ] } diff --git a/assets/_Game/Prefabs/Themes/Farm/Gacha/Farm_Flip_Card.prefab b/assets/_Game/Prefabs/Themes/Farm/Gacha/Farm_Flip_Card.prefab index 3522f9d..91a9707 100644 --- a/assets/_Game/Prefabs/Themes/Farm/Gacha/Farm_Flip_Card.prefab +++ b/assets/_Game/Prefabs/Themes/Farm/Gacha/Farm_Flip_Card.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 44 + "__id__": 56 }, { - "__id__": 46 + "__id__": 58 }, { - "__id__": 48 + "__id__": 60 } ], "_prefab": { - "__id__": 50 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,23 +85,23 @@ "__id__": 17 }, { - "__id__": 25 + "__id__": 31 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 45 }, { - "__id__": 35 + "__id__": 47 }, { - "__id__": 41 + "__id__": 53 } ], "_prefab": { - "__id__": 43 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -490,21 +490,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 18 + } + ], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 24 }, { - "__id__": 20 + "__id__": 26 }, { - "__id__": 22 + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -535,6 +539,168 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f2ItJoJdJEL6eLXIXOnDKm" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "850omvmpZIloiMK6U4pGPa" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fcGsOjXHpMIYCuNmYd+HCa", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -545,7 +711,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -573,7 +739,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -615,7 +781,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 29 }, "_id": "" }, @@ -644,21 +810,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 32 + } + ], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 38 }, { - "__id__": 28 + "__id__": 40 }, { - "__id__": 30 + "__id__": 42 } ], "_prefab": { - "__id__": 32 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -689,17 +859,179 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 31 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "14YeiB62BC46tSFvFvLghP" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bbjghwHxRKTp+Oie9pr3ts" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e9RLecc8JBBKp7Jv79h5ds", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -723,11 +1055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 41 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -765,11 +1097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 43 }, "_id": "" }, @@ -800,7 +1132,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -828,7 +1160,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -852,16 +1184,16 @@ "_cacheMode": 0, "_sockets": [ { - "__id__": 37 + "__id__": 49 }, { - "__id__": 38 + "__id__": 50 }, { - "__id__": 39 + "__id__": 51 }, { - "__id__": 40 + "__id__": 52 } ], "_useTint": false, @@ -901,7 +1233,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/card2/card2-flip", "target": { - "__id__": 25 + "__id__": 31 } }, { @@ -914,7 +1246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 54 }, "ignoreTimeScale": true, "_id": "" @@ -946,7 +1278,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -974,10 +1306,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 59 }, "skeleton": { - "__id__": 35 + "__id__": 47 }, "_flipX": false, "_flipY": false, @@ -997,20 +1329,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 61 }, "animationHandler": { - "__id__": 46 + "__id__": 58 }, "spineRoot": { "__id__": 2 }, "cards": [ { - "__id__": 20 + "__id__": 26 }, { - "__id__": 28 + "__id__": 40 } ], "_id": "" diff --git a/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Flip_Card.prefab b/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Flip_Card.prefab index 2a28c38..d1c4a16 100644 --- a/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Flip_Card.prefab +++ b/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Flip_Card.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 44 + "__id__": 56 }, { - "__id__": 193 + "__id__": 205 } ], "_active": true, "_components": [ { - "__id__": 387 + "__id__": 399 }, { - "__id__": 389 + "__id__": 401 }, { - "__id__": 391 + "__id__": 403 } ], "_prefab": { - "__id__": 393 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,23 +91,23 @@ "__id__": 17 }, { - "__id__": 25 + "__id__": 31 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 45 }, { - "__id__": 35 + "__id__": 47 }, { - "__id__": 41 + "__id__": 53 } ], "_prefab": { - "__id__": 43 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -496,21 +496,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 18 + } + ], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 24 }, { - "__id__": 20 + "__id__": 26 }, { - "__id__": 22 + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -541,6 +545,168 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dikHcy3FM4bpg91g5k2JZ" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "71df1e99-1f51-46f1-b305-0f3100b19b27", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3bajZxRgNN1L+GLG/fdRo7" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "24IcJroFtK1K3Ry421dcX1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -551,7 +717,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -579,7 +745,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -621,7 +787,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 29 }, "_id": "" }, @@ -650,21 +816,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 32 + } + ], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 38 }, { - "__id__": 28 + "__id__": 40 }, { - "__id__": 30 + "__id__": 42 } ], "_prefab": { - "__id__": 32 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -695,17 +865,179 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 31 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "69hbQLw1RH7I26jnkau14N" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "71df1e99-1f51-46f1-b305-0f3100b19b27", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0PPu1CSNLWYBRPLtPXTQz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "17+yzZ7rhIY6TFyY9MEK86", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -729,11 +1061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 41 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -771,11 +1103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 43 }, "_id": "" }, @@ -806,7 +1138,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -834,7 +1166,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -858,16 +1190,16 @@ "_cacheMode": 0, "_sockets": [ { - "__id__": 37 + "__id__": 49 }, { - "__id__": 38 + "__id__": 50 }, { - "__id__": 39 + "__id__": 51 }, { - "__id__": 40 + "__id__": 52 } ], "_useTint": false, @@ -907,7 +1239,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/card2/card2-flip", "target": { - "__id__": 25 + "__id__": 31 } }, { @@ -920,7 +1252,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 54 }, "ignoreTimeScale": true, "_id": "" @@ -949,14 +1281,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 57 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 56 }, "asset": { "__uuid__": "be9a071d-e57c-4d5e-8ddc-e1e3ac5621d9", @@ -964,7 +1296,7 @@ }, "fileId": "046d5q9CdJjamL7XJbiko2", "instance": { - "__id__": 46 + "__id__": 58 }, "targetOverrides": null }, @@ -977,27 +1309,27 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 47 + "__id__": 59 }, { - "__id__": 51 + "__id__": 63 }, { - "__id__": 119 + "__id__": 131 } ], "propertyOverrides": [ { - "__id__": 188 + "__id__": 200 }, { - "__id__": 190 + "__id__": 202 }, { - "__id__": 191 + "__id__": 203 }, { - "__id__": 192 + "__id__": 204 } ], "removedComponents": [] @@ -1005,11 +1337,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 48 + "__id__": 60 }, "components": [ { - "__id__": 49 + "__id__": 61 } ] }, @@ -1025,15 +1357,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 44 + "__id__": 56 } }, "node": { - "__id__": 44 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 62 }, "_id": "" }, @@ -1044,11 +1376,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 52 + "__id__": 64 }, "components": [ { - "__id__": 53 + "__id__": 65 } ] }, @@ -1064,15 +1396,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 44 + "__id__": 56 } }, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 130 }, "_id": "" }, @@ -1082,26 +1414,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 56 }, "_children": [], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 67 }, { - "__id__": 113 + "__id__": 125 }, { - "__id__": 115 + "__id__": 127 }, { - "__id__": 53 + "__id__": 65 } ], "_prefab": { - "__id__": 117 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -1138,11 +1470,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 68 }, "_materials": [ { @@ -1152,56 +1484,56 @@ ], "_visFlags": 0, "startColor": { - "__id__": 57 + "__id__": 69 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 58 + "__id__": 70 }, "startSize": { - "__id__": 58 + "__id__": 70 }, "startSizeY": { - "__id__": 59 + "__id__": 71 }, "startSizeZ": { - "__id__": 60 + "__id__": 72 }, "startSpeed": { - "__id__": 61 + "__id__": 73 }, "startRotation3D": false, "startRotationX": { - "__id__": 62 + "__id__": 74 }, "startRotationY": { - "__id__": 63 + "__id__": 75 }, "startRotationZ": { - "__id__": 64 + "__id__": 76 }, "startRotation": { - "__id__": 64 + "__id__": 76 }, "startDelay": { - "__id__": 65 + "__id__": 77 }, "startLifetime": { - "__id__": 66 + "__id__": 78 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 67 + "__id__": 79 }, "rateOverTime": { - "__id__": 68 + "__id__": 80 }, "rateOverDistance": { - "__id__": 69 + "__id__": 81 }, "bursts": [], "_renderCulling": false, @@ -1212,37 +1544,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 70 + "__id__": 82 }, "_shapeModule": { - "__id__": 76 + "__id__": 88 }, "_sizeOvertimeModule": { - "__id__": 78 + "__id__": 90 }, "_velocityOvertimeModule": { - "__id__": 84 + "__id__": 96 }, "_forceOvertimeModule": { - "__id__": 89 + "__id__": 101 }, "_limitVelocityOvertimeModule": { - "__id__": 93 + "__id__": 105 }, "_rotationOvertimeModule": { - "__id__": 98 + "__id__": 110 }, "_textureAnimationModule": { - "__id__": 102 + "__id__": 114 }, "_noiseModule": { - "__id__": 106 + "__id__": 118 }, "_trailModule": { - "__id__": 107 + "__id__": 119 }, "renderer": { - "__id__": 112 + "__id__": 124 }, "_prewarm": false, "_capacity": 100, @@ -1343,29 +1675,29 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 71 + "__id__": 83 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 72 + "__id__": 84 } }, { "__type__": "cc.Gradient", "colorKeys": [ { - "__id__": 73 + "__id__": 85 } ], "alphaKeys": [ { - "__id__": 74 + "__id__": 86 }, { - "__id__": 75 + "__id__": 87 } ], "mode": 0 @@ -1406,7 +1738,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 77 + "__id__": 89 }, "length": 5, "boxThickness": { @@ -1447,23 +1779,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 79 + "__id__": 91 }, "x": { - "__id__": 81 + "__id__": 93 }, "y": { - "__id__": 82 + "__id__": 94 }, "z": { - "__id__": 83 + "__id__": 95 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 80 + "__id__": 92 }, "multiplier": 1 }, @@ -1524,16 +1856,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 85 + "__id__": 97 }, "y": { - "__id__": 86 + "__id__": 98 }, "z": { - "__id__": 87 + "__id__": 99 }, "speedModifier": { - "__id__": 88 + "__id__": 100 }, "space": 1 }, @@ -1565,13 +1897,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 90 + "__id__": 102 }, "y": { - "__id__": 91 + "__id__": 103 }, "z": { - "__id__": 92 + "__id__": 104 }, "space": 1 }, @@ -1597,16 +1929,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 94 + "__id__": 106 }, "limitY": { - "__id__": 95 + "__id__": 107 }, "limitZ": { - "__id__": 96 + "__id__": 108 }, "limit": { - "__id__": 97 + "__id__": 109 }, "dampen": 0.1, "separateAxes": false, @@ -1641,13 +1973,13 @@ "_enable": true, "_separateAxes": true, "x": { - "__id__": 99 + "__id__": 111 }, "y": { - "__id__": 100 + "__id__": 112 }, "z": { - "__id__": 101 + "__id__": 113 } }, { @@ -1678,10 +2010,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 103 + "__id__": 115 }, "startFrame": { - "__id__": 105 + "__id__": 117 }, "cycleCount": 0, "_flipU": 0, @@ -1694,7 +2026,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 104 + "__id__": 116 }, "multiplier": 1 }, @@ -1761,25 +2093,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 108 + "__id__": 120 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 109 + "__id__": 121 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 110 + "__id__": 122 }, "colorOvertime": { - "__id__": 111 + "__id__": 123 }, "_space": 0, "_particleSystem": { - "__id__": 55 + "__id__": 67 } }, { @@ -1840,11 +2172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 126 }, "_id": "" }, @@ -1858,11 +2190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 128 }, "_contentSize": { "__type__": "cc.Size", @@ -1900,11 +2232,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 120 + "__id__": 132 }, "components": [ { - "__id__": 121 + "__id__": 133 } ] }, @@ -1920,15 +2252,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 44 + "__id__": 56 } }, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 199 }, "_id": "" }, @@ -1938,26 +2270,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 44 + "__id__": 56 }, "_children": [], "_active": true, "_components": [ { - "__id__": 123 + "__id__": 135 }, { - "__id__": 182 + "__id__": 194 }, { - "__id__": 184 + "__id__": 196 }, { - "__id__": 121 + "__id__": 133 } ], "_prefab": { - "__id__": 186 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -1994,11 +2326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 136 }, "_materials": [ { @@ -2008,60 +2340,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 125 + "__id__": 137 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 126 + "__id__": 138 }, "startSize": { - "__id__": 126 + "__id__": 138 }, "startSizeY": { - "__id__": 127 + "__id__": 139 }, "startSizeZ": { - "__id__": 128 + "__id__": 140 }, "startSpeed": { - "__id__": 129 + "__id__": 141 }, "startRotation3D": false, "startRotationX": { - "__id__": 130 + "__id__": 142 }, "startRotationY": { - "__id__": 131 + "__id__": 143 }, "startRotationZ": { - "__id__": 132 + "__id__": 144 }, "startRotation": { - "__id__": 132 + "__id__": 144 }, "startDelay": { - "__id__": 133 + "__id__": 145 }, "startLifetime": { - "__id__": 134 + "__id__": 146 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 135 + "__id__": 147 }, "rateOverTime": { - "__id__": 136 + "__id__": 148 }, "rateOverDistance": { - "__id__": 137 + "__id__": 149 }, "bursts": [ { - "__id__": 138 + "__id__": 150 } ], "_renderCulling": false, @@ -2072,37 +2404,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 140 + "__id__": 152 }, "_shapeModule": { - "__id__": 146 - }, - "_sizeOvertimeModule": { - "__id__": 148 - }, - "_velocityOvertimeModule": { - "__id__": 153 - }, - "_forceOvertimeModule": { "__id__": 158 }, + "_sizeOvertimeModule": { + "__id__": 160 + }, + "_velocityOvertimeModule": { + "__id__": 165 + }, + "_forceOvertimeModule": { + "__id__": 170 + }, "_limitVelocityOvertimeModule": { - "__id__": 162 + "__id__": 174 }, "_rotationOvertimeModule": { - "__id__": 167 + "__id__": 179 }, "_textureAnimationModule": { - "__id__": 171 + "__id__": 183 }, "_noiseModule": { - "__id__": 175 + "__id__": 187 }, "_trailModule": { - "__id__": 176 + "__id__": 188 }, "renderer": { - "__id__": 181 + "__id__": 193 }, "_prewarm": false, "_capacity": 100, @@ -2202,7 +2534,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 139 + "__id__": 151 } }, { @@ -2215,14 +2547,14 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 141 + "__id__": 153 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 142 + "__id__": 154 } }, { @@ -2230,13 +2562,13 @@ "colorKeys": [], "alphaKeys": [ { - "__id__": 143 + "__id__": 155 }, { - "__id__": 144 + "__id__": 156 }, { - "__id__": 145 + "__id__": 157 } ], "mode": 0 @@ -2271,7 +2603,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 147 + "__id__": 159 }, "length": 5, "boxThickness": { @@ -2312,16 +2644,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 149 + "__id__": 161 }, "x": { - "__id__": 150 + "__id__": 162 }, "y": { - "__id__": 151 + "__id__": 163 }, "z": { - "__id__": 152 + "__id__": 164 } }, { @@ -2352,16 +2684,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 154 + "__id__": 166 }, "y": { - "__id__": 155 + "__id__": 167 }, "z": { - "__id__": 156 + "__id__": 168 }, "speedModifier": { - "__id__": 157 + "__id__": 169 }, "space": 1 }, @@ -2393,13 +2725,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 159 + "__id__": 171 }, "y": { - "__id__": 160 + "__id__": 172 }, "z": { - "__id__": 161 + "__id__": 173 }, "space": 1 }, @@ -2425,16 +2757,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 163 + "__id__": 175 }, "limitY": { - "__id__": 164 + "__id__": 176 }, "limitZ": { - "__id__": 165 + "__id__": 177 }, "limit": { - "__id__": 166 + "__id__": 178 }, "dampen": 3, "separateAxes": false, @@ -2469,13 +2801,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 168 + "__id__": 180 }, "y": { - "__id__": 169 + "__id__": 181 }, "z": { - "__id__": 170 + "__id__": 182 } }, { @@ -2506,10 +2838,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 172 + "__id__": 184 }, "startFrame": { - "__id__": 174 + "__id__": 186 }, "cycleCount": 0, "_flipU": 0, @@ -2522,7 +2854,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 173 + "__id__": 185 }, "multiplier": 1 }, @@ -2589,25 +2921,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 177 + "__id__": 189 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 178 + "__id__": 190 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 179 + "__id__": 191 }, "colorOvertime": { - "__id__": 180 + "__id__": 192 }, "_space": 0, "_particleSystem": { - "__id__": 123 + "__id__": 135 } }, { @@ -2668,11 +3000,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 195 }, "_id": "" }, @@ -2686,11 +3018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 122 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -2728,7 +3060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_name" @@ -2744,7 +3076,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_lpos" @@ -2759,7 +3091,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_lrot" @@ -2775,7 +3107,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 201 }, "propertyPath": [ "_euler" @@ -2797,29 +3129,29 @@ }, "_children": [ { - "__id__": 194 + "__id__": 206 }, { - "__id__": 260 + "__id__": 272 } ], "_active": true, "_components": [ { - "__id__": 327 + "__id__": 339 }, { - "__id__": 380 + "__id__": 392 }, { - "__id__": 382 + "__id__": 394 }, { - "__id__": 384 + "__id__": 396 } ], "_prefab": { - "__id__": 386 + "__id__": 398 }, "_lpos": { "__type__": "cc.Vec3", @@ -2856,26 +3188,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 207 }, { - "__id__": 253 + "__id__": 265 }, { - "__id__": 255 + "__id__": 267 }, { - "__id__": 257 + "__id__": 269 } ], "_prefab": { - "__id__": 259 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -2912,11 +3244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 208 }, "_materials": [ { @@ -2926,56 +3258,56 @@ ], "_visFlags": 0, "startColor": { - "__id__": 197 + "__id__": 209 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 198 + "__id__": 210 }, "startSize": { - "__id__": 198 + "__id__": 210 }, "startSizeY": { - "__id__": 199 + "__id__": 211 }, "startSizeZ": { - "__id__": 200 + "__id__": 212 }, "startSpeed": { - "__id__": 201 + "__id__": 213 }, "startRotation3D": false, "startRotationX": { - "__id__": 202 + "__id__": 214 }, "startRotationY": { - "__id__": 203 + "__id__": 215 }, "startRotationZ": { - "__id__": 204 + "__id__": 216 }, "startRotation": { - "__id__": 204 + "__id__": 216 }, "startDelay": { - "__id__": 205 + "__id__": 217 }, "startLifetime": { - "__id__": 206 + "__id__": 218 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 207 + "__id__": 219 }, "rateOverTime": { - "__id__": 208 + "__id__": 220 }, "rateOverDistance": { - "__id__": 209 + "__id__": 221 }, "bursts": [], "_renderCulling": false, @@ -2986,37 +3318,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 210 + "__id__": 222 }, "_shapeModule": { - "__id__": 216 + "__id__": 228 }, "_sizeOvertimeModule": { - "__id__": 218 + "__id__": 230 }, "_velocityOvertimeModule": { - "__id__": 224 + "__id__": 236 }, "_forceOvertimeModule": { - "__id__": 229 + "__id__": 241 }, "_limitVelocityOvertimeModule": { - "__id__": 233 + "__id__": 245 }, "_rotationOvertimeModule": { - "__id__": 238 + "__id__": 250 }, "_textureAnimationModule": { - "__id__": 242 + "__id__": 254 }, "_noiseModule": { - "__id__": 246 + "__id__": 258 }, "_trailModule": { - "__id__": 247 + "__id__": 259 }, "renderer": { - "__id__": 252 + "__id__": 264 }, "_prewarm": false, "_capacity": 100, @@ -3117,29 +3449,29 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 211 + "__id__": 223 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 212 + "__id__": 224 } }, { "__type__": "cc.Gradient", "colorKeys": [ { - "__id__": 213 + "__id__": 225 } ], "alphaKeys": [ { - "__id__": 214 + "__id__": 226 }, { - "__id__": 215 + "__id__": 227 } ], "mode": 0 @@ -3180,7 +3512,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 217 + "__id__": 229 }, "length": 5, "boxThickness": { @@ -3221,23 +3553,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 219 + "__id__": 231 }, "x": { - "__id__": 221 + "__id__": 233 }, "y": { - "__id__": 222 + "__id__": 234 }, "z": { - "__id__": 223 + "__id__": 235 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 220 + "__id__": 232 }, "multiplier": 1 }, @@ -3298,16 +3630,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 225 + "__id__": 237 }, "y": { - "__id__": 226 + "__id__": 238 }, "z": { - "__id__": 227 + "__id__": 239 }, "speedModifier": { - "__id__": 228 + "__id__": 240 }, "space": 1 }, @@ -3339,13 +3671,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 230 + "__id__": 242 }, "y": { - "__id__": 231 + "__id__": 243 }, "z": { - "__id__": 232 + "__id__": 244 }, "space": 1 }, @@ -3371,16 +3703,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 234 + "__id__": 246 }, "limitY": { - "__id__": 235 + "__id__": 247 }, "limitZ": { - "__id__": 236 + "__id__": 248 }, "limit": { - "__id__": 237 + "__id__": 249 }, "dampen": 0.1, "separateAxes": false, @@ -3415,13 +3747,13 @@ "_enable": true, "_separateAxes": true, "x": { - "__id__": 239 + "__id__": 251 }, "y": { - "__id__": 240 + "__id__": 252 }, "z": { - "__id__": 241 + "__id__": 253 } }, { @@ -3452,10 +3784,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 243 + "__id__": 255 }, "startFrame": { - "__id__": 245 + "__id__": 257 }, "cycleCount": 0, "_flipU": 0, @@ -3468,7 +3800,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 244 + "__id__": 256 }, "multiplier": 1 }, @@ -3535,25 +3867,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 248 + "__id__": 260 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 249 + "__id__": 261 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 250 + "__id__": 262 }, "colorOvertime": { - "__id__": 251 + "__id__": 263 }, "_space": 0, "_particleSystem": { - "__id__": 195 + "__id__": 207 } }, { @@ -3614,11 +3946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 266 }, "_id": "" }, @@ -3632,11 +3964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -3660,11 +3992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 194 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 270 }, "_id": "" }, @@ -3691,26 +4023,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 193 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 261 + "__id__": 273 }, { - "__id__": 320 + "__id__": 332 }, { - "__id__": 322 + "__id__": 334 }, { - "__id__": 324 + "__id__": 336 } ], "_prefab": { - "__id__": 326 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -3747,11 +4079,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 274 }, "_materials": [ { @@ -3761,60 +4093,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 263 + "__id__": 275 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 264 + "__id__": 276 }, "startSize": { - "__id__": 264 + "__id__": 276 }, "startSizeY": { - "__id__": 265 + "__id__": 277 }, "startSizeZ": { - "__id__": 266 + "__id__": 278 }, "startSpeed": { - "__id__": 267 + "__id__": 279 }, "startRotation3D": false, "startRotationX": { - "__id__": 268 + "__id__": 280 }, "startRotationY": { - "__id__": 269 + "__id__": 281 }, "startRotationZ": { - "__id__": 270 + "__id__": 282 }, "startRotation": { - "__id__": 270 + "__id__": 282 }, "startDelay": { - "__id__": 271 + "__id__": 283 }, "startLifetime": { - "__id__": 272 + "__id__": 284 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 273 + "__id__": 285 }, "rateOverTime": { - "__id__": 274 + "__id__": 286 }, "rateOverDistance": { - "__id__": 275 + "__id__": 287 }, "bursts": [ { - "__id__": 276 + "__id__": 288 } ], "_renderCulling": false, @@ -3825,37 +4157,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 278 + "__id__": 290 }, "_shapeModule": { - "__id__": 284 - }, - "_sizeOvertimeModule": { - "__id__": 286 - }, - "_velocityOvertimeModule": { - "__id__": 291 - }, - "_forceOvertimeModule": { "__id__": 296 }, + "_sizeOvertimeModule": { + "__id__": 298 + }, + "_velocityOvertimeModule": { + "__id__": 303 + }, + "_forceOvertimeModule": { + "__id__": 308 + }, "_limitVelocityOvertimeModule": { - "__id__": 300 + "__id__": 312 }, "_rotationOvertimeModule": { - "__id__": 305 + "__id__": 317 }, "_textureAnimationModule": { - "__id__": 309 + "__id__": 321 }, "_noiseModule": { - "__id__": 313 + "__id__": 325 }, "_trailModule": { - "__id__": 314 + "__id__": 326 }, "renderer": { - "__id__": 319 + "__id__": 331 }, "_prewarm": false, "_capacity": 100, @@ -3955,7 +4287,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 277 + "__id__": 289 } }, { @@ -3968,14 +4300,14 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 279 + "__id__": 291 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 280 + "__id__": 292 } }, { @@ -3983,13 +4315,13 @@ "colorKeys": [], "alphaKeys": [ { - "__id__": 281 + "__id__": 293 }, { - "__id__": 282 + "__id__": 294 }, { - "__id__": 283 + "__id__": 295 } ], "mode": 0 @@ -4024,7 +4356,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 285 + "__id__": 297 }, "length": 5, "boxThickness": { @@ -4065,16 +4397,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 287 + "__id__": 299 }, "x": { - "__id__": 288 + "__id__": 300 }, "y": { - "__id__": 289 + "__id__": 301 }, "z": { - "__id__": 290 + "__id__": 302 } }, { @@ -4105,16 +4437,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 292 + "__id__": 304 }, "y": { - "__id__": 293 + "__id__": 305 }, "z": { - "__id__": 294 + "__id__": 306 }, "speedModifier": { - "__id__": 295 + "__id__": 307 }, "space": 1 }, @@ -4146,13 +4478,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 297 + "__id__": 309 }, "y": { - "__id__": 298 + "__id__": 310 }, "z": { - "__id__": 299 + "__id__": 311 }, "space": 1 }, @@ -4178,16 +4510,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 301 + "__id__": 313 }, "limitY": { - "__id__": 302 + "__id__": 314 }, "limitZ": { - "__id__": 303 + "__id__": 315 }, "limit": { - "__id__": 304 + "__id__": 316 }, "dampen": 3, "separateAxes": false, @@ -4222,13 +4554,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 306 + "__id__": 318 }, "y": { - "__id__": 307 + "__id__": 319 }, "z": { - "__id__": 308 + "__id__": 320 } }, { @@ -4259,10 +4591,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 310 + "__id__": 322 }, "startFrame": { - "__id__": 312 + "__id__": 324 }, "cycleCount": 0, "_flipU": 0, @@ -4275,7 +4607,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 311 + "__id__": 323 }, "multiplier": 1 }, @@ -4342,25 +4674,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 315 + "__id__": 327 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 316 + "__id__": 328 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 317 + "__id__": 329 }, "colorOvertime": { - "__id__": 318 + "__id__": 330 }, "_space": 0, "_particleSystem": { - "__id__": 261 + "__id__": 273 } }, { @@ -4421,11 +4753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 321 + "__id__": 333 }, "_id": "" }, @@ -4439,11 +4771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 335 }, "_contentSize": { "__type__": "cc.Size", @@ -4467,11 +4799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 260 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 337 }, "_id": "" }, @@ -4498,11 +4830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 340 }, "_materials": [ { @@ -4513,56 +4845,56 @@ ], "_visFlags": 0, "startColor": { - "__id__": 329 + "__id__": 341 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 330 + "__id__": 342 }, "startSize": { - "__id__": 330 + "__id__": 342 }, "startSizeY": { - "__id__": 331 + "__id__": 343 }, "startSizeZ": { - "__id__": 332 + "__id__": 344 }, "startSpeed": { - "__id__": 333 + "__id__": 345 }, "startRotation3D": false, "startRotationX": { - "__id__": 334 + "__id__": 346 }, "startRotationY": { - "__id__": 335 + "__id__": 347 }, "startRotationZ": { - "__id__": 336 + "__id__": 348 }, "startRotation": { - "__id__": 336 + "__id__": 348 }, "startDelay": { - "__id__": 337 + "__id__": 349 }, "startLifetime": { - "__id__": 338 + "__id__": 350 }, "duration": 1, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 339 + "__id__": 351 }, "rateOverTime": { - "__id__": 340 + "__id__": 352 }, "rateOverDistance": { - "__id__": 341 + "__id__": 353 }, "bursts": [], "_renderCulling": false, @@ -4573,37 +4905,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 342 + "__id__": 354 }, "_shapeModule": { - "__id__": 344 - }, - "_sizeOvertimeModule": { - "__id__": 346 - }, - "_velocityOvertimeModule": { - "__id__": 351 - }, - "_forceOvertimeModule": { "__id__": 356 }, + "_sizeOvertimeModule": { + "__id__": 358 + }, + "_velocityOvertimeModule": { + "__id__": 363 + }, + "_forceOvertimeModule": { + "__id__": 368 + }, "_limitVelocityOvertimeModule": { - "__id__": 360 + "__id__": 372 }, "_rotationOvertimeModule": { - "__id__": 365 + "__id__": 377 }, "_textureAnimationModule": { - "__id__": 369 + "__id__": 381 }, "_noiseModule": { - "__id__": 373 + "__id__": 385 }, "_trailModule": { - "__id__": 374 + "__id__": 386 }, "renderer": { - "__id__": 379 + "__id__": 391 }, "_prewarm": false, "_capacity": 100, @@ -4701,7 +5033,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 343 + "__id__": 355 } }, { @@ -4730,7 +5062,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 345 + "__id__": 357 }, "length": 5, "boxThickness": { @@ -4771,16 +5103,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 347 + "__id__": 359 }, "x": { - "__id__": 348 + "__id__": 360 }, "y": { - "__id__": 349 + "__id__": 361 }, "z": { - "__id__": 350 + "__id__": 362 } }, { @@ -4811,16 +5143,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 352 + "__id__": 364 }, "y": { - "__id__": 353 + "__id__": 365 }, "z": { - "__id__": 354 + "__id__": 366 }, "speedModifier": { - "__id__": 355 + "__id__": 367 }, "space": 1 }, @@ -4852,13 +5184,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 357 + "__id__": 369 }, "y": { - "__id__": 358 + "__id__": 370 }, "z": { - "__id__": 359 + "__id__": 371 }, "space": 1 }, @@ -4884,16 +5216,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 361 + "__id__": 373 }, "limitY": { - "__id__": 362 + "__id__": 374 }, "limitZ": { - "__id__": 363 + "__id__": 375 }, "limit": { - "__id__": 364 + "__id__": 376 }, "dampen": 3, "separateAxes": false, @@ -4928,13 +5260,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 366 + "__id__": 378 }, "y": { - "__id__": 367 + "__id__": 379 }, "z": { - "__id__": 368 + "__id__": 380 } }, { @@ -4965,10 +5297,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 370 + "__id__": 382 }, "startFrame": { - "__id__": 372 + "__id__": 384 }, "cycleCount": 0, "_flipU": 0, @@ -4981,7 +5313,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 371 + "__id__": 383 }, "multiplier": 1 }, @@ -5048,25 +5380,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 375 + "__id__": 387 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 376 + "__id__": 388 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 377 + "__id__": 389 }, "colorOvertime": { - "__id__": 378 + "__id__": 390 }, "_space": 0, "_particleSystem": { - "__id__": 327 + "__id__": 339 } }, { @@ -5127,11 +5459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 393 }, "_id": "" }, @@ -5145,11 +5477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 395 }, "_contentSize": { "__type__": "cc.Size", @@ -5173,11 +5505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 397 }, "_id": "" }, @@ -5208,7 +5540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 388 + "__id__": 400 }, "_contentSize": { "__type__": "cc.Size", @@ -5236,10 +5568,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 402 }, "skeleton": { - "__id__": 35 + "__id__": 47 }, "_flipX": false, "_flipY": false, @@ -5259,20 +5591,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 404 }, "animationHandler": { - "__id__": 389 + "__id__": 401 }, "spineRoot": { "__id__": 2 }, "cards": [ { - "__id__": 20 + "__id__": 26 }, { - "__id__": 28 + "__id__": 40 } ], "showSfx": { @@ -5306,7 +5638,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 56 } ] } diff --git a/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chain.prefab b/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chain.prefab index 7c818c2..f7aaf1d 100644 --- a/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chain.prefab +++ b/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chain.prefab @@ -386,7 +386,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -706,7 +706,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -1026,7 +1026,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -1346,7 +1346,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -1666,7 +1666,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -1986,7 +1986,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -2306,7 +2306,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -2626,7 +2626,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -2946,7 +2946,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -3266,7 +3266,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, diff --git a/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chest.prefab b/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chest.prefab index 84a8d4e..19ba7d9 100644 --- a/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chest.prefab +++ b/assets/_Game/Prefabs/Themes/Mummy/Gacha/Mummy_Lucky_Chest.prefab @@ -2867,7 +2867,7 @@ "node": { "__id__": 1 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 197 }, @@ -2878,7 +2878,7 @@ "__id__": 2 }, "rewardRoot": { - "__id__": 11 + "__id__": 10 }, "rewardSprite": { "__id__": 15 diff --git a/assets/_Game/Prefabs/Themes/Mummy/Mummy_Ball.prefab b/assets/_Game/Prefabs/Themes/Mummy/Mummy_Ball.prefab index bd5cb1f..9bfa113 100644 --- a/assets/_Game/Prefabs/Themes/Mummy/Mummy_Ball.prefab +++ b/assets/_Game/Prefabs/Themes/Mummy/Mummy_Ball.prefab @@ -1293,7 +1293,7 @@ "__id__": 6 }, "_impactSound": { - "__uuid__": "b122d38e-ecf1-42e2-8b26-c09d306d90d9", + "__uuid__": "e1d1d404-721b-4610-b254-432e6ae9853f", "__expectedType__": "cc.AudioClip" }, "_impactFlipperSound": { diff --git a/assets/_Game/Prefabs/Themes/Mummy/Mummy_CumulativeBooster.prefab b/assets/_Game/Prefabs/Themes/Mummy/Mummy_CumulativeBooster.prefab index 0e02d28..a34ec86 100644 --- a/assets/_Game/Prefabs/Themes/Mummy/Mummy_CumulativeBooster.prefab +++ b/assets/_Game/Prefabs/Themes/Mummy/Mummy_CumulativeBooster.prefab @@ -1127,7 +1127,7 @@ "__id__": 80 }, "_collectSound": { - "__uuid__": "05a2671e-35bb-4be0-9244-43d541b9a26a", + "__uuid__": "ccc44f78-a046-450b-92cc-9b0f20226ea3", "__expectedType__": "cc.AudioClip" }, "_animation": { @@ -1138,6 +1138,11 @@ }, "displayName": "CHEESE", "duration": 10, + "speedUpBgm": 1, + "backgroundMusic": { + "__uuid__": "eb6ee605-3994-45dd-8524-4347a23f423f", + "__expectedType__": "cc.AudioClip" + }, "_id": "" }, { diff --git a/assets/_Game/Prefabs/Themes/Vital Garden/Gacha/Vital_Graden_Flip_Card.prefab b/assets/_Game/Prefabs/Themes/Vital Garden/Gacha/Vital_Graden_Flip_Card.prefab index fede6e7..7596a34 100644 --- a/assets/_Game/Prefabs/Themes/Vital Garden/Gacha/Vital_Graden_Flip_Card.prefab +++ b/assets/_Game/Prefabs/Themes/Vital Garden/Gacha/Vital_Graden_Flip_Card.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 44 + "__id__": 56 }, { - "__id__": 46 + "__id__": 58 }, { - "__id__": 48 + "__id__": 60 } ], "_prefab": { - "__id__": 50 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,23 +85,23 @@ "__id__": 17 }, { - "__id__": 25 + "__id__": 31 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 45 }, { - "__id__": 35 + "__id__": 47 }, { - "__id__": 41 + "__id__": 53 } ], "_prefab": { - "__id__": 43 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -490,21 +490,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 18 + } + ], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 24 }, { - "__id__": 20 + "__id__": 26 }, { - "__id__": 22 + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -535,6 +539,168 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51Wwl8yX9Mzb7NT8MYKdCu" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "48e9a2a6-76e7-4bd7-b5a3-8e90da0095e0", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a49GxujqtMUZQ8xp5EoCDd" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c5dyhH/CVM3ojbk4Uy/Dab", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -545,7 +711,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -573,7 +739,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 27 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -615,7 +781,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 29 }, "_id": "" }, @@ -644,21 +810,25 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 32 + } + ], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 38 }, { - "__id__": 28 + "__id__": 40 }, { - "__id__": 30 + "__id__": 42 } ], "_prefab": { - "__id__": 32 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -689,17 +859,179 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 31 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 34 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0bhYpoYUtGNKdm7ygumOOP" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "x100", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 60, + "_fontSize": 60, + "_fontFamily": "Arial", + "_lineHeight": 60, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "48e9a2a6-76e7-4bd7-b5a3-8e90da0095e0", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02Br3P8MZAUrX6I5KMV0tt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "229tpTwY1I4YegdSkbN+MN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": { + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -723,11 +1055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 41 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -765,11 +1097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 43 }, "_id": "" }, @@ -800,7 +1132,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -828,7 +1160,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -852,16 +1184,16 @@ "_cacheMode": 0, "_sockets": [ { - "__id__": 37 + "__id__": 49 }, { - "__id__": 38 + "__id__": 50 }, { - "__id__": 39 + "__id__": 51 }, { - "__id__": 40 + "__id__": 52 } ], "_useTint": false, @@ -901,7 +1233,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/card2/card2-flip", "target": { - "__id__": 25 + "__id__": 31 } }, { @@ -914,7 +1246,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 54 }, "ignoreTimeScale": true, "_id": "" @@ -946,7 +1278,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -974,10 +1306,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 59 }, "skeleton": { - "__id__": 35 + "__id__": 47 }, "_flipX": false, "_flipY": false, @@ -997,20 +1329,20 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 61 }, "animationHandler": { - "__id__": 46 + "__id__": 58 }, "spineRoot": { "__id__": 2 }, "cards": [ { - "__id__": 20 + "__id__": 26 }, { - "__id__": 28 + "__id__": 40 } ], "showSfx": { diff --git a/assets/_Game/Scenes/Chocolate-theme.scene b/assets/_Game/Scenes/Chocolate-theme.scene index 74f8bf8..681b7ac 100644 --- a/assets/_Game/Scenes/Chocolate-theme.scene +++ b/assets/_Game/Scenes/Chocolate-theme.scene @@ -11047,7 +11047,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -11059,7 +11059,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, diff --git a/assets/_Game/Scenes/City-theme.scene b/assets/_Game/Scenes/City-theme.scene index 3da5aa7..d5d2949 100644 --- a/assets/_Game/Scenes/City-theme.scene +++ b/assets/_Game/Scenes/City-theme.scene @@ -10546,7 +10546,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -10558,7 +10558,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, diff --git a/assets/_Game/Scenes/Default-theme.scene b/assets/_Game/Scenes/Default-theme.scene index 9d7ca3b..9058beb 100644 --- a/assets/_Game/Scenes/Default-theme.scene +++ b/assets/_Game/Scenes/Default-theme.scene @@ -13034,7 +13034,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -13046,7 +13046,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, diff --git a/assets/_Game/Scenes/Farm-theme.scene b/assets/_Game/Scenes/Farm-theme.scene index 54dc209..52f6586 100644 --- a/assets/_Game/Scenes/Farm-theme.scene +++ b/assets/_Game/Scenes/Farm-theme.scene @@ -10728,7 +10728,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -10740,7 +10740,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, diff --git a/assets/_Game/Scenes/Mummy-theme.scene b/assets/_Game/Scenes/Mummy-theme.scene index 59394a5..024a1b6 100644 --- a/assets/_Game/Scenes/Mummy-theme.scene +++ b/assets/_Game/Scenes/Mummy-theme.scene @@ -29,7 +29,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 1499 + "__id__": 1498 }, "_lpos": { "__type__": "cc.Vec3", @@ -60,7 +60,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 1512 + "__id__": 1511 }, "_id": "40b13cae-d57b-412b-9327-6ded25de4414" }, @@ -317,19 +317,19 @@ "__id__": 16 }, { - "__id__": 1494 + "__id__": 1493 } ], "_active": true, "_components": [ + { + "__id__": 1495 + }, { "__id__": 1496 }, { "__id__": 1497 - }, - { - "__id__": 1498 } ], "_prefab": null, @@ -432,9 +432,9 @@ "_far": 2000, "_color": { "__type__": "cc.Color", - "r": 71, - "g": 35, - "b": 126, + "r": 238, + "g": 188, + "b": 131, "a": 255 }, "_depth": 1, @@ -613,40 +613,40 @@ "__id__": 138 }, { - "__id__": 920 + "__id__": 919 }, { - "__id__": 995 + "__id__": 994 }, { - "__id__": 1057 + "__id__": 1056 }, { - "__id__": 1062 + "__id__": 1061 }, { - "__id__": 1200 + "__id__": 1199 }, { - "__id__": 1203 + "__id__": 1202 }, { - "__id__": 1205 + "__id__": 1204 }, { - "__id__": 1477 + "__id__": 1476 }, { - "__id__": 1480 + "__id__": 1479 } ], "_active": true, "_components": [ { - "__id__": 1492 + "__id__": 1491 }, { - "__id__": 1493 + "__id__": 1492 } ], "_prefab": null, @@ -5571,19 +5571,19 @@ "__id__": 142 }, { - "__id__": 725 + "__id__": 724 }, { - "__id__": 792 + "__id__": 791 }, { - "__id__": 797 + "__id__": 796 }, { - "__id__": 806 + "__id__": 805 }, { - "__id__": 863 + "__id__": 862 } ], "_active": true, @@ -5755,7 +5755,7 @@ "__id__": 152 }, { - "__id__": 719 + "__id__": 718 } ], "_prefab": null, @@ -6129,10 +6129,10 @@ "_minAngle": 10, "_maxAngle": 170, "_soundFx": { - "__id__": 719 + "__id__": 718 }, "_goalSound": { - "__uuid__": "4ce9d2c6-98c5-4d05-94af-70193bb795fe", + "__uuid__": "89f81ee2-68a5-4246-8822-d491706714f3", "__expectedType__": "cc.AudioClip" }, "_cheeseModeGoalSound": { @@ -6140,10 +6140,13 @@ "__expectedType__": "cc.AudioClip" }, "_collectStartSoundFx": { - "__uuid__": "1ac12acc-dde3-4d31-9106-dfc30c030d40", + "__uuid__": "a571b738-4d22-48ef-b363-a96c0176aae6", "__expectedType__": "cc.AudioClip" }, "_rewards": [ + { + "__id__": 719 + }, { "__id__": 720 }, @@ -6155,9 +6158,6 @@ }, { "__id__": 723 - }, - { - "__id__": 724 } ], "_id": "e5qVdeXFZOu6/MatkdDEG6" @@ -6174,10 +6174,10 @@ "_active": true, "_components": [ { - "__id__": 717 + "__id__": 716 }, { - "__id__": 718 + "__id__": 717 } ], "_prefab": null, @@ -6223,11 +6223,14 @@ "__id__": 153 }, { - "__id__": 654 + "__id__": 653 } ], "_active": true, "_components": [ + { + "__id__": 712 + }, { "__id__": 713 }, @@ -6236,9 +6239,6 @@ }, { "__id__": 715 - }, - { - "__id__": 716 } ], "_prefab": null, @@ -6281,7 +6281,7 @@ }, "_children": [ { - "__id__": 706 + "__id__": 705 }, { "__id__": 154 @@ -6289,14 +6289,14 @@ ], "_active": true, "_components": [ + { + "__id__": 709 + }, { "__id__": 710 }, { "__id__": 711 - }, - { - "__id__": 712 } ], "_prefab": null, @@ -6342,22 +6342,22 @@ "__id__": 155 }, { - "__id__": 670 + "__id__": 669 }, { - "__id__": 659 + "__id__": 658 }, { - "__id__": 691 + "__id__": 690 } ], "_active": true, "_components": [ { - "__id__": 704 + "__id__": 703 }, { - "__id__": 705 + "__id__": 704 } ], "_prefab": null, @@ -6411,14 +6411,14 @@ ], "_active": true, "_components": [ + { + "__id__": 649 + }, { "__id__": 650 }, { "__id__": 651 - }, - { - "__id__": 652 } ], "_prefab": null, @@ -9933,19 +9933,18 @@ "__id__": 380 }, "asset": { - "__uuid__": "ae543a74-bb1a-427f-9fa5-751575fe3ef7", + "__uuid__": "5d0b482e-ab35-45a8-b8e2-79d3763a9fa9", "__expectedType__": "cc.Prefab" }, - "fileId": "244TXoUqdKA4qqvhPODAbd", + "fileId": "b0CgrEZDdPP6qjRGc5LHCx", "instance": { "__id__": 382 }, - "targetOverrides": [], - "nestedPrefabInstanceRoots": null + "targetOverrides": [] }, { "__type__": "cc.PrefabInstance", - "fileId": "840+zuo9VNGK6J8O7VYCMv", + "fileId": "a49GlxcpJDUqTxhUaVly4J", "prefabRootNode": null, "mountedChildren": [], "mountedComponents": [], @@ -9973,12 +9972,12 @@ "propertyPath": [ "_name" ], - "value": "Flip_Card" + "value": "Mummy_Lucky_Wheel" }, { "__type__": "cc.TargetInfo", "localID": [ - "244TXoUqdKA4qqvhPODAbd" + "b0CgrEZDdPP6qjRGc5LHCx" ] }, { @@ -10044,19 +10043,18 @@ "__id__": 388 }, "asset": { - "__uuid__": "458b79cf-deed-48cb-b9da-f9e603032e07", + "__uuid__": "5b21c218-21fe-4128-8014-cc1c6999fb2a", "__expectedType__": "cc.Prefab" }, - "fileId": "ec0xxH/etG0KDLbW0fRRht", + "fileId": "d8nEtFnupHxp1DyuqkemXx", "instance": { "__id__": 390 }, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "targetOverrides": [] }, { "__type__": "cc.PrefabInstance", - "fileId": "59yBd+bMJAfZ6F7MzkdLeX", + "fileId": "02BdG29UBC2oC7DrepkE8G", "prefabRootNode": null, "mountedChildren": [], "mountedComponents": [], @@ -10084,12 +10082,12 @@ "propertyPath": [ "_name" ], - "value": "Lucky_Chain" + "value": "Mummy_Lucky_Chest" }, { "__type__": "cc.TargetInfo", "localID": [ - "ec0xxH/etG0KDLbW0fRRht" + "d8nEtFnupHxp1DyuqkemXx" ] }, { @@ -10103,7 +10101,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 0, "z": 0 } }, @@ -10155,10 +10153,10 @@ "__id__": 396 }, "asset": { - "__uuid__": "f68bb7db-db84-48b7-953c-604da45d34c8", + "__uuid__": "730ecd39-d0e9-4b07-935e-458dde301d48", "__expectedType__": "cc.Prefab" }, - "fileId": "d8nEtFnupHxp1DyuqkemXx", + "fileId": "ec0xxH/etG0KDLbW0fRRht", "instance": { "__id__": 398 }, @@ -10167,7 +10165,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "163nd50ExLQKGj6nxUUADm", + "fileId": "f276d0OzxHaaepgqxgcroC", "prefabRootNode": null, "mountedChildren": [], "mountedComponents": [], @@ -10195,12 +10193,12 @@ "propertyPath": [ "_name" ], - "value": "Lucky_Chest" + "value": "Mummy_Lucky_Chain" }, { "__type__": "cc.TargetInfo", "localID": [ - "d8nEtFnupHxp1DyuqkemXx" + "ec0xxH/etG0KDLbW0fRRht" ] }, { @@ -10266,19 +10264,18 @@ "__id__": 404 }, "asset": { - "__uuid__": "619d86b8-ee38-413c-bc97-35532411b7f1", + "__uuid__": "ab8c9345-1c97-4553-9249-60c86bab6690", "__expectedType__": "cc.Prefab" }, - "fileId": "b0CgrEZDdPP6qjRGc5LHCx", + "fileId": "244TXoUqdKA4qqvhPODAbd", "instance": { "__id__": 406 }, - "targetOverrides": [], - "nestedPrefabInstanceRoots": null + "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "feZSEtT9hB/4KXtBrZLT9Y", + "fileId": "f9odLa76hNs6Gg3IQfRgcq", "prefabRootNode": null, "mountedChildren": [], "mountedComponents": [], @@ -10306,12 +10303,12 @@ "propertyPath": [ "_name" ], - "value": "Lucky_Wheel" + "value": "Mummy_Flip_Card" }, { "__type__": "cc.TargetInfo", "localID": [ - "b0CgrEZDdPP6qjRGc5LHCx" + "244TXoUqdKA4qqvhPODAbd" ] }, { @@ -10628,7 +10625,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -10640,7 +10637,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, @@ -14211,11 +14208,11 @@ "__id__": 8 }, "_soundCollectCoinFx": { - "__uuid__": "1ac12acc-dde3-4d31-9106-dfc30c030d40", + "__uuid__": "a571b738-4d22-48ef-b363-a96c0176aae6", "__expectedType__": "cc.AudioClip" }, "_soundScore": { - "__uuid__": "65a023cb-b98f-4470-ba2d-4eba9fe184fe", + "__uuid__": "89f81ee2-68a5-4246-8822-d491706714f3", "__expectedType__": "cc.AudioClip" }, "_starSpeedCurve": { @@ -14336,6 +14333,9 @@ ], "_active": false, "_components": [ + { + "__id__": 645 + }, { "__id__": 646 }, @@ -14344,9 +14344,6 @@ }, { "__id__": 648 - }, - { - "__id__": 649 } ], "_prefab": null, @@ -14411,9 +14408,6 @@ }, { "__id__": 644 - }, - { - "__id__": 645 } ], "_prefab": null, @@ -17025,22 +17019,6 @@ "_miterLimit": 10, "_id": "8bUTHvuSFGMbAUaXWQhLEK" }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 536 - }, - "_enabled": true, - "__prefab": null, - "_type": 0, - "_inverted": false, - "_segments": 64, - "_alphaThreshold": 0.1, - "_id": "c6/DClbxpHZYREkbyS5o8G" - }, { "__type__": "cc.Animation", "_name": "", @@ -17079,7 +17057,7 @@ "_enabled": true, "__prefab": null, "_animation": { - "__id__": 644 + "__id__": 643 }, "_id": "21CWF/h19B4IC/OI3ayhGG" }, @@ -17249,10 +17227,10 @@ "_enabled": true, "__prefab": null, "_scoreLabel": { - "__id__": 653 + "__id__": 652 }, "_ticketLabel": { - "__id__": 656 + "__id__": 655 }, "_buffFx": null, "_controlPanel": { @@ -17278,7 +17256,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 653 }, "_enabled": true, "__prefab": null, @@ -17349,10 +17327,10 @@ "_active": true, "_components": [ { - "__id__": 655 + "__id__": 654 }, { - "__id__": 653 + "__id__": 652 } ], "_prefab": null, @@ -17391,7 +17369,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 653 }, "_enabled": true, "__prefab": null, @@ -17413,7 +17391,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 657 + "__id__": 656 }, "_enabled": true, "__prefab": null, @@ -17478,16 +17456,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 658 + "__id__": 657 }, "_children": [], "_active": true, "_components": [ { - "__id__": 669 + "__id__": 668 }, { - "__id__": 656 + "__id__": 655 } ], "_prefab": null, @@ -17526,23 +17504,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 659 + "__id__": 658 }, "_children": [ { - "__id__": 657 + "__id__": 656 } ], "_active": true, "_components": [ + { + "__id__": 665 + }, { "__id__": 666 }, { "__id__": 667 - }, - { - "__id__": 668 } ], "_prefab": null, @@ -17585,22 +17563,22 @@ }, "_children": [ { - "__id__": 658 + "__id__": 657 }, { - "__id__": 660 + "__id__": 659 } ], "_active": true, "_components": [ + { + "__id__": 662 + }, { "__id__": 663 }, { "__id__": 664 - }, - { - "__id__": 665 } ], "_prefab": null, @@ -17639,16 +17617,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 659 + "__id__": 658 }, "_children": [], "_active": true, "_components": [ { - "__id__": 661 + "__id__": 660 }, { - "__id__": 662 + "__id__": 661 } ], "_prefab": null, @@ -17687,7 +17665,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 659 }, "_enabled": true, "__prefab": null, @@ -17709,7 +17687,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 659 }, "_enabled": true, "__prefab": null, @@ -17748,7 +17726,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 658 }, "_enabled": true, "__prefab": null, @@ -17770,7 +17748,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 658 }, "_enabled": true, "__prefab": null, @@ -17809,7 +17787,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 659 + "__id__": 658 }, "_enabled": true, "__prefab": null, @@ -17839,7 +17817,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 657 }, "_enabled": true, "__prefab": null, @@ -17861,7 +17839,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 657 }, "_enabled": true, "__prefab": null, @@ -17900,7 +17878,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 658 + "__id__": 657 }, "_enabled": true, "__prefab": null, @@ -17930,7 +17908,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 657 + "__id__": 656 }, "_enabled": true, "__prefab": null, @@ -17956,14 +17934,17 @@ }, "_children": [ { - "__id__": 671 + "__id__": 670 }, { - "__id__": 675 + "__id__": 674 } ], "_active": true, "_components": [ + { + "__id__": 686 + }, { "__id__": 687 }, @@ -17972,9 +17953,6 @@ }, { "__id__": 689 - }, - { - "__id__": 690 } ], "_prefab": null, @@ -18013,19 +17991,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 669 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 671 + }, { "__id__": 672 }, { "__id__": 673 - }, - { - "__id__": 674 } ], "_prefab": null, @@ -18064,7 +18042,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 670 }, "_enabled": true, "__prefab": null, @@ -18086,7 +18064,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 670 }, "_enabled": true, "__prefab": null, @@ -18125,7 +18103,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 670 }, "_enabled": true, "__prefab": null, @@ -18155,26 +18133,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 669 }, "_children": [ { - "__id__": 676 + "__id__": 675 }, { - "__id__": 681 + "__id__": 680 } ], "_active": true, "_components": [ + { + "__id__": 683 + }, { "__id__": 684 }, { "__id__": 685 - }, - { - "__id__": 686 } ], "_prefab": null, @@ -18213,17 +18191,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 674 }, "_children": [ { - "__id__": 677 + "__id__": 676 } ], "_active": true, "_components": [ { - "__id__": 680 + "__id__": 679 } ], "_prefab": null, @@ -18262,16 +18240,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 676 + "__id__": 675 }, "_children": [], "_active": true, "_components": [ { - "__id__": 678 + "__id__": 677 }, { - "__id__": 679 + "__id__": 678 } ], "_prefab": null, @@ -18310,7 +18288,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 677 + "__id__": 676 }, "_enabled": true, "__prefab": null, @@ -18332,7 +18310,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 677 + "__id__": 676 }, "_enabled": true, "__prefab": null, @@ -18371,7 +18349,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 675 }, "_enabled": true, "__prefab": null, @@ -18393,16 +18371,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 675 + "__id__": 674 }, "_children": [], "_active": true, "_components": [ { - "__id__": 682 + "__id__": 681 }, { - "__id__": 683 + "__id__": 682 } ], "_prefab": null, @@ -18441,7 +18419,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 680 }, "_enabled": true, "__prefab": null, @@ -18463,7 +18441,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 681 + "__id__": 680 }, "_enabled": true, "__prefab": null, @@ -18528,7 +18506,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 675 + "__id__": 674 }, "_enabled": true, "__prefab": null, @@ -18550,7 +18528,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 675 + "__id__": 674 }, "_enabled": true, "__prefab": null, @@ -18582,7 +18560,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 675 + "__id__": 674 }, "_enabled": true, "__prefab": null, @@ -18612,7 +18590,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 669 }, "_enabled": true, "__prefab": null, @@ -18634,7 +18612,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 669 }, "_enabled": true, "__prefab": null, @@ -18673,7 +18651,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 669 }, "_enabled": true, "__prefab": null, @@ -18703,18 +18681,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 669 }, "_enabled": true, "__prefab": null, "_timeLabel": { - "__id__": 683 + "__id__": 682 }, "_fill": { - "__id__": 673 + "__id__": 672 }, "_timeIcon": { - "__id__": 677 + "__id__": 676 }, "normalColor": { "__type__": "cc.Color", @@ -18746,14 +18724,17 @@ }, "_children": [ { - "__id__": 692 + "__id__": 691 }, { - "__id__": 695 + "__id__": 694 } ], "_active": true, "_components": [ + { + "__id__": 697 + }, { "__id__": 698 }, @@ -18761,13 +18742,10 @@ "__id__": 699 }, { - "__id__": 700 + "__id__": 701 }, { "__id__": 702 - }, - { - "__id__": 703 } ], "_prefab": null, @@ -18806,16 +18784,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 690 }, "_children": [], "_active": true, "_components": [ { - "__id__": 693 + "__id__": 692 }, { - "__id__": 694 + "__id__": 693 } ], "_prefab": null, @@ -18854,7 +18832,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 692 + "__id__": 691 }, "_enabled": true, "__prefab": null, @@ -18876,7 +18854,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 692 + "__id__": 691 }, "_enabled": true, "__prefab": null, @@ -18915,16 +18893,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 691 + "__id__": 690 }, "_children": [], "_active": false, "_components": [ { - "__id__": 696 + "__id__": 695 }, { - "__id__": 697 + "__id__": 696 } ], "_prefab": null, @@ -18963,7 +18941,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 695 + "__id__": 694 }, "_enabled": true, "__prefab": null, @@ -18985,7 +18963,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 695 + "__id__": 694 }, "_enabled": true, "__prefab": null, @@ -19024,7 +19002,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 690 }, "_enabled": true, "__prefab": null, @@ -19046,7 +19024,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 690 }, "_enabled": true, "__prefab": null, @@ -19085,13 +19063,13 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 690 }, "_enabled": true, "__prefab": null, "clickEvents": [ { - "__id__": 701 + "__id__": 700 } ], "_interactable": true, @@ -19131,14 +19109,14 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 691 + "__id__": 690 }, "_id": "1cDmuMEIFEs5ImBNG5Gm0F" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 691 + "__id__": 690 }, "component": "", "_componentId": "fe619HtEX1OQq7oeACKrANd", @@ -19151,7 +19129,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 690 }, "_enabled": true, "__prefab": null, @@ -19181,15 +19159,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 691 + "__id__": 690 }, "_enabled": true, "__prefab": null, "_unMute": { - "__id__": 692 + "__id__": 691 }, "_mute": { - "__id__": 695 + "__id__": 694 }, "_id": "adeG5FRP1GpLzDXol2pxU+" }, @@ -19256,14 +19234,14 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 706 + }, { "__id__": 707 }, { "__id__": 708 - }, - { - "__id__": 709 } ], "_prefab": null, @@ -19302,7 +19280,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 705 }, "_enabled": true, "__prefab": null, @@ -19324,7 +19302,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 705 }, "_enabled": true, "__prefab": null, @@ -19389,7 +19367,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 706 + "__id__": 705 }, "_enabled": true, "__prefab": null, @@ -19830,28 +19808,28 @@ }, "_children": [ { - "__id__": 726 + "__id__": 725 }, { - "__id__": 736 + "__id__": 735 }, { - "__id__": 741 + "__id__": 740 }, { - "__id__": 785 + "__id__": 784 } ], "_active": true, "_components": [ + { + "__id__": 788 + }, { "__id__": 789 }, { "__id__": 790 - }, - { - "__id__": 791 } ], "_prefab": null, @@ -19890,23 +19868,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 725 + "__id__": 724 }, "_children": [ { - "__id__": 727 + "__id__": 726 }, { - "__id__": 729 + "__id__": 728 }, { - "__id__": 732 + "__id__": 731 } ], "_active": true, "_components": [ { - "__id__": 735 + "__id__": 734 } ], "_prefab": null, @@ -19945,13 +19923,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 726 + "__id__": 725 }, "_children": [], "_active": true, "_components": [ { - "__id__": 728 + "__id__": 727 } ], "_prefab": null, @@ -19990,7 +19968,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 727 + "__id__": 726 }, "_enabled": true, "__prefab": null, @@ -20012,16 +19990,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 726 + "__id__": 725 }, "_children": [], "_active": true, "_components": [ { - "__id__": 730 + "__id__": 729 }, { - "__id__": 731 + "__id__": 730 } ], "_prefab": null, @@ -20060,7 +20038,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 728 }, "_enabled": true, "__prefab": null, @@ -20082,7 +20060,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 728 }, "_enabled": true, "__prefab": null, @@ -20121,16 +20099,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 726 + "__id__": 725 }, "_children": [], "_active": true, "_components": [ { - "__id__": 733 + "__id__": 732 }, { - "__id__": 734 + "__id__": 733 } ], "_prefab": null, @@ -20169,7 +20147,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 732 + "__id__": 731 }, "_enabled": true, "__prefab": null, @@ -20191,7 +20169,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 732 + "__id__": 731 }, "_enabled": true, "__prefab": null, @@ -20230,7 +20208,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 725 }, "_enabled": true, "__prefab": null, @@ -20252,17 +20230,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 725 + "__id__": 724 }, "_children": [ { - "__id__": 737 + "__id__": 736 } ], "_active": true, "_components": [ { - "__id__": 740 + "__id__": 739 } ], "_prefab": null, @@ -20301,16 +20279,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 736 + "__id__": 735 }, "_children": [], "_active": true, "_components": [ { - "__id__": 738 + "__id__": 737 }, { - "__id__": 739 + "__id__": 738 } ], "_prefab": null, @@ -20349,7 +20327,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 736 }, "_enabled": true, "__prefab": null, @@ -20371,7 +20349,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 736 }, "_enabled": true, "__prefab": null, @@ -20410,7 +20388,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 736 + "__id__": 735 }, "_enabled": true, "__prefab": null, @@ -20432,20 +20410,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 725 + "__id__": 724 }, "_children": [ { - "__id__": 742 + "__id__": 741 }, { - "__id__": 762 + "__id__": 761 } ], "_active": true, "_components": [ { - "__id__": 784 + "__id__": 783 } ], "_prefab": null, @@ -20482,17 +20460,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 741 + "__id__": 740 }, "_prefab": { - "__id__": 743 + "__id__": 742 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 742 + "__id__": 741 }, "asset": { "__uuid__": "c5e75294-5ee5-4e7a-8192-d1655a94811e", @@ -20500,7 +20478,7 @@ }, "fileId": "5cD4+xkz1ErKrNpV+rss2i", "instance": { - "__id__": 744 + "__id__": 743 }, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -20513,7 +20491,10 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 745 + "__id__": 744 + }, + { + "__id__": 746 }, { "__id__": 747 @@ -20525,7 +20506,7 @@ "__id__": 749 }, { - "__id__": 750 + "__id__": 751 }, { "__id__": 752 @@ -20537,16 +20518,13 @@ "__id__": 754 }, { - "__id__": 755 + "__id__": 756 }, { - "__id__": 757 + "__id__": 758 }, { - "__id__": 759 - }, - { - "__id__": 761 + "__id__": 760 } ], "removedComponents": [] @@ -20554,7 +20532,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 746 + "__id__": 745 }, "propertyPath": [ "_name" @@ -20570,7 +20548,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 746 + "__id__": 745 }, "propertyPath": [ "_lpos" @@ -20585,7 +20563,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 746 + "__id__": 745 }, "propertyPath": [ "_lrot" @@ -20601,7 +20579,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 746 + "__id__": 745 }, "propertyPath": [ "_euler" @@ -20616,7 +20594,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 751 + "__id__": 750 }, "propertyPath": [ "_lrot" @@ -20638,7 +20616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 751 + "__id__": 750 }, "propertyPath": [ "_euler" @@ -20653,7 +20631,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 746 + "__id__": 745 }, "propertyPath": [ "_layer" @@ -20663,7 +20641,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 751 + "__id__": 750 }, "propertyPath": [ "_layer" @@ -20673,7 +20651,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 756 + "__id__": 755 }, "propertyPath": [ "_layer" @@ -20689,7 +20667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 758 + "__id__": 757 }, "propertyPath": [ "_layer" @@ -20705,7 +20683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 760 + "__id__": 759 }, "propertyPath": [ "_rotationOvertimeModule", @@ -20723,7 +20701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 746 + "__id__": 745 }, "propertyPath": [ "_active" @@ -20734,17 +20712,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 741 + "__id__": 740 }, "_prefab": { - "__id__": 763 + "__id__": 762 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 762 + "__id__": 761 }, "asset": { "__uuid__": "c5e75294-5ee5-4e7a-8192-d1655a94811e", @@ -20752,7 +20730,7 @@ }, "fileId": "5cD4+xkz1ErKrNpV+rss2i", "instance": { - "__id__": 764 + "__id__": 763 }, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -20765,7 +20743,10 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 765 + "__id__": 764 + }, + { + "__id__": 766 }, { "__id__": 767 @@ -20780,7 +20761,7 @@ "__id__": 770 }, { - "__id__": 771 + "__id__": 772 }, { "__id__": 773 @@ -20792,19 +20773,16 @@ "__id__": 775 }, { - "__id__": 776 + "__id__": 777 }, { "__id__": 778 }, { - "__id__": 779 + "__id__": 780 }, { - "__id__": 781 - }, - { - "__id__": 783 + "__id__": 782 } ], "removedComponents": [] @@ -20812,7 +20790,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_name" @@ -20828,7 +20806,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_lpos" @@ -20843,7 +20821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_lrot" @@ -20859,7 +20837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_euler" @@ -20874,7 +20852,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_layer" @@ -20884,7 +20862,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 772 + "__id__": 771 }, "propertyPath": [ "_lrot" @@ -20906,7 +20884,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 772 + "__id__": 771 }, "propertyPath": [ "_euler" @@ -20921,7 +20899,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_lscale" @@ -20936,7 +20914,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 772 + "__id__": 771 }, "propertyPath": [ "_lscale" @@ -20951,7 +20929,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 777 + "__id__": 776 }, "propertyPath": [ "_rotationOvertimeModule", @@ -20969,7 +20947,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 772 + "__id__": 771 }, "propertyPath": [ "_layer" @@ -20979,7 +20957,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 780 + "__id__": 779 }, "propertyPath": [ "_layer" @@ -20995,7 +20973,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 782 + "__id__": 781 }, "propertyPath": [ "_layer" @@ -21011,7 +20989,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 766 + "__id__": 765 }, "propertyPath": [ "_active" @@ -21024,7 +21002,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 741 + "__id__": 740 }, "_enabled": true, "__prefab": null, @@ -21046,19 +21024,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 725 + "__id__": 724 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 785 + }, { "__id__": 786 }, { "__id__": 787 - }, - { - "__id__": 788 } ], "_prefab": null, @@ -21097,7 +21075,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 785 + "__id__": 784 }, "_enabled": true, "__prefab": null, @@ -21119,7 +21097,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 785 + "__id__": 784 }, "_enabled": true, "__prefab": null, @@ -21179,7 +21157,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 785 + "__id__": 784 }, "_enabled": true, "__prefab": null, @@ -21207,7 +21185,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 724 }, "_enabled": true, "__prefab": null, @@ -21229,15 +21207,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 724 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 787 + "__id__": 786 }, "_animation": { - "__id__": 791 + "__id__": 790 }, "_score": 100, "_goalFx": { @@ -21252,7 +21230,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 724 }, "_enabled": true, "__prefab": null, @@ -21284,6 +21262,9 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 792 + }, { "__id__": 793 }, @@ -21292,9 +21273,6 @@ }, { "__id__": 795 - }, - { - "__id__": 796 } ], "_prefab": null, @@ -21333,7 +21311,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 792 + "__id__": 791 }, "_enabled": true, "__prefab": null, @@ -21355,7 +21333,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 792 + "__id__": 791 }, "_enabled": true, "__prefab": null, @@ -21490,7 +21468,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 792 + "__id__": 791 }, "_enabled": true, "__prefab": null, @@ -21580,7 +21558,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 792 + "__id__": 791 }, "_enabled": true, "__prefab": null, @@ -21612,14 +21590,17 @@ }, "_children": [ { - "__id__": 798 + "__id__": 797 }, { - "__id__": 800 + "__id__": 799 } ], "_active": true, "_components": [ + { + "__id__": 801 + }, { "__id__": 802 }, @@ -21628,9 +21609,6 @@ }, { "__id__": 804 - }, - { - "__id__": 805 } ], "_prefab": null, @@ -21669,13 +21647,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 797 + "__id__": 796 }, "_children": [], "_active": true, "_components": [ { - "__id__": 799 + "__id__": 798 } ], "_prefab": null, @@ -21714,7 +21692,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 797 }, "_enabled": true, "__prefab": null, @@ -21736,13 +21714,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 797 + "__id__": 796 }, "_children": [], "_active": true, "_components": [ { - "__id__": 801 + "__id__": 800 } ], "_prefab": null, @@ -21781,7 +21759,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 800 + "__id__": 799 }, "_enabled": true, "__prefab": null, @@ -21803,7 +21781,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 796 }, "_enabled": true, "__prefab": null, @@ -21825,7 +21803,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 796 }, "_enabled": true, "__prefab": null, @@ -21880,25 +21858,25 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 796 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 803 + "__id__": 802 }, "_portLeft": { - "__id__": 798 + "__id__": 797 }, "_portRight": { - "__id__": 800 + "__id__": 799 }, "_fx": { "__uuid__": "7afbc379-62e2-4721-b6d4-be47b00b6db2", "__expectedType__": "cc.Prefab" }, "_soundFX": { - "__uuid__": "d3b9a148-5c8e-41f4-9e87-c09175e20b2d", + "__uuid__": "aa1bec52-c7bf-49c9-a6b0-ffafc93898ff", "__expectedType__": "cc.AudioClip" }, "_id": "cf4OeeWmpFIouLcLflIG+0" @@ -21909,7 +21887,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 796 }, "_enabled": true, "__prefab": null, @@ -21943,13 +21921,13 @@ "_active": true, "_components": [ { - "__id__": 807 + "__id__": 806 + }, + { + "__id__": 860 }, { "__id__": 861 - }, - { - "__id__": 862 } ], "_prefab": null, @@ -21988,7 +21966,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 805 }, "_enabled": true, "__prefab": null, @@ -22000,60 +21978,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 808 + "__id__": 807 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 809 + "__id__": 808 }, "startSize": { - "__id__": 809 + "__id__": 808 }, "startSizeY": { - "__id__": 810 + "__id__": 809 }, "startSizeZ": { - "__id__": 811 + "__id__": 810 }, "startSpeed": { - "__id__": 812 + "__id__": 811 }, "startRotation3D": false, "startRotationX": { - "__id__": 813 + "__id__": 812 }, "startRotationY": { - "__id__": 814 + "__id__": 813 }, "startRotationZ": { - "__id__": 815 + "__id__": 814 }, "startRotation": { - "__id__": 815 + "__id__": 814 }, "startDelay": { - "__id__": 816 + "__id__": 815 }, "startLifetime": { - "__id__": 817 + "__id__": 816 }, "duration": 5, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 818 + "__id__": 817 }, "rateOverTime": { - "__id__": 819 + "__id__": 818 }, "rateOverDistance": { - "__id__": 820 + "__id__": 819 }, "bursts": [ { - "__id__": 821 + "__id__": 820 } ], "_renderCulling": false, @@ -22064,37 +22042,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 823 + "__id__": 822 }, "_shapeModule": { - "__id__": 825 + "__id__": 824 }, "_sizeOvertimeModule": { - "__id__": 827 + "__id__": 826 }, "_velocityOvertimeModule": { - "__id__": 832 + "__id__": 831 }, "_forceOvertimeModule": { - "__id__": 837 + "__id__": 836 }, "_limitVelocityOvertimeModule": { - "__id__": 841 + "__id__": 840 }, "_rotationOvertimeModule": { - "__id__": 846 + "__id__": 845 }, "_textureAnimationModule": { - "__id__": 850 + "__id__": 849 }, "_noiseModule": { - "__id__": 854 + "__id__": 853 }, "_trailModule": { - "__id__": 855 + "__id__": 854 }, "renderer": { - "__id__": 860 + "__id__": 859 }, "_prewarm": false, "_capacity": 100, @@ -22190,7 +22168,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 822 + "__id__": 821 } }, { @@ -22203,7 +22181,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 824 + "__id__": 823 } }, { @@ -22232,7 +22210,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 826 + "__id__": 825 }, "length": 5, "boxThickness": { @@ -22273,16 +22251,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 828 + "__id__": 827 }, "x": { - "__id__": 829 + "__id__": 828 }, "y": { - "__id__": 830 + "__id__": 829 }, "z": { - "__id__": 831 + "__id__": 830 } }, { @@ -22313,16 +22291,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 833 + "__id__": 832 }, "y": { - "__id__": 834 + "__id__": 833 }, "z": { - "__id__": 835 + "__id__": 834 }, "speedModifier": { - "__id__": 836 + "__id__": 835 }, "space": 1 }, @@ -22354,13 +22332,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 838 + "__id__": 837 }, "y": { - "__id__": 839 + "__id__": 838 }, "z": { - "__id__": 840 + "__id__": 839 }, "space": 1 }, @@ -22386,16 +22364,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 842 + "__id__": 841 }, "limitY": { - "__id__": 843 + "__id__": 842 }, "limitZ": { - "__id__": 844 + "__id__": 843 }, "limit": { - "__id__": 845 + "__id__": 844 }, "dampen": 3, "separateAxes": false, @@ -22430,13 +22408,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 847 + "__id__": 846 }, "y": { - "__id__": 848 + "__id__": 847 }, "z": { - "__id__": 849 + "__id__": 848 } }, { @@ -22467,10 +22445,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 851 + "__id__": 850 }, "startFrame": { - "__id__": 853 + "__id__": 852 }, "cycleCount": 6, "_flipU": 0, @@ -22483,7 +22461,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 852 + "__id__": 851 }, "multiplier": 1 }, @@ -22550,25 +22528,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 856 + "__id__": 855 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 857 + "__id__": 856 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 858 + "__id__": 857 }, "colorOvertime": { - "__id__": 859 + "__id__": 858 }, "_space": 0, "_particleSystem": { - "__id__": 807 + "__id__": 806 } }, { @@ -22629,7 +22607,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 805 }, "_enabled": true, "__prefab": null, @@ -22641,7 +22619,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 805 }, "_enabled": true, "__prefab": null, @@ -22669,13 +22647,13 @@ "_active": true, "_components": [ { - "__id__": 864 + "__id__": 863 + }, + { + "__id__": 917 }, { "__id__": 918 - }, - { - "__id__": 919 } ], "_prefab": null, @@ -22714,7 +22692,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 862 }, "_enabled": true, "__prefab": null, @@ -22726,60 +22704,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 865 + "__id__": 864 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 866 + "__id__": 865 }, "startSize": { - "__id__": 866 + "__id__": 865 }, "startSizeY": { - "__id__": 867 + "__id__": 866 }, "startSizeZ": { - "__id__": 868 + "__id__": 867 }, "startSpeed": { - "__id__": 869 + "__id__": 868 }, "startRotation3D": false, "startRotationX": { - "__id__": 870 + "__id__": 869 }, "startRotationY": { - "__id__": 871 + "__id__": 870 }, "startRotationZ": { - "__id__": 872 + "__id__": 871 }, "startRotation": { - "__id__": 872 + "__id__": 871 }, "startDelay": { - "__id__": 873 + "__id__": 872 }, "startLifetime": { - "__id__": 874 + "__id__": 873 }, "duration": 5, "loop": true, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 875 + "__id__": 874 }, "rateOverTime": { - "__id__": 876 + "__id__": 875 }, "rateOverDistance": { - "__id__": 877 + "__id__": 876 }, "bursts": [ { - "__id__": 878 + "__id__": 877 } ], "_renderCulling": false, @@ -22790,37 +22768,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 880 + "__id__": 879 }, "_shapeModule": { - "__id__": 882 + "__id__": 881 }, "_sizeOvertimeModule": { - "__id__": 884 + "__id__": 883 }, "_velocityOvertimeModule": { - "__id__": 889 + "__id__": 888 }, "_forceOvertimeModule": { - "__id__": 894 + "__id__": 893 }, "_limitVelocityOvertimeModule": { - "__id__": 898 + "__id__": 897 }, "_rotationOvertimeModule": { - "__id__": 903 + "__id__": 902 }, "_textureAnimationModule": { - "__id__": 907 + "__id__": 906 }, "_noiseModule": { - "__id__": 911 + "__id__": 910 }, "_trailModule": { - "__id__": 912 + "__id__": 911 }, "renderer": { - "__id__": 917 + "__id__": 916 }, "_prewarm": false, "_capacity": 100, @@ -22916,7 +22894,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 879 + "__id__": 878 } }, { @@ -22929,7 +22907,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 881 + "__id__": 880 } }, { @@ -22958,7 +22936,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 883 + "__id__": 882 }, "length": 5, "boxThickness": { @@ -22999,16 +22977,16 @@ "_enable": false, "separateAxes": false, "size": { - "__id__": 885 + "__id__": 884 }, "x": { - "__id__": 886 + "__id__": 885 }, "y": { - "__id__": 887 + "__id__": 886 }, "z": { - "__id__": 888 + "__id__": 887 } }, { @@ -23039,16 +23017,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 890 + "__id__": 889 }, "y": { - "__id__": 891 + "__id__": 890 }, "z": { - "__id__": 892 + "__id__": 891 }, "speedModifier": { - "__id__": 893 + "__id__": 892 }, "space": 1 }, @@ -23080,13 +23058,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 895 + "__id__": 894 }, "y": { - "__id__": 896 + "__id__": 895 }, "z": { - "__id__": 897 + "__id__": 896 }, "space": 1 }, @@ -23112,16 +23090,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 899 + "__id__": 898 }, "limitY": { - "__id__": 900 + "__id__": 899 }, "limitZ": { - "__id__": 901 + "__id__": 900 }, "limit": { - "__id__": 902 + "__id__": 901 }, "dampen": 3, "separateAxes": false, @@ -23156,13 +23134,13 @@ "_enable": false, "_separateAxes": false, "x": { - "__id__": 904 + "__id__": 903 }, "y": { - "__id__": 905 + "__id__": 904 }, "z": { - "__id__": 906 + "__id__": 905 } }, { @@ -23193,10 +23171,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 908 + "__id__": 907 }, "startFrame": { - "__id__": 910 + "__id__": 909 }, "cycleCount": 6, "_flipU": 0, @@ -23209,7 +23187,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 909 + "__id__": 908 }, "multiplier": 1 }, @@ -23276,25 +23254,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 913 + "__id__": 912 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 914 + "__id__": 913 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 915 + "__id__": 914 }, "colorOvertime": { - "__id__": 916 + "__id__": 915 }, "_space": 0, "_particleSystem": { - "__id__": 864 + "__id__": 863 } }, { @@ -23355,7 +23333,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 862 }, "_enabled": true, "__prefab": null, @@ -23367,7 +23345,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 863 + "__id__": 862 }, "_enabled": true, "__prefab": null, @@ -23393,22 +23371,22 @@ }, "_children": [ { - "__id__": 921 + "__id__": 920 }, { - "__id__": 937 + "__id__": 936 }, { - "__id__": 956 + "__id__": 955 }, { - "__id__": 975 + "__id__": 974 } ], "_active": true, "_components": [ { - "__id__": 994 + "__id__": 993 } ], "_prefab": null, @@ -23447,26 +23425,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 920 + "__id__": 919 }, "_children": [ { - "__id__": 922 + "__id__": 921 }, { - "__id__": 929 + "__id__": 928 }, { - "__id__": 931 + "__id__": 930 } ], "_active": true, "_components": [ { - "__id__": 933 + "__id__": 932 }, { - "__id__": 934 + "__id__": 933 } ], "_prefab": null, @@ -23505,23 +23483,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 921 + "__id__": 920 }, "_children": [ { - "__id__": 923 + "__id__": 922 } ], "_active": true, "_components": [ + { + "__id__": 925 + }, { "__id__": 926 }, { "__id__": 927 - }, - { - "__id__": 928 } ], "_prefab": null, @@ -23560,16 +23538,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 922 + "__id__": 921 }, "_children": [], "_active": true, "_components": [ { - "__id__": 924 + "__id__": 923 }, { - "__id__": 925 + "__id__": 924 } ], "_prefab": null, @@ -23608,7 +23586,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 923 + "__id__": 922 }, "_enabled": true, "__prefab": null, @@ -23630,7 +23608,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 923 + "__id__": 922 }, "_enabled": true, "__prefab": null, @@ -23669,7 +23647,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 921 }, "_enabled": true, "__prefab": null, @@ -23691,7 +23669,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 921 }, "_enabled": true, "__prefab": null, @@ -23719,7 +23697,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 921 }, "_enabled": true, "__prefab": null, @@ -23747,13 +23725,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 921 + "__id__": 920 }, "_children": [], "_active": true, "_components": [ { - "__id__": 930 + "__id__": 929 } ], "_prefab": null, @@ -23792,7 +23770,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 929 + "__id__": 928 }, "_enabled": true, "__prefab": null, @@ -23814,13 +23792,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 921 + "__id__": 920 }, "_children": [], "_active": true, "_components": [ { - "__id__": 932 + "__id__": 931 } ], "_prefab": null, @@ -23859,7 +23837,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 931 + "__id__": 930 }, "_enabled": true, "__prefab": null, @@ -23881,7 +23859,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 921 + "__id__": 920 }, "_enabled": true, "__prefab": null, @@ -23903,31 +23881,31 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 921 + "__id__": 920 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 927 + "__id__": 926 }, "_sprite": { - "__id__": 925 + "__id__": 924 }, "_patrolPoint1": { - "__id__": 929 + "__id__": 928 }, "_patrolPoint2": { - "__id__": 931 + "__id__": 930 }, "_speed": 50, "_requireGoal": 3, "_curveY": true, "_patrolCurve": { - "__id__": 935 + "__id__": 934 }, "_multiplierCurve": 120, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "54980d2c-26e7-4de4-9630-e9e57914a9ae", "__expectedType__": "cc.AudioClip" }, "_id": "9cJaywMb9Fr4Z0zlx1Pdcb" @@ -23935,7 +23913,7 @@ { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 936 + "__id__": 935 } }, { @@ -23979,29 +23957,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 920 + "__id__": 919 }, "_children": [ { - "__id__": 938 + "__id__": 937 }, { - "__id__": 941 + "__id__": 940 }, { - "__id__": 948 + "__id__": 947 }, { - "__id__": 950 + "__id__": 949 } ], "_active": true, "_components": [ { - "__id__": 952 + "__id__": 951 }, { - "__id__": 953 + "__id__": 952 } ], "_prefab": null, @@ -24040,16 +24018,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 937 + "__id__": 936 }, "_children": [], "_active": true, "_components": [ { - "__id__": 939 + "__id__": 938 }, { - "__id__": 940 + "__id__": 939 } ], "_prefab": null, @@ -24088,7 +24066,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 938 + "__id__": 937 }, "_enabled": true, "__prefab": null, @@ -24110,7 +24088,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 938 + "__id__": 937 }, "_enabled": true, "__prefab": null, @@ -24149,23 +24127,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 937 + "__id__": 936 }, "_children": [ { - "__id__": 942 + "__id__": 941 } ], "_active": true, "_components": [ + { + "__id__": 944 + }, { "__id__": 945 }, { "__id__": 946 - }, - { - "__id__": 947 } ], "_prefab": null, @@ -24204,16 +24182,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 941 + "__id__": 940 }, "_children": [], "_active": true, "_components": [ { - "__id__": 943 + "__id__": 942 }, { - "__id__": 944 + "__id__": 943 } ], "_prefab": null, @@ -24252,7 +24230,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 942 + "__id__": 941 }, "_enabled": true, "__prefab": null, @@ -24274,7 +24252,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 942 + "__id__": 941 }, "_enabled": true, "__prefab": null, @@ -24313,7 +24291,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 940 }, "_enabled": true, "__prefab": null, @@ -24335,7 +24313,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 940 }, "_enabled": true, "__prefab": null, @@ -24363,7 +24341,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 940 }, "_enabled": true, "__prefab": null, @@ -24391,13 +24369,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 937 + "__id__": 936 }, "_children": [], "_active": true, "_components": [ { - "__id__": 949 + "__id__": 948 } ], "_prefab": null, @@ -24436,7 +24414,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 948 + "__id__": 947 }, "_enabled": true, "__prefab": null, @@ -24458,13 +24436,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 937 + "__id__": 936 }, "_children": [], "_active": true, "_components": [ { - "__id__": 951 + "__id__": 950 } ], "_prefab": null, @@ -24503,7 +24481,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 950 + "__id__": 949 }, "_enabled": true, "__prefab": null, @@ -24525,7 +24503,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 937 + "__id__": 936 }, "_enabled": true, "__prefab": null, @@ -24547,31 +24525,31 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 937 + "__id__": 936 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 946 + "__id__": 945 }, "_sprite": { - "__id__": 944 + "__id__": 943 }, "_patrolPoint1": { - "__id__": 948 + "__id__": 947 }, "_patrolPoint2": { - "__id__": 950 + "__id__": 949 }, "_speed": 50, "_requireGoal": 6, "_curveY": false, "_patrolCurve": { - "__id__": 954 + "__id__": 953 }, "_multiplierCurve": 100, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "54980d2c-26e7-4de4-9630-e9e57914a9ae", "__expectedType__": "cc.AudioClip" }, "_id": "f2+Qohf8JAhZ3Xqi9g9xV1" @@ -24579,7 +24557,7 @@ { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 955 + "__id__": 954 } }, { @@ -24623,29 +24601,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 920 + "__id__": 919 }, "_children": [ { - "__id__": 957 + "__id__": 956 }, { - "__id__": 960 + "__id__": 959 }, { - "__id__": 967 + "__id__": 966 }, { - "__id__": 969 + "__id__": 968 } ], "_active": true, "_components": [ { - "__id__": 971 + "__id__": 970 }, { - "__id__": 972 + "__id__": 971 } ], "_prefab": null, @@ -24684,16 +24662,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 955 }, "_children": [], "_active": true, "_components": [ { - "__id__": 958 + "__id__": 957 }, { - "__id__": 959 + "__id__": 958 } ], "_prefab": null, @@ -24732,7 +24710,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 956 }, "_enabled": true, "__prefab": null, @@ -24754,7 +24732,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 956 }, "_enabled": true, "__prefab": null, @@ -24793,23 +24771,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 955 }, "_children": [ { - "__id__": 961 + "__id__": 960 } ], "_active": true, "_components": [ + { + "__id__": 963 + }, { "__id__": 964 }, { "__id__": 965 - }, - { - "__id__": 966 } ], "_prefab": null, @@ -24848,16 +24826,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 960 + "__id__": 959 }, "_children": [], "_active": true, "_components": [ { - "__id__": 962 + "__id__": 961 }, { - "__id__": 963 + "__id__": 962 } ], "_prefab": null, @@ -24896,7 +24874,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 961 + "__id__": 960 }, "_enabled": true, "__prefab": null, @@ -24918,7 +24896,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 961 + "__id__": 960 }, "_enabled": true, "__prefab": null, @@ -24957,7 +24935,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 959 }, "_enabled": true, "__prefab": null, @@ -24979,7 +24957,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 959 }, "_enabled": true, "__prefab": null, @@ -25007,7 +24985,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 959 }, "_enabled": true, "__prefab": null, @@ -25035,13 +25013,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 955 }, "_children": [], "_active": true, "_components": [ { - "__id__": 968 + "__id__": 967 } ], "_prefab": null, @@ -25080,7 +25058,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 967 + "__id__": 966 }, "_enabled": true, "__prefab": null, @@ -25102,13 +25080,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 955 }, "_children": [], "_active": true, "_components": [ { - "__id__": 970 + "__id__": 969 } ], "_prefab": null, @@ -25147,7 +25125,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 969 + "__id__": 968 }, "_enabled": true, "__prefab": null, @@ -25169,7 +25147,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 956 + "__id__": 955 }, "_enabled": true, "__prefab": null, @@ -25191,31 +25169,31 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 956 + "__id__": 955 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 965 + "__id__": 964 }, "_sprite": { - "__id__": 963 + "__id__": 962 }, "_patrolPoint1": { - "__id__": 967 + "__id__": 966 }, "_patrolPoint2": { - "__id__": 969 + "__id__": 968 }, "_speed": 50, "_requireGoal": 9, "_curveY": false, "_patrolCurve": { - "__id__": 973 + "__id__": 972 }, "_multiplierCurve": 100, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "54980d2c-26e7-4de4-9630-e9e57914a9ae", "__expectedType__": "cc.AudioClip" }, "_id": "99Yu77Ej9N4JRBZjD+OE2I" @@ -25223,7 +25201,7 @@ { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 974 + "__id__": 973 } }, { @@ -25267,29 +25245,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 920 + "__id__": 919 }, "_children": [ { - "__id__": 976 + "__id__": 975 }, { - "__id__": 979 + "__id__": 978 }, { - "__id__": 986 + "__id__": 985 }, { - "__id__": 988 + "__id__": 987 } ], "_active": true, "_components": [ { - "__id__": 990 + "__id__": 989 }, { - "__id__": 991 + "__id__": 990 } ], "_prefab": null, @@ -25328,16 +25306,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 975 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 977 + "__id__": 976 }, { - "__id__": 978 + "__id__": 977 } ], "_prefab": null, @@ -25376,7 +25354,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 976 + "__id__": 975 }, "_enabled": true, "__prefab": null, @@ -25398,7 +25376,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 976 + "__id__": 975 }, "_enabled": true, "__prefab": null, @@ -25437,23 +25415,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 975 + "__id__": 974 }, "_children": [ { - "__id__": 980 + "__id__": 979 } ], "_active": true, "_components": [ + { + "__id__": 982 + }, { "__id__": 983 }, { "__id__": 984 - }, - { - "__id__": 985 } ], "_prefab": null, @@ -25492,16 +25470,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 979 + "__id__": 978 }, "_children": [], "_active": true, "_components": [ { - "__id__": 981 + "__id__": 980 }, { - "__id__": 982 + "__id__": 981 } ], "_prefab": null, @@ -25540,7 +25518,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 980 + "__id__": 979 }, "_enabled": true, "__prefab": null, @@ -25562,7 +25540,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 980 + "__id__": 979 }, "_enabled": true, "__prefab": null, @@ -25601,7 +25579,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 978 }, "_enabled": true, "__prefab": null, @@ -25623,7 +25601,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 978 }, "_enabled": true, "__prefab": null, @@ -25651,7 +25629,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 978 }, "_enabled": true, "__prefab": null, @@ -25679,13 +25657,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 975 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 987 + "__id__": 986 } ], "_prefab": null, @@ -25724,7 +25702,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 986 + "__id__": 985 }, "_enabled": true, "__prefab": null, @@ -25746,13 +25724,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 975 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 989 + "__id__": 988 } ], "_prefab": null, @@ -25791,7 +25769,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 988 + "__id__": 987 }, "_enabled": true, "__prefab": null, @@ -25813,7 +25791,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 975 + "__id__": 974 }, "_enabled": true, "__prefab": null, @@ -25835,31 +25813,31 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 975 + "__id__": 974 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 984 + "__id__": 983 }, "_sprite": { - "__id__": 982 + "__id__": 981 }, "_patrolPoint1": { - "__id__": 986 + "__id__": 985 }, "_patrolPoint2": { - "__id__": 988 + "__id__": 987 }, "_speed": 50, "_requireGoal": 12, "_curveY": false, "_patrolCurve": { - "__id__": 992 + "__id__": 991 }, "_multiplierCurve": 100, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "54980d2c-26e7-4de4-9630-e9e57914a9ae", "__expectedType__": "cc.AudioClip" }, "_id": "2bedVMe25Ou4KcU4DmnB4q" @@ -25867,7 +25845,7 @@ { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 993 + "__id__": 992 } }, { @@ -25911,7 +25889,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 920 + "__id__": 919 }, "_enabled": true, "__prefab": null, @@ -25937,22 +25915,22 @@ }, "_children": [ { - "__id__": 996 + "__id__": 995 }, { - "__id__": 1011 + "__id__": 1010 }, { - "__id__": 1026 + "__id__": 1025 }, { - "__id__": 1041 + "__id__": 1040 } ], "_active": true, "_components": [ { - "__id__": 1056 + "__id__": 1055 } ], "_prefab": null, @@ -25991,23 +25969,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 995 + "__id__": 994 }, "_children": [ { - "__id__": 997 + "__id__": 996 } ], "_active": true, "_components": [ { - "__id__": 1006 + "__id__": 1005 + }, + { + "__id__": 1008 }, { "__id__": 1009 - }, - { - "__id__": 1010 } ], "_prefab": null, @@ -26046,29 +26024,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 996 + "__id__": 995 }, "_children": [ { - "__id__": 998 + "__id__": 997 }, { - "__id__": 1001 + "__id__": 1000 } ], "_active": true, "_components": [ + { + "__id__": 1003 + }, { "__id__": 1004 }, { - "__id__": 1005 + "__id__": 1006 }, { "__id__": 1007 - }, - { - "__id__": 1008 } ], "_prefab": null, @@ -26107,16 +26085,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 997 + "__id__": 996 }, "_children": [], "_active": true, "_components": [ { - "__id__": 999 + "__id__": 998 }, { - "__id__": 1000 + "__id__": 999 } ], "_prefab": null, @@ -26155,7 +26133,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 998 + "__id__": 997 }, "_enabled": true, "__prefab": null, @@ -26177,7 +26155,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 998 + "__id__": 997 }, "_enabled": true, "__prefab": null, @@ -26216,16 +26194,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 997 + "__id__": 996 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1002 + "__id__": 1001 }, { - "__id__": 1003 + "__id__": 1002 } ], "_prefab": null, @@ -26264,7 +26242,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1001 + "__id__": 1000 }, "_enabled": true, "__prefab": null, @@ -26286,7 +26264,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1001 + "__id__": 1000 }, "_enabled": true, "__prefab": null, @@ -26325,7 +26303,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 997 + "__id__": 996 }, "_enabled": true, "__prefab": null, @@ -26353,7 +26331,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 997 + "__id__": 996 }, "_enabled": true, "__prefab": null, @@ -26369,7 +26347,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 1006 + "__id__": 1005 }, "_enableLimit": true, "_lowerAngle": -60, @@ -26385,7 +26363,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 996 + "__id__": 995 }, "_enabled": true, "__prefab": null, @@ -26413,7 +26391,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 997 + "__id__": 996 }, "_enabled": true, "__prefab": null, @@ -26493,7 +26471,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 997 + "__id__": 996 }, "_enabled": true, "__prefab": null, @@ -26515,21 +26493,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 996 + "__id__": 995 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 1010 + "__id__": 1009 }, "_hingeJoint": { - "__id__": 1005 + "__id__": 1004 }, "_motorSpeedActive": -10000, "_motorSpeedDeActive": 10000, "side": 0, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "68e30263-71ff-497f-893b-74d6d5023a8b", "__expectedType__": "cc.AudioClip" }, "_id": "dbyGJf4ZlNuqnbz9gSPD7E" @@ -26540,7 +26518,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 996 + "__id__": 995 }, "_enabled": true, "__prefab": null, @@ -26563,23 +26541,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 995 + "__id__": 994 }, "_children": [ { - "__id__": 1012 + "__id__": 1011 } ], "_active": true, "_components": [ { - "__id__": 1021 + "__id__": 1020 + }, + { + "__id__": 1023 }, { "__id__": 1024 - }, - { - "__id__": 1025 } ], "_prefab": null, @@ -26618,29 +26596,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1011 + "__id__": 1010 }, "_children": [ { - "__id__": 1013 + "__id__": 1012 }, { - "__id__": 1016 + "__id__": 1015 } ], "_active": true, "_components": [ + { + "__id__": 1018 + }, { "__id__": 1019 }, { - "__id__": 1020 + "__id__": 1021 }, { "__id__": 1022 - }, - { - "__id__": 1023 } ], "_prefab": null, @@ -26679,16 +26657,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1012 + "__id__": 1011 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1014 + "__id__": 1013 }, { - "__id__": 1015 + "__id__": 1014 } ], "_prefab": null, @@ -26727,7 +26705,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1013 + "__id__": 1012 }, "_enabled": true, "__prefab": null, @@ -26749,7 +26727,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1013 + "__id__": 1012 }, "_enabled": true, "__prefab": null, @@ -26788,16 +26766,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1012 + "__id__": 1011 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1017 + "__id__": 1016 }, { - "__id__": 1018 + "__id__": 1017 } ], "_prefab": null, @@ -26836,7 +26814,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1016 + "__id__": 1015 }, "_enabled": true, "__prefab": null, @@ -26858,7 +26836,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1016 + "__id__": 1015 }, "_enabled": true, "__prefab": null, @@ -26897,7 +26875,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1012 + "__id__": 1011 }, "_enabled": true, "__prefab": null, @@ -26925,7 +26903,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1012 + "__id__": 1011 }, "_enabled": true, "__prefab": null, @@ -26941,7 +26919,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 1021 + "__id__": 1020 }, "_enableLimit": true, "_lowerAngle": 0, @@ -26957,7 +26935,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1011 + "__id__": 1010 }, "_enabled": true, "__prefab": null, @@ -26985,7 +26963,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1012 + "__id__": 1011 }, "_enabled": true, "__prefab": null, @@ -27080,7 +27058,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1012 + "__id__": 1011 }, "_enabled": true, "__prefab": null, @@ -27102,21 +27080,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1011 + "__id__": 1010 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 1025 + "__id__": 1024 }, "_hingeJoint": { - "__id__": 1020 + "__id__": 1019 }, "_motorSpeedActive": 10000, "_motorSpeedDeActive": -10000, "side": 1, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "68e30263-71ff-497f-893b-74d6d5023a8b", "__expectedType__": "cc.AudioClip" }, "_id": "c2LBQkbqpMS7ebeAdAWNd2" @@ -27127,7 +27105,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1011 + "__id__": 1010 }, "_enabled": true, "__prefab": null, @@ -27150,23 +27128,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 995 + "__id__": 994 }, "_children": [ { - "__id__": 1027 + "__id__": 1026 } ], "_active": true, "_components": [ { - "__id__": 1036 + "__id__": 1035 + }, + { + "__id__": 1038 }, { "__id__": 1039 - }, - { - "__id__": 1040 } ], "_prefab": null, @@ -27205,29 +27183,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1026 + "__id__": 1025 }, "_children": [ { - "__id__": 1028 + "__id__": 1027 }, { - "__id__": 1031 + "__id__": 1030 } ], "_active": true, "_components": [ + { + "__id__": 1033 + }, { "__id__": 1034 }, { - "__id__": 1035 + "__id__": 1036 }, { "__id__": 1037 - }, - { - "__id__": 1038 } ], "_prefab": null, @@ -27266,16 +27244,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1027 + "__id__": 1026 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1029 + "__id__": 1028 }, { - "__id__": 1030 + "__id__": 1029 } ], "_prefab": null, @@ -27314,7 +27292,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1028 + "__id__": 1027 }, "_enabled": true, "__prefab": null, @@ -27336,7 +27314,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1028 + "__id__": 1027 }, "_enabled": true, "__prefab": null, @@ -27375,16 +27353,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1027 + "__id__": 1026 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1032 + "__id__": 1031 }, { - "__id__": 1033 + "__id__": 1032 } ], "_prefab": null, @@ -27423,7 +27401,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1031 + "__id__": 1030 }, "_enabled": true, "__prefab": null, @@ -27445,7 +27423,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1031 + "__id__": 1030 }, "_enabled": true, "__prefab": null, @@ -27484,7 +27462,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1027 + "__id__": 1026 }, "_enabled": true, "__prefab": null, @@ -27512,7 +27490,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1027 + "__id__": 1026 }, "_enabled": true, "__prefab": null, @@ -27528,7 +27506,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 1036 + "__id__": 1035 }, "_enableLimit": true, "_lowerAngle": 0, @@ -27544,7 +27522,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1026 + "__id__": 1025 }, "_enabled": true, "__prefab": null, @@ -27572,7 +27550,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1027 + "__id__": 1026 }, "_enabled": true, "__prefab": null, @@ -27667,7 +27645,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1027 + "__id__": 1026 }, "_enabled": true, "__prefab": null, @@ -27689,21 +27667,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1026 + "__id__": 1025 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 1040 + "__id__": 1039 }, "_hingeJoint": { - "__id__": 1035 + "__id__": 1034 }, "_motorSpeedActive": 10000, "_motorSpeedDeActive": -10000, "side": 1, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "68e30263-71ff-497f-893b-74d6d5023a8b", "__expectedType__": "cc.AudioClip" }, "_id": "14hqKrgTVA0r/f0mOYZ/aP" @@ -27714,7 +27692,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1026 + "__id__": 1025 }, "_enabled": true, "__prefab": null, @@ -27737,23 +27715,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 995 + "__id__": 994 }, "_children": [ { - "__id__": 1042 + "__id__": 1041 } ], "_active": true, "_components": [ { - "__id__": 1051 + "__id__": 1050 + }, + { + "__id__": 1053 }, { "__id__": 1054 - }, - { - "__id__": 1055 } ], "_prefab": null, @@ -27792,29 +27770,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1041 + "__id__": 1040 }, "_children": [ { - "__id__": 1043 + "__id__": 1042 }, { - "__id__": 1046 + "__id__": 1045 } ], "_active": true, "_components": [ + { + "__id__": 1048 + }, { "__id__": 1049 }, { - "__id__": 1050 + "__id__": 1051 }, { "__id__": 1052 - }, - { - "__id__": 1053 } ], "_prefab": null, @@ -27853,16 +27831,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1042 + "__id__": 1041 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1044 + "__id__": 1043 }, { - "__id__": 1045 + "__id__": 1044 } ], "_prefab": null, @@ -27901,7 +27879,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1043 + "__id__": 1042 }, "_enabled": true, "__prefab": null, @@ -27923,7 +27901,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1043 + "__id__": 1042 }, "_enabled": true, "__prefab": null, @@ -27962,16 +27940,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1042 + "__id__": 1041 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1047 + "__id__": 1046 }, { - "__id__": 1048 + "__id__": 1047 } ], "_prefab": null, @@ -28010,7 +27988,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1046 + "__id__": 1045 }, "_enabled": true, "__prefab": null, @@ -28032,7 +28010,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1046 + "__id__": 1045 }, "_enabled": true, "__prefab": null, @@ -28071,7 +28049,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1042 + "__id__": 1041 }, "_enabled": true, "__prefab": null, @@ -28099,7 +28077,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1042 + "__id__": 1041 }, "_enabled": true, "__prefab": null, @@ -28115,7 +28093,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 1051 + "__id__": 1050 }, "_enableLimit": true, "_lowerAngle": -60, @@ -28131,7 +28109,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1041 + "__id__": 1040 }, "_enabled": true, "__prefab": null, @@ -28159,7 +28137,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1042 + "__id__": 1041 }, "_enabled": true, "__prefab": null, @@ -28239,7 +28217,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1042 + "__id__": 1041 }, "_enabled": true, "__prefab": null, @@ -28261,21 +28239,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1041 + "__id__": 1040 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 1055 + "__id__": 1054 }, "_hingeJoint": { - "__id__": 1050 + "__id__": 1049 }, "_motorSpeedActive": -10000, "_motorSpeedDeActive": 10000, "side": 0, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "68e30263-71ff-497f-893b-74d6d5023a8b", "__expectedType__": "cc.AudioClip" }, "_id": "a3/6ZctnhAFb+E8W1w8jJR" @@ -28286,7 +28264,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1041 + "__id__": 1040 }, "_enabled": true, "__prefab": null, @@ -28309,7 +28287,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 995 + "__id__": 994 }, "_enabled": true, "__prefab": null, @@ -28336,6 +28314,9 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 1057 + }, { "__id__": 1058 }, @@ -28344,9 +28325,6 @@ }, { "__id__": 1060 - }, - { - "__id__": 1061 } ], "_prefab": null, @@ -28385,7 +28363,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1056 }, "_enabled": true, "__prefab": null, @@ -28407,7 +28385,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1056 }, "_enabled": true, "__prefab": null, @@ -28435,12 +28413,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1056 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 1059 + "__id__": 1058 }, "_id": "63rfzsm3REkprs+s68PCRK" }, @@ -28450,7 +28428,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1056 }, "_enabled": true, "__prefab": null, @@ -28482,205 +28460,205 @@ }, "_children": [ { - "__id__": 1063 + "__id__": 1062 }, { - "__id__": 1065 + "__id__": 1064 }, { - "__id__": 1067 + "__id__": 1066 }, { - "__id__": 1069 + "__id__": 1068 }, { - "__id__": 1071 + "__id__": 1070 }, { - "__id__": 1073 + "__id__": 1072 }, { - "__id__": 1075 + "__id__": 1074 }, { - "__id__": 1077 + "__id__": 1076 }, { - "__id__": 1079 + "__id__": 1078 }, { - "__id__": 1081 + "__id__": 1080 }, { - "__id__": 1083 + "__id__": 1082 }, { - "__id__": 1085 + "__id__": 1084 }, { - "__id__": 1087 + "__id__": 1086 }, { - "__id__": 1089 + "__id__": 1088 }, { - "__id__": 1091 + "__id__": 1090 }, { - "__id__": 1093 + "__id__": 1092 }, { - "__id__": 1095 + "__id__": 1094 }, { - "__id__": 1097 + "__id__": 1096 }, { - "__id__": 1099 + "__id__": 1098 }, { - "__id__": 1101 + "__id__": 1100 }, { - "__id__": 1103 + "__id__": 1102 }, { - "__id__": 1105 + "__id__": 1104 }, { - "__id__": 1107 + "__id__": 1106 }, { - "__id__": 1109 + "__id__": 1108 }, { - "__id__": 1111 + "__id__": 1110 }, { - "__id__": 1113 + "__id__": 1112 }, { - "__id__": 1115 + "__id__": 1114 }, { - "__id__": 1117 + "__id__": 1116 }, { - "__id__": 1119 + "__id__": 1118 }, { - "__id__": 1121 + "__id__": 1120 }, { - "__id__": 1123 + "__id__": 1122 }, { - "__id__": 1125 + "__id__": 1124 }, { - "__id__": 1127 + "__id__": 1126 }, { - "__id__": 1129 + "__id__": 1128 }, { - "__id__": 1131 + "__id__": 1130 }, { - "__id__": 1133 + "__id__": 1132 }, { - "__id__": 1135 + "__id__": 1134 }, { - "__id__": 1137 + "__id__": 1136 }, { - "__id__": 1139 + "__id__": 1138 }, { - "__id__": 1141 + "__id__": 1140 }, { - "__id__": 1143 + "__id__": 1142 }, { - "__id__": 1145 + "__id__": 1144 }, { - "__id__": 1147 + "__id__": 1146 }, { - "__id__": 1149 + "__id__": 1148 }, { - "__id__": 1151 + "__id__": 1150 }, { - "__id__": 1153 + "__id__": 1152 }, { - "__id__": 1155 + "__id__": 1154 }, { - "__id__": 1157 + "__id__": 1156 }, { - "__id__": 1159 + "__id__": 1158 }, { - "__id__": 1161 + "__id__": 1160 }, { - "__id__": 1163 + "__id__": 1162 }, { - "__id__": 1165 + "__id__": 1164 }, { - "__id__": 1167 + "__id__": 1166 }, { - "__id__": 1169 + "__id__": 1168 }, { - "__id__": 1171 + "__id__": 1170 }, { - "__id__": 1173 + "__id__": 1172 }, { - "__id__": 1175 + "__id__": 1174 }, { - "__id__": 1177 + "__id__": 1176 }, { - "__id__": 1179 + "__id__": 1178 }, { - "__id__": 1181 + "__id__": 1180 }, { - "__id__": 1183 + "__id__": 1182 }, { - "__id__": 1185 + "__id__": 1184 }, { - "__id__": 1187 + "__id__": 1186 }, { - "__id__": 1189 + "__id__": 1188 } ], "_active": true, "_components": [ { - "__id__": 1191 + "__id__": 1190 }, { - "__id__": 1192 + "__id__": 1191 } ], "_prefab": null, @@ -28719,13 +28697,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1064 + "__id__": 1063 } ], "_prefab": null, @@ -28764,7 +28742,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1063 + "__id__": 1062 }, "_enabled": true, "__prefab": null, @@ -28786,13 +28764,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1066 + "__id__": 1065 } ], "_prefab": null, @@ -28831,7 +28809,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1065 + "__id__": 1064 }, "_enabled": true, "__prefab": null, @@ -28853,13 +28831,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1068 + "__id__": 1067 } ], "_prefab": null, @@ -28898,7 +28876,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1067 + "__id__": 1066 }, "_enabled": true, "__prefab": null, @@ -28920,13 +28898,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1070 + "__id__": 1069 } ], "_prefab": null, @@ -28965,7 +28943,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1068 }, "_enabled": true, "__prefab": null, @@ -28987,13 +28965,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1072 + "__id__": 1071 } ], "_prefab": null, @@ -29032,7 +29010,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1071 + "__id__": 1070 }, "_enabled": true, "__prefab": null, @@ -29054,13 +29032,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1074 + "__id__": 1073 } ], "_prefab": null, @@ -29099,7 +29077,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1073 + "__id__": 1072 }, "_enabled": true, "__prefab": null, @@ -29121,13 +29099,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1076 + "__id__": 1075 } ], "_prefab": null, @@ -29166,7 +29144,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1075 + "__id__": 1074 }, "_enabled": true, "__prefab": null, @@ -29188,13 +29166,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1078 + "__id__": 1077 } ], "_prefab": null, @@ -29233,7 +29211,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1077 + "__id__": 1076 }, "_enabled": true, "__prefab": null, @@ -29255,13 +29233,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1080 + "__id__": 1079 } ], "_prefab": null, @@ -29300,7 +29278,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1079 + "__id__": 1078 }, "_enabled": true, "__prefab": null, @@ -29322,13 +29300,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1082 + "__id__": 1081 } ], "_prefab": null, @@ -29367,7 +29345,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1081 + "__id__": 1080 }, "_enabled": true, "__prefab": null, @@ -29389,13 +29367,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1084 + "__id__": 1083 } ], "_prefab": null, @@ -29434,7 +29412,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1083 + "__id__": 1082 }, "_enabled": true, "__prefab": null, @@ -29456,13 +29434,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1086 + "__id__": 1085 } ], "_prefab": null, @@ -29501,7 +29479,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1085 + "__id__": 1084 }, "_enabled": true, "__prefab": null, @@ -29523,13 +29501,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1088 + "__id__": 1087 } ], "_prefab": null, @@ -29568,7 +29546,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1086 }, "_enabled": true, "__prefab": null, @@ -29590,13 +29568,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1090 + "__id__": 1089 } ], "_prefab": null, @@ -29635,7 +29613,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1089 + "__id__": 1088 }, "_enabled": true, "__prefab": null, @@ -29657,13 +29635,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1092 + "__id__": 1091 } ], "_prefab": null, @@ -29702,7 +29680,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1091 + "__id__": 1090 }, "_enabled": true, "__prefab": null, @@ -29724,13 +29702,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1094 + "__id__": 1093 } ], "_prefab": null, @@ -29769,7 +29747,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1093 + "__id__": 1092 }, "_enabled": true, "__prefab": null, @@ -29791,13 +29769,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1096 + "__id__": 1095 } ], "_prefab": null, @@ -29836,7 +29814,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1095 + "__id__": 1094 }, "_enabled": true, "__prefab": null, @@ -29858,13 +29836,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1098 + "__id__": 1097 } ], "_prefab": null, @@ -29903,7 +29881,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1097 + "__id__": 1096 }, "_enabled": true, "__prefab": null, @@ -29925,13 +29903,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1100 + "__id__": 1099 } ], "_prefab": null, @@ -29970,7 +29948,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1099 + "__id__": 1098 }, "_enabled": true, "__prefab": null, @@ -29992,13 +29970,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1102 + "__id__": 1101 } ], "_prefab": null, @@ -30037,7 +30015,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1101 + "__id__": 1100 }, "_enabled": true, "__prefab": null, @@ -30059,13 +30037,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1104 + "__id__": 1103 } ], "_prefab": null, @@ -30104,7 +30082,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1103 + "__id__": 1102 }, "_enabled": true, "__prefab": null, @@ -30126,13 +30104,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1106 + "__id__": 1105 } ], "_prefab": null, @@ -30171,7 +30149,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1105 + "__id__": 1104 }, "_enabled": true, "__prefab": null, @@ -30193,13 +30171,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1108 + "__id__": 1107 } ], "_prefab": null, @@ -30238,7 +30216,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1107 + "__id__": 1106 }, "_enabled": true, "__prefab": null, @@ -30260,13 +30238,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1110 + "__id__": 1109 } ], "_prefab": null, @@ -30305,7 +30283,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1109 + "__id__": 1108 }, "_enabled": true, "__prefab": null, @@ -30327,13 +30305,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1112 + "__id__": 1111 } ], "_prefab": null, @@ -30372,7 +30350,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1111 + "__id__": 1110 }, "_enabled": true, "__prefab": null, @@ -30394,13 +30372,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1114 + "__id__": 1113 } ], "_prefab": null, @@ -30439,7 +30417,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1113 + "__id__": 1112 }, "_enabled": true, "__prefab": null, @@ -30461,13 +30439,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1116 + "__id__": 1115 } ], "_prefab": null, @@ -30506,7 +30484,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1115 + "__id__": 1114 }, "_enabled": true, "__prefab": null, @@ -30528,13 +30506,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1118 + "__id__": 1117 } ], "_prefab": null, @@ -30573,7 +30551,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1117 + "__id__": 1116 }, "_enabled": true, "__prefab": null, @@ -30595,13 +30573,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1120 + "__id__": 1119 } ], "_prefab": null, @@ -30640,7 +30618,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1119 + "__id__": 1118 }, "_enabled": true, "__prefab": null, @@ -30662,13 +30640,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1122 + "__id__": 1121 } ], "_prefab": null, @@ -30707,7 +30685,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1121 + "__id__": 1120 }, "_enabled": true, "__prefab": null, @@ -30729,13 +30707,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1124 + "__id__": 1123 } ], "_prefab": null, @@ -30774,7 +30752,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1123 + "__id__": 1122 }, "_enabled": true, "__prefab": null, @@ -30796,13 +30774,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1126 + "__id__": 1125 } ], "_prefab": null, @@ -30841,7 +30819,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1125 + "__id__": 1124 }, "_enabled": true, "__prefab": null, @@ -30863,13 +30841,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1128 + "__id__": 1127 } ], "_prefab": null, @@ -30908,7 +30886,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1127 + "__id__": 1126 }, "_enabled": true, "__prefab": null, @@ -30930,13 +30908,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1130 + "__id__": 1129 } ], "_prefab": null, @@ -30975,7 +30953,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1129 + "__id__": 1128 }, "_enabled": true, "__prefab": null, @@ -30997,13 +30975,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1132 + "__id__": 1131 } ], "_prefab": null, @@ -31042,7 +31020,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1131 + "__id__": 1130 }, "_enabled": true, "__prefab": null, @@ -31064,13 +31042,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1134 + "__id__": 1133 } ], "_prefab": null, @@ -31109,7 +31087,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1133 + "__id__": 1132 }, "_enabled": true, "__prefab": null, @@ -31131,13 +31109,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1136 + "__id__": 1135 } ], "_prefab": null, @@ -31176,7 +31154,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1135 + "__id__": 1134 }, "_enabled": true, "__prefab": null, @@ -31198,13 +31176,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1138 + "__id__": 1137 } ], "_prefab": null, @@ -31243,7 +31221,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1137 + "__id__": 1136 }, "_enabled": true, "__prefab": null, @@ -31265,13 +31243,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1140 + "__id__": 1139 } ], "_prefab": null, @@ -31310,7 +31288,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1139 + "__id__": 1138 }, "_enabled": true, "__prefab": null, @@ -31332,13 +31310,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1142 + "__id__": 1141 } ], "_prefab": null, @@ -31377,7 +31355,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1141 + "__id__": 1140 }, "_enabled": true, "__prefab": null, @@ -31399,13 +31377,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1144 + "__id__": 1143 } ], "_prefab": null, @@ -31444,7 +31422,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1142 }, "_enabled": true, "__prefab": null, @@ -31466,13 +31444,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1146 + "__id__": 1145 } ], "_prefab": null, @@ -31511,7 +31489,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1145 + "__id__": 1144 }, "_enabled": true, "__prefab": null, @@ -31533,13 +31511,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1148 + "__id__": 1147 } ], "_prefab": null, @@ -31578,7 +31556,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1147 + "__id__": 1146 }, "_enabled": true, "__prefab": null, @@ -31600,13 +31578,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1150 + "__id__": 1149 } ], "_prefab": null, @@ -31645,7 +31623,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1149 + "__id__": 1148 }, "_enabled": true, "__prefab": null, @@ -31667,13 +31645,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1152 + "__id__": 1151 } ], "_prefab": null, @@ -31712,7 +31690,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1151 + "__id__": 1150 }, "_enabled": true, "__prefab": null, @@ -31734,13 +31712,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1154 + "__id__": 1153 } ], "_prefab": null, @@ -31779,7 +31757,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1153 + "__id__": 1152 }, "_enabled": true, "__prefab": null, @@ -31801,13 +31779,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1156 + "__id__": 1155 } ], "_prefab": null, @@ -31846,7 +31824,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1154 }, "_enabled": true, "__prefab": null, @@ -31868,13 +31846,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1158 + "__id__": 1157 } ], "_prefab": null, @@ -31913,7 +31891,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1157 + "__id__": 1156 }, "_enabled": true, "__prefab": null, @@ -31935,13 +31913,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1160 + "__id__": 1159 } ], "_prefab": null, @@ -31980,7 +31958,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1159 + "__id__": 1158 }, "_enabled": true, "__prefab": null, @@ -32002,13 +31980,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1162 + "__id__": 1161 } ], "_prefab": null, @@ -32047,7 +32025,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1161 + "__id__": 1160 }, "_enabled": true, "__prefab": null, @@ -32069,13 +32047,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1164 + "__id__": 1163 } ], "_prefab": null, @@ -32114,7 +32092,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1163 + "__id__": 1162 }, "_enabled": true, "__prefab": null, @@ -32136,13 +32114,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1166 + "__id__": 1165 } ], "_prefab": null, @@ -32181,7 +32159,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1165 + "__id__": 1164 }, "_enabled": true, "__prefab": null, @@ -32203,13 +32181,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1168 + "__id__": 1167 } ], "_prefab": null, @@ -32248,7 +32226,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1167 + "__id__": 1166 }, "_enabled": true, "__prefab": null, @@ -32270,13 +32248,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1170 + "__id__": 1169 } ], "_prefab": null, @@ -32315,7 +32293,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1169 + "__id__": 1168 }, "_enabled": true, "__prefab": null, @@ -32337,13 +32315,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1172 + "__id__": 1171 } ], "_prefab": null, @@ -32382,7 +32360,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1171 + "__id__": 1170 }, "_enabled": true, "__prefab": null, @@ -32404,13 +32382,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1174 + "__id__": 1173 } ], "_prefab": null, @@ -32449,7 +32427,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1173 + "__id__": 1172 }, "_enabled": true, "__prefab": null, @@ -32471,13 +32449,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1176 + "__id__": 1175 } ], "_prefab": null, @@ -32516,7 +32494,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1175 + "__id__": 1174 }, "_enabled": true, "__prefab": null, @@ -32538,13 +32516,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1178 + "__id__": 1177 } ], "_prefab": null, @@ -32583,7 +32561,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1177 + "__id__": 1176 }, "_enabled": true, "__prefab": null, @@ -32605,13 +32583,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1180 + "__id__": 1179 } ], "_prefab": null, @@ -32650,7 +32628,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1179 + "__id__": 1178 }, "_enabled": true, "__prefab": null, @@ -32672,13 +32650,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1182 + "__id__": 1181 } ], "_prefab": null, @@ -32717,7 +32695,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1181 + "__id__": 1180 }, "_enabled": true, "__prefab": null, @@ -32739,13 +32717,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1184 + "__id__": 1183 } ], "_prefab": null, @@ -32784,7 +32762,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1183 + "__id__": 1182 }, "_enabled": true, "__prefab": null, @@ -32806,13 +32784,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1186 + "__id__": 1185 } ], "_prefab": null, @@ -32851,7 +32829,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1185 + "__id__": 1184 }, "_enabled": true, "__prefab": null, @@ -32873,13 +32851,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1188 + "__id__": 1187 } ], "_prefab": null, @@ -32918,7 +32896,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1187 + "__id__": 1186 }, "_enabled": true, "__prefab": null, @@ -32940,13 +32918,13 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1062 + "__id__": 1061 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1190 + "__id__": 1189 } ], "_prefab": null, @@ -32985,7 +32963,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1189 + "__id__": 1188 }, "_enabled": true, "__prefab": null, @@ -33007,7 +32985,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1062 + "__id__": 1061 }, "_enabled": true, "__prefab": null, @@ -33029,19 +33007,22 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1062 + "__id__": 1061 }, "_enabled": true, "__prefab": null, "_objects": [ { - "__id__": 1193 + "__id__": 1192 }, { - "__id__": 1194 + "__id__": 1193 } ], "_boosters": [ + { + "__id__": 1194 + }, { "__id__": 1195 }, @@ -33053,203 +33034,200 @@ }, { "__id__": 1198 - }, - { - "__id__": 1199 } ], "_spawnPoints": [ { - "__id__": 1063 + "__id__": 1062 }, { - "__id__": 1065 + "__id__": 1064 }, { - "__id__": 1067 + "__id__": 1066 }, { - "__id__": 1069 + "__id__": 1068 }, { - "__id__": 1071 + "__id__": 1070 }, { - "__id__": 1073 + "__id__": 1072 }, { - "__id__": 1075 + "__id__": 1074 }, { - "__id__": 1077 + "__id__": 1076 }, { - "__id__": 1079 + "__id__": 1078 }, { - "__id__": 1081 + "__id__": 1080 }, { - "__id__": 1083 + "__id__": 1082 }, { - "__id__": 1085 + "__id__": 1084 }, { - "__id__": 1087 + "__id__": 1086 }, { - "__id__": 1089 + "__id__": 1088 }, { - "__id__": 1091 + "__id__": 1090 }, { - "__id__": 1093 + "__id__": 1092 }, { - "__id__": 1095 + "__id__": 1094 }, { - "__id__": 1097 + "__id__": 1096 }, { - "__id__": 1099 + "__id__": 1098 }, { - "__id__": 1101 + "__id__": 1100 }, { - "__id__": 1103 + "__id__": 1102 }, { - "__id__": 1105 + "__id__": 1104 }, { - "__id__": 1107 + "__id__": 1106 }, { - "__id__": 1109 + "__id__": 1108 }, { - "__id__": 1111 + "__id__": 1110 }, { - "__id__": 1113 + "__id__": 1112 }, { - "__id__": 1115 + "__id__": 1114 }, { - "__id__": 1117 + "__id__": 1116 }, { - "__id__": 1119 + "__id__": 1118 }, { - "__id__": 1121 + "__id__": 1120 }, { - "__id__": 1123 + "__id__": 1122 }, { - "__id__": 1125 + "__id__": 1124 }, { - "__id__": 1127 + "__id__": 1126 }, { - "__id__": 1129 + "__id__": 1128 }, { - "__id__": 1131 + "__id__": 1130 }, { - "__id__": 1133 + "__id__": 1132 }, { - "__id__": 1135 + "__id__": 1134 }, { - "__id__": 1137 + "__id__": 1136 }, { - "__id__": 1139 + "__id__": 1138 }, { - "__id__": 1141 + "__id__": 1140 }, { - "__id__": 1143 + "__id__": 1142 }, { - "__id__": 1145 + "__id__": 1144 }, { - "__id__": 1147 + "__id__": 1146 }, { - "__id__": 1149 + "__id__": 1148 }, { - "__id__": 1151 + "__id__": 1150 }, { - "__id__": 1153 + "__id__": 1152 }, { - "__id__": 1155 + "__id__": 1154 }, { - "__id__": 1157 + "__id__": 1156 }, { - "__id__": 1159 + "__id__": 1158 }, { - "__id__": 1161 + "__id__": 1160 }, { - "__id__": 1163 + "__id__": 1162 }, { - "__id__": 1165 + "__id__": 1164 }, { - "__id__": 1167 + "__id__": 1166 }, { - "__id__": 1169 + "__id__": 1168 }, { - "__id__": 1171 + "__id__": 1170 }, { - "__id__": 1173 + "__id__": 1172 }, { - "__id__": 1175 + "__id__": 1174 }, { - "__id__": 1177 + "__id__": 1176 }, { - "__id__": 1179 + "__id__": 1178 }, { - "__id__": 1181 + "__id__": 1180 }, { - "__id__": 1183 + "__id__": 1182 }, { - "__id__": 1185 + "__id__": 1184 }, { - "__id__": 1187 + "__id__": 1186 }, { - "__id__": 1189 + "__id__": 1188 } ], "_spawnTime": 1.5, @@ -33351,10 +33329,10 @@ "_active": true, "_components": [ { - "__id__": 1201 + "__id__": 1200 }, { - "__id__": 1202 + "__id__": 1201 } ], "_prefab": null, @@ -33393,7 +33371,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1200 + "__id__": 1199 }, "_enabled": true, "__prefab": null, @@ -33415,7 +33393,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1200 + "__id__": 1199 }, "_enabled": true, "__prefab": null, @@ -33460,7 +33438,7 @@ "_active": true, "_components": [ { - "__id__": 1204 + "__id__": 1203 } ], "_prefab": null, @@ -33499,7 +33477,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1203 + "__id__": 1202 }, "_enabled": true, "__prefab": null, @@ -33525,16 +33503,16 @@ }, "_children": [ { - "__id__": 1206 + "__id__": 1205 }, { - "__id__": 1341 + "__id__": 1340 } ], "_active": true, "_components": [ { - "__id__": 1476 + "__id__": 1475 } ], "_prefab": null, @@ -33573,26 +33551,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1205 + "__id__": 1204 }, "_children": [ { - "__id__": 1207 + "__id__": 1206 }, { - "__id__": 1212 + "__id__": 1211 } ], "_active": true, "_components": [ + { + "__id__": 1337 + }, { "__id__": 1338 }, { "__id__": 1339 - }, - { - "__id__": 1340 } ], "_prefab": null, @@ -33631,11 +33609,14 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1206 + "__id__": 1205 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 1207 + }, { "__id__": 1208 }, @@ -33644,9 +33625,6 @@ }, { "__id__": 1210 - }, - { - "__id__": 1211 } ], "_prefab": null, @@ -33685,7 +33663,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1207 + "__id__": 1206 }, "_enabled": true, "__prefab": null, @@ -33707,7 +33685,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1207 + "__id__": 1206 }, "_enabled": true, "__prefab": null, @@ -33746,7 +33724,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1207 + "__id__": 1206 }, "_enabled": true, "__prefab": null, @@ -33774,7 +33752,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1207 + "__id__": 1206 }, "_enabled": true, "__prefab": null, @@ -33802,20 +33780,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1206 + "__id__": 1205 }, "_children": [ { - "__id__": 1213 + "__id__": 1212 }, { - "__id__": 1272 + "__id__": 1271 } ], "_active": false, "_components": [ { - "__id__": 1337 + "__id__": 1336 } ], "_prefab": null, @@ -33854,19 +33832,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1212 + "__id__": 1211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1214 + "__id__": 1213 + }, + { + "__id__": 1269 }, { "__id__": 1270 - }, - { - "__id__": 1271 } ], "_prefab": null, @@ -33905,7 +33883,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1213 + "__id__": 1212 }, "_enabled": true, "__prefab": null, @@ -33918,60 +33896,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 1215 + "__id__": 1214 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 1216 + "__id__": 1215 }, "startSize": { - "__id__": 1216 + "__id__": 1215 }, "startSizeY": { - "__id__": 1217 + "__id__": 1216 }, "startSizeZ": { - "__id__": 1218 + "__id__": 1217 }, "startSpeed": { - "__id__": 1219 + "__id__": 1218 }, "startRotation3D": false, "startRotationX": { - "__id__": 1220 + "__id__": 1219 }, "startRotationY": { - "__id__": 1221 + "__id__": 1220 }, "startRotationZ": { - "__id__": 1222 + "__id__": 1221 }, "startRotation": { - "__id__": 1222 + "__id__": 1221 }, "startDelay": { - "__id__": 1223 + "__id__": 1222 }, "startLifetime": { - "__id__": 1224 + "__id__": 1223 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 1225 + "__id__": 1224 }, "rateOverTime": { - "__id__": 1226 + "__id__": 1225 }, "rateOverDistance": { - "__id__": 1227 + "__id__": 1226 }, "bursts": [ { - "__id__": 1228 + "__id__": 1227 } ], "_renderCulling": false, @@ -33982,37 +33960,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 1230 + "__id__": 1229 }, "_shapeModule": { - "__id__": 1232 + "__id__": 1231 }, "_sizeOvertimeModule": { - "__id__": 1234 + "__id__": 1233 }, "_velocityOvertimeModule": { - "__id__": 1240 + "__id__": 1239 }, "_forceOvertimeModule": { - "__id__": 1246 + "__id__": 1245 }, "_limitVelocityOvertimeModule": { - "__id__": 1250 + "__id__": 1249 }, "_rotationOvertimeModule": { - "__id__": 1255 + "__id__": 1254 }, "_textureAnimationModule": { - "__id__": 1259 + "__id__": 1258 }, "_noiseModule": { - "__id__": 1263 + "__id__": 1262 }, "_trailModule": { - "__id__": 1264 + "__id__": 1263 }, "renderer": { - "__id__": 1269 + "__id__": 1268 }, "_prewarm": false, "_capacity": 8, @@ -34112,7 +34090,7 @@ "_repeatCount": 1, "repeatInterval": 0, "count": { - "__id__": 1229 + "__id__": 1228 } }, { @@ -34125,7 +34103,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 1231 + "__id__": 1230 } }, { @@ -34154,7 +34132,7 @@ "arcMode": 0, "arcSpread": 11.4, "arcSpeed": { - "__id__": 1233 + "__id__": 1232 }, "length": 5, "boxThickness": { @@ -34195,23 +34173,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 1235 + "__id__": 1234 }, "x": { - "__id__": 1237 + "__id__": 1236 }, "y": { - "__id__": 1238 + "__id__": 1237 }, "z": { - "__id__": 1239 + "__id__": 1238 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1236 + "__id__": 1235 }, "multiplier": 1 }, @@ -34272,16 +34250,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": true, "x": { - "__id__": 1241 + "__id__": 1240 }, "y": { - "__id__": 1242 + "__id__": 1241 }, "z": { - "__id__": 1244 + "__id__": 1243 }, "speedModifier": { - "__id__": 1245 + "__id__": 1244 }, "space": 1 }, @@ -34295,7 +34273,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1243 + "__id__": 1242 }, "multiplier": 1 }, @@ -34350,13 +34328,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 1247 + "__id__": 1246 }, "y": { - "__id__": 1248 + "__id__": 1247 }, "z": { - "__id__": 1249 + "__id__": 1248 }, "space": 1 }, @@ -34382,16 +34360,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 1251 + "__id__": 1250 }, "limitY": { - "__id__": 1252 + "__id__": 1251 }, "limitZ": { - "__id__": 1253 + "__id__": 1252 }, "limit": { - "__id__": 1254 + "__id__": 1253 }, "dampen": 3, "separateAxes": false, @@ -34426,13 +34404,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 1256 + "__id__": 1255 }, "y": { - "__id__": 1257 + "__id__": 1256 }, "z": { - "__id__": 1258 + "__id__": 1257 } }, { @@ -34466,10 +34444,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 1260 + "__id__": 1259 }, "startFrame": { - "__id__": 1262 + "__id__": 1261 }, "cycleCount": 0, "_flipU": 0, @@ -34482,7 +34460,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1261 + "__id__": 1260 }, "multiplier": 1 }, @@ -34549,25 +34527,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 1265 + "__id__": 1264 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 1266 + "__id__": 1265 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 1267 + "__id__": 1266 }, "colorOvertime": { - "__id__": 1268 + "__id__": 1267 }, "_space": 0, "_particleSystem": { - "__id__": 1214 + "__id__": 1213 } }, { @@ -34628,7 +34606,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1213 + "__id__": 1212 }, "_enabled": true, "__prefab": null, @@ -34640,7 +34618,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1213 + "__id__": 1212 }, "_enabled": true, "__prefab": null, @@ -34662,19 +34640,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1212 + "__id__": 1211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1273 + "__id__": 1272 + }, + { + "__id__": 1334 }, { "__id__": 1335 - }, - { - "__id__": 1336 } ], "_prefab": null, @@ -34713,7 +34691,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1272 + "__id__": 1271 }, "_enabled": true, "__prefab": null, @@ -34726,60 +34704,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 1274 + "__id__": 1273 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 1275 + "__id__": 1274 }, "startSize": { - "__id__": 1275 + "__id__": 1274 }, "startSizeY": { - "__id__": 1276 + "__id__": 1275 }, "startSizeZ": { - "__id__": 1277 + "__id__": 1276 }, "startSpeed": { - "__id__": 1278 + "__id__": 1277 }, "startRotation3D": false, "startRotationX": { - "__id__": 1279 + "__id__": 1278 }, "startRotationY": { - "__id__": 1280 + "__id__": 1279 }, "startRotationZ": { - "__id__": 1281 + "__id__": 1280 }, "startRotation": { - "__id__": 1281 + "__id__": 1280 }, "startDelay": { - "__id__": 1282 + "__id__": 1281 }, "startLifetime": { - "__id__": 1283 + "__id__": 1282 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 1284 + "__id__": 1283 }, "rateOverTime": { - "__id__": 1285 + "__id__": 1284 }, "rateOverDistance": { - "__id__": 1286 + "__id__": 1285 }, "bursts": [ { - "__id__": 1287 + "__id__": 1286 } ], "_renderCulling": false, @@ -34790,37 +34768,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 1289 + "__id__": 1288 }, "_shapeModule": { - "__id__": 1298 + "__id__": 1297 }, "_sizeOvertimeModule": { - "__id__": 1300 + "__id__": 1299 }, "_velocityOvertimeModule": { - "__id__": 1306 + "__id__": 1305 }, "_forceOvertimeModule": { - "__id__": 1311 + "__id__": 1310 }, "_limitVelocityOvertimeModule": { - "__id__": 1315 + "__id__": 1314 }, "_rotationOvertimeModule": { - "__id__": 1320 + "__id__": 1319 }, "_textureAnimationModule": { - "__id__": 1324 + "__id__": 1323 }, "_noiseModule": { - "__id__": 1328 + "__id__": 1327 }, "_trailModule": { - "__id__": 1329 + "__id__": 1328 }, "renderer": { - "__id__": 1334 + "__id__": 1333 }, "_prewarm": false, "_capacity": 100, @@ -34918,7 +34896,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 1288 + "__id__": 1287 } }, { @@ -34931,38 +34909,38 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 1290 + "__id__": 1289 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 1291 + "__id__": 1290 } }, { "__type__": "cc.Gradient", "colorKeys": [ + { + "__id__": 1291 + }, { "__id__": 1292 }, { "__id__": 1293 - }, - { - "__id__": 1294 } ], "alphaKeys": [ + { + "__id__": 1294 + }, { "__id__": 1295 }, { "__id__": 1296 - }, - { - "__id__": 1297 } ], "mode": 0 @@ -35030,7 +35008,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 1299 + "__id__": 1298 }, "length": 5, "boxThickness": { @@ -35071,23 +35049,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 1301 + "__id__": 1300 }, "x": { - "__id__": 1303 + "__id__": 1302 }, "y": { - "__id__": 1304 + "__id__": 1303 }, "z": { - "__id__": 1305 + "__id__": 1304 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1302 + "__id__": 1301 }, "multiplier": 1 }, @@ -35148,16 +35126,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 1307 + "__id__": 1306 }, "y": { - "__id__": 1308 + "__id__": 1307 }, "z": { - "__id__": 1309 + "__id__": 1308 }, "speedModifier": { - "__id__": 1310 + "__id__": 1309 }, "space": 1 }, @@ -35189,13 +35167,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 1312 + "__id__": 1311 }, "y": { - "__id__": 1313 + "__id__": 1312 }, "z": { - "__id__": 1314 + "__id__": 1313 }, "space": 1 }, @@ -35221,16 +35199,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 1316 + "__id__": 1315 }, "limitY": { - "__id__": 1317 + "__id__": 1316 }, "limitZ": { - "__id__": 1318 + "__id__": 1317 }, "limit": { - "__id__": 1319 + "__id__": 1318 }, "dampen": 0.05, "separateAxes": false, @@ -35265,13 +35243,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 1321 + "__id__": 1320 }, "y": { - "__id__": 1322 + "__id__": 1321 }, "z": { - "__id__": 1323 + "__id__": 1322 } }, { @@ -35303,10 +35281,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 1325 + "__id__": 1324 }, "startFrame": { - "__id__": 1327 + "__id__": 1326 }, "cycleCount": 1, "_flipU": 0, @@ -35319,7 +35297,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1326 + "__id__": 1325 }, "multiplier": 1 }, @@ -35387,25 +35365,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 1330 + "__id__": 1329 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 1331 + "__id__": 1330 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 1332 + "__id__": 1331 }, "colorOvertime": { - "__id__": 1333 + "__id__": 1332 }, "_space": 0, "_particleSystem": { - "__id__": 1273 + "__id__": 1272 } }, { @@ -35466,7 +35444,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1272 + "__id__": 1271 }, "_enabled": true, "__prefab": null, @@ -35478,7 +35456,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1272 + "__id__": 1271 }, "_enabled": true, "__prefab": null, @@ -35500,7 +35478,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1211 }, "_enabled": true, "__prefab": null, @@ -35522,7 +35500,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1205 }, "_enabled": true, "__prefab": null, @@ -35544,15 +35522,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1205 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 1210 + "__id__": 1209 }, "_animation": { - "__id__": 1340 + "__id__": 1339 }, "_force": 40, "_soundFx": { @@ -35568,7 +35546,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1206 + "__id__": 1205 }, "_enabled": true, "__prefab": null, @@ -35591,26 +35569,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1205 + "__id__": 1204 }, "_children": [ { - "__id__": 1342 + "__id__": 1341 }, { - "__id__": 1347 + "__id__": 1346 } ], "_active": true, "_components": [ + { + "__id__": 1472 + }, { "__id__": 1473 }, { "__id__": 1474 - }, - { - "__id__": 1475 } ], "_prefab": null, @@ -35649,11 +35627,14 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1341 + "__id__": 1340 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 1342 + }, { "__id__": 1343 }, @@ -35662,9 +35643,6 @@ }, { "__id__": 1345 - }, - { - "__id__": 1346 } ], "_prefab": null, @@ -35703,7 +35681,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1342 + "__id__": 1341 }, "_enabled": true, "__prefab": null, @@ -35725,7 +35703,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1342 + "__id__": 1341 }, "_enabled": true, "__prefab": null, @@ -35764,7 +35742,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1342 + "__id__": 1341 }, "_enabled": true, "__prefab": null, @@ -35792,7 +35770,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1342 + "__id__": 1341 }, "_enabled": true, "__prefab": null, @@ -35820,20 +35798,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1341 + "__id__": 1340 }, "_children": [ { - "__id__": 1348 + "__id__": 1347 }, { - "__id__": 1407 + "__id__": 1406 } ], "_active": false, "_components": [ { - "__id__": 1472 + "__id__": 1471 } ], "_prefab": null, @@ -35872,19 +35850,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1347 + "__id__": 1346 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1349 + "__id__": 1348 + }, + { + "__id__": 1404 }, { "__id__": 1405 - }, - { - "__id__": 1406 } ], "_prefab": null, @@ -35923,7 +35901,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1348 + "__id__": 1347 }, "_enabled": true, "__prefab": null, @@ -35936,60 +35914,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 1350 + "__id__": 1349 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 1351 + "__id__": 1350 }, "startSize": { - "__id__": 1351 + "__id__": 1350 }, "startSizeY": { - "__id__": 1352 + "__id__": 1351 }, "startSizeZ": { - "__id__": 1353 + "__id__": 1352 }, "startSpeed": { - "__id__": 1354 + "__id__": 1353 }, "startRotation3D": false, "startRotationX": { - "__id__": 1355 + "__id__": 1354 }, "startRotationY": { - "__id__": 1356 + "__id__": 1355 }, "startRotationZ": { - "__id__": 1357 + "__id__": 1356 }, "startRotation": { - "__id__": 1357 + "__id__": 1356 }, "startDelay": { - "__id__": 1358 + "__id__": 1357 }, "startLifetime": { - "__id__": 1359 + "__id__": 1358 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 1360 + "__id__": 1359 }, "rateOverTime": { - "__id__": 1361 + "__id__": 1360 }, "rateOverDistance": { - "__id__": 1362 + "__id__": 1361 }, "bursts": [ { - "__id__": 1363 + "__id__": 1362 } ], "_renderCulling": false, @@ -36000,37 +35978,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 1365 + "__id__": 1364 }, "_shapeModule": { - "__id__": 1367 + "__id__": 1366 }, "_sizeOvertimeModule": { - "__id__": 1369 + "__id__": 1368 }, "_velocityOvertimeModule": { - "__id__": 1375 + "__id__": 1374 }, "_forceOvertimeModule": { - "__id__": 1381 + "__id__": 1380 }, "_limitVelocityOvertimeModule": { - "__id__": 1385 + "__id__": 1384 }, "_rotationOvertimeModule": { - "__id__": 1390 + "__id__": 1389 }, "_textureAnimationModule": { - "__id__": 1394 + "__id__": 1393 }, "_noiseModule": { - "__id__": 1398 + "__id__": 1397 }, "_trailModule": { - "__id__": 1399 + "__id__": 1398 }, "renderer": { - "__id__": 1404 + "__id__": 1403 }, "_prewarm": false, "_capacity": 8, @@ -36130,7 +36108,7 @@ "_repeatCount": 1, "repeatInterval": 0, "count": { - "__id__": 1364 + "__id__": 1363 } }, { @@ -36143,7 +36121,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 1366 + "__id__": 1365 } }, { @@ -36172,7 +36150,7 @@ "arcMode": 0, "arcSpread": 11.4, "arcSpeed": { - "__id__": 1368 + "__id__": 1367 }, "length": 5, "boxThickness": { @@ -36213,23 +36191,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 1370 + "__id__": 1369 }, "x": { - "__id__": 1372 + "__id__": 1371 }, "y": { - "__id__": 1373 + "__id__": 1372 }, "z": { - "__id__": 1374 + "__id__": 1373 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1371 + "__id__": 1370 }, "multiplier": 1 }, @@ -36290,16 +36268,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": true, "x": { - "__id__": 1376 + "__id__": 1375 }, "y": { - "__id__": 1377 + "__id__": 1376 }, "z": { - "__id__": 1379 + "__id__": 1378 }, "speedModifier": { - "__id__": 1380 + "__id__": 1379 }, "space": 1 }, @@ -36313,7 +36291,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1378 + "__id__": 1377 }, "multiplier": 1 }, @@ -36368,13 +36346,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 1382 + "__id__": 1381 }, "y": { - "__id__": 1383 + "__id__": 1382 }, "z": { - "__id__": 1384 + "__id__": 1383 }, "space": 1 }, @@ -36400,16 +36378,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 1386 + "__id__": 1385 }, "limitY": { - "__id__": 1387 + "__id__": 1386 }, "limitZ": { - "__id__": 1388 + "__id__": 1387 }, "limit": { - "__id__": 1389 + "__id__": 1388 }, "dampen": 3, "separateAxes": false, @@ -36444,13 +36422,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 1391 + "__id__": 1390 }, "y": { - "__id__": 1392 + "__id__": 1391 }, "z": { - "__id__": 1393 + "__id__": 1392 } }, { @@ -36484,10 +36462,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 1395 + "__id__": 1394 }, "startFrame": { - "__id__": 1397 + "__id__": 1396 }, "cycleCount": 0, "_flipU": 0, @@ -36500,7 +36478,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1396 + "__id__": 1395 }, "multiplier": 1 }, @@ -36567,25 +36545,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 1400 + "__id__": 1399 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 1401 + "__id__": 1400 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 1402 + "__id__": 1401 }, "colorOvertime": { - "__id__": 1403 + "__id__": 1402 }, "_space": 0, "_particleSystem": { - "__id__": 1349 + "__id__": 1348 } }, { @@ -36646,7 +36624,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1348 + "__id__": 1347 }, "_enabled": true, "__prefab": null, @@ -36658,7 +36636,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1348 + "__id__": 1347 }, "_enabled": true, "__prefab": null, @@ -36680,19 +36658,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1347 + "__id__": 1346 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1408 + "__id__": 1407 + }, + { + "__id__": 1469 }, { "__id__": 1470 - }, - { - "__id__": 1471 } ], "_prefab": null, @@ -36731,7 +36709,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1407 + "__id__": 1406 }, "_enabled": true, "__prefab": null, @@ -36744,60 +36722,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 1409 + "__id__": 1408 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 1410 + "__id__": 1409 }, "startSize": { - "__id__": 1410 + "__id__": 1409 }, "startSizeY": { - "__id__": 1411 + "__id__": 1410 }, "startSizeZ": { - "__id__": 1412 + "__id__": 1411 }, "startSpeed": { - "__id__": 1413 + "__id__": 1412 }, "startRotation3D": false, "startRotationX": { - "__id__": 1414 + "__id__": 1413 }, "startRotationY": { - "__id__": 1415 + "__id__": 1414 }, "startRotationZ": { - "__id__": 1416 + "__id__": 1415 }, "startRotation": { - "__id__": 1416 + "__id__": 1415 }, "startDelay": { - "__id__": 1417 + "__id__": 1416 }, "startLifetime": { - "__id__": 1418 + "__id__": 1417 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 1419 + "__id__": 1418 }, "rateOverTime": { - "__id__": 1420 + "__id__": 1419 }, "rateOverDistance": { - "__id__": 1421 + "__id__": 1420 }, "bursts": [ { - "__id__": 1422 + "__id__": 1421 } ], "_renderCulling": false, @@ -36808,37 +36786,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 1424 + "__id__": 1423 }, "_shapeModule": { - "__id__": 1433 + "__id__": 1432 }, "_sizeOvertimeModule": { - "__id__": 1435 + "__id__": 1434 }, "_velocityOvertimeModule": { - "__id__": 1441 + "__id__": 1440 }, "_forceOvertimeModule": { - "__id__": 1446 + "__id__": 1445 }, "_limitVelocityOvertimeModule": { - "__id__": 1450 + "__id__": 1449 }, "_rotationOvertimeModule": { - "__id__": 1455 + "__id__": 1454 }, "_textureAnimationModule": { - "__id__": 1459 + "__id__": 1458 }, "_noiseModule": { - "__id__": 1463 + "__id__": 1462 }, "_trailModule": { - "__id__": 1464 + "__id__": 1463 }, "renderer": { - "__id__": 1469 + "__id__": 1468 }, "_prewarm": false, "_capacity": 100, @@ -36936,7 +36914,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 1423 + "__id__": 1422 } }, { @@ -36949,38 +36927,38 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 1425 + "__id__": 1424 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 1426 + "__id__": 1425 } }, { "__type__": "cc.Gradient", "colorKeys": [ + { + "__id__": 1426 + }, { "__id__": 1427 }, { "__id__": 1428 - }, - { - "__id__": 1429 } ], "alphaKeys": [ + { + "__id__": 1429 + }, { "__id__": 1430 }, { "__id__": 1431 - }, - { - "__id__": 1432 } ], "mode": 0 @@ -37048,7 +37026,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 1434 + "__id__": 1433 }, "length": 5, "boxThickness": { @@ -37089,23 +37067,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 1436 + "__id__": 1435 }, "x": { - "__id__": 1438 + "__id__": 1437 }, "y": { - "__id__": 1439 + "__id__": 1438 }, "z": { - "__id__": 1440 + "__id__": 1439 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1437 + "__id__": 1436 }, "multiplier": 1 }, @@ -37166,16 +37144,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 1442 + "__id__": 1441 }, "y": { - "__id__": 1443 + "__id__": 1442 }, "z": { - "__id__": 1444 + "__id__": 1443 }, "speedModifier": { - "__id__": 1445 + "__id__": 1444 }, "space": 1 }, @@ -37207,13 +37185,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 1447 + "__id__": 1446 }, "y": { - "__id__": 1448 + "__id__": 1447 }, "z": { - "__id__": 1449 + "__id__": 1448 }, "space": 1 }, @@ -37239,16 +37217,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 1451 + "__id__": 1450 }, "limitY": { - "__id__": 1452 + "__id__": 1451 }, "limitZ": { - "__id__": 1453 + "__id__": 1452 }, "limit": { - "__id__": 1454 + "__id__": 1453 }, "dampen": 0.05, "separateAxes": false, @@ -37283,13 +37261,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 1456 + "__id__": 1455 }, "y": { - "__id__": 1457 + "__id__": 1456 }, "z": { - "__id__": 1458 + "__id__": 1457 } }, { @@ -37321,10 +37299,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 1460 + "__id__": 1459 }, "startFrame": { - "__id__": 1462 + "__id__": 1461 }, "cycleCount": 1, "_flipU": 0, @@ -37337,7 +37315,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1461 + "__id__": 1460 }, "multiplier": 1 }, @@ -37405,25 +37383,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 1465 + "__id__": 1464 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 1466 + "__id__": 1465 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 1467 + "__id__": 1466 }, "colorOvertime": { - "__id__": 1468 + "__id__": 1467 }, "_space": 0, "_particleSystem": { - "__id__": 1408 + "__id__": 1407 } }, { @@ -37484,7 +37462,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1407 + "__id__": 1406 }, "_enabled": true, "__prefab": null, @@ -37496,7 +37474,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1407 + "__id__": 1406 }, "_enabled": true, "__prefab": null, @@ -37518,7 +37496,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1347 + "__id__": 1346 }, "_enabled": true, "__prefab": null, @@ -37540,7 +37518,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1341 + "__id__": 1340 }, "_enabled": true, "__prefab": null, @@ -37562,15 +37540,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1341 + "__id__": 1340 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 1345 + "__id__": 1344 }, "_animation": { - "__id__": 1475 + "__id__": 1474 }, "_force": 40, "_soundFx": { @@ -37586,7 +37564,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1341 + "__id__": 1340 }, "_enabled": true, "__prefab": null, @@ -37609,7 +37587,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1205 + "__id__": 1204 }, "_enabled": true, "__prefab": null, @@ -37637,10 +37615,10 @@ "_active": true, "_components": [ { - "__id__": 1478 + "__id__": 1477 }, { - "__id__": 1479 + "__id__": 1478 } ], "_prefab": null, @@ -37679,7 +37657,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1477 + "__id__": 1476 }, "_enabled": true, "__prefab": null, @@ -37701,7 +37679,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1477 + "__id__": 1476 }, "_enabled": true, "__prefab": null, @@ -37744,19 +37722,19 @@ }, "_children": [ { - "__id__": 1481 + "__id__": 1480 }, { - "__id__": 1484 + "__id__": 1483 } ], "_active": true, "_components": [ { - "__id__": 1488 + "__id__": 1487 }, { - "__id__": 1489 + "__id__": 1488 } ], "_prefab": null, @@ -37795,16 +37773,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1480 + "__id__": 1479 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1482 + "__id__": 1481 }, { - "__id__": 1483 + "__id__": 1482 } ], "_prefab": null, @@ -37843,7 +37821,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1481 + "__id__": 1480 }, "_enabled": true, "__prefab": null, @@ -37865,7 +37843,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1481 + "__id__": 1480 }, "_enabled": true, "__prefab": null, @@ -37901,19 +37879,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1480 + "__id__": 1479 }, "_children": [], "_active": true, "_components": [ + { + "__id__": 1484 + }, { "__id__": 1485 }, { "__id__": 1486 - }, - { - "__id__": 1487 } ], "_prefab": null, @@ -37952,7 +37930,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1484 + "__id__": 1483 }, "_enabled": true, "__prefab": null, @@ -37974,7 +37952,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1484 + "__id__": 1483 }, "_enabled": true, "__prefab": null, @@ -38039,7 +38017,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1484 + "__id__": 1483 }, "_enabled": true, "__prefab": null, @@ -38069,7 +38047,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1480 + "__id__": 1479 }, "_enabled": true, "__prefab": null, @@ -38091,22 +38069,22 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1480 + "__id__": 1479 }, "_enabled": true, "__prefab": null, "_popup": { - "__id__": 1481 + "__id__": 1480 }, "_label": { - "__id__": 1486 + "__id__": 1485 }, "_stickers": [ { - "__id__": 1490 + "__id__": 1489 }, { - "__id__": 1491 + "__id__": 1490 } ], "_id": "ebx5eaCQhFnYEdDdBHEy9W" @@ -38166,10 +38144,10 @@ "__id__": 6 }, "_topContainer": { - "__id__": 1494 + "__id__": 1493 }, "_ballHolder": { - "__id__": 1203 + "__id__": 1202 }, "_ballSpawnPosition": { "__type__": "cc.Vec3", @@ -38187,11 +38165,11 @@ "__expectedType__": "cc.AudioClip" }, "_ballOutSound": { - "__uuid__": "90fc5275-7ce7-4e86-a757-0674c4fe8f18", + "__uuid__": "bb2aa62a-cecb-47e0-b9d7-73320fda08bd", "__expectedType__": "cc.AudioClip" }, "_backgroundMusic": { - "__uuid__": "40b027bb-9e2f-40e5-85a7-cd32e2ad51af", + "__uuid__": "e0e28763-09ec-4259-a129-6b08d26aa301", "__expectedType__": "cc.AudioClip" }, "_gameOverMusic": { @@ -38212,7 +38190,7 @@ "_active": true, "_components": [ { - "__id__": 1495 + "__id__": 1494 } ], "_prefab": null, @@ -38251,7 +38229,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1494 + "__id__": 1493 }, "_enabled": true, "__prefab": null, @@ -38343,30 +38321,30 @@ "instance": null, "targetOverrides": [ { - "__id__": 1500 + "__id__": 1499 }, { - "__id__": 1502 + "__id__": 1501 }, { - "__id__": 1504 + "__id__": 1503 }, { - "__id__": 1506 + "__id__": 1505 }, { - "__id__": 1508 + "__id__": 1507 }, { - "__id__": 1510 + "__id__": 1509 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 742 + "__id__": 741 }, { - "__id__": 762 + "__id__": 761 }, { "__id__": 159 @@ -38391,7 +38369,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 652 + "__id__": 651 }, "sourceInfo": null, "propertyPath": [ @@ -38401,7 +38379,7 @@ "__id__": 159 }, "targetInfo": { - "__id__": 1501 + "__id__": 1500 } }, { @@ -38423,7 +38401,7 @@ "__id__": 447 }, "targetInfo": { - "__id__": 1503 + "__id__": 1502 } }, { @@ -38444,10 +38422,10 @@ "gacha" ], "target": { - "__id__": 380 + "__id__": 404 }, "targetInfo": { - "__id__": 1505 + "__id__": 1504 } }, { @@ -38468,10 +38446,10 @@ "gacha" ], "target": { - "__id__": 396 + "__id__": 388 }, "targetInfo": { - "__id__": 1507 + "__id__": 1506 } }, { @@ -38492,10 +38470,10 @@ "gacha" ], "target": { - "__id__": 388 + "__id__": 396 }, "targetInfo": { - "__id__": 1509 + "__id__": 1508 } }, { @@ -38516,10 +38494,10 @@ "gacha" ], "target": { - "__id__": 404 + "__id__": 380 }, "targetInfo": { - "__id__": 1511 + "__id__": 1510 } }, { @@ -38531,28 +38509,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 1513 + "__id__": 1512 }, "shadows": { - "__id__": 1514 + "__id__": 1513 }, "_skybox": { - "__id__": 1515 + "__id__": 1514 }, "fog": { - "__id__": 1516 + "__id__": 1515 }, "octree": { - "__id__": 1517 + "__id__": 1516 }, "skin": { - "__id__": 1518 + "__id__": 1517 }, "lightProbeInfo": { - "__id__": 1519 + "__id__": 1518 }, "postSettings": { - "__id__": 1520 + "__id__": 1519 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/_Game/Scenes/Park-theme.scene b/assets/_Game/Scenes/Park-theme.scene index 314afe8..08fb2bb 100644 --- a/assets/_Game/Scenes/Park-theme.scene +++ b/assets/_Game/Scenes/Park-theme.scene @@ -10685,7 +10685,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -10697,7 +10697,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, diff --git a/assets/_Game/Scenes/Vital-Garden-theme.scene b/assets/_Game/Scenes/Vital-Garden-theme.scene index 51ad117..4f88770 100644 --- a/assets/_Game/Scenes/Vital-Garden-theme.scene +++ b/assets/_Game/Scenes/Vital-Garden-theme.scene @@ -11039,7 +11039,7 @@ }, { "__type__": "Gacha", - "id": "GLC", + "id": "GFC", "type": 3, "gacha": null }, @@ -11051,7 +11051,7 @@ }, { "__type__": "Gacha", - "id": "GFC", + "id": "GFR", "type": 0, "gacha": null }, diff --git a/assets/_Game/Scripts/Gacha/FlipCard.ts b/assets/_Game/Scripts/Gacha/FlipCard.ts index a8916f3..072c2bb 100644 --- a/assets/_Game/Scripts/Gacha/FlipCard.ts +++ b/assets/_Game/Scripts/Gacha/FlipCard.ts @@ -1,4 +1,4 @@ -import { _decorator, AudioClip, Component, Node, Sprite } from 'cc'; +import { _decorator, AudioClip, Component, Label, Node, Sprite } from 'cc'; import GachaBase from '../Base/GachaBase'; import SpineAnimationHandler from '../Base/SpineAnimationHandler'; import AudioManager from '../Manager/AudioManager'; @@ -68,6 +68,7 @@ export default class FlipCard extends GachaBase { if (reward) { AudioManager.playSfx(this.selectCardSfx); this.cards[+value - 1].spriteFrame = reward.icon; + this.cards[+value - 1].getComponentInChildren(Label).string = 'x' + reward.quantity.toString(); await this.animationHandler.setAnimationAsync(`card${value}-active`, { trackIndex: +value }); const pos = this.cards[+value - 1].node.worldPosition.clone(); pos.y += 150; diff --git a/assets/_Game/Scripts/UI/GameOverPanel.ts b/assets/_Game/Scripts/UI/GameOverPanel.ts index 2fdeeb1..397d0bb 100644 --- a/assets/_Game/Scripts/UI/GameOverPanel.ts +++ b/assets/_Game/Scripts/UI/GameOverPanel.ts @@ -119,9 +119,7 @@ export class GameOverPanel extends Component { let duration = 0; for (let i = 0; i < items; i++) { if (this._clicked) return; - score += x; duration = this._starSpeedCurve.evaluate(i / items - 1); - score = score > totalScore ? totalScore : score; const obj = this._floatingStarFactory.create(this._scoreUI); obj.node.setWorldPosition(this._scoreUI.worldPosition); tween(obj.node) @@ -138,6 +136,8 @@ export class GameOverPanel extends Component { ) .call(() => obj.node.releaseToPool()) .call(async () => { + score += x; + score = score > totalScore ? totalScore : score; Tween.stopAllByTarget(this.yourScore.node); this.yourScore.string = score.toString(); tween(this.yourScore.node) diff --git a/assets/_Game/Sounds/Theme/Mummy.meta b/assets/_Game/Sounds/Theme/Mummy.meta new file mode 100644 index 0000000..b2e6c27 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "2454405b-3e51-418d-8a1a-a965d84a4711", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/_Game/Sounds/Theme/Mummy/ball_out.mp3 b/assets/_Game/Sounds/Theme/Mummy/ball_out.mp3 new file mode 100644 index 0000000..e5ab205 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/ball_out.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/ball_out.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/ball_out.mp3.meta new file mode 100644 index 0000000..b9d074d --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/ball_out.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "bb2aa62a-cecb-47e0-b9d7-73320fda08bd", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/bgm.mp3 b/assets/_Game/Sounds/Theme/Mummy/bgm.mp3 new file mode 100644 index 0000000..d42b18a Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/bgm.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/bgm.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/bgm.mp3.meta new file mode 100644 index 0000000..17ac7fb --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/bgm.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "e0e28763-09ec-4259-a129-6b08d26aa301", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/bgm_booster.mp3 b/assets/_Game/Sounds/Theme/Mummy/bgm_booster.mp3 new file mode 100644 index 0000000..d2de327 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/bgm_booster.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/bgm_booster.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/bgm_booster.mp3.meta new file mode 100644 index 0000000..68c00f3 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/bgm_booster.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "eb6ee605-3994-45dd-8524-4347a23f423f", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/booster_active.mp3 b/assets/_Game/Sounds/Theme/Mummy/booster_active.mp3 new file mode 100644 index 0000000..77b388d Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/booster_active.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/booster_active.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/booster_active.mp3.meta new file mode 100644 index 0000000..fd397f0 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/booster_active.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "ccc44f78-a046-450b-92cc-9b0f20226ea3", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/cannon.mp3 b/assets/_Game/Sounds/Theme/Mummy/cannon.mp3 new file mode 100644 index 0000000..63445a9 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/cannon.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/cannon.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/cannon.mp3.meta new file mode 100644 index 0000000..9346415 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/cannon.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "ff42aa1b-ad3b-4abb-86c3-d526f5101ba4", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/clock.mp3 b/assets/_Game/Sounds/Theme/Mummy/clock.mp3 new file mode 100644 index 0000000..8b1ac41 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/clock.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/clock.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/clock.mp3.meta new file mode 100644 index 0000000..4fa4ff7 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/clock.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "887683a5-9135-4e9b-a32c-c86a72a81f36", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/collect.mp3 b/assets/_Game/Sounds/Theme/Mummy/collect.mp3 new file mode 100644 index 0000000..6e4da87 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/collect.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/collect.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/collect.mp3.meta new file mode 100644 index 0000000..3cb2274 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/collect.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "a571b738-4d22-48ef-b363-a96c0176aae6", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/enemy.mp3 b/assets/_Game/Sounds/Theme/Mummy/enemy.mp3 new file mode 100644 index 0000000..5b58f5c Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/enemy.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/enemy.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/enemy.mp3.meta new file mode 100644 index 0000000..e9c1e8e --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/enemy.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "54980d2c-26e7-4de4-9630-e9e57914a9ae", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/flippers.mp3 b/assets/_Game/Sounds/Theme/Mummy/flippers.mp3 new file mode 100644 index 0000000..7d0432c Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/flippers.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/flippers.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/flippers.mp3.meta new file mode 100644 index 0000000..302b361 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/flippers.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "68e30263-71ff-497f-893b-74d6d5023a8b", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/goal.mp3 b/assets/_Game/Sounds/Theme/Mummy/goal.mp3 new file mode 100644 index 0000000..f91e069 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/goal.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/goal.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/goal.mp3.meta new file mode 100644 index 0000000..d6954be --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/goal.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "89f81ee2-68a5-4246-8822-d491706714f3", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/impact.mp3 b/assets/_Game/Sounds/Theme/Mummy/impact.mp3 new file mode 100644 index 0000000..438e697 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/impact.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/impact.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/impact.mp3.meta new file mode 100644 index 0000000..d7230e7 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/impact.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "e1d1d404-721b-4610-b254-432e6ae9853f", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/multi.mp3 b/assets/_Game/Sounds/Theme/Mummy/multi.mp3 new file mode 100644 index 0000000..2bc32dd Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/multi.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/multi.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/multi.mp3.meta new file mode 100644 index 0000000..d223e65 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/multi.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "aa1bec52-c7bf-49c9-a6b0-ffafc93898ff", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/slingshot1.mp3 b/assets/_Game/Sounds/Theme/Mummy/slingshot1.mp3 new file mode 100644 index 0000000..aa9a213 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/slingshot1.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/slingshot1.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/slingshot1.mp3.meta new file mode 100644 index 0000000..dabe30c --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/slingshot1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "d02b6cde-0f3b-47ac-a69f-67fc3c091b5a", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Mummy/slingshot2.mp3 b/assets/_Game/Sounds/Theme/Mummy/slingshot2.mp3 new file mode 100644 index 0000000..5a6af10 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Mummy/slingshot2.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Mummy/slingshot2.mp3.meta b/assets/_Game/Sounds/Theme/Mummy/slingshot2.mp3.meta new file mode 100644 index 0000000..170536a --- /dev/null +++ b/assets/_Game/Sounds/Theme/Mummy/slingshot2.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "9e4bbff6-4c93-4651-aba4-f7d37d34eb3e", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sprites/Themes/Chocolate/Ball 2.png b/assets/_Game/Sprites/Themes/Chocolate/Ball 2.png new file mode 100644 index 0000000..3084c5d Binary files /dev/null and b/assets/_Game/Sprites/Themes/Chocolate/Ball 2.png differ diff --git a/assets/_Game/Sprites/Themes/Chocolate/Ball 2.png.meta b/assets/_Game/Sprites/Themes/Chocolate/Ball 2.png.meta new file mode 100644 index 0000000..c934a66 --- /dev/null +++ b/assets/_Game/Sprites/Themes/Chocolate/Ball 2.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "40ab076b-cfad-4474-8a5e-6c21fbc15e66", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "40ab076b-cfad-4474-8a5e-6c21fbc15e66@6c48a", + "displayName": "Ball 2", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "40ab076b-cfad-4474-8a5e-6c21fbc15e66", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "40ab076b-cfad-4474-8a5e-6c21fbc15e66@f9941", + "displayName": "Ball 2", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 103, + "height": 107, + "rawWidth": 103, + "rawHeight": 107, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -51.5, + -53.5, + 0, + 51.5, + -53.5, + 0, + -51.5, + 53.5, + 0, + 51.5, + 53.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 107, + 103, + 107, + 0, + 0, + 103, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -51.5, + -53.5, + 0 + ], + "maxPos": [ + 51.5, + 53.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "40ab076b-cfad-4474-8a5e-6c21fbc15e66@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "40ab076b-cfad-4474-8a5e-6c21fbc15e66@f9941" + } +}