diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index cf9f7d14..0256562d 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -25,16 +25,22 @@ "__id__": 8 }, { - "__id__": 38 + "__id__": 14 }, { - "__id__": 57 + "__id__": 33 }, { - "__id__": 61 + "__id__": 37 }, { - "__id__": 71 + "__id__": 47 + }, + { + "__id__": 109 + }, + { + "__id__": 121 } ], "_active": true, @@ -79,8 +85,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, + "x": 0.85, + "y": 0.85, "z": 1 }, "_mobility": 0, @@ -237,25 +243,18 @@ "_parent": { "__id__": 1 }, - "_children": [ + "_children": [], + "_active": true, + "_components": [ { "__id__": 9 }, { - "__id__": 21 - } - ], - "_active": true, - "_components": [ - { - "__id__": 33 - }, - { - "__id__": 35 + "__id__": 11 } ], "_prefab": { - "__id__": 37 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -272,8 +271,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6590350270271302, - "y": 0.6590350270271326, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -286,620 +285,22 @@ }, "_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 - }, - "_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__": 8 + }, + "_enabled": true, + "__prefab": { "__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": "atk", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 8 - }, - "_children": [ - { - "__id__": 22 - } - ], - "_active": true, - "_components": [ - { - "__id__": 28 - }, - { - "__id__": 30 - } - ], - "_prefab": { - "__id__": 32 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 32.44600000000014, - "y": 136.61500000000024, - "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": "Heroes_icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 21 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 23 - }, - { - "__id__": 25 - } - ], - "_prefab": { - "__id__": 27 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 15.777, - "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__": 22 - }, - "_enabled": true, - "__prefab": { - "__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", - "instance": null, - "targetOverrides": null, - "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": 148 + "width": 90, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -922,7 +323,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -980,23 +381,23 @@ }, "_children": [ { - "__id__": 39 + "__id__": 15 } ], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 25 }, { - "__id__": 51 + "__id__": 27 }, { - "__id__": 54 + "__id__": 30 } ], "_prefab": { - "__id__": 56 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -1033,21 +434,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 38 + "__id__": 14 }, "_children": [ { - "__id__": 40 + "__id__": 16 } ], "_active": true, "_components": [ { - "__id__": 46 + "__id__": 22 } ], "_prefab": { - "__id__": 48 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -1084,20 +485,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 15 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 17 }, { - "__id__": 43 + "__id__": 19 } ], "_prefab": { - "__id__": 45 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", @@ -1134,11 +535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 16 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 18 }, "_contentSize": { "__type__": "cc.Size", @@ -1162,11 +563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 16 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 20 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1220,11 +621,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", @@ -1261,11 +662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", @@ -1289,11 +690,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 28 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1317,7 +718,7 @@ "_cacheMode": 1, "_sockets": [ { - "__id__": 53 + "__id__": 29 } ], "_useTint": false, @@ -1336,7 +737,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/bone", "target": { - "__id__": 39 + "__id__": 15 } }, { @@ -1345,11 +746,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 31 }, "_id": "" }, @@ -1382,11 +783,11 @@ "_active": true, "_components": [ { - "__id__": 58 + "__id__": 34 } ], "_prefab": { - "__id__": 60 + "__id__": 36 }, "_lpos": { "__type__": "cc.Vec3", @@ -1423,11 +824,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -1470,20 +871,20 @@ "_active": true, "_components": [ { - "__id__": 62 + "__id__": 38 }, { - "__id__": 64 + "__id__": 40 }, { - "__id__": 66 + "__id__": 42 }, { - "__id__": 68 + "__id__": 44 } ], "_prefab": { - "__id__": 70 + "__id__": 46 }, "_lpos": { "__type__": "cc.Vec3", @@ -1520,11 +921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 37 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -1548,11 +949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 37 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 41 }, "enabledContactListener": true, "bullet": true, @@ -1582,11 +983,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 37 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 43 }, "tag": 4, "_group": 2, @@ -1616,11 +1017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 37 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 45 }, "_id": "" }, @@ -1651,29 +1052,29 @@ }, "_children": [ { - "__id__": 72 + "__id__": 48 }, { - "__id__": 86 + "__id__": 62 }, { - "__id__": 100 + "__id__": 76 }, { - "__id__": 114 + "__id__": 90 }, { - "__id__": 126 + "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 106 } ], "_prefab": { - "__id__": 132 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1710,32 +1111,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 47 }, "_children": [ { - "__id__": 73 + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 55 }, { - "__id__": 81 + "__id__": 57 }, { - "__id__": 83 + "__id__": 59 } ], "_prefab": { - "__id__": 85 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 114.862, + "x": -45.269, + "y": 89.042, "z": 0 }, "_lrot": { @@ -1767,20 +1168,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 72 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 50 }, { - "__id__": 76 + "__id__": 52 } ], "_prefab": { - "__id__": 78 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -1817,20 +1218,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 15 + "width": 85, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -1845,11 +1246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1903,20 +1304,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 15 + "width": 85, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -1931,11 +1332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1976,17 +1377,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 60 }, "_barSprite": { - "__id__": 76 + "__id__": 52 }, "_mode": 0, - "_totalLength": 80, + "_totalLength": 85, "_progress": 1, "_reverse": false, "_id": "" @@ -2014,32 +1415,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 47 }, "_children": [ { - "__id__": 87 + "__id__": 63 } ], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 69 }, { - "__id__": 95 + "__id__": 71 }, { - "__id__": 97 + "__id__": 73 } ], "_prefab": { - "__id__": 99 + "__id__": 75 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 99.862, + "x": -44.415, + "y": -0.42, "z": 0 }, "_lrot": { @@ -2071,20 +1472,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 86 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 88 + "__id__": 64 }, { - "__id__": 90 + "__id__": 66 } ], "_prefab": { - "__id__": 92 + "__id__": 68 }, "_lpos": { "__type__": "cc.Vec3", @@ -2121,20 +1522,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 65 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 15 + "width": 85, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -2149,11 +1550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 67 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2207,20 +1608,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 70 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 15 + "width": 85, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -2235,11 +1636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 72 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2280,17 +1681,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 86 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 74 }, "_barSprite": { - "__id__": 90 + "__id__": 66 }, "_mode": 0, - "_totalLength": 80, + "_totalLength": 85, "_progress": 1, "_reverse": false, "_id": "" @@ -2318,32 +1719,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 47 }, "_children": [ { - "__id__": 101 + "__id__": 77 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 83 }, { - "__id__": 109 + "__id__": 85 }, { - "__id__": 111 + "__id__": 87 } ], "_prefab": { - "__id__": 113 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 127.42, + "x": -44.595, + "y": 99.668, "z": 0 }, "_lrot": { @@ -2375,20 +1776,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 100 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 78 }, { - "__id__": 104 + "__id__": 80 } ], "_prefab": { - "__id__": 106 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -2425,20 +1826,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 79 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, + "width": 85, "height": 10 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -2453,11 +1854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 81 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2511,20 +1912,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, + "width": 85, "height": 10 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -2539,11 +1940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 86 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2581,17 +1982,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 76 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 88 }, "_barSprite": { - "__id__": 104 + "__id__": 80 }, "_mode": 0, - "_totalLength": 80, + "_totalLength": 85, "_progress": 1, "_reverse": false, "_id": "" @@ -2619,29 +2020,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 47 }, "_children": [ { - "__id__": 115 + "__id__": 91 } ], "_active": true, "_components": [ { - "__id__": 121 + "__id__": 97 }, { - "__id__": 123 + "__id__": 99 } ], "_prefab": { - "__id__": 125 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", - "x": -40.768, - "y": 110.195, + "x": -30.643, + "y": 70.444, "z": 0 }, "_lrot": { @@ -2673,20 +2074,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 114 + "__id__": 90 }, "_children": [], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 92 }, { - "__id__": 118 + "__id__": 94 } ], "_prefab": { - "__id__": 120 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -2723,11 +2124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 93 }, "_contentSize": { "__type__": "cc.Size", @@ -2751,11 +2152,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 115 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 95 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2832,11 +2233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -2860,11 +2261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2918,17 +2319,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 47 }, "_children": [], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 103 } ], "_prefab": { - "__id__": 129 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -2965,11 +2366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -3006,11 +2407,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -3041,6 +2442,604 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "hp_max", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 110 + } + ], + "_active": true, + "_components": [ + { + "__id__": 116 + }, + { + "__id__": 118 + } + ], + "_prefab": { + "__id__": 120 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -23.203, + "y": 24.334, + "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.Node", + "_name": "life2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 109 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 111 + }, + { + "__id__": 113 + } + ], + "_prefab": { + "__id__": 115 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -12.798, + "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__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 112 + }, + "_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__": 110 + }, + "_enabled": true, + "__prefab": { + "__id__": 114 + }, + "_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__": 109 + }, + "_enabled": true, + "__prefab": { + "__id__": 117 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 24.24609375, + "height": 27.2 + }, + "_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__": 109 + }, + "_enabled": true, + "__prefab": { + "__id__": 119 + }, + "_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": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 20, + "_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": "atk", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 122 + } + ], + "_active": true, + "_components": [ + { + "__id__": 128 + }, + { + "__id__": 130 + } + ], + "_prefab": { + "__id__": 132 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 21.38304655140837, + "y": 102.51707115199474, + "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.Node", + "_name": "Heroes_icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 121 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 123 + }, + { + "__id__": 125 + } + ], + "_prefab": { + "__id__": 127 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 15.777, + "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__": 122 + }, + "_enabled": true, + "__prefab": { + "__id__": 124 + }, + "_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__": 122 + }, + "_enabled": true, + "__prefab": { + "__id__": 126 + }, + "_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", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 129 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 24.24609375, + "height": 27.2 + }, + "_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__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 131 + }, + "_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": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 20, + "_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": "", @@ -3082,7 +3081,7 @@ "__id__": 136 }, "animator": { - "__id__": 54 + "__id__": 30 }, "_id": "" }, @@ -3107,7 +3106,7 @@ "__expectedType__": "cc.Material" }, "BoxRang": { - "__id__": 61 + "__id__": 37 }, "_id": "" }, @@ -3229,13 +3228,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0, - "y": 40 + "x": -0.4, + "y": 65.2 }, "_size": { "__type__": "cc.Size", - "width": 80, - "height": 71.6 + "width": 89.8, + "height": 104.5 }, "_id": "" }, diff --git a/assets/resources/game/map/Layer01.png.meta b/assets/resources/game/map/Layer01.png.meta index 462fdc06..3f559bf8 100644 --- a/assets/resources/game/map/Layer01.png.meta +++ b/assets/resources/game/map/Layer01.png.meta @@ -50,8 +50,8 @@ "height": 250, "rawWidth": 1775, "rawHeight": 250, - "borderTop": 0, - "borderBottom": 0, + "borderTop": 52, + "borderBottom": 172, "borderLeft": 0, "borderRight": 0, "packable": true, diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 736e3498..1bf012d1 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -439,7 +439,7 @@ "__id__": 9 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 11 @@ -649,7 +649,7 @@ "__id__": 9 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 21 @@ -664,7 +664,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 386.128, + "y": 472.233, "z": 0 }, "_lrot": { @@ -676,8 +676,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -785,7 +785,7 @@ "__id__": 9 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 27 @@ -800,7 +800,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 237.308, - "y": 403.375, + "y": 489.48, "z": 0 }, "_lrot": { @@ -813,7 +813,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 1, - "y": 1.5, + "y": 1, "z": 1 }, "_mobility": 0, @@ -921,7 +921,7 @@ "__id__": 9 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 33 @@ -936,7 +936,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 189.041, - "y": 454.505, + "y": 540.61, "z": 0 }, "_lrot": { @@ -949,7 +949,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 1, - "y": 2, + "y": 1, "z": 1 }, "_mobility": 0, @@ -1057,7 +1057,7 @@ "__id__": 9 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 39 @@ -1072,7 +1072,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 86.105, "z": 0 }, "_lrot": { @@ -1113,7 +1113,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1773, - "height": 250 + "height": 450 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1152,9 +1152,9 @@ "__uuid__": "62c9a567-cc88-4a66-a76f-183cc1e61b55@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1180,6 +1180,8 @@ "__id__": 0 }, "fileId": "252Y+fH3NOL7xVrv2RoEs5", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1264,6 +1266,8 @@ "__id__": 0 }, "fileId": "6dFdGsgPxD8oVoba7hVEO3", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1933,6 +1937,8 @@ "__id__": 0 }, "fileId": "68Q5vEQWBINrggngtTZ7wh", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts index 80a9c6c8..d8768ac3 100644 --- a/assets/script/game/common/config/BoxSet.ts +++ b/assets/script/game/common/config/BoxSet.ts @@ -27,7 +27,7 @@ export enum BoxSet { MONSTER_START = 300, END_POINT = 360, //游戏地平线 - GAME_LINE = 10, + GAME_LINE = 120, CSKILL_X = 320, CSKILL_Y = 200, //攻击距离 diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index f77c29e5..bb22b04b 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+200; + pos.y=pos.y+100; break; case 2: monster_layer= scene.entityLayer2!.node!; - pos.y=pos.y+100; + pos.y=pos.y-100; default: break; } diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts index 8d8e8b20..d6c02345 100644 --- a/assets/script/game/map/view/MapViewComp.ts +++ b/assets/script/game/map/view/MapViewComp.ts @@ -39,7 +39,7 @@ export class MapViewComp extends CCComp { start() { this.scene = this.getComponent(MapViewScene); this.load_data() - this.load_role() + // this.load_role() } load_role(){ let role = ecs.getEntity(Role); diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 827b622d..4e4f3b68 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -136,12 +136,13 @@ export class MonsterViewComp extends CCComp { // console.log('monster view group 相同'); switch (selfCollider.group) { case BoxSet.HERO: - if(self_pos.x < other_pos.x&&Math.abs(self_pos.x-other_pos.x) <= BoxSet.MOVE_RANGE_X && self_pos.y==other_pos.y){ + if(self_pos.x < other_pos.x){ this.stop_cd=0.1 } + this.stop_cd=0.1 break; case BoxSet.MONSTER: - if(self_pos.x > other_pos.x&&Math.abs(self_pos.x-other_pos.x) <= BoxSet.MOVE_RANGE_X && self_pos.y==other_pos.y){ + if(self_pos.x > other_pos.x){ this.stop_cd=0.1 } break