From e8dbb9bab354449ec2cf0c2648cc772a389a1f5c Mon Sep 17 00:00:00 2001 From: pan Date: Fri, 16 Aug 2024 17:06:23 +0800 Subject: [PATCH] dd --- assets/resources/game/heros/hero.prefab | 24 +- assets/resources/game/map/map_rpg.prefab | 202 +++++++- assets/resources/game/player/own.prefab | 442 +++++++++++++++--- assets/resources/game/skills/base.prefab | 20 +- assets/script/game/monster/MonsterViewComp.ts | 8 +- assets/script/game/skills/SkillCom.ts | 2 +- settings/v2/packages/engine.json | 2 +- settings/v2/packages/project.json | 20 +- 8 files changed, 585 insertions(+), 135 deletions(-) diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index 21909cd1..621e99de 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -660,7 +660,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 5, - "y": 100, + "y": 80, "z": 0 }, "_lrot": { @@ -750,7 +750,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 50, + "width": 40, "height": 5 }, "_anchorPoint": { @@ -836,7 +836,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 50, + "width": 40, "height": 5 }, "_anchorPoint": { @@ -964,7 +964,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 5, - "y": 95, + "y": 75, "z": 0 }, "_lrot": { @@ -1054,7 +1054,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 50, + "width": 40, "height": 5 }, "_anchorPoint": { @@ -1140,7 +1140,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 50, + "width": 40, "height": 5 }, "_anchorPoint": { @@ -1430,7 +1430,7 @@ "__id__": 64 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 70 @@ -1712,8 +1712,6 @@ "__id__": 0 }, "fileId": "2dGu24EexKI57EzgA2ECVa", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1845,13 +1843,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": -0.8, - "y": 35.1 + "x": 22.7, + "y": 37.6 }, "_size": { "__type__": "cc.Size", - "width": 61.7, - "height": 72.7 + "width": 14.7, + "height": 81.7 }, "_id": "" }, diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 07a13a1d..5795ac4e 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 60 + "__id__": 70 }, { - "__id__": 62 + "__id__": 72 }, { - "__id__": 64 + "__id__": 74 } ], "_prefab": { - "__id__": 66 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -197,17 +197,17 @@ "_active": true, "_components": [ { - "__id__": 53 + "__id__": 63 }, { - "__id__": 55 + "__id__": 65 }, { - "__id__": 57 + "__id__": 67 } ], "_prefab": { - "__id__": 59 + "__id__": 69 }, "_lpos": { "__type__": "cc.Vec3", @@ -263,11 +263,11 @@ "_active": true, "_components": [ { - "__id__": 50 + "__id__": 60 } ], "_prefab": { - "__id__": 52 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -1043,18 +1043,22 @@ "_parent": { "__id__": 7 }, - "_children": [], + "_children": [ + { + "__id__": 45 + } + ], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 55 }, { - "__id__": 47 + "__id__": 57 } ], "_prefab": { - "__id__": 49 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1085,6 +1089,149 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 44 + }, + "_prefab": { + "__id__": 46 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 45 + }, + "asset": { + "__uuid__": "63c02880-bda6-4370-bb22-46bf4f49bbfe", + "__expectedType__": "cc.Prefab" + }, + "fileId": "fdklpBwCBM/qJ4WFlQF3kT", + "instance": { + "__id__": 47 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "2fXaJzu7JM+6/jYrphb/fs", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 48 + }, + { + "__id__": 50 + }, + { + "__id__": 51 + }, + { + "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 49 + }, + "propertyPath": [ + "_name" + ], + "value": "own" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fdklpBwCBM/qJ4WFlQF3kT" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 49 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -312.4457, + "y": 27.56899999999996, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 49 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 49 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 49 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 49 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -1095,7 +1242,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1123,7 +1270,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 58 }, "light": { "__uuid__": "683fa094-5032-4f8d-a8c6-63a962c9bdd5", @@ -1158,7 +1305,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1199,7 +1346,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 64 }, "_contentSize": { "__type__": "cc.Size", @@ -1227,7 +1374,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 66 }, "camera": { "__id__": 3 @@ -1245,7 +1392,7 @@ "__id__": 41 }, "SkillLayer": { - "__id__": 47 + "__id__": 57 }, "isFollowPlayer": true, "_id": "" @@ -1264,7 +1411,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 68 }, "_id": "" }, @@ -1295,7 +1442,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1323,7 +1470,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 73 }, "_cameraComponent": { "__id__": 3 @@ -1345,7 +1492,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 75 }, "_alignFlags": 45, "_target": null, @@ -1381,6 +1528,11 @@ }, "fileId": "32qENLKwZHV5S2IyZfpNx2", "instance": null, - "targetOverrides": null + "targetOverrides": null, + "nestedPrefabInstanceRoots": [ + { + "__id__": 45 + } + ] } ] \ No newline at end of file diff --git a/assets/resources/game/player/own.prefab b/assets/resources/game/player/own.prefab index 218f2ab4..4a2f76b1 100644 --- a/assets/resources/game/player/own.prefab +++ b/assets/resources/game/player/own.prefab @@ -25,29 +25,32 @@ "__id__": 8 }, { - "__id__": 16 + "__id__": 27 } ], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 41 }, { - "__id__": 32 + "__id__": 43 }, { - "__id__": 34 + "__id__": 45 }, { - "__id__": 36 + "__id__": 47 }, { - "__id__": 38 + "__id__": 49 + }, + { + "__id__": 51 } ], "_prefab": { - "__id__": 40 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", @@ -142,8 +145,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 119 + "width": 72, + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -179,7 +182,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "b1745dc0-d78b-4443-a4fc-746ff6749b39@f9941", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34d88", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -222,12 +225,117 @@ "_parent": { "__id__": 1 }, - "_children": [], + "_children": [ + { + "__id__": 9 + } + ], "_active": true, "_components": [ { - "__id__": 9 + "__id__": 19 }, + { + "__id__": 21 + }, + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 26 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 5, + "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__": 8 + }, + "_children": [ + { + "__id__": 10 + } + ], + "_active": true, + "_components": [ + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_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 + }, + "_children": [], + "_active": true, + "_components": [ { "__id__": 11 }, @@ -241,7 +349,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -8, "z": 0 }, "_lrot": { @@ -267,6 +375,133 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 105 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "21OT7FeExH3qJ+HlQeiKcW" + }, + { + "__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__": "8a791edd-743c-45ad-8991-81f589e8b598@1de2e", + "__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": "ae/02lQLpCD7dTY0Zi+P/s" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "76pAU1XptHYqO31w89LgnK", + "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": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07BVAwSehA/5Rcf5ZFuQwy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "763rWvVQlPoZSgcfW0QuMN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -277,17 +512,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 20 }, "_contentSize": { "__type__": "cc.Size", - "width": 320, - "height": 320 + "width": 15.520000457763672, + "height": 9.600000381469727 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.53125, - "y": 0.53125 + "x": 0, + "y": 0 }, "_id": "" }, @@ -305,7 +540,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 22 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -318,16 +553,20 @@ "a": 255 }, "_skeletonData": { - "__uuid__": "52673d05-5225-4ac6-98e4-efe6494452ce", + "__uuid__": "a80809a8-64bf-4c66-b49e-7aa837d821dd", "__expectedType__": "sp.SkeletonData" }, - "defaultSkin": "heath", - "defaultAnimation": "magic1", + "defaultSkin": "default", + "defaultAnimation": "", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 1, "_cacheMode": 1, - "_sockets": [], + "_sockets": [ + { + "__id__": 23 + } + ], "_useTint": false, "_debugMesh": false, "_debugBones": false, @@ -340,6 +579,13 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d6Qb8NhhhN1ascGn7UPZok" }, + { + "__type__": "sp.Skeleton.SpineSocket", + "path": "root/bone", + "target": { + "__id__": 9 + } + }, { "__type__": "eb846wnC9NNnIJh5u2Kw3mj", "_name": "", @@ -350,14 +596,8 @@ }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 25 }, - "AssetRawUrl": { - "__uuid__": "50147ed6-e9d8-4918-9335-9f22e6e3209d", - "__expectedType__": "cc.JsonAsset" - }, - "PlayOnStart": true, - "AutoUpdate": true, "_id": "" }, { @@ -387,20 +627,20 @@ }, "_children": [ { - "__id__": 17 + "__id__": 28 } ], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 36 }, { - "__id__": 27 + "__id__": 38 } ], "_prefab": { - "__id__": 29 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -437,23 +677,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 16 + "__id__": 27 }, "_children": [], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 29 }, { - "__id__": 20 + "__id__": 31 }, { - "__id__": 22 + "__id__": 33 } ], "_prefab": { - "__id__": 24 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -490,15 +730,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", - "width": 112.05859375, + "width": 69.3671875, "height": 34.24 }, "_anchorPoint": { @@ -518,11 +758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 32 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -534,7 +774,7 @@ "b": 255, "a": 255 }, - "_string": "oops - rpg", + "_string": "player", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 24, @@ -586,11 +826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 17 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 34 }, "_id": "" }, @@ -617,11 +857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -645,11 +885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 39 }, "_resizeMode": 1, "_layoutType": 2, @@ -700,7 +940,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -710,7 +950,7 @@ "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 0 }, "_id": "" }, @@ -728,7 +968,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 44 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -745,7 +985,7 @@ "defaultAnimation": "", "_premultipliedAlpha": true, "_timeScale": 1, - "_preCacheMode": -1, + "_preCacheMode": 0, "_cacheMode": 0, "_sockets": [], "_useTint": false, @@ -770,10 +1010,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 46 }, "animator": { - "__id__": 13 + "__id__": 24 }, "_id": "" }, @@ -781,24 +1021,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7bybVvagtM/reemx81cxhr" }, - { - "__type__": "dce41bFTUxMzbef69z5vQ3c", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 37 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ffaqK4updOaqQdIyXhL8X+" - }, { "__type__": "60726sarbtIDJfLLE+75yKL", "_name": "", @@ -809,7 +1031,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 48 }, "_id": "" }, @@ -817,6 +1039,74 @@ "__type__": "cc.CompPrefabInfo", "fileId": "39G8yJo19PUpY+Tgxza8T5" }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 50 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 32, + "_type": 2, + "_allowSleep": false, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8EJ1KQ3hNRbAw0cgsaNRx" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 52 + }, + "tag": 0, + "_group": 32, + "_density": 1, + "_sensor": false, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 1.6, + "y": 44.4 + }, + "_size": { + "__type__": "cc.Size", + "width": 58.5, + "height": 111 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "62fAGknj9OypOrug6f/FI6" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/base.prefab b/assets/resources/game/skills/base.prefab index 214bf110..24f4dc6b 100644 --- a/assets/resources/game/skills/base.prefab +++ b/assets/resources/game/skills/base.prefab @@ -133,13 +133,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 20, - "height": 72 + "width": 72, + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": 0.5, + "y": 0.5 }, "_id": "" }, @@ -224,8 +224,8 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": 0.5, + "y": 0.5 }, "_id": "" }, @@ -287,13 +287,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 10.2, - "y": 33.2 + "x": 28.9, + "y": 6.8 }, "_size": { "__type__": "cc.Size", - "width": 20.4, - "height": 66.4 + "width": 57.9, + "height": 13.6 }, "_id": "" }, diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 622f3322..72f2a608 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -76,7 +76,7 @@ export class MonsterViewComp extends CCComp { // collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this); collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); } - this.node.getChildByName("level").getChildByName("level").getComponent(Label).string = this.level.toString(); + // this.node.getChildByName("level").getChildByName("level").getComponent(Label).string = this.level.toString(); } @@ -253,10 +253,10 @@ export class MonsterViewComp extends CCComp { load_skill(skill_name){ // console.log("load_skill"); let skill = ecs.getEntity(Skill); - let pos = v3(0,0) - let speed =150 + let pos = v3(0,40) + let speed =110 let scale = this.camp - let range = 80 + let range = 100 skill.load(pos,speed,range,scale,this.node,skill_name,this.atk); } in_atked() { diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index d59c1d98..f11258ed 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -14,7 +14,7 @@ export class SkillCom extends CCComp { // // var entity = this.ent as ecs.Entity; // ecs.Entity 可转为当前模块的具体实体对象 // // this.on(ModuleEvent.Cmd, this.onHandler, this); // } - speed:number = 600; + speed:number = 200; range:number = 80; scale:number = 1; atk:number = 10; diff --git a/settings/v2/packages/engine.json b/settings/v2/packages/engine.json index a68156ec..60a5c650 100644 --- a/settings/v2/packages/engine.json +++ b/settings/v2/packages/engine.json @@ -151,6 +151,6 @@ }, "__version__": "1.0.8", "macroConfig": { - "BATCHER2D_MEM_INCREMENT": 1440 + "BATCHER2D_MEM_INCREMENT": 144 } } diff --git a/settings/v2/packages/project.json b/settings/v2/packages/project.json index 3483d77e..7bd9d030 100644 --- a/settings/v2/packages/project.json +++ b/settings/v2/packages/project.json @@ -40,14 +40,24 @@ { "index": 4, "name": "HERO_SKILL" + }, + { + "index": 5, + "name": "PLAYER" + }, + { + "index": 6, + "name": "BOSS" } ], "collisionMatrix": { - "0": 7, - "1": 23, - "2": 15, - "3": 4, - "4": 2 + "0": 103, + "1": 55, + "2": 79, + "3": 36, + "4": 66, + "5": 11, + "6": 21 } } }