From 97875dfe2b6b2a384688383fcf3dceb3a12fda6a Mon Sep 17 00:00:00 2001 From: walkpan Date: Fri, 23 Aug 2024 13:26:26 +0800 Subject: [PATCH] ddd --- assets/resources/game/map/map_rpg.prefab | 10 +- assets/resources/game/skills/atk1/atk.plist | 72 ++++++- .../resources/game/skills/atk1/atk.plist.meta | 194 +++++++++++++++++- assets/resources/game/skills/atk1/atk.png | Bin 7724 -> 17472 bytes assets/resources/game/skills/base.prefab | 15 +- assets/resources/game/skills/base2.prefab | 10 +- assets/script/game/Role/Role.ts | 7 +- assets/script/game/map/view/MapViewComp.ts | 2 +- assets/script/game/monster/MonsterViewComp.ts | 10 +- assets/script/game/skills/SkillCom.ts | 9 +- 10 files changed, 286 insertions(+), 43 deletions(-) diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 2b5828b1..0e10e144 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -601,13 +601,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0, - "y": -386.5 + "x": 1.9, + "y": -400.1 }, "_size": { "__type__": "cc.Size", - "width": 3182.4, - "height": 827 + "width": 3178.5, + "height": 799.8 }, "_id": "" }, @@ -624,8 +624,6 @@ "__id__": 0 }, "fileId": "9eQ9Op13lL5ZqF+H2E1cEl", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/game/skills/atk1/atk.plist b/assets/resources/game/skills/atk1/atk.plist index f4bbfc79..977171a6 100644 --- a/assets/resources/game/skills/atk1/atk.plist +++ b/assets/resources/game/skills/atk1/atk.plist @@ -15,9 +15,9 @@ spriteSourceSize {96,96} textureRect - {{96,1},{80,96}} + {{1,678},{80,96}} textureRotated - + atk1_07.png @@ -30,9 +30,69 @@ spriteSourceSize {96,93} textureRect - {{1,1},{96,93}} + {{1,583},{96,93}} textureRotated - + + + guard_trailing_0-12.png + + aliases + + spriteOffset + {0,0} + spriteSize + {97,143} + spriteSourceSize + {97,143} + textureRect + {{1,295},{97,143}} + textureRotated + + + guard_trailing_0-17.png + + aliases + + spriteOffset + {0,0} + spriteSize + {98,141} + spriteSourceSize + {98,141} + textureRect + {{1,1},{98,141}} + textureRotated + + + guard_trailing_0-18.png + + aliases + + spriteOffset + {0,0} + spriteSize + {97,141} + spriteSourceSize + {97,141} + textureRect + {{1,440},{97,141}} + textureRotated + + + guard_trailing_0-8.png + + aliases + + spriteOffset + {0,0} + spriteSize + {97,149} + spriteSourceSize + {97,149} + textureRect + {{1,144},{97,149}} + textureRotated + metadata @@ -46,9 +106,9 @@ realTextureFileName atk.png size - {177,98} + {100,759} smartupdate - $TexturePacker:SmartUpdate:921ca90a772281d8370d52dcd03d69bb:e98751142a1edb6198b7f9d055c0661a:161bb8e8e5d13d624c660b9bcb3183a7$ + $TexturePacker:SmartUpdate:dedc4bfaabc2009a0f55fa94882d533b:ccd331208d7352b4c4126d7e1102f82e:161bb8e8e5d13d624c660b9bcb3183a7$ textureFileName atk.png diff --git a/assets/resources/game/skills/atk1/atk.plist.meta b/assets/resources/game/skills/atk1/atk.plist.meta index df3daf2f..9d252d6c 100644 --- a/assets/resources/game/skills/atk1/atk.plist.meta +++ b/assets/resources/game/skills/atk1/atk.plist.meta @@ -7,6 +7,52 @@ ".json" ], "subMetas": { + "85462": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@85462", + "displayName": "", + "id": "85462", + "name": "guard_trailing_0-18", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 440, + "width": 97, + "height": 141, + "rawWidth": 97, + "rawHeight": 141, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "41d52": { "importer": "sprite-frame", "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", @@ -16,11 +62,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 96, - "trimY": 1, + "trimX": 1, + "trimY": 678, "width": 80, "height": 96, "rawWidth": 96, @@ -62,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 1, + "trimY": 583, "width": 96, "height": 93, "rawWidth": 96, @@ -98,6 +144,144 @@ ".json" ], "subMetas": {} + }, + "5e00d": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@5e00d", + "displayName": "", + "id": "5e00d", + "name": "guard_trailing_0-12", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 295, + "width": 97, + "height": 143, + "rawWidth": 97, + "rawHeight": 143, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "1573b": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@1573b", + "displayName": "", + "id": "1573b", + "name": "guard_trailing_0-17", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 98, + "height": 141, + "rawWidth": 98, + "rawHeight": 141, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "104fb": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@104fb", + "displayName": "", + "id": "104fb", + "name": "guard_trailing_0-8", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 144, + "width": 97, + "height": 149, + "rawWidth": 97, + "rawHeight": 149, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { diff --git a/assets/resources/game/skills/atk1/atk.png b/assets/resources/game/skills/atk1/atk.png index 285a1065445085e3d73f029644e924df71f84c4f..c02666778621a58edfce1fff4a9c8628e90bd2b9 100644 GIT binary patch literal 17472 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 P00000NkvXXu0mjfQl=C; literal 7724 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 - role.load() + role.load(103) } load_data(){ // let heros = oops.res.get("config/game/heros") diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 2c040e08..6bc2f69e 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -123,11 +123,9 @@ export class MonsterViewComp extends CCComp { } onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - if(selfCollider.group != otherCollider.group&&otherCollider.tag != BoxSet.ATK_RANGE){ + if(selfCollider.group != otherCollider.group&&otherCollider.tag != BoxSet.ATK_RANGE&&otherCollider.tag != BoxSet.SKILL_TAG){ this.is_atking = true; - if(otherCollider.tag != BoxSet.SKILL_TAG&&selfCollider.tag != BoxSet.ATK_RANGE){ - this.stop_cd = 0.1; - } + this.stop_cd = 0.1; } } @@ -213,8 +211,8 @@ export class MonsterViewComp extends CCComp { shoot(skill_uuid:number){ // console.log("monster shoot"); let skill = ecs.getEntity(Skill); - let x=0 - let pos = v3(x,40) + let x=32 + let pos = v3(this.scale*32,30) let speed =SkillSet[skill_uuid].speed; let scale = this.scale let dis = SkillSet[skill_uuid].dis; diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index e3c54ea9..e631e255 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -37,7 +37,8 @@ export class SkillCom extends CCComp { collider.tag = this.box_tag; collider.sensor = true; if (collider) { - collider.on(Contact2DType.END_CONTACT, this.onEndContact, this); + collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); + // collider.on(Contact2DType.END_CONTACT, this.onEndContact, this); collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); } if(this.t_pos){ @@ -66,9 +67,9 @@ export class SkillCom extends CCComp { } } - onEndContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - if(otherCollider.group != selfCollider.group){ - // console.log("skill end contact",selfCollider.group,otherCollider.group) + onBeginContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + if(otherCollider.group != selfCollider.group&&otherCollider.tag !=BoxSet.ATK_RANGE&&otherCollider.tag !=BoxSet.SKILL_TAG){ + // console.log("skill onBeginContact",selfCollider.group,otherCollider.group) this.is_destroy=true } }