From 01ad8b619e62d6db4b3b0e6cf3c95b2e42308d68 Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Wed, 18 Sep 2024 17:45:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E8=8B=B1=E9=9B=84=E7=9B=AE=E6=A0=87=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/hero/arc1.prefab | 372 ++++-------------- assets/resources/game/hero/k1.prefab | 340 ++++------------ assets/resources/game/hero/k3.prefab | 339 ++++------------ assets/resources/game/hero/m1.prefab | 351 ++++------------- assets/resources/game/hero/m2.prefab | 331 ++++------------ assets/resources/game/hero/m3.prefab | 339 ++++------------ assets/resources/game/hero/range_box.prefab | 193 +++++++++ .../resources/game/hero/range_box.prefab.meta | 13 + assets/resources/game/heros/role.prefab | 12 +- assets/script/game/Role/RoleSpine.ts | 11 +- assets/script/game/Role/RoleViewComp.ts | 12 +- .../script/game/common/SingletonModuleComp.ts | 45 +-- .../script/game/common/config/MissionSet.ts | 7 +- assets/script/game/common/config/heroSet.ts | 4 +- assets/script/game/hero/Hero.ts | 27 +- assets/script/game/hero/HeroViewComp.ts | 83 ++-- assets/script/game/map/MapMonsterComp.ts | 78 +++- 17 files changed, 834 insertions(+), 1723 deletions(-) create mode 100644 assets/resources/game/hero/range_box.prefab create mode 100644 assets/resources/game/hero/range_box.prefab.meta diff --git a/assets/resources/game/hero/arc1.prefab b/assets/resources/game/hero/arc1.prefab index 2178d3b7..9272a2df 100644 --- a/assets/resources/game/hero/arc1.prefab +++ b/assets/resources/game/hero/arc1.prefab @@ -25,41 +25,38 @@ "__id__": 8 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 26 + "__id__": 24 }, { - "__id__": 34 + "__id__": 36 }, { - "__id__": 48 - }, - { - "__id__": 58 + "__id__": 46 } ], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 54 }, { - "__id__": 68 + "__id__": 56 }, { - "__id__": 70 + "__id__": 58 }, { - "__id__": 72 + "__id__": 60 }, { - "__id__": 74 + "__id__": 62 } ], "_prefab": { - "__id__": 76 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +225,7 @@ }, { "__type__": "cc.Node", - "_name": "range_box", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -245,18 +242,15 @@ }, { "__id__": 13 - }, - { - "__id__": 15 } ], "_prefab": { - "__id__": 17 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 50, + "x": -3.533, + "y": 5.725, "z": 0 }, "_lrot": { @@ -294,186 +288,6 @@ "__prefab": { "__id__": 10 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 20, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7v65R9FlK35rDSodMKBaf" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1dGvLlJTxIyqWs7tv5eOjk" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "tag": 4, - "_group": 4, - "_density": 0, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 250, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 500, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1dqgNlJdOJJzLITAnZIRf" - }, - { - "__type__": "4d46f6aanNOIZlLrgDp9iTQ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "24l3aZD6dMtppJ1mFoqSvG" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efBGnhxpVAs6aCGcg6inWm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 25 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -3.533, - "y": 5.725, - "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__": 18 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, "_contentSize": { "__type__": "cc.Size", "width": 80, @@ -496,11 +310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -541,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 14 }, "playOnLoad": true, "_clips": [ @@ -596,14 +410,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 16 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -611,7 +425,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 28 + "__id__": 18 }, "targetOverrides": null }, @@ -625,16 +439,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 19 }, { - "__id__": 31 + "__id__": 21 }, { - "__id__": 32 + "__id__": 22 }, { - "__id__": 33 + "__id__": 23 } ], "removedComponents": [] @@ -642,7 +456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_name" @@ -658,7 +472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -673,7 +487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lrot" @@ -689,7 +503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_euler" @@ -708,14 +522,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 25 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 24 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -723,7 +537,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 26 }, "targetOverrides": null }, @@ -737,25 +551,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 27 }, { - "__id__": 39 + "__id__": 29 }, { - "__id__": 40 + "__id__": 30 }, { - "__id__": 41 + "__id__": 31 }, { - "__id__": 42 + "__id__": 32 }, { - "__id__": 44 - }, - { - "__id__": 46 + "__id__": 34 } ], "removedComponents": [] @@ -763,7 +574,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_name" @@ -779,7 +590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lpos" @@ -794,7 +605,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lrot" @@ -810,7 +621,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_euler" @@ -825,23 +636,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a0XbEkK/5Hz5NHSlvc4s5C" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 45 + "__id__": 33 }, "propertyPath": [ "_active" @@ -857,7 +652,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 47 + "__id__": 35 }, "propertyPath": [ "_active" @@ -877,14 +672,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 49 + "__id__": 37 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 48 + "__id__": 36 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -892,7 +687,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 50 + "__id__": 38 }, "targetOverrides": null }, @@ -906,19 +701,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 54 + "__id__": 42 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 56 + "__id__": 44 } ], "removedComponents": [] @@ -926,7 +721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 + "__id__": 40 }, "propertyPath": [ "_name" @@ -942,7 +737,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 + "__id__": 40 }, "propertyPath": [ "_lpos" @@ -957,7 +752,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 + "__id__": 40 }, "propertyPath": [ "_lrot" @@ -973,7 +768,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 + "__id__": 40 }, "propertyPath": [ "_euler" @@ -988,7 +783,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 57 + "__id__": 45 }, "propertyPath": [ "_active" @@ -1008,14 +803,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 59 + "__id__": 47 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 58 + "__id__": 46 }, "asset": { "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7", @@ -1023,7 +818,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 60 + "__id__": 48 }, "targetOverrides": null }, @@ -1037,16 +832,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 64 + "__id__": 52 }, { - "__id__": 65 + "__id__": 53 } ], "removedComponents": [] @@ -1054,7 +849,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 50 }, "propertyPath": [ "_name" @@ -1070,7 +865,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 50 }, "propertyPath": [ "_lpos" @@ -1085,7 +880,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -1101,7 +896,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 50 }, "propertyPath": [ "_euler" @@ -1123,7 +918,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 55 }, "_contentSize": { "__type__": "cc.Size", @@ -1151,7 +946,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 57 }, "enabledContactListener": true, "bullet": true, @@ -1185,7 +980,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 59 }, "tag": 0, "_group": 4, @@ -1195,13 +990,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 3.8, - "y": 38.9 + "x": -0.1, + "y": 36.8 }, "_size": { "__type__": "cc.Size", - "width": 38.7, - "height": 52.5 + "width": 36.1, + "height": 53.8 }, "_id": "" }, @@ -1219,7 +1014,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 61 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -1229,9 +1024,6 @@ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2", "__expectedType__": "cc.Material" }, - "BoxRang": { - "__id__": 8 - }, "_id": "" }, { @@ -1248,10 +1040,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 63 }, "animator": { - "__id__": 23 + "__id__": 13 }, "_id": "" }, @@ -1272,16 +1064,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 58 + "__id__": 46 }, { - "__id__": 48 + "__id__": 36 }, { - "__id__": 34 + "__id__": 24 }, { - "__id__": 26 + "__id__": 16 } ] } diff --git a/assets/resources/game/hero/k1.prefab b/assets/resources/game/hero/k1.prefab index 8f0cf061..22f92419 100644 --- a/assets/resources/game/hero/k1.prefab +++ b/assets/resources/game/hero/k1.prefab @@ -25,41 +25,38 @@ "__id__": 8 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 26 + "__id__": 24 }, { - "__id__": 34 + "__id__": 32 }, { - "__id__": 42 - }, - { - "__id__": 50 + "__id__": 40 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 48 }, { - "__id__": 60 + "__id__": 50 }, { - "__id__": 62 + "__id__": 52 }, { - "__id__": 64 + "__id__": 54 }, { - "__id__": 66 + "__id__": 56 } ], "_prefab": { - "__id__": 68 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +225,7 @@ }, { "__type__": "cc.Node", - "_name": "range_box", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -245,18 +242,15 @@ }, { "__id__": 13 - }, - { - "__id__": 15 } ], "_prefab": { - "__id__": 17 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 5.725, "z": 0 }, "_lrot": { @@ -294,186 +288,6 @@ "__prefab": { "__id__": 10 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 20, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7v65R9FlK35rDSodMKBaf" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1dGvLlJTxIyqWs7tv5eOjk" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "tag": 4, - "_group": 4, - "_density": 0, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 200, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1dqgNlJdOJJzLITAnZIRf" - }, - { - "__type__": "4d46f6aanNOIZlLrgDp9iTQ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e3pHt1VSRBAY+Za/OOtKNW" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efBGnhxpVAs6aCGcg6inWm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 25 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 18 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, "_contentSize": { "__type__": "cc.Size", "width": 96, @@ -496,11 +310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -541,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 14 }, "playOnLoad": true, "_clips": [ @@ -596,14 +410,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 16 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -611,7 +425,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 28 + "__id__": 18 }, "targetOverrides": null }, @@ -625,16 +439,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 19 }, { - "__id__": 31 + "__id__": 21 }, { - "__id__": 32 + "__id__": 22 }, { - "__id__": 33 + "__id__": 23 } ], "removedComponents": [] @@ -642,7 +456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_name" @@ -658,7 +472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -673,7 +487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lrot" @@ -689,7 +503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_euler" @@ -708,14 +522,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 25 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 24 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -723,7 +537,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 26 }, "targetOverrides": null }, @@ -737,16 +551,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 27 }, { - "__id__": 39 + "__id__": 29 }, { - "__id__": 40 + "__id__": 30 }, { - "__id__": 41 + "__id__": 31 } ], "removedComponents": [] @@ -754,7 +568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_name" @@ -770,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lpos" @@ -785,7 +599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lrot" @@ -801,7 +615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_euler" @@ -820,14 +634,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 43 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 32 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -835,7 +649,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 44 + "__id__": 34 }, "targetOverrides": null }, @@ -849,16 +663,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 45 + "__id__": 35 }, { - "__id__": 47 + "__id__": 37 }, { - "__id__": 48 + "__id__": 38 }, { - "__id__": 49 + "__id__": 39 } ], "removedComponents": [] @@ -866,7 +680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_name" @@ -882,7 +696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -897,7 +711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -913,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -932,14 +746,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 51 + "__id__": 41 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 50 + "__id__": 40 }, "asset": { "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7", @@ -947,7 +761,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 52 + "__id__": 42 }, "targetOverrides": null }, @@ -961,16 +775,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 53 + "__id__": 43 }, { - "__id__": 55 + "__id__": 45 }, { - "__id__": 56 + "__id__": 46 }, { - "__id__": 57 + "__id__": 47 } ], "removedComponents": [] @@ -978,7 +792,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_name" @@ -994,7 +808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -1009,7 +823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lrot" @@ -1025,7 +839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_euler" @@ -1047,7 +861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 49 }, "_contentSize": { "__type__": "cc.Size", @@ -1075,7 +889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 51 }, "enabledContactListener": true, "bullet": true, @@ -1109,7 +923,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 53 }, "tag": 0, "_group": 4, @@ -1119,13 +933,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 1.5, - "y": 40.7 + "x": -1.3, + "y": 39.7 }, "_size": { "__type__": "cc.Size", - "width": 37.5, - "height": 57.8 + "width": 38.2, + "height": 59.6 }, "_id": "" }, @@ -1143,10 +957,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 55 }, "animator": { - "__id__": 23 + "__id__": 13 }, "_id": "" }, @@ -1164,7 +978,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 57 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -1174,9 +988,6 @@ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2", "__expectedType__": "cc.Material" }, - "BoxRang": { - "__id__": 8 - }, "_id": "" }, { @@ -1193,19 +1004,18 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 50 + "__id__": 40 }, { - "__id__": 42 + "__id__": 32 }, { - "__id__": 34 + "__id__": 24 }, { - "__id__": 26 + "__id__": 16 } ] } diff --git a/assets/resources/game/hero/k3.prefab b/assets/resources/game/hero/k3.prefab index 07c8d2fc..5dbbfd1c 100644 --- a/assets/resources/game/hero/k3.prefab +++ b/assets/resources/game/hero/k3.prefab @@ -25,41 +25,38 @@ "__id__": 8 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 26 + "__id__": 24 }, { - "__id__": 34 + "__id__": 32 }, { - "__id__": 42 - }, - { - "__id__": 50 + "__id__": 40 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 48 }, { - "__id__": 60 + "__id__": 50 }, { - "__id__": 62 + "__id__": 52 }, { - "__id__": 64 + "__id__": 54 }, { - "__id__": 66 + "__id__": 56 } ], "_prefab": { - "__id__": 68 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +225,7 @@ }, { "__type__": "cc.Node", - "_name": "range_box", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -245,18 +242,15 @@ }, { "__id__": 13 - }, - { - "__id__": 15 } ], "_prefab": { - "__id__": 17 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 5.725, "z": 0 }, "_lrot": { @@ -294,186 +288,6 @@ "__prefab": { "__id__": 10 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 20, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7v65R9FlK35rDSodMKBaf" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1dGvLlJTxIyqWs7tv5eOjk" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "tag": 4, - "_group": 4, - "_density": 0, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 200, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1dqgNlJdOJJzLITAnZIRf" - }, - { - "__type__": "4d46f6aanNOIZlLrgDp9iTQ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e3pHt1VSRBAY+Za/OOtKNW" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efBGnhxpVAs6aCGcg6inWm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 25 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 18 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, "_contentSize": { "__type__": "cc.Size", "width": 104, @@ -496,11 +310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -541,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 14 }, "playOnLoad": true, "_clips": [ @@ -596,14 +410,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 16 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -611,7 +425,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 28 + "__id__": 18 }, "targetOverrides": null }, @@ -625,16 +439,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 19 }, { - "__id__": 31 + "__id__": 21 }, { - "__id__": 32 + "__id__": 22 }, { - "__id__": 33 + "__id__": 23 } ], "removedComponents": [] @@ -642,7 +456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_name" @@ -658,7 +472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -673,7 +487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lrot" @@ -689,7 +503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_euler" @@ -708,14 +522,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 25 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 24 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -723,7 +537,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 26 }, "targetOverrides": null }, @@ -737,16 +551,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 27 }, { - "__id__": 39 + "__id__": 29 }, { - "__id__": 40 + "__id__": 30 }, { - "__id__": 41 + "__id__": 31 } ], "removedComponents": [] @@ -754,7 +568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_name" @@ -770,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lpos" @@ -785,7 +599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lrot" @@ -801,7 +615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_euler" @@ -820,14 +634,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 43 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 32 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -835,7 +649,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 44 + "__id__": 34 }, "targetOverrides": null }, @@ -849,16 +663,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 45 + "__id__": 35 }, { - "__id__": 47 + "__id__": 37 }, { - "__id__": 48 + "__id__": 38 }, { - "__id__": 49 + "__id__": 39 } ], "removedComponents": [] @@ -866,7 +680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_name" @@ -882,7 +696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -897,7 +711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -913,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -932,14 +746,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 51 + "__id__": 41 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 50 + "__id__": 40 }, "asset": { "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7", @@ -947,7 +761,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 52 + "__id__": 42 }, "targetOverrides": null }, @@ -961,16 +775,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 53 + "__id__": 43 }, { - "__id__": 55 + "__id__": 45 }, { - "__id__": 56 + "__id__": 46 }, { - "__id__": 57 + "__id__": 47 } ], "removedComponents": [] @@ -978,7 +792,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_name" @@ -994,7 +808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -1009,7 +823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lrot" @@ -1025,7 +839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_euler" @@ -1047,7 +861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 49 }, "_contentSize": { "__type__": "cc.Size", @@ -1075,7 +889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 51 }, "enabledContactListener": true, "bullet": true, @@ -1109,7 +923,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 53 }, "tag": 0, "_group": 4, @@ -1119,13 +933,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 1.5, - "y": 40.7 + "x": 0.1, + "y": 38.9 }, "_size": { "__type__": "cc.Size", - "width": 37.5, - "height": 57.8 + "width": 36.2, + "height": 61.5 }, "_id": "" }, @@ -1143,10 +957,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 55 }, "animator": { - "__id__": 23 + "__id__": 13 }, "_id": "" }, @@ -1164,7 +978,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 57 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -1174,9 +988,6 @@ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2", "__expectedType__": "cc.Material" }, - "BoxRang": { - "__id__": 8 - }, "_id": "" }, { @@ -1196,16 +1007,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 50 + "__id__": 40 }, { - "__id__": 42 + "__id__": 32 }, { - "__id__": 34 + "__id__": 24 }, { - "__id__": 26 + "__id__": 16 } ] } diff --git a/assets/resources/game/hero/m1.prefab b/assets/resources/game/hero/m1.prefab index 6473eb1a..d3df2113 100644 --- a/assets/resources/game/hero/m1.prefab +++ b/assets/resources/game/hero/m1.prefab @@ -25,41 +25,38 @@ "__id__": 8 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 26 + "__id__": 24 }, { - "__id__": 34 + "__id__": 32 }, { - "__id__": 42 - }, - { - "__id__": 55 + "__id__": 45 } ], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 53 }, { - "__id__": 65 + "__id__": 55 }, { - "__id__": 67 + "__id__": 57 }, { - "__id__": 69 + "__id__": 59 }, { - "__id__": 71 + "__id__": 61 } ], "_prefab": { - "__id__": 73 + "__id__": 63 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +225,7 @@ }, { "__type__": "cc.Node", - "_name": "range_box", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -245,18 +242,15 @@ }, { "__id__": 13 - }, - { - "__id__": 15 } ], "_prefab": { - "__id__": 17 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 5.725, "z": 0 }, "_lrot": { @@ -294,186 +288,6 @@ "__prefab": { "__id__": 10 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 20, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7v65R9FlK35rDSodMKBaf" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1dGvLlJTxIyqWs7tv5eOjk" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "tag": 4, - "_group": 4, - "_density": 0, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 250, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 500, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1dqgNlJdOJJzLITAnZIRf" - }, - { - "__type__": "4d46f6aanNOIZlLrgDp9iTQ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e3pHt1VSRBAY+Za/OOtKNW" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efBGnhxpVAs6aCGcg6inWm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 25 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 18 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, "_contentSize": { "__type__": "cc.Size", "width": 88, @@ -496,11 +310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -541,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 14 }, "playOnLoad": true, "_clips": [ @@ -596,14 +410,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 16 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -611,7 +425,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 28 + "__id__": 18 }, "targetOverrides": null }, @@ -625,16 +439,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 19 }, { - "__id__": 31 + "__id__": 21 }, { - "__id__": 32 + "__id__": 22 }, { - "__id__": 33 + "__id__": 23 } ], "removedComponents": [] @@ -642,7 +456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_name" @@ -658,7 +472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -673,7 +487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lrot" @@ -689,7 +503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_euler" @@ -708,14 +522,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 25 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 24 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -723,7 +537,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 26 }, "targetOverrides": null }, @@ -737,16 +551,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 27 }, { - "__id__": 39 + "__id__": 29 }, { - "__id__": 40 + "__id__": 30 }, { - "__id__": 41 + "__id__": 31 } ], "removedComponents": [] @@ -754,7 +568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_name" @@ -770,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lpos" @@ -785,7 +599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lrot" @@ -801,7 +615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_euler" @@ -820,14 +634,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 43 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 32 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -835,7 +649,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 44 + "__id__": 34 }, "targetOverrides": null }, @@ -849,25 +663,25 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 45 + "__id__": 35 }, { - "__id__": 47 + "__id__": 37 }, { - "__id__": 48 + "__id__": 38 }, { - "__id__": 49 + "__id__": 39 }, { - "__id__": 50 + "__id__": 40 }, { - "__id__": 51 + "__id__": 41 }, { - "__id__": 53 + "__id__": 43 } ], "removedComponents": [] @@ -875,7 +689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_name" @@ -891,7 +705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -906,7 +720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -922,7 +736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -937,7 +751,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_active" @@ -947,7 +761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 + "__id__": 42 }, "propertyPath": [ "_active" @@ -963,7 +777,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_active" @@ -983,14 +797,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 56 + "__id__": 46 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 55 + "__id__": 45 }, "asset": { "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7", @@ -998,7 +812,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 57 + "__id__": 47 }, "targetOverrides": null }, @@ -1012,16 +826,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 58 + "__id__": 48 }, { - "__id__": 60 + "__id__": 50 }, { - "__id__": 61 + "__id__": 51 }, { - "__id__": 62 + "__id__": 52 } ], "removedComponents": [] @@ -1029,7 +843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 49 }, "propertyPath": [ "_name" @@ -1045,7 +859,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 49 }, "propertyPath": [ "_lpos" @@ -1060,7 +874,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 49 }, "propertyPath": [ "_lrot" @@ -1076,7 +890,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 49 }, "propertyPath": [ "_euler" @@ -1098,7 +912,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", @@ -1126,7 +940,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 56 }, "enabledContactListener": true, "bullet": true, @@ -1160,7 +974,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 58 }, "tag": 0, "_group": 4, @@ -1170,13 +984,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 3.7, - "y": 32.8 + "x": 0.6, + "y": 36.4 }, "_size": { "__type__": "cc.Size", - "width": 35.1, - "height": 50.7 + "width": 39.9, + "height": 55.5 }, "_id": "" }, @@ -1194,10 +1008,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 60 }, "animator": { - "__id__": 23 + "__id__": 13 }, "_id": "" }, @@ -1215,7 +1029,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 62 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -1225,9 +1039,6 @@ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2", "__expectedType__": "cc.Material" }, - "BoxRang": { - "__id__": 8 - }, "_id": "" }, { @@ -1247,16 +1058,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 55 + "__id__": 45 }, { - "__id__": 42 + "__id__": 32 }, { - "__id__": 34 + "__id__": 24 }, { - "__id__": 26 + "__id__": 16 } ] } diff --git a/assets/resources/game/hero/m2.prefab b/assets/resources/game/hero/m2.prefab index 9f0cfefd..cbebb3d2 100644 --- a/assets/resources/game/hero/m2.prefab +++ b/assets/resources/game/hero/m2.prefab @@ -25,41 +25,38 @@ "__id__": 8 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 26 + "__id__": 24 }, { - "__id__": 34 + "__id__": 32 }, { - "__id__": 42 - }, - { - "__id__": 50 + "__id__": 40 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 48 }, { - "__id__": 60 + "__id__": 50 }, { - "__id__": 62 + "__id__": 52 }, { - "__id__": 64 + "__id__": 54 }, { - "__id__": 66 + "__id__": 56 } ], "_prefab": { - "__id__": 68 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +225,7 @@ }, { "__type__": "cc.Node", - "_name": "range_box", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -245,18 +242,15 @@ }, { "__id__": 13 - }, - { - "__id__": 15 } ], "_prefab": { - "__id__": 17 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 5.725, "z": 0 }, "_lrot": { @@ -294,186 +288,6 @@ "__prefab": { "__id__": 10 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 20, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7v65R9FlK35rDSodMKBaf" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1dGvLlJTxIyqWs7tv5eOjk" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "tag": 4, - "_group": 4, - "_density": 0, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 250, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 500, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1dqgNlJdOJJzLITAnZIRf" - }, - { - "__type__": "4d46f6aanNOIZlLrgDp9iTQ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e3pHt1VSRBAY+Za/OOtKNW" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efBGnhxpVAs6aCGcg6inWm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 25 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 18 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, "_contentSize": { "__type__": "cc.Size", "width": 88, @@ -496,11 +310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -541,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 14 }, "playOnLoad": true, "_clips": [ @@ -596,14 +410,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 16 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -611,7 +425,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 28 + "__id__": 18 }, "targetOverrides": null }, @@ -625,16 +439,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 19 }, { - "__id__": 31 + "__id__": 21 }, { - "__id__": 32 + "__id__": 22 }, { - "__id__": 33 + "__id__": 23 } ], "removedComponents": [] @@ -642,7 +456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_name" @@ -658,7 +472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -673,7 +487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lrot" @@ -689,7 +503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_euler" @@ -708,14 +522,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 25 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 24 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -723,7 +537,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 26 }, "targetOverrides": null }, @@ -737,16 +551,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 27 }, { - "__id__": 39 + "__id__": 29 }, { - "__id__": 40 + "__id__": 30 }, { - "__id__": 41 + "__id__": 31 } ], "removedComponents": [] @@ -754,7 +568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_name" @@ -770,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lpos" @@ -785,7 +599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lrot" @@ -801,7 +615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_euler" @@ -820,14 +634,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 43 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 32 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -835,7 +649,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 44 + "__id__": 34 }, "targetOverrides": null }, @@ -849,16 +663,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 45 + "__id__": 35 }, { - "__id__": 47 + "__id__": 37 }, { - "__id__": 48 + "__id__": 38 }, { - "__id__": 49 + "__id__": 39 } ], "removedComponents": [] @@ -866,7 +680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_name" @@ -882,7 +696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -897,7 +711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -913,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -932,14 +746,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 51 + "__id__": 41 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 50 + "__id__": 40 }, "asset": { "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7", @@ -947,7 +761,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 52 + "__id__": 42 }, "targetOverrides": null }, @@ -961,16 +775,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 53 + "__id__": 43 }, { - "__id__": 55 + "__id__": 45 }, { - "__id__": 56 + "__id__": 46 }, { - "__id__": 57 + "__id__": 47 } ], "removedComponents": [] @@ -978,7 +792,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_name" @@ -994,7 +808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -1009,7 +823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lrot" @@ -1025,7 +839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_euler" @@ -1047,7 +861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 49 }, "_contentSize": { "__type__": "cc.Size", @@ -1075,7 +889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 51 }, "enabledContactListener": true, "bullet": true, @@ -1109,7 +923,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 53 }, "tag": 0, "_group": 4, @@ -1143,10 +957,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 55 }, "animator": { - "__id__": 23 + "__id__": 13 }, "_id": "" }, @@ -1164,7 +978,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 57 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -1174,9 +988,6 @@ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2", "__expectedType__": "cc.Material" }, - "BoxRang": { - "__id__": 8 - }, "_id": "" }, { @@ -1196,16 +1007,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 50 + "__id__": 40 }, { - "__id__": 42 + "__id__": 32 }, { - "__id__": 34 + "__id__": 24 }, { - "__id__": 26 + "__id__": 16 } ] } diff --git a/assets/resources/game/hero/m3.prefab b/assets/resources/game/hero/m3.prefab index 64882654..4a08cdce 100644 --- a/assets/resources/game/hero/m3.prefab +++ b/assets/resources/game/hero/m3.prefab @@ -25,41 +25,38 @@ "__id__": 8 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 26 + "__id__": 24 }, { - "__id__": 34 + "__id__": 32 }, { - "__id__": 42 - }, - { - "__id__": 50 + "__id__": 40 } ], "_active": true, "_components": [ { - "__id__": 58 + "__id__": 48 }, { - "__id__": 60 + "__id__": 50 }, { - "__id__": 62 + "__id__": 52 }, { - "__id__": 64 + "__id__": 54 }, { - "__id__": 66 + "__id__": 56 } ], "_prefab": { - "__id__": 68 + "__id__": 58 }, "_lpos": { "__type__": "cc.Vec3", @@ -228,7 +225,7 @@ }, { "__type__": "cc.Node", - "_name": "range_box", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -245,18 +242,15 @@ }, { "__id__": 13 - }, - { - "__id__": 15 } ], "_prefab": { - "__id__": 17 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 5.725, "z": 0 }, "_lrot": { @@ -294,186 +288,6 @@ "__prefab": { "__id__": 10 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 20, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a7v65R9FlK35rDSodMKBaf" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1dGvLlJTxIyqWs7tv5eOjk" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 14 - }, - "tag": 4, - "_group": 4, - "_density": 0, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 250, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 500, - "height": 150 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c1dqgNlJdOJJzLITAnZIRf" - }, - { - "__type__": "4d46f6aanNOIZlLrgDp9iTQ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 8 - }, - "_enabled": true, - "__prefab": { - "__id__": 16 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e3pHt1VSRBAY+Za/OOtKNW" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efBGnhxpVAs6aCGcg6inWm", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 19 - }, - { - "__id__": 21 - }, - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 25 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 18 - }, - "_enabled": true, - "__prefab": { - "__id__": 20 - }, "_contentSize": { "__type__": "cc.Size", "width": 88, @@ -496,11 +310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -541,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 14 }, "playOnLoad": true, "_clips": [ @@ -596,14 +410,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 17 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 16 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -611,7 +425,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 28 + "__id__": 18 }, "targetOverrides": null }, @@ -625,16 +439,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 19 }, { - "__id__": 31 + "__id__": 21 }, { - "__id__": 32 + "__id__": 22 }, { - "__id__": 33 + "__id__": 23 } ], "removedComponents": [] @@ -642,7 +456,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_name" @@ -658,7 +472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lpos" @@ -673,7 +487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_lrot" @@ -689,7 +503,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 20 }, "propertyPath": [ "_euler" @@ -708,14 +522,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 35 + "__id__": 25 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 34 + "__id__": 24 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -723,7 +537,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 36 + "__id__": 26 }, "targetOverrides": null }, @@ -737,16 +551,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 37 + "__id__": 27 }, { - "__id__": 39 + "__id__": 29 }, { - "__id__": 40 + "__id__": 30 }, { - "__id__": 41 + "__id__": 31 } ], "removedComponents": [] @@ -754,7 +568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_name" @@ -770,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lpos" @@ -785,7 +599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_lrot" @@ -801,7 +615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 28 }, "propertyPath": [ "_euler" @@ -820,14 +634,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 43 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 42 + "__id__": 32 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -835,7 +649,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 44 + "__id__": 34 }, "targetOverrides": null }, @@ -849,16 +663,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 45 + "__id__": 35 }, { - "__id__": 47 + "__id__": 37 }, { - "__id__": 48 + "__id__": 38 }, { - "__id__": 49 + "__id__": 39 } ], "removedComponents": [] @@ -866,7 +680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_name" @@ -882,7 +696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -897,7 +711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -913,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -932,14 +746,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 51 + "__id__": 41 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 50 + "__id__": 40 }, "asset": { "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7", @@ -947,7 +761,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 52 + "__id__": 42 }, "targetOverrides": null }, @@ -961,16 +775,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 53 + "__id__": 43 }, { - "__id__": 55 + "__id__": 45 }, { - "__id__": 56 + "__id__": 46 }, { - "__id__": 57 + "__id__": 47 } ], "removedComponents": [] @@ -978,7 +792,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_name" @@ -994,7 +808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lpos" @@ -1009,7 +823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_lrot" @@ -1025,7 +839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 44 }, "propertyPath": [ "_euler" @@ -1047,7 +861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 49 }, "_contentSize": { "__type__": "cc.Size", @@ -1075,7 +889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 51 }, "enabledContactListener": true, "bullet": true, @@ -1109,7 +923,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 53 }, "tag": 0, "_group": 4, @@ -1119,13 +933,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0.4, - "y": 38.7 + "x": -0.3, + "y": 38 }, "_size": { "__type__": "cc.Size", - "width": 38.4, - "height": 56.8 + "width": 39.8, + "height": 56.6 }, "_id": "" }, @@ -1143,10 +957,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 55 }, "animator": { - "__id__": 23 + "__id__": 13 }, "_id": "" }, @@ -1164,7 +978,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 57 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -1174,9 +988,6 @@ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2", "__expectedType__": "cc.Material" }, - "BoxRang": { - "__id__": 8 - }, "_id": "" }, { @@ -1196,16 +1007,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 50 + "__id__": 40 }, { - "__id__": 42 + "__id__": 32 }, { - "__id__": 34 + "__id__": 24 }, { - "__id__": 26 + "__id__": 16 } ] } diff --git a/assets/resources/game/hero/range_box.prefab b/assets/resources/game/hero/range_box.prefab new file mode 100644 index 00000000..82c621a6 --- /dev/null +++ b/assets/resources/game/hero/range_box.prefab @@ -0,0 +1,193 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "range_box", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "range_box", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 2 + }, + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 10 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 50, + "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__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 3 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 20, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a7v65R9FlK35rDSodMKBaf" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 4, + "_type": 1, + "_allowSleep": false, + "_gravityScale": 0, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1dGvLlJTxIyqWs7tv5eOjk" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "tag": 4, + "_group": 4, + "_density": 0, + "_sensor": false, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 250, + "y": 0 + }, + "_size": { + "__type__": "cc.Size", + "width": 500, + "height": 150 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c1dqgNlJdOJJzLITAnZIRf" + }, + { + "__type__": "4d46f6aanNOIZlLrgDp9iTQ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "24l3aZD6dMtppJ1mFoqSvG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "efBGnhxpVAs6aCGcg6inWm", + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/hero/range_box.prefab.meta b/assets/resources/game/hero/range_box.prefab.meta new file mode 100644 index 00000000..f8e2ef78 --- /dev/null +++ b/assets/resources/game/hero/range_box.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "092d8df3-9145-434f-830f-25a41a1befc0", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "range_box" + } +} diff --git a/assets/resources/game/heros/role.prefab b/assets/resources/game/heros/role.prefab index fdf7306e..faa90060 100644 --- a/assets/resources/game/heros/role.prefab +++ b/assets/resources/game/heros/role.prefab @@ -375,11 +375,11 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "move", + "defaultAnimation": "idle", "_premultipliedAlpha": true, - "_timeScale": 1.5, - "_preCacheMode": 0, - "_cacheMode": 0, + "_timeScale": 2, + "_preCacheMode": 2, + "_cacheMode": 2, "_sockets": [], "_useTint": false, "_debugMesh": false, @@ -541,7 +541,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "CCPropertyOverrideInfo", @@ -1183,7 +1183,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "beu6yjuuRGXa17pWShcP0O" + "fileId": "deY6sB84xEirMEaB+AZywz" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/script/game/Role/RoleSpine.ts b/assets/script/game/Role/RoleSpine.ts index ddaa8c73..a2a477d0 100644 --- a/assets/script/game/Role/RoleSpine.ts +++ b/assets/script/game/Role/RoleSpine.ts @@ -18,7 +18,7 @@ const { ccclass, property } = _decorator; export class RoleSpine extends Component { private loop: boolean = true; private spine!: sp.Skeleton; - private default:string = "move"; + private default:string = "idle"; private atk_name: string = "atk"; private move_name: string = "move"; private max_name: string = "max"; @@ -32,17 +32,16 @@ export class RoleSpine extends Component { this.spine = this.node.getChildByName("anm")!.getComponent(sp.Skeleton); this.spine.setEndListener(trackEntry => { var animationName = trackEntry.animation ? trackEntry.animation.name : ""; - console.log("[track %s][animation %s] end.", trackEntry.trackIndex, animationName); - // if (animationName == "atk" || animationName== "max" ) { - // this.spine.setAnimation(0, this.default, true); - // } + // console.log("[track %s][animation %s] end.", trackEntry.trackIndex, animationName); + if (animationName == "atk" || animationName== "max" ) { + this.spine.setAnimation(0, this.default, true); + } }); } protected play(animName: string, loop: boolean) { } atk(){ - this.spine.setAnimation(0, this.atk_name, false); } idle(){ diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts index ed82e57f..4cdc2866 100644 --- a/assets/script/game/Role/RoleViewComp.ts +++ b/assets/script/game/Role/RoleViewComp.ts @@ -91,7 +91,7 @@ export class RoleViewComp extends CCComp { is_dead:boolean = false; //是否摧毁 is_stop:boolean = false; is_atking:boolean = false; - + type:number = 0; onLoad() { // this.BoxRang = this.node.getChildByName("range_box"); this.as = this.node.getComponent(RoleSpine); @@ -182,7 +182,8 @@ export class RoleViewComp extends CCComp { this.check_buff_atks(dt) this.in_shield(dt); this.in_stop(dt); - this.in_atk(dt); + this.atk_time += dt; + this.in_atk(); // this.move(); this.check_enemys() } @@ -259,7 +260,7 @@ export class RoleViewComp extends CCComp { return false } } - in_atk(dt: number) { + in_atk() { if(this.atk_time >= this.atk_cd){ // if(this.is_atking&&this.check_enemy_alive()){ // this.atk_time = 0; @@ -273,11 +274,10 @@ export class RoleViewComp extends CCComp { this.as.atk(); this.scheduleOnce(()=>{ this.shoot(this.skill,-30); - },0.4) - }else{ - this.atk_time += dt; + },0.2) } } + hp_change(hp: number){ if(this.is_dead){ return; diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 2fc9726c..9a8e5f9f 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -44,43 +44,32 @@ export class SingletonModuleComp extends ecs.Comp { {x:-BoxSet.CSKILL_X+110,y:BoxSet.CSKILL_Y+55,eid:0}, {x:-BoxSet.CSKILL_X+165,y:BoxSet.CSKILL_Y+55,eid:0}, ]; - role_heros: any = [ - {x:BoxSet.ROLE_FUX,y:50,eid:0}, - {x:BoxSet.ROLE_FUX,y:0,eid:0}, - {x:BoxSet.ROLE_FUX,y:-50,eid:0}, - - {x:BoxSet.ROLE_FUX+40,y:50,eid:0}, - {x:BoxSet.ROLE_FUX+40,y:0,eid:0}, - {x:BoxSet.ROLE_FUX+40,y:-50,eid:0}, - - {x:BoxSet.ROLE_BUX,y:50,eid:0}, - {x:BoxSet.ROLE_BUX,y:0,eid:0}, - {x:BoxSet.ROLE_BUX,y:-50,eid:0}, - - {x:BoxSet.ROLE_BUX-40,y:50,eid:0}, - {x:BoxSet.ROLE_BUX-40,y:0,eid:0}, - {x:BoxSet.ROLE_BUX-40,y:-50,eid:0}, - - ]; monster_buffs: any = []; /** 游戏主角 */ Role: Role = null; - t_monster:any={eid:0,pos:v3(0,0,0)}; - t_hero:any={eid:0,pos:v3(0,0,0)}; - /** 游戏数据 */ - // data:data = null!; - /**怪物数据 数组 */ - /**heros 数据 */ + heros:any = []; monsters:any = []; skills:any = [] sk_info:any = [] monsters_dead:any = [] heros_dead:any = [] - least_hp_monster_eid:number=0; - least_hp_monster_hp:number=1000; - least_hp_hero_eid:number=0; - least_hp_hero_hp:number=1000; + hero_pos:any=[ + {x:-320,y:70}, + {x:-320,y:0}, + {x:-320,y:-70}, + {x:-320,y:0}, + {x:-320,y:0}, + {x:-320,y:0}, + ] + enemy_pos:any =[ + {x:320,y:70}, + {x:320,y:0}, + {x:320,y:-70}, + {x:320,y:0}, + {x:320,y:0}, + {x:320,y:0}, + ] vm_data: any = { name : "纸片精灵大乱斗", game_over:false, diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/MissionSet.ts index 036cc801..898b3c23 100644 --- a/assets/script/game/common/config/MissionSet.ts +++ b/assets/script/game/common/config/MissionSet.ts @@ -1,11 +1,8 @@ -export const MissionNum = [1,2] +export const MissionNum = [1] export const MonsetList = { 1:{ 1:[1031,1032,1033,1011,1012,1013], - }, - 2:{ - 1:[1011,1012,1013,1031,1032,1033,], - }, + } } diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 675805aa..80a2542f 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -10,7 +10,7 @@ export const HeroSet = { max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 2003, word: "守护", info: "自身护盾", atktype: 1, }, 9011: { - uuid: 9004, path: "m1", type: 1, level: 1,cost:2, name: "冰法", atk: 15, hp: 20, atk_dis: 300, atk_cd: 2.5, power: 0, power_max: 10, speed: 30, + uuid: 9004, path: "m1", type: 3, level: 1,cost:2, name: "冰法", atk: 15, hp: 20, atk_dis: 300, atk_cd: 2.5, power: 0, power_max: 10, speed: 30, max_skill: "寒冰箭", skill_uuid: 9002, max_skill_uuid: 1002, word: "守护", info: "自身护盾", atktype: 1, }, 9021: { @@ -25,7 +25,7 @@ export const HeroSet = { 9041: { - uuid: 9009, path: "arc1", type: 3, level: 1,cost:2, name: "弓箭手", atk: 5, hp: 30, atk_dis: 200, atk_cd: 1.5, power: 0, power_max: 10, speed: 30, + uuid: 9009, path: "arc1", type: 2, level: 1,cost:2, name: "弓箭手", atk: 5, hp: 30, atk_dis: 200, atk_cd: 1.5, power: 0, power_max: 10, speed: 30, max_skill: "精准射击", skill_uuid: 9003, max_skill_uuid: 1003, word: "狂暴", info: "全体攻击", atktype: 2 }, diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index e584e8d9..d8bf495a 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -58,21 +58,22 @@ export class Hero extends ecs.Entity { hero_init(uuid:number=1001,node:Node,index:number=-1){ var hv = node.getComponent(HeroViewComp)!; // console.log("hero_init",buff) - hv.speed =hv.ospeed = smc.heros[uuid].speed; - hv.hero_name= smc.heros[uuid].name; - hv.hp= hv.hp_max = smc.heros[uuid].hp; - hv.level = smc.heros[uuid].level; - hv.atk = smc.heros[uuid].atk; - hv.atk_cd = smc.heros[uuid].atk_cd; - hv.atk_dis = smc.heros[uuid].atk_dis; - hv.power = smc.heros[uuid].power; - hv.power_max= smc.heros[uuid].power_max; - hv.type = smc.heros[uuid].type; - hv.skill_uuid = smc.heros[uuid].skill_uuid; - hv.max_skill_uuid = smc.heros[uuid].max_skill_uuid; + let hero_set= smc.heros[uuid] + hv.speed =hv.ospeed = hero_set.speed; + hv.hero_name= hero_set.name; + hv.hp= hv.hp_max = hero_set.hp; + hv.level = hero_set.level; + hv.atk = hero_set.atk; + hv.atk_cd = hero_set.atk_cd; + hv.atk_dis = hero_set.atk_dis; + hv.power = hero_set.power; + hv.power_max= hero_set.power_max; + hv.type = hero_set.type; + hv.skill_uuid = hero_set.skill_uuid; + hv.max_skill_uuid = hero_set.max_skill_uuid; hv.scale = 1; hv.role_heros_index = index; - hv.Tpos = v3(0,0,0); + hv.type = hero_set.type; this.add(hv); } set_ratio(uuid:number){ diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 87199cd6..d2e2123a 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -5,7 +5,7 @@ * @LastEditTime: 2022-08-17 12:36:18 */ -import { Vec3, _decorator , v3,Collider2D,Contact2DType,Label,RigidBody2D ,Node,Prefab,instantiate,ProgressBar, Component, Material, Sprite} from "cc"; +import { Vec3, _decorator , v3,Collider2D,Contact2DType,Label,RigidBody2D ,Node,Prefab,instantiate,ProgressBar, Component, Material, Sprite, math} from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { HeroSpine } from "./HeroSpine"; @@ -36,8 +36,8 @@ export class HeroViewComp extends CCComp { @property(Material) atkMaterial: Material; - @property(Node) - BoxRang:Node =null! + // @property(Node) + // BoxRang:Node =null! is_role:boolean = false; enemy_pos:Vec3=null!; @@ -106,8 +106,8 @@ export class HeroViewComp extends CCComp { // this.node.getChildByName("hp_max").setScale(this.scale,1); // this.node.getChildByName("hp_max").getComponent(Label).string=this.hp_max.toString(); this.orginalFlashMaterial = this.sprite.getRenderMaterial(0); - this.BoxRang.getComponent(BoxRangComp).box_group = this.box_group; - this.BoxRang.getComponent(BoxRangComp).atk_range = this.atk_range + // this.BoxRang.getComponent(BoxRangComp).box_group = this.box_group; + // this.BoxRang.getComponent(BoxRangComp).atk_range = this.atk_range // this.BoxRang.getComponent(BoxRangComp).offset_x = 300; // console.log("monseter ",this.BoxRang); // console.log("monseter ",this.BoxRang); @@ -148,15 +148,24 @@ export class HeroViewComp extends CCComp { } onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D) { if(selfCollider.group == otherCollider.group&&selfCollider.tag==otherCollider.tag){ - - if(selfCollider.node.position.y < otherCollider.node.position.y){ - if(selfCollider.node.getSiblingIndex() < otherCollider.node.getSiblingIndex()){ - - selfCollider.node.setSiblingIndex(otherCollider.node.getSiblingIndex()+1) - // console.log("onPreSolve b:"+selfCollider.node.uuid+":"+selfCollider.node.getSiblingIndex()+"/"+otherCollider.node.uuid+":"+otherCollider.node.getSiblingIndex()); - } - + if(otherCollider.node.name=="role") return + let self_x = selfCollider.node.position.x; + let other_x = otherCollider.node.position.x; + if(otherCollider.node.getComponent(HeroViewComp).type == this.type && self_x < other_x && Math.abs(other_x-self_x) < 15 ){ + this.stop_cd = 0.1; } + // if(selfCollider.node.position.y < otherCollider.node.position.y){ + // if(selfCollider.node.getSiblingIndex() < otherCollider.node.getSiblingIndex()){ + + // selfCollider.node.setSiblingIndex(otherCollider.node.getSiblingIndex()+1) + // // console.log("onPreSolve b:"+selfCollider.node.uuid+":"+selfCollider.node.getSiblingIndex()+"/"+otherCollider.node.uuid+":"+otherCollider.node.getSiblingIndex()); + // } + + // } + } + if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0){ + this.stop_cd = 0.1; + this.is_atking=true } } onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) { @@ -171,7 +180,10 @@ export class HeroViewComp extends CCComp { this.check_buff_atks(dt) this.in_shield(dt); this.in_stop(dt); + this.atk_time += dt; + this.check_enemy_alive() this.in_atk(dt); + this.hp_show() // this.in_speek(dt); this.move(dt); @@ -200,7 +212,7 @@ export class HeroViewComp extends CCComp { this.node.getChildByName("top").getChildByName("hp").active = true; } } - move_to(){ + move_to(target:any){ // if(this.stop_cd > 0){ // return // } @@ -208,13 +220,13 @@ export class HeroViewComp extends CCComp { // return // } var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); - move.target = v3(smc.Role.RoleView.node.position.x+smc.role_heros[this.role_heros_index].x,smc.Role.RoleView.node.position.y+smc.role_heros[this.role_heros_index].y); + move.target = v3(target.x,target.y); move.node = this.node; move.speed = this.ospeed; } power_change(power: number){ this.power += power; - if(this.power >= this.power_max&&this.check_enemy_alive()){ + if(this.power >= this.power_max){ this.as.atk() // this.to_speek(smc.skills[this.max_skill_uuid].name) this.scheduleOnce(()=>{ @@ -230,25 +242,23 @@ export class HeroViewComp extends CCComp { } get_enemy_pos(){ let pos =this.skill_pos() - let t_pos:Vec3 = v3(720,BoxSet.GAME_LINE) + let t_pos:Vec3 = v3(720,0) if(this.enemy){ - if(!this.enemy.isValid){ - console.log("move_to",this.enemy.isValid); - return - } - t_pos = v3(this.enemy.position.x-this.node.position.x,this.enemy.position.y-(this.node.position.y+pos.y)+BoxSet.ATK_Y) + t_pos = v3(this.enemy.x-this.node.position.x,this.enemy.y-(this.node.position.y+pos.y)) } + console.log("get_hero_pos",this.enemy,this.node.position,t_pos); return {pos,t_pos} } get_hero_pos(hero:any){ let pos =this.skill_pos() - let t_pos:Vec3 = v3(720,BoxSet.GAME_LINE) + let t_pos:Vec3 = v3(720,0) if(!hero.HeroView.node.isValid){ console.log("hero.heroView.node.isValid",hero.HeroView); return }else{ - t_pos = v3(hero.HeroView.node.position.x-this.node.position.x,hero.HeroView.node.position.y-(this.node.position.y+pos.y)+BoxSet.ATK_Y) + t_pos = v3(hero.HeroView.node.position.x-this.node.position.x,hero.HeroView.node.position.y-(this.node.position.y+pos.y)) } + return {pos,t_pos} } shoot_enemy(skill_uuid:number,y:number=0,x:number=0){ @@ -256,6 +266,7 @@ export class HeroViewComp extends CCComp { let skill = ecs.getEntity(Skill); let atk = smc.skills[skill_uuid].atk+this.atk+this.buff_atk; let {pos,t_pos}=this.get_enemy_pos() + pos.y=pos.y + y pos.x=pos.x + x skill.load(pos,BoxSet.HERO,this.node,skill_uuid,atk,t_pos); @@ -348,19 +359,26 @@ export class HeroViewComp extends CCComp { } check_enemy_alive(){ - if(this.enemy){ - if(!this.enemy.isValid){ - return false + let dir = 320 + for (let i = 0; i <= 2; i++) { + let mon:any = smc.enemy_pos[i]; + let squaredDistance =mon.x*mon.x+mon.y*mon.y + let distance = Math.sqrt(squaredDistance); + if(distance < dir){ + dir = distance + this.enemy = mon } - if(Math.abs(this.enemy.position.x-this.node.position.x) < this.atk_dis) return true; - return false + + } + if(dir < this.atk_dis){ + this.is_atking=true }else{ - return false + this.is_atking=false } } in_atk(dt: number) { if(this.atk_time >= this.atk_cd){ - if(this.is_atking&&this.check_enemy_alive()){ + if(this.is_atking){ this.atk_time = 0; // console.log("atk_cd:"+this.atk_cd); this.as.atk(); @@ -368,8 +386,6 @@ export class HeroViewComp extends CCComp { this.handle_skill(this.skill_uuid) },0.4) } - }else{ - this.atk_time += dt; } } @@ -407,7 +423,6 @@ export class HeroViewComp extends CCComp { if(this.hp <= 0){ this.dead(); this.is_dead = true; - // smc.role_heros[this.role_heros_index].eid == 0 setTimeout(() => { this.ent.destroy(); }, 15); diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index e71a102c..81e66c42 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -34,11 +34,13 @@ export class MapMonsterComp extends CCComp { mission_list:any = [] setp_timer: Timer = new Timer(0.3); target_timer: Timer = new Timer(0.1); - setp_num:number = 5; + setp_num:number = 6; game_over:boolean = false; start_ys:any[] = [70,0,-70]; hero_start_ys:any[] = [35,-35]; - + mon_index:number = 0 + hero_index:number = 0 + line:number=BoxSet.GAME_LINE onLoad(){ // 监听全局事件 oops.message.on("other_add_monster", this.on_other_add_monster, this); @@ -65,13 +67,14 @@ export class MapMonsterComp extends CCComp { this.monster_refresh() } if (this.refresh_timer.update(dt)) { - this.setp_num = 5 + this.setp_num = 6 } if (this.mission_up_timer.update(dt)) { // 刷新怪物定时器 this.cur_count += 1; } - + this.count_hero_pos() + this.count_mon_pos() // if (this.game_timer.update(dt)) { // smc.vm_data.game.g_time += 1; // } @@ -83,6 +86,56 @@ export class MapMonsterComp extends CCComp { count = list.length return count; } + count_mon_pos(){ + let monsters:any= ecs.query(ecs.allOf(MonModelComp)); + let x = 320 + let x1 = 320 + let x2 = 320 + for(let i=0;i x&&ho.y == (this.line +70)){ + x = ho.x + continue + } + if(ho.x > x1&&ho.y == this.line ){ + x1 = ho.x + continue + } + if(ho.x > x2&&ho.y == (this.line -70)){ + x2 = ho.x + continue + } + } + smc.hero_pos[0].x=x + smc.hero_pos[1].x=x1 + smc.hero_pos[2].x=x2 + } load_role(){ let role = ecs.getEntity(Role); let pos = v3(BoxSet.HERO_START+50,BoxSet.GAME_LINE) @@ -97,23 +150,28 @@ export class MapMonsterComp extends CCComp { private addHero(uuid:number=1001) { let hero = ecs.getEntity(Hero); var scene = smc.map.MapView.scene; - let oy=RandomManager.instance.getRandomByObjectList(this.start_ys,1) - let pos:Vec3 = v3(-280,BoxSet.GAME_LINE+oy[0]); - + let pos:Vec3 = v3(-280,BoxSet.GAME_LINE+this.start_ys[2]); let monster_layer = scene.entityLayer!.node! let scale = 1 hero.load(pos,scale,uuid,monster_layer); + this.hero_index += 1 + if(this.hero_index > 2){ + this.hero_index = 0 + } } monster_refresh(){ if (this.setp_num <= 0){ return } - let m:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],1) + let m:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],3) var scene = smc.map.MapView.scene; - let oy=RandomManager.instance.getRandomInt(-70,70,1) - let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+oy) + let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+this.start_ys[this.mon_index]) let monster_layer = scene.entityLayer!.node! this.addMonster(m[0],monster_layer,pos) + this.mon_index += 1 + if(this.mon_index>2){ + this.mon_index = 0 + } this.setp_num -= 1 } private addMonster(uuid:number=1001,layer:any,pos:Vec3=v3(0,0,0)) {