diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index 20adab2a..5e003518 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -25,41 +25,44 @@ "__id__": 8 }, { - "__id__": 33 + "__id__": 38 }, { - "__id__": 37 + "__id__": 57 }, { - "__id__": 47 + "__id__": 61 + }, + { + "__id__": 71 } ], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 133 }, { - "__id__": 107 + "__id__": 135 }, { - "__id__": 109 + "__id__": 137 }, { - "__id__": 111 + "__id__": 139 }, { - "__id__": 113 + "__id__": 141 }, { - "__id__": 115 + "__id__": 143 }, { - "__id__": 117 + "__id__": 145 } ], "_prefab": { - "__id__": 119 + "__id__": 147 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +231,7 @@ }, { "__type__": "cc.Node", - "_name": "avatar", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -237,26 +240,130 @@ "_children": [ { "__id__": 9 + }, + { + "__id__": 21 } ], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 33 }, { - "__id__": 27 - }, - { - "__id__": 30 + "__id__": 35 } ], "_prefab": { - "__id__": 32 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, + "y": 12.483, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 2.1855693419110217e-8, + "w": 0.9999999999999998 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6590350270271302, + "y": 0.6590350270271326, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0.000002504477982493727 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "hp_max", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 8 + }, + "_children": [ + { + "__id__": 10 + } + ], + "_active": true, + "_components": [ + { + "__id__": 16 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 20 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 35.35500000000013, + "y": 13.43100000000004, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": -2.1855693419110217e-8, + "w": 0.9999999999999998 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.5173700319252283, + "y": 1.517370031925223, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -0.000002504477982493727 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "life2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 9 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 14.578, "y": 0, "z": 0 }, @@ -283,9 +390,204 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 10, + "height": 10 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fI6TdTZxPW5R4qYKD+CMi" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_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@8c1af", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d60jRoQNlMpL4sDIi+I+qt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9fYbqDxH5E5rUf3p7EHVYX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 9 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 18.6845703125, + "height": 22.16 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "77S+DEIvpBJZGaJq7QM3XR" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 9 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "10", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 15, + "_fontSize": 15, + "_fontFamily": "Arial", + "_lineHeight": 16, + "_overflow": 0, + "_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, + "_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": "3cLm67s0VOpqlQcseqL6Nx" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "71fO0wJmJE7aiNMnNKYq0h", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", - "_name": "TNode", + "_name": "atk", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -293,38 +595,38 @@ }, "_children": [ { - "__id__": 10 - }, - { - "__id__": 16 + "__id__": 22 } ], "_active": true, "_components": [ { - "__id__": 22 + "__id__": 28 + }, + { + "__id__": 30 } ], "_prefab": { - "__id__": 24 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", - "x": -0.0000010490732620382914, - "y": 24, + "x": 32.44600000000014, + "y": 136.61500000000024, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 2.1855693419110223e-8, - "w": 0.9999999999999996 + "z": -2.1855693419110217e-8, + "w": 0.9999999999999998 }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.0139000415802002, - "y": 1.013900041580204, + "x": 1.5173700319252283, + "y": 1.517370031925223, "z": 1 }, "_mobility": 0, @@ -333,35 +635,35 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0.000002504477982493727 + "z": -0.000002504477982493727 }, "_id": "" }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "Heroes_icon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 9 + "__id__": 21 }, "_children": [], "_active": true, "_components": [ { - "__id__": 11 + "__id__": 23 }, { - "__id__": 13 + "__id__": 25 } ], "_prefab": { - "__id__": 15 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -6, + "x": 15.777, + "y": 0, "z": 0 }, "_lrot": { @@ -373,8 +675,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.65, - "y": 0.65, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -393,16 +695,209 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 24 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 10, + "height": 12 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "28TSwXUgBDXIH6fxdbHVTv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 22 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_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@d3524", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "954xpYP8RGkbCVtAhvs3dP" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2cDrIqNBZEj78KCFuDbu6Z", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 21 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 18.6845703125, + "height": 22.16 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "33BVi7jsdAebIpDo8I9TGQ" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 21 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "10", + "_horizontalAlign": 0, + "_verticalAlign": 1, + "_actualFontSize": 15, + "_fontSize": 15, + "_fontFamily": "Arial", + "_lineHeight": 16, + "_overflow": 0, + "_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, + "_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": "d9egMzG21BmJxYe3Fm9HYY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "77UdJOTAhET6QRtskTCSa7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", "width": 138, - "height": 138 + "height": 148 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -421,11 +916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -473,26 +968,134 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "avatar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 39 + } + ], + "_active": true, + "_components": [ + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 54 + } + ], + "_prefab": { + "__id__": 56 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -1.919, + "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": "TNode", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [ + { + "__id__": 40 + } + ], + "_active": true, + "_components": [ + { + "__id__": 46 + } + ], + "_prefab": { + "__id__": 48 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -0.0000010490732620382914, + "y": 24, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 2.1855693419110223e-8, + "w": 0.9999999999999996 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.0139000415802002, + "y": 1.013900041580204, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0.000002504477982493727 + }, + "_id": "" + }, { "__type__": "cc.Node", "_name": "bb", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 9 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 17 + "__id__": 41 }, { - "__id__": 19 + "__id__": 43 } ], "_prefab": { - "__id__": 21 + "__id__": 45 }, "_lpos": { "__type__": "cc.Vec3", @@ -529,11 +1132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -557,11 +1160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -615,11 +1218,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 9 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -656,11 +1259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 50 }, "_contentSize": { "__type__": "cc.Size", @@ -684,11 +1287,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 52 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -712,7 +1315,7 @@ "_cacheMode": 1, "_sockets": [ { - "__id__": 29 + "__id__": 53 } ], "_useTint": false, @@ -731,7 +1334,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/bone", "target": { - "__id__": 9 + "__id__": 39 } }, { @@ -740,11 +1343,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 55 }, "_id": "" }, @@ -777,11 +1380,11 @@ "_active": true, "_components": [ { - "__id__": 34 + "__id__": 58 } ], "_prefab": { - "__id__": 36 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -818,11 +1421,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 59 }, "_contentSize": { "__type__": "cc.Size", @@ -865,20 +1468,20 @@ "_active": true, "_components": [ { - "__id__": 38 + "__id__": 62 }, { - "__id__": 40 + "__id__": 64 }, { - "__id__": 42 + "__id__": 66 }, { - "__id__": 44 + "__id__": 68 } ], "_prefab": { - "__id__": 46 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -915,11 +1518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -943,11 +1546,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 65 }, "enabledContactListener": true, "bullet": true, @@ -977,11 +1580,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 67 }, "tag": 4, "_group": 2, @@ -1011,11 +1614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 69 }, "_id": "" }, @@ -1046,31 +1649,34 @@ }, "_children": [ { - "__id__": 48 + "__id__": 72 }, { - "__id__": 62 + "__id__": 86 }, { - "__id__": 76 + "__id__": 100 }, { - "__id__": 90 + "__id__": 114 + }, + { + "__id__": 126 } ], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 130 } ], "_prefab": { - "__id__": 104 + "__id__": 132 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 2.229, + "y": 18.139, "z": 0 }, "_lrot": { @@ -1102,32 +1708,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 47 + "__id__": 71 }, "_children": [ { - "__id__": 49 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 79 }, { - "__id__": 57 + "__id__": 81 }, { - "__id__": 59 + "__id__": 83 } ], "_prefab": { - "__id__": 61 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", - "x": 1.1368683772161603e-13, - "y": 131.02400000000011, + "x": 0, + "y": 114.862, "z": 0 }, "_lrot": { @@ -1159,20 +1765,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 48 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 74 }, { - "__id__": 52 + "__id__": 76 } ], "_prefab": { - "__id__": 54 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -1209,16 +1815,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", "width": 80, - "height": 10 + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1237,11 +1843,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 77 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1295,16 +1901,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", "width": 80, - "height": 10 + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1323,11 +1929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1368,14 +1974,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 48 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 84 }, "_barSprite": { - "__id__": 52 + "__id__": 76 }, "_mode": 0, "_totalLength": 80, @@ -1406,32 +2012,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 47 + "__id__": 71 }, "_children": [ { - "__id__": 63 + "__id__": 87 } ], "_active": true, "_components": [ { - "__id__": 69 + "__id__": 93 }, { - "__id__": 71 + "__id__": 95 }, { - "__id__": 73 + "__id__": 97 } ], "_prefab": { - "__id__": 75 + "__id__": 99 }, "_lpos": { "__type__": "cc.Vec3", - "x": 1.1368683772161603e-13, - "y": 121.02400000000011, + "x": 0, + "y": 99.862, "z": 0 }, "_lrot": { @@ -1463,20 +2069,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 62 + "__id__": 86 }, "_children": [], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 88 }, { - "__id__": 66 + "__id__": 90 } ], "_prefab": { - "__id__": 68 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -1513,16 +2119,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", "width": 80, - "height": 10 + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1541,11 +2147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 63 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1599,16 +2205,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", "width": 80, - "height": 10 + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1627,11 +2233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1672,14 +2278,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 98 }, "_barSprite": { - "__id__": 66 + "__id__": 90 }, "_mode": 0, "_totalLength": 80, @@ -1710,32 +2316,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 47 + "__id__": 71 }, "_children": [ { - "__id__": 77 + "__id__": 101 } ], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 107 }, { - "__id__": 85 + "__id__": 109 }, { - "__id__": 87 + "__id__": 111 } ], "_prefab": { - "__id__": 89 + "__id__": 113 }, "_lpos": { "__type__": "cc.Vec3", - "x": 1.1368683772161603e-13, - "y": 141.02400000000011, + "x": 0, + "y": 127.42, "z": 0 }, "_lrot": { @@ -1767,20 +2373,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 76 + "__id__": 100 }, "_children": [], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 102 }, { - "__id__": 80 + "__id__": 104 } ], "_prefab": { - "__id__": 82 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -1817,11 +2423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 77 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -1845,11 +2451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 77 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 105 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1903,11 +2509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -1931,11 +2537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1973,14 +2579,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 112 }, "_barSprite": { - "__id__": 80 + "__id__": 104 }, "_mode": 0, "_totalLength": 80, @@ -2011,29 +2617,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 47 + "__id__": 71 }, "_children": [ { - "__id__": 91 + "__id__": 115 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 121 }, { - "__id__": 99 + "__id__": 123 } ], "_prefab": { - "__id__": 101 + "__id__": 125 }, "_lpos": { "__type__": "cc.Vec3", - "x": -40.76699999999994, - "y": 130.33400000000006, + "x": -40.768, + "y": 110.195, "z": 0 }, "_lrot": { @@ -2065,20 +2671,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 114 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 116 }, { - "__id__": 94 + "__id__": 118 } ], "_prefab": { - "__id__": 96 + "__id__": 120 }, "_lpos": { "__type__": "cc.Vec3", @@ -2115,11 +2721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 117 }, "_contentSize": { "__type__": "cc.Size", @@ -2143,11 +2749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 115 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 119 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2224,11 +2830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -2252,11 +2858,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 114 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 124 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2304,17 +2910,105 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "info", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 71 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 127 + } + ], + "_prefab": { + "__id__": 129 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -2.228999999999928, + "y": -22.293000000000006, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.0000000000000002, + "y": 1.0000000000000002, + "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__": 47 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 128 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5ee77+ulxDVLmOpnqyiJiI" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a8xJwPSnJC46y3h55Dx4+q", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": { + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2355,7 +3049,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 134 }, "_contentSize": { "__type__": "cc.Size", @@ -2383,10 +3077,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 136 }, "animator": { - "__id__": 30 + "__id__": 54 }, "_id": "" }, @@ -2404,14 +3098,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 138 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", "__expectedType__": "cc.Material" }, "BoxRang": { - "__id__": 37 + "__id__": 61 }, "_id": "" }, @@ -2429,7 +3123,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 140 }, "_id": "" }, @@ -2447,7 +3141,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2489,7 +3183,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 144 }, "enabledContactListener": true, "bullet": true, @@ -2523,7 +3217,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 146 }, "tag": 0, "_group": 2, diff --git a/assets/resources/game/skills/tooltip.prefab b/assets/resources/game/skills/tooltip.prefab index 51562562..15c0dffb 100644 --- a/assets/resources/game/skills/tooltip.prefab +++ b/assets/resources/game/skills/tooltip.prefab @@ -911,7 +911,7 @@ "__id__": 41 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 47 diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts index 844ec9ef..ab37eeec 100644 --- a/assets/script/game/Role/RoleViewComp.ts +++ b/assets/script/game/Role/RoleViewComp.ts @@ -35,7 +35,7 @@ export class RoleViewComp extends CCComp { hp_max:number = 1000; power: number = 0; stop_cd:number = 0; - atk_cd:number = 3; + atk_cd:number = 5; atk:number = 10; skill_uuid:number = 9003; max_skill_uuid:number = 1001; diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 96a4732b..f77c29e5 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -81,11 +81,11 @@ export class MapMonsterComp extends CCComp { switch (x) { case 1: monster_layer = scene.entityLayer1!.node!; - pos.y=pos.y+5; + pos.y=pos.y+200; break; case 2: monster_layer= scene.entityLayer2!.node!; - pos.y=pos.y-5; + pos.y=pos.y+100; default: break; } diff --git a/assets/script/game/monster/CSkillComp.ts b/assets/script/game/monster/CSkillComp.ts index 29c0c562..3bd26a2b 100644 --- a/assets/script/game/monster/CSkillComp.ts +++ b/assets/script/game/monster/CSkillComp.ts @@ -36,7 +36,6 @@ export class CSkillComp extends CCComp { this.cd = new Timer(smc.skills[this.skill_uuid].cd) this.time =smc.skills[this.skill_uuid].sd this.node.getChildByName("time").getComponent(Label).string = this.time.toString() - } protected update(dt: number): void { if (this.sd.update(dt)) { diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index 9f402505..639deaac 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -10,12 +10,16 @@ import { HeroCard } from "./HeroCard"; import { HeroModelComp } from "./HeroModelComp"; import { Hero } from "./Hero"; import { MonsterViewComp } from "./MonsterViewComp"; +import { MapMonsterComp } from "../map/MapMonsterComp"; +import { MapSkillComp } from "../map/MapSkillComp"; const { ccclass, property } = _decorator; /** 视图层对象 */ @ccclass('HeroCardViewComp') @ecs.register('HeroCardView', false) export class HeroCardViewComp extends CCComp { + MM: MapMonsterComp; + MS: MapSkillComp; card_name:string = "hero_card"; card_uid:number = 1000; in_destroy:boolean = false; @@ -136,11 +140,12 @@ export class HeroCardViewComp extends CCComp { oops.message.dispatchEvent("do_add_hero", { uuid: this.card_uid }); break; case 2: + oops.message.dispatchEvent("do_use_skill", { uuid: this.card_uid }); + break; + case 3: oops.message.dispatchEvent("do_use_skill", { uuid: this.card_uid }); - // console.log("do_use_skill",this.card_uid) break; default: - break; } diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index e460e175..827b622d 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -52,7 +52,7 @@ export class MonsterViewComp extends CCComp { hp_speed: number = 0; //每秒回复量 power: number = 0; /**能量**/ - power_max: number = 60; /** 能量最大值 */ + power_max: number = 1200; /** 能量最大值 */ power_speed: number = 1; //能量回复速度每0.1秒回复量 skill_name: string = "base"; //技能名称 @@ -257,7 +257,9 @@ export class MonsterViewComp extends CCComp { } add_hp(hp: number=0){ console.log("hero 加血动画"); - this.tooltip(2,"+"+hp.toString()); + this.tooltip(2,hp.toString()); + let hp_progress= this.hp/this.hp_max; + this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; } shield_change(hp: number){ let ls=this.shield - hp;