From 9c33bb0f7b0b6b5bde029efe1039e987426a1f09 Mon Sep 17 00:00:00 2001 From: panw Date: Wed, 26 Nov 2025 10:07:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=80=E8=83=BD=E6=8F=90=E7=A4=BA):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0MP=E6=81=A2=E5=A4=8D=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加MP恢复提示类型到TooltipTypes枚举 在TooltipCom组件中实现MP恢复提示的显示逻辑 更新tooltip.prefab结构以支持MP恢复提示 移除未使用的tooltip.prefab.meta文件 移除英雄prefab中的tooltip 说话节点 --- assets/resources/game/heros/ha1.prefab | 168 +--- assets/resources/game/heros/hc1.prefab | 168 +--- assets/resources/game/heros/hh1.prefab | 168 +--- assets/resources/game/heros/hk1.prefab | 168 +--- assets/resources/game/heros/hm1.prefab | 168 +--- assets/resources/game/heros/hm2.prefab | 168 +--- assets/resources/game/heros/hz1.prefab | 168 +--- assets/resources/game/heros/mo1.prefab | 168 +--- assets/resources/game/heros/mo2.prefab | 168 +--- assets/resources/game/heros/mo3.prefab | 168 +--- assets/resources/game/heros/mo4.prefab | 167 +--- assets/resources/game/heros/tooltip.prefab | 801 ------------------ .../resources/game/heros/tooltip.prefab.meta | 13 - .../resources/game/skill/buff/tooltip.prefab | 476 ++++++++++- assets/script/game/common/config/GameSet.ts | 1 + assets/script/game/hero/HeroViewComp.ts | 7 +- assets/script/game/skill/TooltipCom.ts | 8 + 17 files changed, 692 insertions(+), 2461 deletions(-) delete mode 100644 assets/resources/game/heros/tooltip.prefab delete mode 100644 assets/resources/game/heros/tooltip.prefab.meta diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 659c595f..efd394df 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/hc1.prefab b/assets/resources/game/heros/hc1.prefab index e2bdbd3e..74da91cd 100644 --- a/assets/resources/game/heros/hc1.prefab +++ b/assets/resources/game/heros/hc1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/hh1.prefab b/assets/resources/game/heros/hh1.prefab index 75a7aa7c..c1f66cf6 100644 --- a/assets/resources/game/heros/hh1.prefab +++ b/assets/resources/game/heros/hh1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/hk1.prefab b/assets/resources/game/heros/hk1.prefab index 94e90fc3..5bc33bbd 100644 --- a/assets/resources/game/heros/hk1.prefab +++ b/assets/resources/game/heros/hk1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": false, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/hm1.prefab b/assets/resources/game/heros/hm1.prefab index dc0cc1c8..ecdb6473 100644 --- a/assets/resources/game/heros/hm1.prefab +++ b/assets/resources/game/heros/hm1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/hm2.prefab b/assets/resources/game/heros/hm2.prefab index 2ed483d7..d1fa3f6f 100644 --- a/assets/resources/game/heros/hm2.prefab +++ b/assets/resources/game/heros/hm2.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/hz1.prefab b/assets/resources/game/heros/hz1.prefab index 88e67fe7..3fa55447 100644 --- a/assets/resources/game/heros/hz1.prefab +++ b/assets/resources/game/heros/hz1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/mo1.prefab b/assets/resources/game/heros/mo1.prefab index 65ed59f2..e69f2411 100644 --- a/assets/resources/game/heros/mo1.prefab +++ b/assets/resources/game/heros/mo1.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -671,10 +668,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -682,7 +679,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -715,131 +712,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -851,7 +723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -866,7 +738,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -882,7 +754,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -897,7 +769,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -914,7 +786,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -942,7 +814,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -957,12 +829,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -980,7 +853,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1014,7 +887,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1050,9 +923,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/mo2.prefab b/assets/resources/game/heros/mo2.prefab index 0ba7aa4e..a4858f75 100644 --- a/assets/resources/game/heros/mo2.prefab +++ b/assets/resources/game/heros/mo2.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/mo3.prefab b/assets/resources/game/heros/mo3.prefab index ef18fdb6..a78b6186 100644 --- a/assets/resources/game/heros/mo3.prefab +++ b/assets/resources/game/heros/mo3.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -960,12 +832,13 @@ "__type__": "873f8d+SolMEo8DiTTxZRh4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -983,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1017,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1053,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/mo4.prefab b/assets/resources/game/heros/mo4.prefab index 854f770b..cadb87fc 100644 --- a/assets/resources/game/heros/mo4.prefab +++ b/assets/resources/game/heros/mo4.prefab @@ -29,31 +29,28 @@ }, { "__id__": 37 - }, - { - "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 46 }, { - "__id__": 57 + "__id__": 48 }, { - "__id__": 59 + "__id__": 50 }, { - "__id__": 61 + "__id__": 52 }, { - "__id__": 63 + "__id__": 54 } ], "_prefab": { - "__id__": 65 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -674,10 +671,10 @@ "__id__": 37 }, "asset": { - "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 39 }, @@ -685,7 +682,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fe79INE+JI1Jy2Hu0iKLMn", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -718,131 +715,6 @@ "propertyPath": [ "_name" ], - "value": "tooltip" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0d6ZXmA5dHkZxoGONDL2sE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 4.65, - "y": 129.718, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 47 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 46 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 48 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 50 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -854,7 +726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lpos" @@ -869,7 +741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_lrot" @@ -885,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_euler" @@ -900,7 +772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 41 }, "propertyPath": [ "_active" @@ -917,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -945,7 +817,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 49 }, "anm": { "__id__": 5 @@ -966,7 +838,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 51 }, "_id": "" }, @@ -984,7 +856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 53 }, "enabledContactListener": true, "bullet": false, @@ -1018,7 +890,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 55 }, "tag": 0, "_group": 4, @@ -1054,9 +926,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 46 - }, { "__id__": 37 }, diff --git a/assets/resources/game/heros/tooltip.prefab b/assets/resources/game/heros/tooltip.prefab deleted file mode 100644 index 7fe9a867..00000000 --- a/assets/resources/game/heros/tooltip.prefab +++ /dev/null @@ -1,801 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "tooltip", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "tooltip", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - }, - { - "__id__": 24 - } - ], - "_active": true, - "_components": [ - { - "__id__": 32 - } - ], - "_prefab": { - "__id__": 34 - }, - "_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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 3 - } - ], - "_active": true, - "_components": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 21 - } - ], - "_prefab": { - "__id__": 23 - }, - "_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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Button_Border_Circle_H53_White_Bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ - { - "__id__": 4 - } - ], - "_active": true, - "_components": [ - { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - } - ], - "_prefab": { - "__id__": 16 - }, - "_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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "BubbleFrame_01_ArrowBg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 5 - }, - { - "__id__": 7 - } - ], - "_prefab": { - "__id__": 9 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 70.583, - "y": -43.963, - "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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 31, - "height": 37 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0cSf9kAD1DFbHiUjMIIH+g" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@8b3ab", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "837tIFMjhFy6LI1VDae3SQ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9bbsSellpJ/7mfHLWpToGK", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 228, - "height": 73 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "55OEMGRiREoarVbxxS4xtp" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@df277", - "__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": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "de5EHTIPtGUoEgaAHAhhfE" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_alignFlags": 45, - "_target": null, - "_left": 1, - "_right": 1, - "_top": 1, - "_bottom": 1, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 50, - "_originalHeight": 53, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "53LMej0GtNaJyk91eOlrcd" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "79W04mlENAn6oQ1y1oZyNg", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 230, - "height": 75 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d1/BqGCLlHV4LOZCExXtbR" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": null, - "_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": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "09S6er24tADYna5lfOQEkl" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 22 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 50, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "3b5Bvues1P/qDyLQHYI8J7" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fadwGZO+5HPqK+IqWjAe1I", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "words", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 25 - }, - { - "__id__": 27 - }, - { - "__id__": 29 - } - ], - "_prefab": { - "__id__": 31 - }, - "_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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 24 - }, - "_enabled": true, - "__prefab": { - "__id__": 26 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 220, - "height": 65 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "60n+Hxfa1P5qORRYWRA3am" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 24 - }, - "_enabled": true, - "__prefab": { - "__id__": 28 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "点我可以调整出战英雄", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 21, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 25, - "_overflow": 2, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 1.5, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6e8rPYem5HYojc44/ZRvP+" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 24 - }, - "_enabled": true, - "__prefab": { - "__id__": 30 - }, - "_alignFlags": 45, - "_target": null, - "_left": 5, - "_right": 5, - "_top": 5, - "_bottom": 5, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 63, - "_originalHeight": 59.49999999999999, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9cjyQ0wVdFkrdMNAqOGW27" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9d+dPANj1LBo7dJI/bx9b5", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 33 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 230, - "height": 75 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0alpB0Wg1E+5gOjL4DZ451" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0d6ZXmA5dHkZxoGONDL2sE", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/heros/tooltip.prefab.meta b/assets/resources/game/heros/tooltip.prefab.meta deleted file mode 100644 index 1c7f1b7d..00000000 --- a/assets/resources/game/heros/tooltip.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "tooltip" - } -} diff --git a/assets/resources/game/skill/buff/tooltip.prefab b/assets/resources/game/skill/buff/tooltip.prefab index 90a4a861..504ff96b 100644 --- a/assets/resources/game/skill/buff/tooltip.prefab +++ b/assets/resources/game/skill/buff/tooltip.prefab @@ -41,22 +41,25 @@ }, { "__id__": 112 + }, + { + "__id__": 128 } ], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 146 }, { - "__id__": 130 + "__id__": 148 }, { - "__id__": 132 + "__id__": 150 } ], "_prefab": { - "__id__": 134 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -3229,6 +3232,465 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "add_mp", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 129 + } + ], + "_active": false, + "_components": [ + { + "__id__": 143 + } + ], + "_prefab": { + "__id__": 145 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 100, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "mp", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 128 + }, + "_children": [ + { + "__id__": 130 + } + ], + "_active": true, + "_components": [ + { + "__id__": 138 + }, + { + "__id__": 140 + } + ], + "_prefab": { + "__id__": 142 + }, + "_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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 129 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 131 + }, + { + "__id__": 133 + }, + { + "__id__": 135 + } + ], + "_prefab": { + "__id__": 137 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -36.930390625, + "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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": { + "__id__": 132 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 29.19921875, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7pa95arBMLryPjDchPW2u" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": { + "__id__": 134 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 78, + "g": 187, + "b": 248, + "a": 255 + }, + "_string": "+", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 50, + "_fontSize": 50, + "_fontFamily": "Arial", + "_lineHeight": 50, + "_overflow": 2, + "_enableWrapText": true, + "_font": { + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f59zx54hJB37o3wtSqIGBV" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": { + "__id__": 136 + }, + "_alignFlags": 8, + "_target": null, + "_left": -26.875, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_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": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bff7l/qFpNO5oNUSmuFSLr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "dde8Se2FBP6YgwyTh2rZbf", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 129 + }, + "_enabled": true, + "__prefab": { + "__id__": 139 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 49.31, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a7muNmCwZAKpIRc8MvTGGv" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 129 + }, + "_enabled": true, + "__prefab": { + "__id__": 141 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 78, + "g": 187, + "b": 248, + "a": 255 + }, + "_string": "50", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 50, + "_fontSize": 50, + "_fontFamily": "Arial", + "_lineHeight": 50, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 1, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2aXJDSKKZKIbjQcZu71V+X" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "38i7UtIApLjqUtKEKBvdcg", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 128 + }, + "_enabled": true, + "__prefab": { + "__id__": 144 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "59w5YrumVHsLzq3Hx6nzWc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "240I/BD+VEa7lFN2Uv61xY", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -3239,7 +3701,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3267,7 +3729,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 149 }, "_id": "" }, @@ -3285,7 +3747,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 151 }, "playOnLoad": true, "_clips": [ diff --git a/assets/script/game/common/config/GameSet.ts b/assets/script/game/common/config/GameSet.ts index dab0b7de..9d36ea95 100644 --- a/assets/script/game/common/config/GameSet.ts +++ b/assets/script/game/common/config/GameSet.ts @@ -146,4 +146,5 @@ export const TooltipTypes = { lvup:6, apup:7, hpup:8, + addmp:9, } diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 4e46faf8..b5e8a534 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -295,7 +295,12 @@ export class HeroViewComp extends CCComp { this.hp_tip(TooltipTypes.health, hp.toFixed(0)); this.top_node.active=true this.hp_show(this.model.hp, this.model.Attrs[Attrs.HP_MAX]); - + } + mp(mp: number = 0) { + // 生命值更新由 Model 层处理，这里只负责视图表现 + this.hp_tip(TooltipTypes.addmp, mp.toFixed(0)); + this.top_node.active=true + this.mp_show(this.model.mp, this.model.Attrs[Attrs.MP_MAX]); } alive(){ diff --git a/assets/script/game/skill/TooltipCom.ts b/assets/script/game/skill/TooltipCom.ts index 5c1f2f99..e0ac7712 100644 --- a/assets/script/game/skill/TooltipCom.ts +++ b/assets/script/game/skill/TooltipCom.ts @@ -41,6 +41,14 @@ export class TooltipCom extends CCComp { this.ent.destroy() },0.5) break + case TooltipTypes.addmp: + this.node.setSiblingIndex(110); + this.node.getChildByName("add_mp").getChildByName("mp").getComponent(Label).string = this.value; + this.node.getChildByName("add_mp").active=true; + this.scheduleOnce(()=>{ + this.ent.destroy() + },0.5) + break case TooltipTypes.crit: this.node.setPosition(v3(this.node.position.x,this.node.position.y)) this.node.setSiblingIndex(200);