diff --git a/assets/resources/game/hero/arc1.prefab b/assets/resources/game/hero/arc1.prefab index 944036d6..954ee73e 100644 --- a/assets/resources/game/hero/arc1.prefab +++ b/assets/resources/game/hero/arc1.prefab @@ -1740,13 +1740,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 6.4, - "y": 29.5 + "x": 3.8, + "y": 38.9 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 42.1 + "width": 38.7, + "height": 52.5 }, "_id": "" }, diff --git a/assets/resources/game/hero/k3.prefab b/assets/resources/game/hero/k3.prefab index 1b43b96a..9d232330 100644 --- a/assets/resources/game/hero/k3.prefab +++ b/assets/resources/game/hero/k3.prefab @@ -1812,13 +1812,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 3.7, - "y": 32.8 + "x": 1.5, + "y": 40.7 }, "_size": { "__type__": "cc.Size", - "width": 35.1, - "height": 50.7 + "width": 37.5, + "height": 57.8 }, "_id": "" }, diff --git a/assets/resources/game/hero/m2.prefab b/assets/resources/game/hero/m2.prefab index 2a288c52..7bb98414 100644 --- a/assets/resources/game/hero/m2.prefab +++ b/assets/resources/game/hero/m2.prefab @@ -1812,13 +1812,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 3.7, - "y": 32.8 + "x": -1, + "y": 39.7 }, "_size": { "__type__": "cc.Size", - "width": 35.1, - "height": 50.7 + "width": 44.6, + "height": 61.3 }, "_id": "" }, diff --git a/assets/resources/game/hero/m3.prefab b/assets/resources/game/hero/m3.prefab index 66f3e0f0..a2ed5727 100644 --- a/assets/resources/game/hero/m3.prefab +++ b/assets/resources/game/hero/m3.prefab @@ -1812,13 +1812,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 3.7, - "y": 32.8 + "x": 0.4, + "y": 38.7 }, "_size": { "__type__": "cc.Size", - "width": 35.1, - "height": 50.7 + "width": 38.4, + "height": 56.8 }, "_id": "" }, diff --git a/assets/resources/game/hero/tooltip.prefab b/assets/resources/game/hero/tooltip.prefab index f06fed70..15860cf1 100644 --- a/assets/resources/game/hero/tooltip.prefab +++ b/assets/resources/game/hero/tooltip.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -11.34, - "y": 4.926, + "y": 1.926, "z": 0 }, "_lrot": { @@ -223,7 +223,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -12.355, - "y": 9.918, + "y": 6.918, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/hero/top.prefab b/assets/resources/game/hero/top.prefab index e78d1cb7..b51ce3d5 100644 --- a/assets/resources/game/hero/top.prefab +++ b/assets/resources/game/hero/top.prefab @@ -100,7 +100,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 11.501, + "y": 7.59, "z": 0 }, "_lrot": { @@ -369,8 +369,6 @@ "__id__": 0 }, "fileId": "f2myW76VRBr7QDUKzNBD0m", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -404,7 +402,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 4.35, + "y": 0.439, "z": 0 }, "_lrot": { @@ -673,8 +671,6 @@ "__id__": 0 }, "fileId": "ccpjZ8TLVIGazawaY3ULHg", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -708,7 +704,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 8.374, + "y": 4.463, "z": 0 }, "_lrot": { @@ -977,8 +973,6 @@ "__id__": 0 }, "fileId": "4bGUhFXlZF/Jdkcq0HY9ai", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1012,7 +1006,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 14.442, + "y": 10.531, "z": 0 }, "_lrot": { @@ -1483,8 +1477,6 @@ "__id__": 0 }, "fileId": "16MuhUBUpB2ZdBTYflEf1n", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/game/monster/du1.prefab b/assets/resources/game/monster/du1.prefab index 4d0cb1c6..52ce2bfb 100644 --- a/assets/resources/game/monster/du1.prefab +++ b/assets/resources/game/monster/du1.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 8.4, + "y": 29.4 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 43.9, + "height": 56.8 }, "_id": "" }, diff --git a/assets/resources/game/monster/du2.prefab b/assets/resources/game/monster/du2.prefab index d49663c8..792d3c02 100644 --- a/assets/resources/game/monster/du2.prefab +++ b/assets/resources/game/monster/du2.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 6.7, + "y": 31.3 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 46.8, + "height": 58.5 }, "_id": "" }, diff --git a/assets/resources/game/monster/du3.prefab b/assets/resources/game/monster/du3.prefab index fe799a7d..1d62ee25 100644 --- a/assets/resources/game/monster/du3.prefab +++ b/assets/resources/game/monster/du3.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 7, + "y": 33.7 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 48.4, + "height": 63.6 }, "_id": "" }, diff --git a/assets/resources/game/monster/ge1.prefab b/assets/resources/game/monster/ge1.prefab index 0fc51e58..ec188095 100644 --- a/assets/resources/game/monster/ge1.prefab +++ b/assets/resources/game/monster/ge1.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 0.4, + "y": 30 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 45.5, + "height": 56 }, "_id": "" }, @@ -1895,7 +1895,6 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": [ { "__id__": 74 diff --git a/assets/resources/game/monster/ge2.prefab b/assets/resources/game/monster/ge2.prefab index 66d30882..460d8229 100644 --- a/assets/resources/game/monster/ge2.prefab +++ b/assets/resources/game/monster/ge2.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 3, + "y": 28.9 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 39.8, + "height": 53.9 }, "_id": "" }, diff --git a/assets/resources/game/monster/ge3.prefab b/assets/resources/game/monster/ge3.prefab index c2ec4bfd..2655562b 100644 --- a/assets/resources/game/monster/ge3.prefab +++ b/assets/resources/game/monster/ge3.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 3.4, + "y": 27.9 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 41.4, + "height": 51.7 }, "_id": "" }, @@ -1895,7 +1895,6 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": [ { "__id__": 74 diff --git a/assets/resources/game/monster/gou1.prefab b/assets/resources/game/monster/gou1.prefab index 7b31b857..80924b28 100644 --- a/assets/resources/game/monster/gou1.prefab +++ b/assets/resources/game/monster/gou1.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 1.9, + "y": 31.1 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 39.3, + "height": 58.8 }, "_id": "" }, @@ -1895,7 +1895,6 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": [ { "__id__": 74 diff --git a/assets/resources/game/monster/gou2.prefab b/assets/resources/game/monster/gou2.prefab index 926acddc..50f7f3c9 100644 --- a/assets/resources/game/monster/gou2.prefab +++ b/assets/resources/game/monster/gou2.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 2.4, + "y": 27.9 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 37.4, + "height": 57.3 }, "_id": "" }, @@ -1895,7 +1895,6 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": [ { "__id__": 74 diff --git a/assets/resources/game/monster/gou3.prefab b/assets/resources/game/monster/gou3.prefab index bbca4333..4961dffb 100644 --- a/assets/resources/game/monster/gou3.prefab +++ b/assets/resources/game/monster/gou3.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 0.9, + "y": 28.8 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 43.4, + "height": 55.7 }, "_id": "" }, diff --git a/assets/resources/game/monster/mon.prefab b/assets/resources/game/monster/mon.prefab index 794b4205..c505738d 100644 --- a/assets/resources/game/monster/mon.prefab +++ b/assets/resources/game/monster/mon.prefab @@ -848,13 +848,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": -1.7, + "y": 35.5 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 46.6, + "height": 64.7 }, "_id": "" }, diff --git a/assets/resources/game/monster/orc1.prefab b/assets/resources/game/monster/orc1.prefab index d8d3c223..d033f83c 100644 --- a/assets/resources/game/monster/orc1.prefab +++ b/assets/resources/game/monster/orc1.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 2.2, + "y": 34.7 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 45.9, + "height": 66.3 }, "_id": "" }, diff --git a/assets/resources/game/monster/orc2.prefab b/assets/resources/game/monster/orc2.prefab index 504e0481..d533eeee 100644 --- a/assets/resources/game/monster/orc2.prefab +++ b/assets/resources/game/monster/orc2.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 3.5, + "y": 33.9 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 48.6, + "height": 64.3 }, "_id": "" }, diff --git a/assets/resources/game/monster/orc3.prefab b/assets/resources/game/monster/orc3.prefab index e1e4b750..1b65dd7f 100644 --- a/assets/resources/game/monster/orc3.prefab +++ b/assets/resources/game/monster/orc3.prefab @@ -1848,13 +1848,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.6, - "y": 25 + "x": 6.9, + "y": 32.5 }, "_size": { "__type__": "cc.Size", - "width": 25.9, - "height": 28.7 + "width": 42.4, + "height": 63.7 }, "_id": "" }, diff --git a/assets/resources/game/monster/top.prefab b/assets/resources/game/monster/top.prefab index 6b7aa0f3..1cd540a4 100644 --- a/assets/resources/game/monster/top.prefab +++ b/assets/resources/game/monster/top.prefab @@ -43,7 +43,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 66.342, + "y": 41.342, "z": 0 }, "_lrot": { @@ -100,7 +100,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 11.501, + "y": -2.499, "z": 0 }, "_lrot": { @@ -404,7 +404,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 4.35, + "y": -9.65, "z": 0 }, "_lrot": { @@ -708,7 +708,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 8.374, + "y": -5.626, "z": 0 }, "_lrot": { @@ -1012,7 +1012,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 14.442, + "y": 0.442, "z": 0 }, "_lrot": { @@ -1524,6 +1524,7 @@ "__id__": 0 }, "fileId": "a3sRCQG4NNNK+lnXyMRQ9U", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/game/monster/ys1.prefab b/assets/resources/game/monster/ys1.prefab index 6c92d3c8..790223e3 100644 --- a/assets/resources/game/monster/ys1.prefab +++ b/assets/resources/game/monster/ys1.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.2, - "y": 28.2 + "x": -0.5, + "y": 34.5 }, "_size": { "__type__": "cc.Size", - "width": 25.2, - "height": 35.2 + "width": 45.2, + "height": 64.2 }, "_id": "" }, diff --git a/assets/resources/game/monster/ys2.prefab b/assets/resources/game/monster/ys2.prefab index 4454cfd7..7f48e37a 100644 --- a/assets/resources/game/monster/ys2.prefab +++ b/assets/resources/game/monster/ys2.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.2, - "y": 28.2 + "x": -0.5, + "y": 32.5 }, "_size": { "__type__": "cc.Size", - "width": 25.2, - "height": 35.2 + "width": 46.1, + "height": 63.1 }, "_id": "" }, diff --git a/assets/resources/game/monster/ys3.prefab b/assets/resources/game/monster/ys3.prefab index e61f2831..8f71c179 100644 --- a/assets/resources/game/monster/ys3.prefab +++ b/assets/resources/game/monster/ys3.prefab @@ -1825,13 +1825,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 8.2, - "y": 28.2 + "x": -0.3, + "y": 35.6 }, "_size": { "__type__": "cc.Size", - "width": 25.2, - "height": 35.2 + "width": 48.2, + "height": 68.2 }, "_id": "" }, diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab index 2d2fde13..964c93db 100644 --- a/assets/resources/game/skills/arrow.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -109,7 +109,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": -1, - "y": 0.1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139, - "height": 128 + "width": 30, + "height": 1 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -178,7 +178,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -319,13 +319,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 4, - "y": 2.9 + "x": -3.1, + "y": 0.3 }, "_size": { "__type__": "cc.Size", - "width": 37, - "height": 34.3 + "width": 23.1, + "height": 8 }, "_id": "" }, diff --git a/assets/resources/game/skills/mball.prefab b/assets/resources/game/skills/mball.prefab index e5203aed..0c7fc9c5 100644 --- a/assets/resources/game/skills/mball.prefab +++ b/assets/resources/game/skills/mball.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.3, - "y": 0.3, + "x": -1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139, - "height": 128 + "width": 30, + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -178,7 +178,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -319,13 +319,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 4, - "y": 2.9 + "x": -4.5, + "y": 0.1 }, "_size": { "__type__": "cc.Size", - "width": 37, - "height": 34.3 + "width": 20, + "height": 15.4 }, "_id": "" }, diff --git a/assets/resources/game/skills/patk.prefab b/assets/resources/game/skills/patk.prefab index 0927f6f8..d060aa37 100644 --- a/assets/resources/game/skills/patk.prefab +++ b/assets/resources/game/skills/patk.prefab @@ -319,13 +319,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": -0.2, - "y": -0.4 + "x": 0, + "y": 0 }, "_size": { "__type__": "cc.Size", - "width": 41.2, - "height": 42.4 + "width": 20, + "height": 60 }, "_id": "" }, diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index ffc90bad..b536648c 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -1,7 +1,7 @@ export const HeroSet = { 9001: { - uuid: 9001, path: "k3", type: 1, level: 1, name: "战士", atk: 4, hp: 35, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 9001, path: "k3", type: 1, level: 1, name: "战士", atk: 4, hp: 35, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1, }, @@ -30,51 +30,51 @@ export const HeroSet = { } export const MonSet = { 1001: { - uuid: 1001, path: "ge1", type: 1, level: 1, name: "战斗哥", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1001, path: "ge1", type: 1, level: 1, name: "战斗哥", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1002: { - uuid: 1002, path: "ge2", type: 1, level: 1, name: "墨西哥", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1002, path: "ge2", type: 1, level: 1, name: "墨西哥", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1003: { - uuid: 1003, path: "ge3", type: 1, level: 1, name: "铁头哥", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1003, path: "ge3", type: 1, level: 1, name: "铁头哥", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1011: { - uuid: 1011, path: "orc1", type: 1, level: 1, name: "森林兽人", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1011, path: "orc1", type: 1, level: 1, name: "森林兽人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1012: { - uuid: 1012, path: "orc2", type: 1, level: 1, name: "荒野兽人", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1012, path: "orc2", type: 1, level: 1, name: "荒野兽人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1013: { - uuid: 1013, path: "orc3", type: 1, level: 1, name: "兽人战士", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1013, path: "orc3", type: 1, level: 1, name: "兽人战士", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1021: { - uuid: 1021, path: "gou1", type: 1, level: 1, name: "黄皮豺狼", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1021, path: "gou1", type: 1, level: 1, name: "黄皮豺狼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1022: { - uuid: 1022, path: "gou2", type: 1, level: 1, name: "白皮豺狼", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1022, path: "gou2", type: 1, level: 1, name: "白皮豺狼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1023: { - uuid: 1023, path: "gou3", type: 1, level: 1, name: "灰皮豺狼", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1023, path: "gou3", type: 1, level: 1, name: "灰皮豺狼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1031: { - uuid: 1031, path: "gou1", type: 1, level: 1, name: "独眼巨人", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1031, path: "gou1", type: 1, level: 1, name: "独眼巨人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1032: { - uuid: 1032, path: "gou2", type: 1, level: 1, name: "狂暴独眼", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1032, path: "gou2", type: 1, level: 1, name: "狂暴独眼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1033: { - uuid: 1033, path: "gou3", type: 1, level: 1, name: "独眼首领", atk: 4, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30, + uuid: 1033, path: "gou3", type: 1, level: 1, name: "独眼首领", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 }, 1041: { diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 1d4346c7..99134082 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -145,13 +145,11 @@ export class HeroViewComp extends CCComp { } onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D) { if(selfCollider.group == otherCollider.group&&selfCollider.tag==otherCollider.tag){ - console.log("onBeginContact tag "+selfCollider.tag+otherCollider.tag) if(selfCollider.node.position.y < otherCollider.node.position.y){ if(selfCollider.node.getSiblingIndex() < otherCollider.node.getSiblingIndex()){ - console.log("onPreSolve",selfCollider.node,otherCollider.node) - console.log("onPreSolve f:"+selfCollider.node.uuid+":"+selfCollider.node.getSiblingIndex()+"/"+otherCollider.node.uuid+":"+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()); + // console.log("onPreSolve b:"+selfCollider.node.uuid+":"+selfCollider.node.getSiblingIndex()+"/"+otherCollider.node.uuid+":"+otherCollider.node.getSiblingIndex()); } } @@ -201,38 +199,7 @@ export class HeroViewComp extends CCComp { var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); move.target = v3(smc.Role.RoleView.node.position.x+10,smc.Role.RoleView.node.position.y); move.node = this.node; - move.speed = this.ospeed; - - // if(this.box_group == BoxSet.MON){ - // if(smc.t_hero.eid != 0){ - // var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); - // if(smc.t_hero.pos.x < this.node.position.x){ - // // this.node.setScale(-Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_hero.pos.x+20,smc.t_hero.pos.y); - // }else{ - // // this.node.setScale(Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_hero.pos.x-20,smc.t_hero.pos.y); - // } - // move.node = this.node; - // move.speed = this.ospeed; - // } - // } - - // if(this.box_group == BoxSet.HERO){ - // if(smc.t_mon.eid != 0){ - // var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); - // if(smc.t_mon.pos.x < this.node.position.x){ - // // this.node.setScale(-Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_mon.pos.x+20,smc.t_mon.pos.y); - // }else{ - // // this.node.setScale(Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_mon.pos.x-20,smc.t_mon.pos.y); - // } - // move.node = this.node; - // move.speed = this.ospeed; - // } - // } - + move.speed = this.ospeed; } power_change(power: number){ this.power += power; diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 1ce69982..59dbf876 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -34,7 +34,7 @@ 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 = 1; + setp_num:number = 5; game_over:boolean = false; onLoad(){ // 监听全局事件 @@ -62,7 +62,7 @@ export class MapMonsterComp extends CCComp { this.monster_refresh() } if (this.refresh_timer.update(dt)) { - this.setp_num = 1 + this.setp_num = 5 } if (this.mission_up_timer.update(dt)) { // 刷新怪物定时器 @@ -101,25 +101,11 @@ export class MapMonsterComp extends CCComp { if (this.setp_num <= 0){ return } - // console.log("当前波数",this.cur_count) - // console.log("当前怪物池",this.mission_list[this.monster_level]) let m:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],1) - let m1:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],1) - let m2:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],1) - // console.log("刷怪",m) var scene = smc.map.MapView.scene; - let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+RandomManager.instance.getRandomInt(80,130, 1)) - let pos1:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+RandomManager.instance.getRandomInt(10,60, 1)) - let pos2:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE-RandomManager.instance.getRandomInt(10,60, 1)) - let pos3:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE-RandomManager.instance.getRandomInt(80,130, 1)) - + let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+RandomManager.instance.getRandomInt(-130,130, 1)) let monster_layer = scene.entityLayer!.node! - // let monster_layer1 = scene.entityLayer1!.node!; - // let monster_layer2 = scene.entityLayer2!.node!; this.addMonster(m[0],monster_layer,pos) - this.addMonster(m1[0],monster_layer,pos1) - this.addMonster(m2[0],monster_layer,pos2) - this.addMonster(m2[0],monster_layer,pos3) this.setp_num -= 1 } private addMonster(uuid:number=1001,layer:any,pos:Vec3=v3(0,0,0)) { diff --git a/assets/script/game/mon/MonViewComp.ts b/assets/script/game/mon/MonViewComp.ts index e621c93b..9df37318 100644 --- a/assets/script/game/mon/MonViewComp.ts +++ b/assets/script/game/mon/MonViewComp.ts @@ -138,30 +138,18 @@ export class MonViewComp extends CCComp { } onEndContact (selfCollider: Collider2D, otherCollider: Collider2D) { } onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D) { - - // if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0){ - // this.is_atking = true; - // this.stop_cd = 0.1; - // } + 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()); + } + + } + } } onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) { - // if(selfCollider.group == otherCollider.group&&otherCollider.tag == 0&&selfCollider.tag == 0){ - // let self_pos=selfCollider.node.getPosition(); - // let other_pos=otherCollider.node.getPosition(); - // // console.log('mon view group 相同'); - // switch (selfCollider.group) { - // case BoxSet.HERO: - // if(self_pos.x < other_pos.x){ - // // this.stop_cd=0.1 - // } - // break; - // case BoxSet.MONSTER: - // if(self_pos.x > other_pos.x){ - // // this.stop_cd=0.1 - // } - // break - // } - // } + } @@ -191,50 +179,18 @@ export class MonViewComp extends CCComp { if(this.scale===-1&&this.node.position.x <= BoxSet.HERO_START+this.atk_cd){ return; } - // if(this.enemy){ - // return - // } + this.set_diry() this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z); } set_diry(){ this.dir_y=-(this.node.position.y-BoxSet.GAME_LINE)/60 - } move_to(){ + } + move_to(){ var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); move.target = v3(smc.Role.RoleView.node.position.x+10,smc.Role.RoleView.node.position.y); move.node = this.node; move.speed = this.ospeed; - - // if(this.box_group == BoxSet.MON){ - // if(smc.t_hero.eid != 0){ - // var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); - // if(smc.t_hero.pos.x < this.node.position.x){ - // // this.node.setScale(-Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_hero.pos.x+20,smc.t_hero.pos.y); - // }else{ - // // this.node.setScale(Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_hero.pos.x-20,smc.t_hero.pos.y); - // } - // move.node = this.node; - // move.speed = this.ospeed; - // } - // } - - // if(this.box_group == BoxSet.HERO){ - // if(smc.t_mon.eid != 0){ - // var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp); - // if(smc.t_mon.pos.x < this.node.position.x){ - // // this.node.setScale(-Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_mon.pos.x+20,smc.t_mon.pos.y); - // }else{ - // // this.node.setScale(Math.abs(this.node.scale.x),this.node.scale.y) - // move.target = v3(smc.t_mon.pos.x-20,smc.t_mon.pos.y); - // } - // move.node = this.node; - // move.speed = this.ospeed; - // } - // } - } power_change(power: number){ this.power += power;