From 46a779633a4183ea094da99ea4fdf68473b2170f Mon Sep 17 00:00:00 2001 From: walkpan Date: Sat, 15 Nov 2025 11:15:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(hero):=20=E6=B7=BB=E5=8A=A0=E5=8F=97?= =?UTF-8?q?=E5=87=BB=E9=97=AA=E5=85=89=E6=95=88=E6=9E=9C=E5=B9=B6=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增FlashSprite组件实现受击闪光效果 重构HeroAnmComp和HeroViewComp以支持闪光效果 更新多个英雄prefab以包含闪光材质和组件 --- assets/resources/game/heros/ha1.prefab | 180 ++- assets/resources/game/heros/hc1.prefab | 180 ++- assets/resources/game/heros/hh1.prefab | 180 ++- assets/resources/game/heros/hk1.prefab | 180 ++- assets/resources/game/heros/hm1.prefab | 180 ++- assets/resources/game/heros/hm2.prefab | 180 ++- assets/resources/game/heros/hz1.prefab | 180 ++- assets/resources/game/heros/mo1.prefab | 180 ++- assets/resources/game/heros/mo2.prefab | 180 ++- assets/resources/game/heros/mo3.prefab | 180 ++- assets/resources/game/heros/mo4.prefab | 179 ++- assets/script/game/hero/HeroAnmComp.ts | 7 +- assets/script/game/hero/HeroSpine.ts | 3 + assets/script/game/hero/HeroViewComp.ts | 6 +- assets/script/game/hero/hit-flash-white.meta | 9 + .../game/hero/hit-flash-white/materials.meta | 9 + .../materials/hit-flash-white.mtl | 31 + .../materials/hit-flash-white.mtl.meta | 11 + .../game/hero/hit-flash-white/scenes.meta | 9 + .../scenes/2D-hit-flash-white.scene | 1414 +++++++++++++++++ .../scenes/2D-hit-flash-white.scene.meta | 11 + .../game/hero/hit-flash-white/scripts.meta | 9 + .../hit-flash-white/scripts/FlashSprite.ts | 29 + .../scripts/FlashSprite.ts.meta | 9 + .../game/hero/hit-flash-white/shaders.meta | 9 + .../builtin-sprite-hit-flash-white.effect | 97 ++ ...builtin-sprite-hit-flash-white.effect.meta | 11 + assets/script/game/hit-flash-white.meta | 9 + 28 files changed, 2800 insertions(+), 862 deletions(-) create mode 100644 assets/script/game/hero/hit-flash-white.meta create mode 100644 assets/script/game/hero/hit-flash-white/materials.meta create mode 100644 assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl create mode 100644 assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl.meta create mode 100644 assets/script/game/hero/hit-flash-white/scenes.meta create mode 100644 assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene create mode 100644 assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene.meta create mode 100644 assets/script/game/hero/hit-flash-white/scripts.meta create mode 100644 assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts create mode 100644 assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts.meta create mode 100644 assets/script/game/hero/hit-flash-white/shaders.meta create mode 100644 assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect create mode 100644 assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect.meta create mode 100644 assets/script/game/hit-flash-white.meta diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index f27a0ded..659c595f 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f9iLivg4dHhJksWCjvY9/w" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/hc1.prefab b/assets/resources/game/heros/hc1.prefab index 0e1aae4a..e2bdbd3e 100644 --- a/assets/resources/game/heros/hc1.prefab +++ b/assets/resources/game/heros/hc1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6cZu2rl69OR5+l1nRZerhd" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/hh1.prefab b/assets/resources/game/heros/hh1.prefab index 79cce64d..75a7aa7c 100644 --- a/assets/resources/game/heros/hh1.prefab +++ b/assets/resources/game/heros/hh1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4zlwtvd5P+aVOci53P5lC" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/hk1.prefab b/assets/resources/game/heros/hk1.prefab index f2734e22..94e90fc3 100644 --- a/assets/resources/game/heros/hk1.prefab +++ b/assets/resources/game/heros/hk1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "beiAlRY51OUIUqmpz9SWoV" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": false, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/hm1.prefab b/assets/resources/game/heros/hm1.prefab index e167297b..dc0cc1c8 100644 --- a/assets/resources/game/heros/hm1.prefab +++ b/assets/resources/game/heros/hm1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b4+2TVK9JC7p5lhflMVjuO" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/hm2.prefab b/assets/resources/game/heros/hm2.prefab index fa11e53a..2ed483d7 100644 --- a/assets/resources/game/heros/hm2.prefab +++ b/assets/resources/game/heros/hm2.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35IEDlwu9Ch7vrlwlSwNdw" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/hz1.prefab b/assets/resources/game/heros/hz1.prefab index fdece4be..88e67fe7 100644 --- a/assets/resources/game/heros/hz1.prefab +++ b/assets/resources/game/heros/hz1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "406uXfKLJEbab+NVEqD1aS" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71mx/IdRVDz5H8mz6V7BsE" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/mo1.prefab b/assets/resources/game/heros/mo1.prefab index 323fb489..65ed59f2 100644 --- a/assets/resources/game/heros/mo1.prefab +++ b/assets/resources/game/heros/mo1.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -296,6 +299,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1dn32Q7fxNOrkpyNeazdIo" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "devH7HFXJH/5FNGHYdEhes" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -316,14 +341,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -331,7 +356,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -344,15 +369,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -362,8 +381,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -371,7 +396,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -387,7 +412,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -402,7 +427,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -418,7 +443,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -433,7 +458,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -443,7 +468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -463,7 +488,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -482,14 +507,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -497,7 +522,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -510,23 +535,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -534,7 +559,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -550,7 +575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -565,7 +590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -581,7 +606,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -596,7 +621,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -617,7 +642,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -636,14 +661,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -651,7 +676,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -664,20 +689,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -685,7 +710,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -701,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -716,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -732,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -747,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -761,14 +786,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -776,7 +801,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -789,20 +814,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -810,7 +835,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -826,7 +851,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -841,7 +866,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -857,7 +882,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -872,7 +897,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -889,7 +914,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -917,7 +942,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -932,13 +957,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -956,7 +980,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -990,7 +1014,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1027,16 +1051,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/mo2.prefab b/assets/resources/game/heros/mo2.prefab index 9f8f9b34..0ba7aa4e 100644 --- a/assets/resources/game/heros/mo2.prefab +++ b/assets/resources/game/heros/mo2.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1dn32Q7fxNOrkpyNeazdIo" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "65HGZeqCFG6I9S+QXhV5Iy" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/mo3.prefab b/assets/resources/game/heros/mo3.prefab index df85d8be..ef18fdb6 100644 --- a/assets/resources/game/heros/mo3.prefab +++ b/assets/resources/game/heros/mo3.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1dn32Q7fxNOrkpyNeazdIo" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4XOt+7BBBWYCH6pjBzbHe" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -935,13 +960,12 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, - "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1054,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/resources/game/heros/mo4.prefab b/assets/resources/game/heros/mo4.prefab index eb962905..854f770b 100644 --- a/assets/resources/game/heros/mo4.prefab +++ b/assets/resources/game/heros/mo4.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 12 + "__id__": 14 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 44 + "__id__": 46 } ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -50,10 +47,13 @@ }, { "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 63 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -106,10 +106,13 @@ }, { "__id__": 9 + }, + { + "__id__": 11 } ], "_prefab": { - "__id__": 11 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -299,6 +302,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1dn32Q7fxNOrkpyNeazdIo" }, + { + "__type__": "954e43Y+QJHNIUpmqTCWA7A", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "hitFlashMaterial": { + "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "__expectedType__": "cc.Material" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d05NTLi3pF055eJmK0otVJ" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -319,14 +344,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 13 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 12 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -334,7 +359,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 14 + "__id__": 16 }, "targetOverrides": null }, @@ -347,15 +372,9 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 15 - }, { "__id__": 17 }, - { - "__id__": 18 - }, { "__id__": 19 }, @@ -365,8 +384,14 @@ { "__id__": 21 }, + { + "__id__": 22 + }, { "__id__": 23 + }, + { + "__id__": 25 } ], "removedComponents": [] @@ -374,7 +399,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_name" @@ -390,7 +415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -405,7 +430,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -421,7 +446,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -436,7 +461,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_active" @@ -446,7 +471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 22 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -466,7 +491,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 16 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -485,14 +510,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 25 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 24 + "__id__": 26 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -500,7 +525,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 26 + "__id__": 28 }, "targetOverrides": null }, @@ -513,23 +538,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 27 - }, { "__id__": 29 }, - { - "__id__": 30 - }, { "__id__": 31 }, { "__id__": 32 }, + { + "__id__": 33 + }, { "__id__": 34 + }, + { + "__id__": 36 } ], "removedComponents": [] @@ -537,7 +562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_name" @@ -553,7 +578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lpos" @@ -568,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lrot" @@ -584,7 +609,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_euler" @@ -599,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -620,7 +645,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 28 + "__id__": 30 }, "propertyPath": [ "_lscale" @@ -639,14 +664,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 36 + "__id__": 38 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 35 + "__id__": 37 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -654,7 +679,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 37 + "__id__": 39 }, "targetOverrides": null }, @@ -667,20 +692,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 38 - }, { "__id__": 40 }, - { - "__id__": 41 - }, { "__id__": 42 }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 } ], "removedComponents": [] @@ -688,7 +713,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_name" @@ -704,7 +729,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -719,7 +744,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -735,7 +760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -750,7 +775,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 41 }, "propertyPath": [ "_active" @@ -764,14 +789,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 46 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -779,7 +804,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 46 + "__id__": 48 }, "targetOverrides": null }, @@ -792,20 +817,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 47 - }, { "__id__": 49 }, - { - "__id__": 50 - }, { "__id__": 51 }, { "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -813,7 +838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_name" @@ -829,7 +854,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -844,7 +869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -860,7 +885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -875,7 +900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 50 }, "propertyPath": [ "_active" @@ -892,7 +917,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -920,7 +945,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "anm": { "__id__": 5 @@ -941,7 +966,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_id": "" }, @@ -959,7 +984,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "enabledContactListener": true, "bullet": false, @@ -993,7 +1018,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "tag": 0, "_group": 4, @@ -1030,16 +1055,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 + "__id__": 46 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 24 + "__id__": 26 }, { - "__id__": 12 + "__id__": 14 } ] } diff --git a/assets/script/game/hero/HeroAnmComp.ts b/assets/script/game/hero/HeroAnmComp.ts index 85a17671..f7fc003b 100644 --- a/assets/script/game/hero/HeroAnmComp.ts +++ b/assets/script/game/hero/HeroAnmComp.ts @@ -1,17 +1,19 @@ import { _decorator, Animation, AnimationState, CCClass, Component, } from "cc"; import { HeroViewComp } from "./HeroViewComp"; import { FacSet } from "../common/config/GameSet"; +import { FlashSprite } from "./hit-flash-white/scripts/FlashSprite"; const { ccclass, property } = _decorator; @ccclass('HeroAnmComp') export default class HeroAnmComp extends Component{ - + fsSprite:FlashSprite = null!; private anmcon:any=null private _hasStop = true; private default_anim:string='Idle' anms:any[]=["idle","move","stun","dead","buff","atk0","atk1","atk2","max0","max1"] onLoad () { this.anmcon=this.node.getComponent(Animation) + this.fsSprite = this.node.getComponent(FlashSprite); this.anmcon.on(Animation.EventType.FINISHED, this.onAnimationFinished, this); } @@ -25,6 +27,9 @@ export default class HeroAnmComp extends Component{ this.anmcon.play(this.default_anim) } } + atked(){ + this.fsSprite.clickFlash(); + } move () { if(this.anmcon.getState("move").isPlaying) return this.anmcon.play("move") diff --git a/assets/script/game/hero/HeroSpine.ts b/assets/script/game/hero/HeroSpine.ts index b25876f2..334aceda 100644 --- a/assets/script/game/hero/HeroSpine.ts +++ b/assets/script/game/hero/HeroSpine.ts @@ -66,6 +66,9 @@ export class HeroSpine extends Component { break } } + do_atked(){ + this.anm.atked() + } dead(){ // console.log("do dead"); this.anm.dead() diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index a145a096..0dc3f18f 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -14,7 +14,7 @@ import { Tooltip } from "../skill/Tooltip"; import { timedCom } from "../skill/timedCom"; import { HeroInfo, HType } from "../common/config/heroSet"; import { Timer } from "db://oops-framework/core/common/timer/Timer"; -import { FlashSprite } from "./materials/scripts/FlashSprite"; + const { ccclass, property } = _decorator; @@ -38,7 +38,6 @@ export class HeroViewComp extends CCComp { // 血条显示相关 hpBarShowTime:number = 5; // 血条显示持续时间（秒） hpBarShowCD:number = 0; // 血条显示计时器 - fsSprite:FlashSprite = null!; // ==================== UI 节点引用 ==================== private top_node: Node = null!; @@ -103,7 +102,6 @@ export class HeroViewComp extends CCComp { this.top_node = this.node.getChildByName("top"); let hp_y = this.node.getComponent(UITransform).height+10; this.top_node.setPosition(0, hp_y, 0); - this.fsSprite = this.node.getComponent(FlashSprite); } @@ -217,7 +215,7 @@ export class HeroViewComp extends CCComp { /** 受击特效 */ private in_atked(anm: string = "atked", scale: number = 1) { - this.fsSprite.clickFlash(); + this.as.do_atked() // var path = "game/skill/end/" + anm; // var prefab: Prefab = oops.res.get(path, Prefab)!; // var node = instantiate(prefab); diff --git a/assets/script/game/hero/hit-flash-white.meta b/assets/script/game/hero/hit-flash-white.meta new file mode 100644 index 00000000..86e15662 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "0463b128-1ee2-4cee-972b-eaf9fee2bf6c", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/materials.meta b/assets/script/game/hero/hit-flash-white/materials.meta new file mode 100644 index 00000000..e5c2adf2 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/materials.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "044ce6c2-4a58-4a83-8a5b-f6d7f89a3aa3", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl b/assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl new file mode 100644 index 00000000..b1dd8419 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl @@ -0,0 +1,31 @@ +{ + "__type__": "cc.Material", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "_effectAsset": { + "__uuid__": "b8d82f81-c2f9-40e5-805b-922f0c170a79", + "__expectedType__": "cc.EffectAsset" + }, + "_techIdx": 0, + "_defines": [ + { + "USE_TEXTURE": true + } + ], + "_states": [ + { + "rasterizerState": {}, + "depthStencilState": {}, + "blendState": { + "targets": [ + {} + ] + } + } + ], + "_props": [ + {} + ] +} \ No newline at end of file diff --git a/assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl.meta b/assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl.meta new file mode 100644 index 00000000..e14a64cc --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/materials/hit-flash-white.mtl.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.0.21", + "importer": "material", + "imported": true, + "uuid": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/scenes.meta b/assets/script/game/hero/hit-flash-white/scenes.meta new file mode 100644 index 00000000..48f8d2ae --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/scenes.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "e091410c-c7b6-4416-ae99-38697c103286", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene b/assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene new file mode 100644 index 00000000..c84512f1 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene @@ -0,0 +1,1414 @@ +[ + { + "__type__": "cc.SceneAsset", + "_name": "2D-hit-flash-white", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "scene": { + "__id__": 1 + } + }, + { + "__type__": "cc.Scene", + "_name": "2D-hit-flash-white", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "autoReleaseAssets": false, + "_globals": { + "__id__": 35 + }, + "_id": "5e1d3eb2-c300-4627-94c7-2ee03b8314f1" + }, + { + "__type__": "cc.Node", + "_name": "Canvas", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 8 + }, + { + "__id__": 12 + }, + { + "__id__": 16 + }, + { + "__id__": 20 + }, + { + "__id__": 24 + } + ], + "_active": true, + "_components": [ + { + "__id__": 32 + }, + { + "__id__": 33 + }, + { + "__id__": 34 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 640, + "y": 360.00000000000006, + "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": "beI88Z2HpFELqR4T5EMHpg" + }, + { + "__type__": "cc.Node", + "_name": "Camera", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 4 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 1000 + }, + "_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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "ebFwiq8gBFaYpqYbdoDODe" + }, + { + "__type__": "cc.Camera", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": null, + "_projection": 0, + "_priority": 0, + "_fov": 45, + "_fovAxis": 0, + "_orthoHeight": 449.9092088197147, + "_near": 0, + "_far": 1000, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_depth": 1, + "_stencil": 0, + "_clearFlags": 7, + "_rect": { + "__type__": "cc.Rect", + "x": 0, + "y": 0, + "width": 1, + "height": 1 + }, + "_aperture": 19, + "_shutter": 7, + "_iso": 0, + "_screenScale": 1, + "_visibility": 1108344832, + "_targetTexture": null, + "_postProcess": null, + "_usePostProcess": false, + "_cameraType": -1, + "_trackingType": 0, + "_id": "63WIch3o5BEYRlXzTT0oWc" + }, + { + "__type__": "cc.Node", + "_name": "Bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 6 + }, + { + "__id__": 7 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 38.158, + "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": "984IY2gxlAOJSCE8sgUKHh" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 5 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1500, + "height": 800 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "b33PMYBwNDnoZaX8jv+ZFA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 5 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 204, + "g": 204, + "b": 204, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6edf1d55-6987-46a2-ab03-551f4124be3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "88VBNT15BCoZx3UMR94EG1" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + { + "__id__": 11 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -197.704, + "y": -143.199, + "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": "47cuWuYTZDNqHwOLhCZ+SM" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "d7GMA7U/dLG4N8tq4LxUco" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "92752fa5-d999-48f7-b1c5-350358701189@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "4fkJA3Tq1P2Lf42/n1IzcA" + }, + { + "__type__": "d9233/h16dOHobPFFFI9fGn", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": null, + "hitFlashMaterial": { + "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", + "__expectedType__": "cc.Material" + }, + "_id": "af9hkq/dRIWK8zM66cWYLm" + }, + { + "__type__": "cc.Node", + "_name": "Sprite-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 13 + }, + { + "__id__": 14 + }, + { + "__id__": 15 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 264.609, + "y": -104.921, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 0.6 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "6drcCva8ZDhbENsX9FjGWC" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 600, + "height": 500 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "8alYuNilxB/6e+bDJ7qytz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "83cc6859-79e5-469c-b845-e9febd162daf@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "76Kkl+3uBOSJ6yXPT8FHjG" + }, + { + "__type__": "d9233/h16dOHobPFFFI9fGn", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": null, + "hitFlashMaterial": { + "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", + "__expectedType__": "cc.Material" + }, + "_id": "a6OFEn8C5BYLARqGmaayJC" + }, + { + "__type__": "cc.Node", + "_name": "Sprite-002", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 17 + }, + { + "__id__": 18 + }, + { + "__id__": 19 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -294.976, + "y": -25.589, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 0.6 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "7cZJzv11tKMKx7UKmN7PYn" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "7aFHVGh1RI142n7gcGFH3U" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "d5e44836-49d0-4503-a0d8-2e2a4f7debd6@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "abRd5eu9BBcKXZhvmt1pnh" + }, + { + "__type__": "d9233/h16dOHobPFFFI9fGn", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 16 + }, + "_enabled": true, + "__prefab": null, + "hitFlashMaterial": { + "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", + "__expectedType__": "cc.Material" + }, + "_id": "9far8e04RH7I6Cv5YBRjUX" + }, + { + "__type__": "cc.Node", + "_name": "Sprite-003", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + }, + { + "__id__": 22 + }, + { + "__id__": 23 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -310.482, + "y": -214.014, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 0.6 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "a9awv5R2hETa/jQcZT6LQv" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "05irYaj4lHersoOQgEX4Tm" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6c4dbd2d-3d0b-4b15-927e-e1ef95c31caa@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "63XQOZ/kZKjoWgRTjMt3H9" + }, + { + "__type__": "d9233/h16dOHobPFFFI9fGn", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": null, + "hitFlashMaterial": { + "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", + "__expectedType__": "cc.Material" + }, + "_id": "f4QaJbnz1JIatPp1up/5ig" + }, + { + "__type__": "cc.Node", + "_name": "Button", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 25 + } + ], + "_active": true, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 263, + "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": "70Y/G/NkdCLqyMSRayLQ6d" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 24 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 26 + }, + { + "__id__": 27 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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": "ceDUmMd0FK95Js2SanW8fU" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 25 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "7bYgUbyNhALbAc8O7fDwfF" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 25 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_string": "Click", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 24.09375, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_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": "320fPIz4BBg4yItbvc3KJO" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "c5CEOO8bpFd4i07XuGManc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "03lEccfZpM0Id//+Wr4rih" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": null, + "clickEvents": [ + { + "__id__": 31 + } + ], + "_interactable": true, + "_transition": 2, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 24 + }, + "_id": "ceer4hT0BDJKzVNgil1Bmt" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 12 + }, + "component": "", + "_componentId": "d9233/h16dOHobPFFFI9fGn", + "handler": "clickFlash", + "customEventData": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1280, + "height": 720 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "d6rUX5yfhMlKoWX2bSbawx" + }, + { + "__type__": "cc.Canvas", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": null, + "_cameraComponent": { + "__id__": 4 + }, + "_alignCanvasWithScreen": true, + "_id": "12O/ljcVlEqLmVm3U2gEOQ" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 5.684341886080802e-14, + "_bottom": 5.684341886080802e-14, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "c5V1EV8IpMtrIvY1OE9t2u" + }, + { + "__type__": "cc.SceneGlobals", + "ambient": { + "__id__": 36 + }, + "shadows": { + "__id__": 37 + }, + "_skybox": { + "__id__": 38 + }, + "fog": { + "__id__": 39 + }, + "octree": { + "__id__": 40 + }, + "skin": { + "__id__": 41 + }, + "lightProbeInfo": { + "__id__": 42 + }, + "postSettings": { + "__id__": 43 + }, + "bakedWithStationaryMainLight": false, + "bakedWithHighpLightmap": false + }, + { + "__type__": "cc.AmbientInfo", + "_skyColorHDR": { + "__type__": "cc.Vec4", + "x": 0, + "y": 0, + "z": 0, + "w": 0.520833125 + }, + "_skyColor": { + "__type__": "cc.Vec4", + "x": 0, + "y": 0, + "z": 0, + "w": 0.520833125 + }, + "_skyIllumHDR": 20000, + "_skyIllum": 20000, + "_groundAlbedoHDR": { + "__type__": "cc.Vec4", + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "_groundAlbedo": { + "__type__": "cc.Vec4", + "x": 0, + "y": 0, + "z": 0, + "w": 0 + }, + "_skyColorLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.5, + "z": 0.8, + "w": 1 + }, + "_skyIllumLDR": 20000, + "_groundAlbedoLDR": { + "__type__": "cc.Vec4", + "x": 0.2, + "y": 0.2, + "z": 0.2, + "w": 1 + } + }, + { + "__type__": "cc.ShadowsInfo", + "_enabled": false, + "_type": 0, + "_normal": { + "__type__": "cc.Vec3", + "x": 0, + "y": 1, + "z": 0 + }, + "_distance": 0, + "_planeBias": 1, + "_shadowColor": { + "__type__": "cc.Color", + "r": 76, + "g": 76, + "b": 76, + "a": 255 + }, + "_maxReceived": 4, + "_size": { + "__type__": "cc.Vec2", + "x": 512, + "y": 512 + } + }, + { + "__type__": "cc.SkyboxInfo", + "_envLightingType": 0, + "_envmapHDR": null, + "_envmap": null, + "_envmapLDR": null, + "_diffuseMapHDR": null, + "_diffuseMapLDR": null, + "_enabled": false, + "_useHDR": true, + "_editableMaterial": null, + "_reflectionHDR": null, + "_reflectionLDR": null, + "_rotationAngle": 0 + }, + { + "__type__": "cc.FogInfo", + "_type": 0, + "_fogColor": { + "__type__": "cc.Color", + "r": 200, + "g": 200, + "b": 200, + "a": 255 + }, + "_enabled": false, + "_fogDensity": 0.3, + "_fogStart": 0.5, + "_fogEnd": 300, + "_fogAtten": 5, + "_fogTop": 1.5, + "_fogRange": 1.2, + "_accurate": false + }, + { + "__type__": "cc.OctreeInfo", + "_enabled": false, + "_minPos": { + "__type__": "cc.Vec3", + "x": -1024, + "y": -1024, + "z": -1024 + }, + "_maxPos": { + "__type__": "cc.Vec3", + "x": 1024, + "y": 1024, + "z": 1024 + }, + "_depth": 8 + }, + { + "__type__": "cc.SkinInfo", + "_enabled": false, + "_blurRadius": 0.01, + "_sssIntensity": 3 + }, + { + "__type__": "cc.LightProbeInfo", + "_giScale": 1, + "_giSamples": 1024, + "_bounces": 2, + "_reduceRinging": 0, + "_showProbe": true, + "_showWireframe": true, + "_showConvex": false, + "_data": null, + "_lightProbeSphereVolume": 1 + }, + { + "__type__": "cc.PostSettingsInfo", + "_toneMappingType": 0 + } +] \ No newline at end of file diff --git a/assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene.meta b/assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene.meta new file mode 100644 index 00000000..821fe15c --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/scenes/2D-hit-flash-white.scene.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.1.50", + "importer": "scene", + "imported": true, + "uuid": "5e1d3eb2-c300-4627-94c7-2ee03b8314f1", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/scripts.meta b/assets/script/game/hero/hit-flash-white/scripts.meta new file mode 100644 index 00000000..14faa1d6 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/scripts.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "e4743688-2ecb-436b-8826-69fcb4485b73", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts b/assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts new file mode 100644 index 00000000..73c98cce --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts @@ -0,0 +1,29 @@ +import { _decorator, color, Component, Material, Node, Sprite } from 'cc'; +const { ccclass, property } = _decorator; + +@ccclass('FlashSprite') +export class FlashSprite extends Component { + + @property(Material) + hitFlashMaterial: Material; + orginalFlashMaterial: Material; + sprite: Sprite; + + start() { + this.sprite = this.node.getComponent(Sprite); + this.orginalFlashMaterial = this.sprite.getRenderMaterial(0); + + } + + update(deltaTime: number) { + + } + + public clickFlash() { + this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); + this.scheduleOnce(() => { + this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); + }, 0.1); + } +} + diff --git a/assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts.meta b/assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts.meta new file mode 100644 index 00000000..17bba318 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/scripts/FlashSprite.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "954e4dd8-f902-4734-8529-9aa4c2580ec0", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/shaders.meta b/assets/script/game/hero/hit-flash-white/shaders.meta new file mode 100644 index 00000000..d166b09c --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/shaders.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "5553e1ee-12b8-410b-833c-33586c917944", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect b/assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect new file mode 100644 index 00000000..2e9988f3 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect @@ -0,0 +1,97 @@ +// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. +CCEffect %{ + techniques: + - passes: + - vert: sprite-vs:vert + frag: sprite-fs:frag + depthStencilState: + depthTest: false + depthWrite: false + blendState: + targets: + - blend: true + blendSrc: src_alpha + blendDst: one_minus_src_alpha + blendDstAlpha: one_minus_src_alpha + rasterizerState: + cullMode: none + properties: + alphaThreshold: { value: 0.5 } +}% + +CCProgram sprite-vs %{ + precision highp float; + #include + #if USE_LOCAL + #include + #endif + #if SAMPLE_FROM_RT + #include + #endif + in vec3 a_position; + in vec2 a_texCoord; + in vec4 a_color; + + out vec4 color; + out vec2 uv0; + out vec4 lightColor; + + vec4 vert () { + vec4 pos = vec4(a_position, 1); + + #if USE_LOCAL + pos = cc_matWorld * pos; + #endif + + #if USE_PIXEL_ALIGNMENT + pos = cc_matView * pos; + pos.xyz = floor(pos.xyz); + pos = cc_matProj * pos; + #else + pos = cc_matViewProj * pos; + #endif + + uv0 = a_texCoord; + #if SAMPLE_FROM_RT + CC_HANDLE_RT_SAMPLE_FLIP(uv0); + #endif + color = a_color; + + lightColor = a_color; + + return pos; + } +}% + +CCProgram sprite-fs %{ + precision highp float; + #include + #include + + in vec4 color; + in vec4 lightColor; + + #if USE_TEXTURE + in vec2 uv0; + #pragma builtin(local) + layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture; + #endif + + vec4 frag () { + vec4 o = vec4(1, 1, 1, 1); + + #if USE_TEXTURE + o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0); + #if IS_GRAY + float gray = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b; + o.r = o.g = o.b = gray; + #endif + #endif + + o.rgb = o.rgb * (1.0 - lightColor.a) + lightColor.rgb * lightColor.a; + + o *= color; + ALPHA_TEST(o); + return o; + } +}% diff --git a/assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect.meta b/assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect.meta new file mode 100644 index 00000000..a7984b47 --- /dev/null +++ b/assets/script/game/hero/hit-flash-white/shaders/builtin-sprite-hit-flash-white.effect.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.7.1", + "importer": "effect", + "imported": true, + "uuid": "b8d82f81-c2f9-40e5-805b-922f0c170a79", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/hit-flash-white.meta b/assets/script/game/hit-flash-white.meta new file mode 100644 index 00000000..86e15662 --- /dev/null +++ b/assets/script/game/hit-flash-white.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "0463b128-1ee2-4cee-972b-eaf9fee2bf6c", + "files": [], + "subMetas": {}, + "userData": {} +}