From db180645112633bd0d428f6b2c551fd8e299e37d Mon Sep 17 00:00:00 2001 From: panw Date: Mon, 30 Jun 2025 16:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90,=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=20=E8=8B=B1=E9=9B=84=20=E5=92=8C=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/skills/anm/tobig.anim | 569 +++++++++- assets/resources/game/skills/tooltip.prefab | 1054 ++++++++++++++++++- assets/script/game/common/config/Mission.ts | 10 + assets/script/game/hero/HeroViewComp.ts | 21 +- assets/script/game/skills/TooltipCom.ts | 35 +- assets/script/todo.md | 6 +- 6 files changed, 1669 insertions(+), 26 deletions(-) diff --git a/assets/resources/game/skills/anm/tobig.anim b/assets/resources/game/skills/anm/tobig.anim index 5f4a5ff1..bd64f0fc 100644 --- a/assets/resources/game/skills/anm/tobig.anim +++ b/assets/resources/game/skills/anm/tobig.anim @@ -37,13 +37,22 @@ }, { "__id__": 78 + }, + { + "__id__": 89 + }, + { + "__id__": 100 + }, + { + "__id__": 111 } ], "_exoticAnimation": null, "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 89 + "__id__": 122 }, "_auxiliaryCurveEntries": [] }, @@ -1682,6 +1691,564 @@ "preExtrapolation": 1, "postExtrapolation": 1 }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 90 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 92 + }, + { + "__id__": 94 + }, + { + "__id__": 96 + }, + { + "__id__": 98 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 91 + }, + "position" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "hpup" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 93 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 95 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 20, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 70, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 97 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 99 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 101 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 103 + }, + { + "__id__": 105 + }, + { + "__id__": 107 + }, + { + "__id__": 109 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 102 + }, + "position" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "apup" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 104 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 106 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 20, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 70, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 108 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 110 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 112 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 114 + }, + { + "__id__": 116 + }, + { + "__id__": 118 + }, + { + "__id__": 120 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 113 + }, + "position" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "lvup" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 115 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 117 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 20, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 80, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 119 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.5555555555555556 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 121 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, { "__type__": "cc.AnimationClipAdditiveSettings", "enabled": false, diff --git a/assets/resources/game/skills/tooltip.prefab b/assets/resources/game/skills/tooltip.prefab index a243fb7b..f3e3a65e 100644 --- a/assets/resources/game/skills/tooltip.prefab +++ b/assets/resources/game/skills/tooltip.prefab @@ -32,22 +32,31 @@ }, { "__id__": 52 + }, + { + "__id__": 62 + }, + { + "__id__": 72 + }, + { + "__id__": 88 } ], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 104 }, { - "__id__": 64 + "__id__": 106 }, { - "__id__": 66 + "__id__": 108 } ], "_prefab": { - "__id__": 68 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -1557,6 +1566,1037 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "lvup", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 63 + } + ], + "_active": false, + "_components": [ + { + "__id__": 69 + } + ], + "_prefab": { + "__id__": 71 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 20, + "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": "lv", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 62 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 64 + }, + { + "__id__": 66 + } + ], + "_prefab": { + "__id__": 68 + }, + "_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__": 63 + }, + "_enabled": true, + "__prefab": { + "__id__": 65 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 150.1, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9drEGODIZEJJc9Dd8jhuuW" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 63 + }, + "_enabled": true, + "__prefab": { + "__id__": 67 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 253, + "g": 253, + "b": 0, + "a": 255 + }, + "_string": "等级提升", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 31, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 30, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_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": true, + "_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": "1aWuH1D2pMtZBWvVG3HxcL" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9dlfAPWTpKGrz/BjQPsJOk", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 62 + }, + "_enabled": true, + "__prefab": { + "__id__": 70 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dNAAOC0JJ/4HYB9aHWOce" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7arpnN+ztJzbhzemgNpinH", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "apup", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 73 + }, + { + "__id__": 79 + } + ], + "_active": false, + "_components": [ + { + "__id__": 85 + } + ], + "_prefab": { + "__id__": 87 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 20, + "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": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 72 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 74 + }, + { + "__id__": 76 + } + ], + "_prefab": { + "__id__": 78 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -30.67, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 73 + }, + "_enabled": true, + "__prefab": { + "__id__": 75 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 82, + "height": 81 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "40cr/w4WBPRZLTa06NFwBg" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 73 + }, + "_enabled": true, + "__prefab": { + "__id__": 77 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e4b0d", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ecd/jh3lpFiqRrP7IWmm6l" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "53gl0MSb1JZaTlNJEKj6BS", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 72 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 80 + }, + { + "__id__": 82 + } + ], + "_prefab": { + "__id__": 84 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 46.606, + "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__": 79 + }, + "_enabled": true, + "__prefab": { + "__id__": 81 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5736A8Ja5M9YKJ5iHM/2Ch" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 79 + }, + "_enabled": true, + "__prefab": { + "__id__": 83 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 253, + "b": 30, + "a": 255 + }, + "_string": "+8", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 31, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 30, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_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": true, + "_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": "11aCtt0b5F6bLbckFDMcm3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "203vQv+HNDkroy7SF4eNuJ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": { + "__id__": 86 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20/EW8N8REbIpag7AHFb5P" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e1Stv+dlpBtq0W5qwgxlQj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "hpup", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 89 + }, + { + "__id__": 95 + } + ], + "_active": false, + "_components": [ + { + "__id__": 101 + } + ], + "_prefab": { + "__id__": 103 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 20, + "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": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 88 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 90 + }, + { + "__id__": 92 + } + ], + "_prefab": { + "__id__": 94 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -30.67, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.55, + "y": 0.55, + "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__": 89 + }, + "_enabled": true, + "__prefab": { + "__id__": 91 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2bClynwrBJ1pfI/AWh00Q7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 89 + }, + "_enabled": true, + "__prefab": { + "__id__": 93 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@01ece", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1ec1uZMj9BpY5Sz4T/rMGn" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "aeSCo6vOBOG6BW+VZ9JIPD", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 88 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 96 + }, + { + "__id__": 98 + } + ], + "_prefab": { + "__id__": 100 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 44.33, + "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__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 97 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "27IO/G2qVCvrrRRbcyMG21" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 99 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 253, + "b": 30, + "a": 255 + }, + "_string": "+8", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 31, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 30, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_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": true, + "_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": "62jqe62hJFMa2bBsFL6Gr2" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e8TL7jIHBElZjFdQuC1XBw", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": { + "__id__": 102 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a2OVfI8ChAjo42SKDTLn63" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ffLmV8x/RGe7QRC4c4kLfk", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1567,7 +2607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 105 }, "_contentSize": { "__type__": "cc.Size", @@ -1595,7 +2635,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 107 }, "_id": "" }, @@ -1613,7 +2653,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 109 }, "playOnLoad": true, "_clips": [ diff --git a/assets/script/game/common/config/Mission.ts b/assets/script/game/common/config/Mission.ts index b1f0238d..316a2add 100644 --- a/assets/script/game/common/config/Mission.ts +++ b/assets/script/game/common/config/Mission.ts @@ -124,3 +124,13 @@ export const VmInfo = { thorns:0, lifesteal:0, } +export const TooltipTypes = { + life:1, + health:2, + skill:3, + crit:4, + uskill:5, + lvup:6, + apup:7, + hpup:8, +} \ No newline at end of file diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 48c4eba9..81248b5c 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -11,7 +11,7 @@ import { oops } from "db://oops-framework/core/Oops"; import { GameEvent } from "../common/config/GameEvent"; import { FightConComp } from "../map/FightConComp"; import { EquipSpecialAttr } from "../common/config/Equips"; -import { FightSet } from "../common/config/Mission"; +import { FightSet, TooltipTypes } from "../common/config/Mission"; import { getApIncrease, getHpIncrease, getUpExp, HeroPos } from "../common/config/heroSet"; import { FriendModelComp } from "./FriendModel"; import { MasterModelComp } from "./MasterModel"; @@ -231,6 +231,7 @@ export class HeroViewComp extends CCComp { this.ap -= Math.floor(ap/100*this.ap); } this.BUFFCOMP.vmdata_update() + this.BUFFCOMP.tooltip(TooltipTypes.apup,ap.toFixed(0)); } update_hp(e:GameEvent,data:any){ console.log("[HeroViewComp]:update_hp",data) @@ -248,6 +249,7 @@ export class HeroViewComp extends CCComp { this.hp_max += Math.floor(hp) ; this.hp += Math.floor(hp*(100+this.buff_hp)/100) ; this.BUFFCOMP.vmdata_update(true) + this.BUFFCOMP.tooltip(TooltipTypes.hpup,hp.toFixed(0)); } @@ -267,7 +269,7 @@ export class HeroViewComp extends CCComp { if(this.hp > this.hp_max){ this.hp = this.hp_max; } - this.BUFFCOMP.tooltip(2,hp.toFixed(0)); + this.BUFFCOMP.tooltip(TooltipTypes.health,hp.toFixed(0)); this.BUFFCOMP.vmdata_update(true) } @@ -366,7 +368,7 @@ export class HeroViewComp extends CCComp { let n_deR=deR-DEBUFF_DOWN-buff_debuff_down let r=RandomManager.instance.getRandomInt(0,100) if(r > n_deR) { - this.BUFFCOMP.tooltip(5,"*抵抗*") + this.BUFFCOMP.tooltip(TooltipTypes.uskill,"*抵抗*") return } @@ -501,7 +503,7 @@ export class HeroViewComp extends CCComp { check_shield(){ if(this.shield>0){ this.shield -= 1 - this.BUFFCOMP.tooltip(5,"*吸收*"); + this.BUFFCOMP.tooltip(TooltipTypes.uskill,"*吸收*"); if (this.shield <= 0) { if(this == null) return; this.BUFFCOMP.show_shield(false); @@ -515,7 +517,7 @@ export class HeroViewComp extends CCComp { if(this.dod > 0){ let random = Math.random()*100 if(random < this.dod) { - this.BUFFCOMP.tooltip(6,"*闪避*"); + this.BUFFCOMP.tooltip(TooltipTypes.uskill,"*闪避*"); return true } } @@ -603,7 +605,7 @@ export class HeroViewComp extends CCComp { case "max": this.as.max() this.BUFFCOMP.max_show(skill.fname) - this.BUFFCOMP.tooltip(3,skill.name,skill_id) + this.BUFFCOMP.tooltip(TooltipTypes.skill,skill.name,skill_id) break case "atk": this.as.atk() @@ -625,14 +627,13 @@ export class HeroViewComp extends CCComp { } to_update(){ - console.log("[HeroViewComp]:升级",this.lv) this.add_ap(getApIncrease(this.hero_uuid,this.lv,this.lv+1)) this.add_hp_max(getHpIncrease(this.hero_uuid,this.lv,this.lv+1)) this.lv+=1 this.next_exp=getUpExp(this.lv) - console.log("[HeroViewComp]:up ap,hp",getApIncrease(this.hero_uuid,this.lv,this.lv+1),getHpIncrease(this.hero_uuid,this.lv,this.lv+1)) this.BUFFCOMP.vmdata_update() this.BUFFCOMP.lv_up() + this.BUFFCOMP.tooltip(TooltipTypes.lvup) //@todo 需要添加 升级动画 } /** 显示伤害数字 */ @@ -674,10 +675,10 @@ export class HeroViewComp extends CCComp { this.BUFFCOMP.in_atked(); this.atked_count++; if (isCrit) { - this.BUFFCOMP.tooltip(4, damage.toFixed(0), damage); + this.BUFFCOMP.tooltip(TooltipTypes.crit, damage.toFixed(0), damage); // console.log("暴击伤害：" + damage); } else { - this.BUFFCOMP.tooltip(1, damage.toFixed(0), damage); + this.BUFFCOMP.tooltip(TooltipTypes.life, damage.toFixed(0), damage); // console.log("普通伤害：" + damage); } } diff --git a/assets/script/game/skills/TooltipCom.ts b/assets/script/game/skills/TooltipCom.ts index 5804ceb9..009e15f8 100644 --- a/assets/script/game/skills/TooltipCom.ts +++ b/assets/script/game/skills/TooltipCom.ts @@ -5,6 +5,7 @@ import { BoxSet } from "../common/config/BoxSet"; import { smc } from "../common/SingletonModuleComp"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; import { SkillSet } from "../common/config/SkillSet"; +import { TooltipTypes } from "../common/config/Mission"; const { ccclass, property } = _decorator; @@ -23,9 +24,10 @@ export class TooltipCom extends CCComp { alive_time:number = 0.3; skill_name_time=0.5; scale:number = 1; + start() { switch(this.stype){ - case 1: + case TooltipTypes.life: this.node.setPosition(v3(this.node.position.x,this.node.position.y-50)) this.node.setSiblingIndex(100); this.node.getChildByName("loss_life").getChildByName("hp").getComponent(Label).string = this.value; @@ -34,7 +36,7 @@ export class TooltipCom extends CCComp { this.ent.destroy() },0.5) break - case 2: + case TooltipTypes.health: this.node.setSiblingIndex(110); this.node.getChildByName("add_life").getChildByName("hp").getComponent(Label).string = this.value; this.node.getChildByName("add_life").active=true; @@ -42,7 +44,7 @@ export class TooltipCom extends CCComp { this.ent.destroy() },0.5) break - case 4: + case TooltipTypes.crit: this.node.setPosition(v3(this.node.position.x,this.node.position.y-50)) this.node.setSiblingIndex(200); this.node.getChildByName("bloss").getChildByName("hp").getComponent(Label).string = this.value; @@ -51,7 +53,7 @@ export class TooltipCom extends CCComp { this.ent.destroy() },0.5) break - case 3: + case TooltipTypes.skill: this.node.getChildByName("skill").getChildByName("name").getComponent(Label).string = "<"+SkillSet[this.s_uuid].name+">"; this.node.getChildByName("skill").active=true; this.node.setPosition(v3(this.node.position.x,this.node.position.y+30)) @@ -59,7 +61,7 @@ export class TooltipCom extends CCComp { this.ent.destroy() },0.5) break - case 5: + case TooltipTypes.uskill: this.node.getChildByName("uskill").getChildByName("name").getComponent(Label).string = this.value; this.node.getChildByName("uskill").active=true; this.node.setPosition(v3(this.node.position.x,this.node.position.y+30)) @@ -67,6 +69,29 @@ export class TooltipCom extends CCComp { this.ent.destroy() },0.5) break + case TooltipTypes.lvup: + // this.node.getChildByName("lvup").getChildByName("name").getComponent(Label).string = this.value; + this.node.getChildByName("lvup").active=true; + this.node.setPosition(v3(this.node.position.x,this.node.position.y-30)) + this.scheduleOnce(()=>{ + this.ent.destroy() + },0.5) + break + case TooltipTypes.apup: + this.node.getChildByName("apup").getChildByName("num").getComponent(Label).string = "+"+this.value; + this.node.getChildByName("apup").active=true; + this.node.setPosition(v3(this.node.position.x,this.node.position.y-30)) + this.scheduleOnce(()=>{ + this.ent.destroy() + },0.5) + break + case TooltipTypes.hpup: + this.node.getChildByName("hpup").getChildByName("num").getComponent(Label).string = "+"+this.value; + this.node.getChildByName("hpup").active=true; + this.node.setPosition(v3(this.node.position.x,this.node.position.y-30)) + this.scheduleOnce(()=>{ + this.ent.destroy() + },0.5) } // console.log("TooltipView start:",this.node.getSiblingIndex()); diff --git a/assets/script/todo.md b/assets/script/todo.md index af900856..840d9c24 100644 --- a/assets/script/todo.md +++ b/assets/script/todo.md @@ -26,7 +26,7 @@ - [x] 技能需要重新设计 - [ ] 伙伴特殊技能设定 - [x] debuff 设定 易伤 为次数和伤害累加 -- [ ] 冰冻 眩晕 功能更新 还需要检验 +- [x] 冰冻 眩晕 功能更新 还需要检验 - [x] 分按钮三选一, 装备, 功能卡, - [ ] 副将和技能,特殊情况下 触发更换和获取 - [x] 修改 发现都是1金币,加白色0金币 绿色+1金币,蓝色+2金币 @@ -40,10 +40,10 @@ - [ ] 金币掉落 动画 从头顶掉到底部bar - [x] 技能和伙伴都 需要主动点击 才会弹出,特定回合出现选项 - [x] 添加等级系统,主将和伙伴都可以升级,升级获得属性提升和 技能获取 -- [ ] 添加升级动画 +- [x] 添加升级动画 - [x] 卡牌技能 触发会中断问题 - [x] buff和debuff 增益功能 添加 - +- [x] 升级 和+ap +hp 动画 波数 升级 获取装备的等级