pan/pixelheros
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

技能碰撞改回物理碰撞

Browse Source
This commit is contained in:
panfudan
2025-03-30 16:59:40 +08:00
parent 67704725b2
commit 798a831227
85 changed files with 13428 additions and 7394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/script/game/common/config/BoxSet.ts
View File

@@ -28,7 +28,7 @@ export enum BoxSet {
MONSTER_START = 360,
END_POINT = 360,
//游戏地平线
GAME_LINE = 10,
GAME_LINE = 130,
CSKILL_X = 320,
CSKILL_Y = 400,
//攻击距离

1
assets/script/game/common/config/GameEvent.ts
View File

@@ -19,5 +19,6 @@ export enum GameEvent {
UseCard = "UseCard",
UserHeroCard = "UserHeroCard",
UserSkillCard = "UserSkillCard",
CallHero = "CallHero",
}

4
assets/script/game/common/config/MissionSet.ts
View File

@@ -13,12 +13,12 @@ export const BossList = {
}
export const MissionNum = 3 //对应关卡数MissionSet 的索引
export const MissionSet = [
[5201,5202,5203,5204,5205,5206,5207,5208,5209,5210,5211,5212],
[5201,5202,5203,5204,5205,5206,5210,5211,5212],
[5213,5214,5215],
[5201],
]
export const Missions = [
[5201,5202,5203,5204,5205,5206,5207,5208,5209,5210,5211,5212,5219,5220,5221],
[5201,5202,5203,5204,5205,5206,5210,5211,5212,5219,5220,5221],
[5213,5214,5215,5216,5217,5218],
[5225,5226,5227],
]

88
assets/script/game/common/config/heroSet.ts
View File

@@ -1,3 +1,5 @@
import { v3 } from "cc"
/**
* kind ：1:烈焰 2:寒冰 3:自然 4:暗影 5:神圣
**/
@@ -30,52 +32,56 @@ export enum HeroFac {
enemy = 1,
}
export const HeroList = [5001,5002,5003,5004,5005,5006,5007,5008,5009,5010,5011]
export const MonList = [5201,5202,5203,5204,5205,5206,5207,5208,5209,5210,5211,5212,5213,5214,5215,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227]
export const MonList = [5201,5202,5203,5204,5205,5206,5210,5211,5212,5213,5214,5215,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227]
export const HeroSet = {
Start_x:[-200,-260,-320],
Start_y:[70,0,-70]
}
export const HeroPos={
0:{pos:v3(-140,130,0)},
1:{pos:v3(-220,130,0)},
2:{pos:v3(-300,130,0)},
}
export const MonSet = {
Start_x:[200,260,320],
Start_y:[70,0,-70]
0:{pos:v3(320,220,0)},
1:{pos:v3(320,150,0)},
2:{pos:v3(320,80,0)},
3:{pos:v3(320,10,0)},
}
export const HeroInfo = {
5001:{uuid:5001,name:"神圣守护",path:"k2", quality:3,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5002:{uuid:5002,name:"幻影剑豪",path:"k1", quality:3,kind:2,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5003:{uuid:5003,name:"战争领主",path:"k5", quality:3,kind:2,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5004:{uuid:5004,name:"混沌法师",path:"zh1", quality:3,kind:2,type:2,hp:200,ap:10,dis:500,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5005:{uuid:5005,name:"火焰法师",path:"zh2", quality:3,kind:2,type:2,hp:200,ap:15,dis:500,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5006:{uuid:5006,name:"风暴精灵",path:"m4", quality:3,kind:2,type:2,hp:200,ap:15,dis:500,a_cd:1.5,speed:50,skills:[6001],tals:"说明"},
5007:{uuid:5007,name:"生命圣者",path:"d1", quality:3,kind:2,type:2,hp:200,ap:10,dis:500,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5008:{uuid:5008,name:"战争祭祀",path:"d2", quality:3,kind:2,type:2,hp:200,ap:10,dis:500,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5009:{uuid:5009,name:"暴风射手",path:"a5", quality:3,kind:2,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6006],tals:"说明"},
5010:{uuid:5010,name:"苍穹射手",path:"a3", quality:3,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6006],tals:"说明"},
5011:{uuid:5011,name:"幽灵射手",path:"a4", quality:3,kind:2,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6006],tals:"说明"},
5201:{uuid:5201,name:"兽人战士",path:"mor1", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5202:{uuid:5202,name:"兽人刺客",path:"mor2", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5203:{uuid:5203,name:"兽人护卫",path:"mor3", quality:1,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6007],tals:"说明"},
5204:{uuid:5204,name:"石卫", path:"mgem1",quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5205:{uuid:5205,name:"土卫", path:"mgem2",quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5206:{uuid:5206,name:"树人", path:"mgem3",quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5207:{uuid:5207,name:"小骷髅", path:"mkl1", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5208:{uuid:5208,name:"小骷髅", path:"mkl2", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5209:{uuid:5209,name:"小骷髅", path:"mkl3", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5210:{uuid:5210,name:"骷髅战士",path:"mkl4", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5211:{uuid:5211,name:"骷髅战士",path:"mkl5", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5212:{uuid:5212,name:"骷髅战士",path:"mkl6", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5213:{uuid:5213,name:"骷髅射手",path:"mkla1",quality:1,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5214:{uuid:5214,name:"骷髅射手",path:"mkla2",quality:1,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5215:{uuid:5215,name:"骷髅射手",path:"mkla3",quality:1,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5216:{uuid:5216,name:"元素1", path:"my1", quality:2,kind:1,type:2,hp:200,ap:15,dis:500,a_cd:1.5,speed:50,skills:[6001],tals:"说明"},
5217:{uuid:5217,name:"元素2", path:"my2", quality:2,kind:1,type:2,hp:200,ap:15,dis:500,a_cd:1.5,speed:50,skills:[6002],tals:"说明"},
5218:{uuid:5218,name:"元素3", path:"my3", quality:2,kind:1,type:2,hp:200,ap:15,dis:500,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5219:{uuid:5219,name:"牛头战士",path:"mn1", quality:2,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5220:{uuid:5220,name:"牛头战士",path:"mn2", quality:1,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6010],tals:"说明"},
5221:{uuid:5221,name:"牛头战士",path:"mn3", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5222:{uuid:5222,name:"独眼巨人",path:"md1", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5223:{uuid:5223,name:"独眼巨人",path:"md2", quality:1,kind:1,type:0,hp:200,ap:10,dis:400,a_cd:1,speed:50,skills:[6008],tals:"说明"},
5224:{uuid:5224,name:"独眼巨人",path:"md3", quality:1,kind:1,type:1,hp:200,ap:15,dis:400,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5225:{uuid:5225,name:"精英独眼",path:"md4", quality:3,kind:1,type:2,hp:200,ap:15,dis:500,a_cd:1,speed:50,skills:[6009],tals:"说明"},
5226:{uuid:5226,name:"精英牛头",path:"mn4", quality:3,kind:1,type:2,hp:200,ap:15,dis:500,a_cd:1,speed:50,skills:[6010],tals:"说明"},
5227:{uuid:5227,name:"精英兽人",path:"mor4", quality:3,kind:1,type:2,hp:200,ap:15,dis:500,a_cd:1,speed:50,skills:[6009],tals:"说明"}
5001:{uuid:5001,name:"神圣守护",path:"k2", lv:3,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:700,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5002:{uuid:5002,name:"幻影剑豪",path:"k1", lv:3,kind:2,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:700,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5003:{uuid:5003,name:"战争领主",path:"k5", lv:3,kind:2,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:700,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5004:{uuid:5004,name:"混沌法师",path:"zh1", lv:3,kind:2,type:2,hp:200,ap:10,rate:50,ra_up:0,dis:700,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5005:{uuid:5005,name:"火焰法师",path:"zh2", lv:3,kind:2,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:700,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5006:{uuid:5006,name:"风暴精灵",path:"m4", lv:3,kind:2,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:700,a_cd:1.5,speed:50,skills:[6001],tals:"说明"},
5007:{uuid:5007,name:"生命圣者",path:"d1", lv:3,kind:2,type:2,hp:200,ap:10,rate:50,ra_up:0,dis:700,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5008:{uuid:5008,name:"战争祭祀",path:"d2", lv:3,kind:2,type:2,hp:200,ap:10,rate:50,ra_up:0,dis:700,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5009:{uuid:5009,name:"暴风射手",path:"a5", lv:3,kind:2,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:700,a_cd:1.2,speed:50,skills:[6006],tals:"说明"},
5010:{uuid:5010,name:"苍穹射手",path:"a3", lv:3,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:700,a_cd:1.2,speed:50,skills:[6006],tals:"说明"},
5011:{uuid:5011,name:"幽灵射手",path:"a4", lv:3,kind:2,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:700,a_cd:1.2,speed:50,skills:[6006],tals:"说明"},
5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:80,a_cd:1.2,speed:50,skills:[6007],tals:"说明"},
5204:{uuid:5204,name:"石卫", path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5205:{uuid:5205,name:"土卫", path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5206:{uuid:5206,name:"树人", path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5210:{uuid:5210,name:"骷髅战士",path:"mkl4", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5211:{uuid:5211,name:"骷髅战士",path:"mkl5", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5212:{uuid:5212,name:"骷髅战士",path:"mkl6", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5213:{uuid:5213,name:"骷髅射手",path:"mkla1",lv:1,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:80,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5214:{uuid:5214,name:"骷髅射手",path:"mkla2",lv:1,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:80,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5215:{uuid:5215,name:"骷髅射手",path:"mkla3",lv:1,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:80,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5216:{uuid:5216,name:"元素1", path:"my1", lv:2,kind:1,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:200,a_cd:1.5,speed:50,skills:[6001],tals:"说明"},
5217:{uuid:5217,name:"元素2", path:"my2", lv:2,kind:1,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:200,a_cd:1.5,speed:50,skills:[6002],tals:"说明"},
5218:{uuid:5218,name:"元素3", path:"my3", lv:2,kind:1,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:200,a_cd:1.5,speed:50,skills:[6003],tals:"说明"},
5219:{uuid:5219,name:"牛头战士",path:"mn1", lv:2,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5220:{uuid:5220,name:"牛头战士",path:"mn2", lv:1,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:80,a_cd:1.2,speed:50,skills:[6010],tals:"说明"},
5221:{uuid:5221,name:"牛头战士",path:"mn3", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5222:{uuid:5222,name:"独眼巨人",path:"md1", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6005],tals:"说明"},
5223:{uuid:5223,name:"独眼巨人",path:"md2", lv:1,kind:1,type:0,hp:200,ap:10,rate:50,ra_up:0,dis:80,a_cd:1,speed:50,skills:[6008],tals:"说明"},
5224:{uuid:5224,name:"独眼巨人",path:"md3", lv:1,kind:1,type:1,hp:200,ap:15,rate:50,ra_up:0,dis:80,a_cd:1.2,speed:50,skills:[6005],tals:"说明"},
5225:{uuid:5225,name:"精英独眼",path:"md4", lv:3,kind:1,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:200,a_cd:1,speed:50,skills:[6009],tals:"说明"},
5226:{uuid:5226,name:"精英牛头",path:"mn4", lv:3,kind:1,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:200,a_cd:1,speed:50,skills:[6010],tals:"说明"},
5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:3,kind:1,type:2,hp:200,ap:15,rate:50,ra_up:0,dis:200,a_cd:1,speed:50,skills:[6009],tals:"说明"}
};

2
assets/script/game/common/ecs/position/BattleMoveSystem.ts
View File

@@ -28,7 +28,7 @@ export class BattleMoveSystem extends ecs.ComblockSystem implements ecs.ISystemU
this.updateRenderOrder(e);
// 同步状态
if (!shouldStop) {
if (!shouldStop&&view.fac==1) {
if(view.is_stop||view.is_dead) return //停止移动或者死亡不移动
// 计算移动量
const delta = (view.speed/3) * this.dt * move.direction;