From 52ee731e3f530f8f86760edff6d63b612019b5e2 Mon Sep 17 00:00:00 2001 From: panfudan Date: Thu, 7 Aug 2025 23:37:18 +0800 Subject: [PATCH] dd --- assets/resources/game/heros/a4.prefab | 294 +++++---- assets/resources/game/heros/a5.prefab | 2 +- assets/resources/game/heros/d1.prefab | 2 +- assets/resources/game/heros/d2.prefab | 2 +- assets/resources/game/heros/k2.prefab | 2 +- assets/resources/game/heros/k3.prefab | 2 +- assets/resources/game/heros/m4.prefab | 466 +++++++------- assets/resources/game/heros/zh1.prefab | 466 +++++++------- assets/resources/game/heros/zh2.prefab | 466 +++++++------- assets/resources/game/skills/anm/atk2.anim | 2 +- assets/resources/game/skills/buff.prefab | 582 ++++++++++-------- .../resources/game/skills/max_fireatk.prefab | 24 +- assets/resources/gui/role_controller.prefab | 18 +- assets/script/game/common/config/SkillSet.ts | 8 +- assets/script/game/common/config/heroSet.ts | 20 +- .../common/ecs/position/BattleMoveSystem.ts | 3 + assets/script/game/hero/BuffComp.ts | 26 +- 17 files changed, 1251 insertions(+), 1134 deletions(-) diff --git a/assets/resources/game/heros/a4.prefab b/assets/resources/game/heros/a4.prefab index c8545ec5..f0f7238b 100644 --- a/assets/resources/game/heros/a4.prefab +++ b/assets/resources/game/heros/a4.prefab @@ -28,35 +28,26 @@ "__id__": 17 }, { - "__id__": 26 + "__id__": 32 }, { - "__id__": 34 + "__id__": 40 }, { - "__id__": 46 + "__id__": 52 }, { - "__id__": 57 + "__id__": 63 }, { - "__id__": 66 + "__id__": 72 }, { - "__id__": 75 + "__id__": 81 } ], "_active": true, "_components": [ - { - "__id__": 83 - }, - { - "__id__": 85 - }, - { - "__id__": 87 - }, { "__id__": 89 }, @@ -71,10 +62,19 @@ }, { "__id__": 97 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + }, + { + "__id__": 103 } ], "_prefab": { - "__id__": 99 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -415,6 +415,15 @@ }, { "__id__": 25 + }, + { + "__id__": 26 + }, + { + "__id__": 28 + }, + { + "__id__": 30 } ], "removedComponents": [] @@ -491,6 +500,57 @@ ], "value": true }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "06rIMEZhtCFqxn+0HUwA7U", + "aeAW4zjwBDyJD3EFyy6QyB" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 29 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "32p0FTAsdPS6U4aymzjUkA", + "aeAW4zjwBDyJD3EFyy6QyB" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 31 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d4PzngPStAI4kvOSezL4iM", + "aeAW4zjwBDyJD3EFyy6QyB" + ] + }, { "__type__": "cc.Node", "_name": "anm", @@ -503,17 +563,17 @@ "_active": true, "_components": [ { - "__id__": 27 + "__id__": 33 }, { - "__id__": 29 + "__id__": 35 }, { - "__id__": 31 + "__id__": 37 } ], "_prefab": { - "__id__": 33 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", @@ -550,11 +610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -578,11 +638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -623,11 +683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 26 + "__id__": 32 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 38 }, "_id": "" }, @@ -655,14 +715,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 41 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 40 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -670,7 +730,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 36 + "__id__": 42 }, "targetOverrides": null }, @@ -683,26 +743,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, { "__id__": 43 }, { "__id__": 45 + }, + { + "__id__": 46 + }, + { + "__id__": 47 + }, + { + "__id__": 48 + }, + { + "__id__": 49 + }, + { + "__id__": 51 } ], "removedComponents": [] @@ -710,7 +770,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 44 }, "propertyPath": [ "_name" @@ -726,7 +786,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -741,7 +801,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 44 }, "propertyPath": [ "_lrot" @@ -757,7 +817,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 44 }, "propertyPath": [ "_euler" @@ -772,7 +832,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 44 }, "propertyPath": [ "_active" @@ -782,7 +842,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 50 }, "propertyPath": [ "_contentSize" @@ -802,7 +862,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 44 }, "propertyPath": [ "_lscale" @@ -821,14 +881,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 47 + "__id__": 53 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 46 + "__id__": 52 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -836,7 +896,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 48 + "__id__": 54 }, "targetOverrides": null }, @@ -850,22 +910,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 49 + "__id__": 55 }, { - "__id__": 51 + "__id__": 57 }, { - "__id__": 52 + "__id__": 58 }, { - "__id__": 53 + "__id__": 59 }, { - "__id__": 54 + "__id__": 60 }, { - "__id__": 56 + "__id__": 62 } ], "removedComponents": [] @@ -873,7 +933,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 56 }, "propertyPath": [ "_name" @@ -889,7 +949,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 56 }, "propertyPath": [ "_lpos" @@ -904,7 +964,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 56 }, "propertyPath": [ "_lrot" @@ -920,7 +980,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 56 }, "propertyPath": [ "_euler" @@ -935,7 +995,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 55 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -956,7 +1016,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 56 }, "propertyPath": [ "_lscale" @@ -975,14 +1035,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 58 + "__id__": 64 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 57 + "__id__": 63 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -990,7 +1050,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 59 + "__id__": 65 }, "targetOverrides": null }, @@ -1004,19 +1064,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 60 + "__id__": 66 }, { - "__id__": 62 + "__id__": 68 }, { - "__id__": 63 + "__id__": 69 }, { - "__id__": 64 + "__id__": 70 }, { - "__id__": 65 + "__id__": 71 } ], "removedComponents": [] @@ -1024,7 +1084,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 67 }, "propertyPath": [ "_name" @@ -1040,7 +1100,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 67 }, "propertyPath": [ "_lpos" @@ -1055,7 +1115,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 67 }, "propertyPath": [ "_lrot" @@ -1071,7 +1131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 67 }, "propertyPath": [ "_euler" @@ -1086,7 +1146,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 61 + "__id__": 67 }, "propertyPath": [ "_active" @@ -1100,14 +1160,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 67 + "__id__": 73 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 66 + "__id__": 72 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -1115,7 +1175,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 68 + "__id__": 74 }, "targetOverrides": null }, @@ -1129,19 +1189,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 69 + "__id__": 75 }, { - "__id__": 71 + "__id__": 77 }, { - "__id__": 72 + "__id__": 78 }, { - "__id__": 73 + "__id__": 79 }, { - "__id__": 74 + "__id__": 80 } ], "removedComponents": [] @@ -1149,7 +1209,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 76 }, "propertyPath": [ "_name" @@ -1165,7 +1225,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 76 }, "propertyPath": [ "_lpos" @@ -1180,7 +1240,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 76 }, "propertyPath": [ "_lrot" @@ -1196,7 +1256,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 76 }, "propertyPath": [ "_euler" @@ -1211,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 76 }, "propertyPath": [ "_active" @@ -1225,14 +1285,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 76 + "__id__": 82 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 75 + "__id__": 81 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1240,7 +1300,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 77 + "__id__": 83 }, "targetOverrides": null }, @@ -1254,16 +1314,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 78 + "__id__": 84 }, { - "__id__": 80 + "__id__": 86 }, { - "__id__": 81 + "__id__": 87 }, { - "__id__": 82 + "__id__": 88 } ], "removedComponents": [] @@ -1271,7 +1331,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 79 + "__id__": 85 }, "propertyPath": [ "_name" @@ -1287,7 +1347,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 79 + "__id__": 85 }, "propertyPath": [ "_lpos" @@ -1302,7 +1362,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 79 + "__id__": 85 }, "propertyPath": [ "_lrot" @@ -1318,7 +1378,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 79 + "__id__": 85 }, "propertyPath": [ "_euler" @@ -1340,7 +1400,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 90 }, "_contentSize": { "__type__": "cc.Size", @@ -1368,10 +1428,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 92 }, "anm": { - "__id__": 31 + "__id__": 37 }, "_id": "" }, @@ -1389,7 +1449,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 94 }, "_id": "" }, @@ -1407,7 +1467,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 96 }, "_id": "" }, @@ -1425,7 +1485,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 98 }, "enabledContactListener": true, "bullet": false, @@ -1459,7 +1519,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 100 }, "tag": 0, "_group": 4, @@ -1493,7 +1553,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 102 }, "_id": "" }, @@ -1511,7 +1571,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 104 }, "_id": "" }, @@ -1532,19 +1592,19 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 75 + "__id__": 81 }, { - "__id__": 66 + "__id__": 72 }, { - "__id__": 57 + "__id__": 63 }, { - "__id__": 46 + "__id__": 52 }, { - "__id__": 34 + "__id__": 40 }, { "__id__": 17 diff --git a/assets/resources/game/heros/a5.prefab b/assets/resources/game/heros/a5.prefab index df906892..322b1642 100644 --- a/assets/resources/game/heros/a5.prefab +++ b/assets/resources/game/heros/a5.prefab @@ -489,7 +489,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.Node", diff --git a/assets/resources/game/heros/d1.prefab b/assets/resources/game/heros/d1.prefab index 73863059..767685a2 100644 --- a/assets/resources/game/heros/d1.prefab +++ b/assets/resources/game/heros/d1.prefab @@ -489,7 +489,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.Node", diff --git a/assets/resources/game/heros/d2.prefab b/assets/resources/game/heros/d2.prefab index 7313f5b4..e1108bd5 100644 --- a/assets/resources/game/heros/d2.prefab +++ b/assets/resources/game/heros/d2.prefab @@ -489,7 +489,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.Node", diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab index 098f070e..069dd1a5 100644 --- a/assets/resources/game/heros/k2.prefab +++ b/assets/resources/game/heros/k2.prefab @@ -350,7 +350,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.Node", diff --git a/assets/resources/game/heros/k3.prefab b/assets/resources/game/heros/k3.prefab index 1149901a..3ee1f5d2 100644 --- a/assets/resources/game/heros/k3.prefab +++ b/assets/resources/game/heros/k3.prefab @@ -350,7 +350,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "cc.Node", diff --git a/assets/resources/game/heros/m4.prefab b/assets/resources/game/heros/m4.prefab index 1313d42c..38c4a3c3 100644 --- a/assets/resources/game/heros/m4.prefab +++ b/assets/resources/game/heros/m4.prefab @@ -25,13 +25,13 @@ "__id__": 11 }, { - "__id__": 19 + "__id__": 20 }, { - "__id__": 34 + "__id__": 28 }, { - "__id__": 45 + "__id__": 43 }, { "__id__": 54 @@ -40,7 +40,7 @@ "__id__": 63 }, { - "__id__": 71 + "__id__": 72 } ], "_active": true, @@ -224,6 +224,131 @@ ], "value": false }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 12 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 11 + }, + "asset": { + "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", + "__expectedType__": "cc.Prefab" + }, + "fileId": "65v9q/98dMjafRlb094Ctr", + "instance": { + "__id__": 13 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "86BuJqvxtDJK/e/RGph1cW", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 17 + }, + { + "__id__": 18 + }, + { + "__id__": 19 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_name" + ], + "value": "buff" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "65v9q/98dMjafRlb094Ctr" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.Node", "_name": "anm", @@ -236,17 +361,17 @@ "_active": true, "_components": [ { - "__id__": 12 + "__id__": 21 }, { - "__id__": 14 + "__id__": 23 }, { - "__id__": 16 + "__id__": 25 } ], "_prefab": { - "__id__": 18 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -283,11 +408,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", @@ -311,11 +436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 24 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -356,11 +481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 26 }, "_id": "" }, @@ -388,14 +513,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 20 + "__id__": 29 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 19 + "__id__": 28 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -403,7 +528,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 21 + "__id__": 30 }, "targetOverrides": null }, @@ -416,32 +541,32 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 25 - }, - { - "__id__": 26 - }, - { - "__id__": 27 - }, - { - "__id__": 28 - }, - { - "__id__": 30 - }, { "__id__": 31 }, { - "__id__": 32 + "__id__": 33 + }, + { + "__id__": 34 + }, + { + "__id__": 35 + }, + { + "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 40 + }, + { + "__id__": 41 } ], "removedComponents": [] @@ -449,7 +574,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_name" @@ -465,7 +590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lpos" @@ -480,7 +605,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lrot" @@ -496,7 +621,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_euler" @@ -511,7 +636,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_active" @@ -521,7 +646,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 29 + "__id__": 38 }, "propertyPath": [ "_contentSize" @@ -541,7 +666,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lscale" @@ -556,7 +681,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_layer" @@ -566,7 +691,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 42 }, "propertyPath": [ "_layer" @@ -586,14 +711,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 44 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 43 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -601,7 +726,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 45 }, "targetOverrides": null }, @@ -615,22 +740,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 46 }, { - "__id__": 39 + "__id__": 48 }, { - "__id__": 40 + "__id__": 49 }, { - "__id__": 41 + "__id__": 50 }, { - "__id__": 42 + "__id__": 51 }, { - "__id__": 44 + "__id__": 53 } ], "removedComponents": [] @@ -638,7 +763,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_name" @@ -654,7 +779,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lpos" @@ -669,7 +794,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lrot" @@ -685,7 +810,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_euler" @@ -700,7 +825,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 52 }, "propertyPath": [ "_lpos" @@ -721,7 +846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lscale" @@ -733,131 +858,6 @@ "z": 1 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 46 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 45 - }, - "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", - "__expectedType__": "cc.Prefab" - }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", - "instance": { - "__id__": 47 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 48 - }, - { - "__id__": 50 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_name" - ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.Node", "_objFlags": 0, @@ -875,10 +875,10 @@ "__id__": 54 }, "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", + "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__expectedType__": "cc.Prefab" }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", + "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { "__id__": 56 }, @@ -886,7 +886,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", + "fileId": "fe79INE+JI1Jy2Hu0iKLMn", "prefabRootNode": { "__id__": 1 }, @@ -919,12 +919,12 @@ "propertyPath": [ "_name" ], - "value": "up" + "value": "tooltip" }, { "__type__": "cc.TargetInfo", "localID": [ - "91yoyAQGNDm5ziI7NUChZ+" + "0d6ZXmA5dHkZxoGONDL2sE" ] }, { @@ -937,8 +937,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 4.302, - "y": 45.887, + "x": 4.65, + "y": 129.718, "z": 0 } }, @@ -1000,10 +1000,10 @@ "__id__": 63 }, "asset": { - "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "733PKzwANLyJWD2ume4u5f", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 65 }, @@ -1011,7 +1011,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1029,6 +1029,9 @@ }, { "__id__": 70 + }, + { + "__id__": 71 } ], "removedComponents": [] @@ -1041,12 +1044,12 @@ "propertyPath": [ "_name" ], - "value": "wind" + "value": "up" }, { "__type__": "cc.TargetInfo", "localID": [ - "733PKzwANLyJWD2ume4u5f" + "91yoyAQGNDm5ziI7NUChZ+" ] }, { @@ -1059,8 +1062,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 4.302, + "y": 45.887, "z": 0 } }, @@ -1095,6 +1098,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 67 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -1102,28 +1115,28 @@ "__id__": 1 }, "_prefab": { - "__id__": 72 + "__id__": 73 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 71 + "__id__": 72 }, "asset": { - "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", + "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", "__expectedType__": "cc.Prefab" }, - "fileId": "65v9q/98dMjafRlb094Ctr", + "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 73 + "__id__": 74 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "86BuJqvxtDJK/e/RGph1cW", + "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM", "prefabRootNode": { "__id__": 1 }, @@ -1131,10 +1144,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 74 - }, - { - "__id__": 76 + "__id__": 75 }, { "__id__": 77 @@ -1151,23 +1161,23 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_name" ], - "value": "buff" + "value": "wind" }, { "__type__": "cc.TargetInfo", "localID": [ - "65v9q/98dMjafRlb094Ctr" + "733PKzwANLyJWD2ume4u5f" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_lpos" @@ -1182,7 +1192,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_lrot" @@ -1198,7 +1208,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_euler" @@ -1210,16 +1220,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 75 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.UITransform", "_name": "", @@ -1261,7 +1261,7 @@ "__id__": 83 }, "anm": { - "__id__": 16 + "__id__": 25 }, "_id": "" }, @@ -1404,7 +1404,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 71 + "__id__": 72 }, { "__id__": 63 @@ -1413,13 +1413,13 @@ "__id__": 54 }, { - "__id__": 45 + "__id__": 43 }, { - "__id__": 34 + "__id__": 28 }, { - "__id__": 19 + "__id__": 11 }, { "__id__": 2 diff --git a/assets/resources/game/heros/zh1.prefab b/assets/resources/game/heros/zh1.prefab index 663ab813..bc2eb682 100644 --- a/assets/resources/game/heros/zh1.prefab +++ b/assets/resources/game/heros/zh1.prefab @@ -25,13 +25,13 @@ "__id__": 11 }, { - "__id__": 19 + "__id__": 20 }, { - "__id__": 34 + "__id__": 28 }, { - "__id__": 45 + "__id__": 43 }, { "__id__": 54 @@ -40,7 +40,7 @@ "__id__": 63 }, { - "__id__": 71 + "__id__": 72 } ], "_active": true, @@ -227,6 +227,131 @@ ], "value": false }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 12 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 11 + }, + "asset": { + "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", + "__expectedType__": "cc.Prefab" + }, + "fileId": "65v9q/98dMjafRlb094Ctr", + "instance": { + "__id__": 13 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "86BuJqvxtDJK/e/RGph1cW", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 17 + }, + { + "__id__": 18 + }, + { + "__id__": 19 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_name" + ], + "value": "buff" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "65v9q/98dMjafRlb094Ctr" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.Node", "_name": "anm", @@ -239,17 +364,17 @@ "_active": true, "_components": [ { - "__id__": 12 + "__id__": 21 }, { - "__id__": 14 + "__id__": 23 }, { - "__id__": 16 + "__id__": 25 } ], "_prefab": { - "__id__": 18 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,11 +411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", @@ -314,11 +439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 24 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -359,11 +484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 26 }, "_id": "" }, @@ -391,14 +516,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 20 + "__id__": 29 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 19 + "__id__": 28 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -406,7 +531,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 21 + "__id__": 30 }, "targetOverrides": null }, @@ -419,32 +544,32 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 25 - }, - { - "__id__": 26 - }, - { - "__id__": 27 - }, - { - "__id__": 28 - }, - { - "__id__": 30 - }, { "__id__": 31 }, { - "__id__": 32 + "__id__": 33 + }, + { + "__id__": 34 + }, + { + "__id__": 35 + }, + { + "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 40 + }, + { + "__id__": 41 } ], "removedComponents": [] @@ -452,7 +577,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_name" @@ -468,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lpos" @@ -483,7 +608,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lrot" @@ -499,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_euler" @@ -514,7 +639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_active" @@ -524,7 +649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 29 + "__id__": 38 }, "propertyPath": [ "_contentSize" @@ -544,7 +669,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lscale" @@ -559,7 +684,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_layer" @@ -569,7 +694,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 42 }, "propertyPath": [ "_layer" @@ -589,14 +714,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 44 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 43 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -604,7 +729,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 45 }, "targetOverrides": null }, @@ -618,22 +743,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 46 }, { - "__id__": 39 + "__id__": 48 }, { - "__id__": 40 + "__id__": 49 }, { - "__id__": 41 + "__id__": 50 }, { - "__id__": 42 + "__id__": 51 }, { - "__id__": 44 + "__id__": 53 } ], "removedComponents": [] @@ -641,7 +766,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_name" @@ -657,7 +782,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lpos" @@ -672,7 +797,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lrot" @@ -688,7 +813,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_euler" @@ -703,7 +828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 52 }, "propertyPath": [ "_lpos" @@ -724,7 +849,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lscale" @@ -736,131 +861,6 @@ "z": 1 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 46 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 45 - }, - "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", - "__expectedType__": "cc.Prefab" - }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", - "instance": { - "__id__": 47 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 48 - }, - { - "__id__": 50 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_name" - ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.Node", "_objFlags": 0, @@ -878,10 +878,10 @@ "__id__": 54 }, "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", + "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__expectedType__": "cc.Prefab" }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", + "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { "__id__": 56 }, @@ -889,7 +889,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", + "fileId": "fe79INE+JI1Jy2Hu0iKLMn", "prefabRootNode": { "__id__": 1 }, @@ -922,12 +922,12 @@ "propertyPath": [ "_name" ], - "value": "up" + "value": "tooltip" }, { "__type__": "cc.TargetInfo", "localID": [ - "91yoyAQGNDm5ziI7NUChZ+" + "0d6ZXmA5dHkZxoGONDL2sE" ] }, { @@ -940,8 +940,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 4.302, - "y": 45.887, + "x": 4.65, + "y": 129.718, "z": 0 } }, @@ -1003,10 +1003,10 @@ "__id__": 63 }, "asset": { - "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "733PKzwANLyJWD2ume4u5f", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 65 }, @@ -1014,7 +1014,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1032,6 +1032,9 @@ }, { "__id__": 70 + }, + { + "__id__": 71 } ], "removedComponents": [] @@ -1044,12 +1047,12 @@ "propertyPath": [ "_name" ], - "value": "wind" + "value": "up" }, { "__type__": "cc.TargetInfo", "localID": [ - "733PKzwANLyJWD2ume4u5f" + "91yoyAQGNDm5ziI7NUChZ+" ] }, { @@ -1062,8 +1065,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 4.302, + "y": 45.887, "z": 0 } }, @@ -1098,6 +1101,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 67 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -1105,28 +1118,28 @@ "__id__": 1 }, "_prefab": { - "__id__": 72 + "__id__": 73 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 71 + "__id__": 72 }, "asset": { - "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", + "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", "__expectedType__": "cc.Prefab" }, - "fileId": "65v9q/98dMjafRlb094Ctr", + "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 73 + "__id__": 74 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "86BuJqvxtDJK/e/RGph1cW", + "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM", "prefabRootNode": { "__id__": 1 }, @@ -1134,10 +1147,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 74 - }, - { - "__id__": 76 + "__id__": 75 }, { "__id__": 77 @@ -1154,23 +1164,23 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_name" ], - "value": "buff" + "value": "wind" }, { "__type__": "cc.TargetInfo", "localID": [ - "65v9q/98dMjafRlb094Ctr" + "733PKzwANLyJWD2ume4u5f" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_lpos" @@ -1185,7 +1195,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_lrot" @@ -1201,7 +1211,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_euler" @@ -1213,16 +1223,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 75 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.UITransform", "_name": "", @@ -1264,7 +1264,7 @@ "__id__": 83 }, "anm": { - "__id__": 16 + "__id__": 25 }, "_id": "" }, @@ -1425,7 +1425,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 71 + "__id__": 72 }, { "__id__": 63 @@ -1434,13 +1434,13 @@ "__id__": 54 }, { - "__id__": 45 + "__id__": 43 }, { - "__id__": 34 + "__id__": 28 }, { - "__id__": 19 + "__id__": 11 }, { "__id__": 2 diff --git a/assets/resources/game/heros/zh2.prefab b/assets/resources/game/heros/zh2.prefab index a58b5430..9d2d6582 100644 --- a/assets/resources/game/heros/zh2.prefab +++ b/assets/resources/game/heros/zh2.prefab @@ -25,13 +25,13 @@ "__id__": 11 }, { - "__id__": 19 + "__id__": 20 }, { - "__id__": 34 + "__id__": 28 }, { - "__id__": 45 + "__id__": 43 }, { "__id__": 54 @@ -40,7 +40,7 @@ "__id__": 63 }, { - "__id__": 71 + "__id__": 72 } ], "_active": true, @@ -227,6 +227,131 @@ ], "value": false }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 12 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 11 + }, + "asset": { + "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", + "__expectedType__": "cc.Prefab" + }, + "fileId": "65v9q/98dMjafRlb094Ctr", + "instance": { + "__id__": 13 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "86BuJqvxtDJK/e/RGph1cW", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 17 + }, + { + "__id__": 18 + }, + { + "__id__": 19 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_name" + ], + "value": "buff" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "65v9q/98dMjafRlb094Ctr" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, { "__type__": "cc.Node", "_name": "anm", @@ -239,17 +364,17 @@ "_active": true, "_components": [ { - "__id__": 12 + "__id__": 21 }, { - "__id__": 14 + "__id__": 23 }, { - "__id__": 16 + "__id__": 25 } ], "_prefab": { - "__id__": 18 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,11 +411,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", @@ -314,11 +439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 24 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -359,11 +484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 11 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 26 }, "_id": "" }, @@ -391,14 +516,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 20 + "__id__": 29 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 19 + "__id__": 28 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -406,7 +531,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 21 + "__id__": 30 }, "targetOverrides": null }, @@ -419,32 +544,32 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 22 - }, - { - "__id__": 24 - }, - { - "__id__": 25 - }, - { - "__id__": 26 - }, - { - "__id__": 27 - }, - { - "__id__": 28 - }, - { - "__id__": 30 - }, { "__id__": 31 }, { - "__id__": 32 + "__id__": 33 + }, + { + "__id__": 34 + }, + { + "__id__": 35 + }, + { + "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + }, + { + "__id__": 40 + }, + { + "__id__": 41 } ], "removedComponents": [] @@ -452,7 +577,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_name" @@ -468,7 +593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lpos" @@ -483,7 +608,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lrot" @@ -499,7 +624,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_euler" @@ -514,7 +639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_active" @@ -524,7 +649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 29 + "__id__": 38 }, "propertyPath": [ "_contentSize" @@ -544,7 +669,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_lscale" @@ -559,7 +684,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 32 }, "propertyPath": [ "_layer" @@ -569,7 +694,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 42 }, "propertyPath": [ "_layer" @@ -589,14 +714,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 44 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 43 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -604,7 +729,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 45 }, "targetOverrides": null }, @@ -618,22 +743,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 46 }, { - "__id__": 39 + "__id__": 48 }, { - "__id__": 40 + "__id__": 49 }, { - "__id__": 41 + "__id__": 50 }, { - "__id__": 42 + "__id__": 51 }, { - "__id__": 44 + "__id__": 53 } ], "removedComponents": [] @@ -641,7 +766,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_name" @@ -657,7 +782,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lpos" @@ -672,7 +797,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lrot" @@ -688,7 +813,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_euler" @@ -703,7 +828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 52 }, "propertyPath": [ "_lpos" @@ -724,7 +849,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 47 }, "propertyPath": [ "_lscale" @@ -736,131 +861,6 @@ "z": 1 } }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 46 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 45 - }, - "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", - "__expectedType__": "cc.Prefab" - }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", - "instance": { - "__id__": 47 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 48 - }, - { - "__id__": 50 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_name" - ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 49 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.Node", "_objFlags": 0, @@ -878,10 +878,10 @@ "__id__": 54 }, "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", + "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", "__expectedType__": "cc.Prefab" }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", + "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { "__id__": 56 }, @@ -889,7 +889,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", + "fileId": "fe79INE+JI1Jy2Hu0iKLMn", "prefabRootNode": { "__id__": 1 }, @@ -922,12 +922,12 @@ "propertyPath": [ "_name" ], - "value": "up" + "value": "tooltip" }, { "__type__": "cc.TargetInfo", "localID": [ - "91yoyAQGNDm5ziI7NUChZ+" + "0d6ZXmA5dHkZxoGONDL2sE" ] }, { @@ -940,8 +940,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 4.302, - "y": 45.887, + "x": 4.65, + "y": 129.718, "z": 0 } }, @@ -1003,10 +1003,10 @@ "__id__": 63 }, "asset": { - "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "733PKzwANLyJWD2ume4u5f", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 65 }, @@ -1014,7 +1014,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1032,6 +1032,9 @@ }, { "__id__": 70 + }, + { + "__id__": 71 } ], "removedComponents": [] @@ -1044,12 +1047,12 @@ "propertyPath": [ "_name" ], - "value": "wind" + "value": "up" }, { "__type__": "cc.TargetInfo", "localID": [ - "733PKzwANLyJWD2ume4u5f" + "91yoyAQGNDm5ziI7NUChZ+" ] }, { @@ -1062,8 +1065,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 4.302, + "y": 45.887, "z": 0 } }, @@ -1098,6 +1101,16 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 67 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -1105,28 +1118,28 @@ "__id__": 1 }, "_prefab": { - "__id__": 72 + "__id__": 73 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 71 + "__id__": 72 }, "asset": { - "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", + "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", "__expectedType__": "cc.Prefab" }, - "fileId": "65v9q/98dMjafRlb094Ctr", + "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 73 + "__id__": 74 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "86BuJqvxtDJK/e/RGph1cW", + "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM", "prefabRootNode": { "__id__": 1 }, @@ -1134,10 +1147,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 74 - }, - { - "__id__": 76 + "__id__": 75 }, { "__id__": 77 @@ -1154,23 +1164,23 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_name" ], - "value": "buff" + "value": "wind" }, { "__type__": "cc.TargetInfo", "localID": [ - "65v9q/98dMjafRlb094Ctr" + "733PKzwANLyJWD2ume4u5f" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_lpos" @@ -1185,7 +1195,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_lrot" @@ -1201,7 +1211,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 76 }, "propertyPath": [ "_euler" @@ -1213,16 +1223,6 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 75 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, { "__type__": "cc.UITransform", "_name": "", @@ -1264,7 +1264,7 @@ "__id__": 83 }, "anm": { - "__id__": 16 + "__id__": 25 }, "_id": "" }, @@ -1425,7 +1425,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 71 + "__id__": 72 }, { "__id__": 63 @@ -1434,13 +1434,13 @@ "__id__": 54 }, { - "__id__": 45 + "__id__": 43 }, { - "__id__": 34 + "__id__": 28 }, { - "__id__": 19 + "__id__": 11 }, { "__id__": 2 diff --git a/assets/resources/game/skills/anm/atk2.anim b/assets/resources/game/skills/anm/atk2.anim index 56ff3590..f7996ca5 100644 --- a/assets/resources/game/skills/anm/atk2.anim +++ b/assets/resources/game/skills/anm/atk2.anim @@ -9,7 +9,7 @@ "_native": "", "sample": 24, "speed": 1, - "wrapMode": 2, + "wrapMode": 1, "enableTrsBlending": false, "_duration": 1.0833333333333333, "_hash": 500763545, diff --git a/assets/resources/game/skills/buff.prefab b/assets/resources/game/skills/buff.prefab index fbfc941f..ffcd3da4 100644 --- a/assets/resources/game/skills/buff.prefab +++ b/assets/resources/game/skills/buff.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 11 + "__id__": 16 }, { - "__id__": 20 - }, - { - "__id__": 29 + "__id__": 30 } ], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 44 } ], "_prefab": { - "__id__": 40 + "__id__": 46 }, "_lpos": { "__type__": "cc.Vec3", @@ -86,10 +83,10 @@ "__id__": 2 }, "asset": { - "__uuid__": "5a91888e-badd-4e3b-8fab-4a1e17bb3809", + "__uuid__": "fed355c0-e0b8-4725-be8b-0eeb1a9a1fd5", "__expectedType__": "cc.Prefab" }, - "fileId": "d9+1SmE5VA0p7BpyF8Wbya", + "fileId": "aeAW4zjwBDyJD3EFyy6QyB", "instance": { "__id__": 4 }, @@ -97,7 +94,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "25Ecn86QNHGYkSDYdzoB3I", + "fileId": "d4PzngPStAI4kvOSezL4iM", "prefabRootNode": { "__id__": 1 }, @@ -118,136 +115,15 @@ }, { "__id__": 10 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_name" - ], - "value": "bb" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d9+1SmE5VA0p7BpyF8Wbya" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": -13, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": -0.7071067811865475, - "w": 0.7071067811865476 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": -90 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 6 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 2, - "y": 3, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 12 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 11 - }, - "asset": { - "__uuid__": "02422ee1-4cc8-419b-9db3-c78e0240278e", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fzvNK4CpK3piQYO0XOTKc", - "instance": { - "__id__": 13 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "96jrow9kZNI6hGjq7sljSC", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ + }, + { + "__id__": 11 + }, + { + "__id__": 12 + }, { "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 17 - }, - { - "__id__": 18 - }, - { - "__id__": 19 } ], "removedComponents": [] @@ -255,23 +131,23 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_name" ], - "value": "bp" + "value": "by1" }, { "__type__": "cc.TargetInfo", "localID": [ - "5fzvNK4CpK3piQYO0XOTKc" + "aeAW4zjwBDyJD3EFyy6QyB" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_lpos" @@ -279,14 +155,14 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -13, + "y": 0, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_lrot" @@ -302,7 +178,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_euler" @@ -317,18 +193,67 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 15 + "__id__": 6 }, "propertyPath": [ "_lscale" ], "value": { "__type__": "cc.Vec3", - "x": 2, - "y": 3, + "x": 1.5, + "y": 1.5, "z": 1 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 13 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 102, + "height": 64 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f373/vztdOU7+pp1xJd2U9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_spriteFrame" + ], + "value": { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@5540a", + "__expectedType__": "cc.SpriteFrame" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e6kveHcyJDD5TerXmIcUI5" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -336,14 +261,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 21 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 20 + "__id__": 16 }, "asset": { "__uuid__": "fed355c0-e0b8-4725-be8b-0eeb1a9a1fd5", @@ -351,7 +276,195 @@ }, "fileId": "aeAW4zjwBDyJD3EFyy6QyB", "instance": { - "__id__": 22 + "__id__": 18 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "06rIMEZhtCFqxn+0HUwA7U", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 19 + }, + { + "__id__": 21 + }, + { + "__id__": 22 + }, + { + "__id__": 23 + }, + { + "__id__": 24 + }, + { + "__id__": 25 + }, + { + "__id__": 26 + }, + { + "__id__": 28 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_name" + ], + "value": "by2" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aeAW4zjwBDyJD3EFyy6QyB" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -5, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": -0.7071067811865475, + "w": 0.7071067811865476 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -90 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1.5, + "y": 2, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 20 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 27 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 102, + "height": 64 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f373/vztdOU7+pp1xJd2U9" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 29 + }, + "propertyPath": [ + "_spriteFrame" + ], + "value": { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@aa15b", + "__expectedType__": "cc.SpriteFrame" + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e6kveHcyJDD5TerXmIcUI5" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 31 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 30 + }, + "asset": { + "__uuid__": "fed355c0-e0b8-4725-be8b-0eeb1a9a1fd5", + "__expectedType__": "cc.Prefab" + }, + "fileId": "aeAW4zjwBDyJD3EFyy6QyB", + "instance": { + "__id__": 32 }, "targetOverrides": null }, @@ -365,19 +478,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 23 + "__id__": 33 }, { - "__id__": 25 + "__id__": 35 }, { - "__id__": 26 + "__id__": 36 }, { - "__id__": 27 + "__id__": 37 }, { - "__id__": 28 + "__id__": 38 + }, + { + "__id__": 39 + }, + { + "__id__": 40 + }, + { + "__id__": 42 } ], "removedComponents": [] @@ -385,12 +507,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 34 }, "propertyPath": [ "_name" ], - "value": "by" + "value": "by3" }, { "__type__": "cc.TargetInfo", @@ -401,7 +523,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 34 }, "propertyPath": [ "_lpos" @@ -416,7 +538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 34 }, "propertyPath": [ "_lrot" @@ -432,7 +554,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 34 }, "propertyPath": [ "_euler" @@ -447,7 +569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 34 }, "propertyPath": [ "_lscale" @@ -455,139 +577,58 @@ "value": { "__type__": "cc.Vec3", "x": 2, - "y": 3, + "y": 2.5, "z": 1 } }, { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 34 }, - "_prefab": { - "__id__": 30 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 29 - }, - "asset": { - "__uuid__": "15ebea82-dd62-4920-8d33-c03aec2ea520", - "__expectedType__": "cc.Prefab" - }, - "fileId": "76SnZzdG9Es5pIgepl1NEF", - "instance": { - "__id__": 31 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "97MZN6SpVAipeaCcFZJOwa", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 32 - }, - { - "__id__": 34 - }, - { - "__id__": 35 - }, - { - "__id__": 36 - }, - { - "__id__": 37 - } + "propertyPath": [ + "_active" ], - "removedComponents": [] + "value": false }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 41 }, "propertyPath": [ - "_name" + "_contentSize" ], - "value": "bg" + "value": { + "__type__": "cc.Size", + "width": 102, + "height": 64 + } }, { "__type__": "cc.TargetInfo", "localID": [ - "76SnZzdG9Es5pIgepl1NEF" + "f373/vztdOU7+pp1xJd2U9" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 43 }, "propertyPath": [ - "_lpos" + "_spriteFrame" ], "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": -13, - "z": 0 + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@3d405", + "__expectedType__": "cc.SpriteFrame" } }, { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": -0.7071067811865475, - "w": 0.7071067811865476 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": -90 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 2, - "y": 3, - "z": 1 - } + "__type__": "cc.TargetInfo", + "localID": [ + "e6kveHcyJDD5TerXmIcUI5" + ] }, { "__type__": "cc.UITransform", @@ -599,7 +640,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -630,13 +671,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 29 + "__id__": 30 }, { - "__id__": 20 - }, - { - "__id__": 11 + "__id__": 16 }, { "__id__": 2 diff --git a/assets/resources/game/skills/max_fireatk.prefab b/assets/resources/game/skills/max_fireatk.prefab index 9c30c217..11728371 100644 --- a/assets/resources/game/skills/max_fireatk.prefab +++ b/assets/resources/game/skills/max_fireatk.prefab @@ -73,8 +73,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.2, - "y": 1, + "x": 1.4, + "y": 1.4, "z": 1 }, "_mobility": 0, @@ -110,8 +110,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 32.066, + "y": 42.521, "z": 0 }, "_lrot": { @@ -243,8 +243,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 20, - "y": -10, + "x": 52.066, + "y": 32.521, "z": 0 }, "_lrot": { @@ -376,8 +376,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 20, - "y": -10, + "x": 52.066, + "y": 32.521, "z": 0 }, "_lrot": { @@ -509,8 +509,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 32.066, + "y": 42.521, "z": 0 }, "_lrot": { @@ -642,8 +642,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -40.059, - "y": -5.905, + "x": -7.993, + "y": 36.616, "z": 0 }, "_lrot": { diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 99cefec7..e48dab7a 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -4777,8 +4777,8 @@ "componentProperty": "", "refreshRate": 0.1, "watchPathArr": [ - "data.hero1.hp", - "data.hero1.hp_max" + "data.hero2.hp", + "data.hero2.hp_max" ], "stringFormat": "", "_id": "" @@ -5112,8 +5112,8 @@ "componentProperty": "", "refreshRate": 0.1, "watchPathArr": [ - "data.hero1.cd", - "data.hero1.cd_max" + "data.hero2.cd", + "data.hero2.cd_max" ], "stringFormat": "", "_id": "" @@ -5675,6 +5675,8 @@ "__id__": 0 }, "fileId": "caE6Zadz5ON6WlxdWSnKjq", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7168,8 +7170,8 @@ "componentProperty": "", "refreshRate": 0.1, "watchPathArr": [ - "data.hero1.hp", - "data.hero1.hp_max" + "data.hero3.hp", + "data.hero3.hp_max" ], "stringFormat": "", "_id": "" @@ -7503,8 +7505,8 @@ "componentProperty": "", "refreshRate": 0.1, "watchPathArr": [ - "data.hero1.cd", - "data.hero1.cd_max" + "data.hero3.cd", + "data.hero3.cd_max" ], "stringFormat": "", "_id": "" diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 29b76c2b..14294bbf 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -265,7 +265,13 @@ export const SkillSet = { 6010:{uuid:6010,name:"攻击",for_hero:false,sp_name:"atk1",path:"3036",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedStart,RType:RType.linear,EType:EType.animationEnd,fname:"max",flash:false,with:0, debuff:0,deV:0,deC:0,deR:100,in:8,ap:100,cd:5,hit:1,hited:0.2,buV:0,buC:0,buR:100,speed:720,cost:10,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, - + 6011:{uuid:6011,name:"攻击",for_hero:false,sp_name:"atk2",path:"3036",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, + TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedStart,RType:RType.linear,EType:EType.animationEnd,fname:"max",flash:false,with:0, + debuff:0,deV:0,deC:0,deR:100,in:8,ap:100,cd:5,hit:1,hited:0.2,buV:0,buC:0,buR:100,speed:720,cost:10,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, + 6020:{uuid:6020,name:"烈焰斩击",for_hero:false,sp_name:"max_fireatk",path:"3036",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, + TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:CdType.cd,AType:AType.fixedStart,RType:RType.linear,EType:EType.animationEnd,fname:"max",flash:false,with:0, + debuff:0,deV:0,deC:0,deR:100,in:8,ap:100,cd:5,hit:1,hited:0.2,buV:0,buC:0,buR:100,speed:720,cost:10,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, + 6021:{uuid:6021,name:"烈火护盾",for_hero:true,sp_name:"max_firedun",path:"3061",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"atk",DTType:DTType.range,CdType:CdType.power,AType:AType.fixedStart,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:90, diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 5a911ffa..cc3bd105 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -255,12 +255,12 @@ export const getGrowthModeDescription = (heroType: HType): string => { export const HeroInfo = { //主将 - 5001:{uuid:5001,name:"刺心.艾吉斯",path:"k2", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6010,6004,6004], + 5001:{uuid:5001,name:"火焰骑士",path:"k2", quality:HQuality.BLUE,lv:1,kind:1, + type:HType.warrior,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6011,6020], buff:[],info:"剑类专精,穿刺伤害额外+10%"}, - 5002:{uuid:5002,name:"飓风.格罗姆",path:"k3", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6010,6005,6005], + 5002:{uuid:5002,name:"圣盾骑士",path:"k3", quality:HQuality.BLUE,lv:1,kind:1, + type:HType.warrior,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6011,6004], buff:[],info:"斧类专精,风怒概率增加10%"}, // 5003:{uuid:5003,name:"碎颅.赫克托",path:"k4", quality:HQuality.BLUE,lv:1,kind:1, @@ -272,28 +272,28 @@ export const HeroInfo = { // buff:[],info:"刀类专精,易伤效果额外持续1次"}, 5005:{uuid:5005,name:"幽灵射手",path:"a4", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.remote,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6003,6003,6003], + type:HType.remote,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6003,6003], buff:[],info:"说明"}, 5007:{uuid:5007,name:"混沌法师",path:"zh1", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6002,6002,6002], + type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6002,6002], buff:[],info:"说明"}, 5008:{uuid:5008,name:"火焰法师",path:"zh2", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6002,6002,6002], + type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6022,6002], buff:[],info:"说明"}, 5009:{uuid:5009,name:"风暴精灵",path:"d1", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6002,6002,6002], + type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6002,6002], buff:[],info:"说明"}, 5010:{uuid:5010,name:"战争祭祀",path:"d2", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6002,6002,6002], + type:HType.mage,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6024,6002], buff:[],info:"说明"}, 5011:{uuid:5011,name:"暴风射手",path:"a5", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.remote,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6003,6003,6003], + type:HType.remote,hp:100,ap:15,dis:400,cd:1.5,speed:50,skills:[6003,6003], buff:[],info:"说明"}, diff --git a/assets/script/game/common/ecs/position/BattleMoveSystem.ts b/assets/script/game/common/ecs/position/BattleMoveSystem.ts index 5f183de8..06d29b5a 100644 --- a/assets/script/game/common/ecs/position/BattleMoveSystem.ts +++ b/assets/script/game/common/ecs/position/BattleMoveSystem.ts @@ -75,6 +75,9 @@ export class BattleMoveSystem extends ecs.ComblockSystem implements ecs.ISystemU if(view.node.position.x <= FightSet.HEARTPOS){ oops.message.dispatchEvent(GameEvent.LifeChange,-1) view.atk_heart=true + view.is_dead=true + view.BUFFCOMP.dead() + view.do_dead() } } } diff --git a/assets/script/game/hero/BuffComp.ts b/assets/script/game/hero/BuffComp.ts index ba74d3d1..b7a312ec 100644 --- a/assets/script/game/hero/BuffComp.ts +++ b/assets/script/game/hero/BuffComp.ts @@ -6,6 +6,7 @@ import { timedCom } from '../skills/timedCom'; import { smc } from '../common/SingletonModuleComp'; import { HeroViewComp } from './HeroViewComp'; import { GameEvent } from '../common/config/GameEvent'; +import { Timer } from 'db://oops-framework/core/common/timer/Timer'; const { ccclass, property } = _decorator; @ccclass('BuffComp') @@ -33,6 +34,10 @@ export class BuffComp extends Component { speek_time:number=0; HeroView:HeroViewComp=null! hp_bar:any=null + + timer:Timer=new Timer(2); + buff_keys:any[]=["by1","by2","by3"] + key_index:number=0; protected onLoad(): void { } start() { @@ -47,11 +52,11 @@ export class BuffComp extends Component { this.hp_bar=this.top_node.getChildByName("hp").getComponent(ProgressBar) // this.top_node.getChildByName("hp").active=(this.node.getComponent(HeroViewComp).fac == 1 ? true : false) - this.vmdata_update() + // this.vmdata_update() } to_update_vmdata(){ - this.vmdata_update(false) + // this.vmdata_update(false) } update(deltaTime: number) { if(smc.mission.pause) return @@ -60,11 +65,13 @@ export class BuffComp extends Component { if(this.wind_cd <= 0 && this.node.getChildByName("wind").active){ this.node.getChildByName("wind").active = false; } - - if(this.buff_cd > 0 ) this.buff_cd -= deltaTime; - if(this.buff_cd <= 0 && this.node.getChildByName("buff").active){ - this.node.getChildByName("buff").active = false; + if(this.timer.update(deltaTime)){ + this.timer.reset() + this.show_buff(this.buff_keys[this.key_index]) + this.key_index++ + if(this.key_index>=this.buff_keys.length) this.key_index=0 } + // this.in_speek(deltaTime) // this.vmdata_update() } @@ -132,9 +139,10 @@ export class BuffComp extends Component { } - show_buff(t:number=1){ - this.buff_cd = t; - this.node.getChildByName("buff").active = true; + show_buff(key:string="bb"){ + this.node.getChildByName("buff").getChildByName("by1").active = key == "by1" + this.node.getChildByName("buff").getChildByName("by2").active = key == "by2" + this.node.getChildByName("buff").getChildByName("by3").active = key == "by3" }