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

feat: 新增英雄合并配置并优化出生时物理组件禁用逻辑

Browse Source 
- 在 MissionHeroComp 中添加 merge_need_count 和 merge_max_lv 配置项，用于控制英雄合并所需数量和最大等级
- 修改英雄合并逻辑，根据配置动态判断合并条件和所需数量
- 优化 Hero 实体出生时的组件禁用逻辑，增加对 RigidBody2D 组件的禁用
This commit is contained in:
panw
2026-03-27 14:57:07 +08:00
parent e57ecca665
commit ccccf025c5
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
assets/script/game/map/MissionHeroComp.ts
View File

@@ -21,6 +21,8 @@ export class MissionHeroCompComp extends CCComp {
Friend_is_dead:boolean=false
current_hero_uuid:number=0
current_hero_num:number=-1
merge_need_count:number=3
merge_max_lv:number=3
is_merging:boolean=false
heros:any=[]
onLoad(){
@@ -62,9 +64,11 @@ export class MissionHeroCompComp extends CCComp {
const uuid = Number(args?.uuid ?? 1001);
const hero_lv = Math.max(1, Number(args?.hero_lv ?? 1));
this.addHero(uuid, hero_lv);
if (!this.canMergeLevel(hero_lv)) return;
const needCount = this.getMergeNeedCount();
const aliveHeroes = this.getAliveHeroes();
const mergeHeroes = this.pickMergeHeroes(aliveHeroes, uuid, hero_lv, 3);
if (mergeHeroes.length === 3) {
const mergeHeroes = this.pickMergeHeroes(aliveHeroes, uuid, hero_lv, needCount);
if (mergeHeroes.length === needCount) {
this.is_merging = true;
try {
const mergedLv = await this.mergeGroupHeroes(mergeHeroes, uuid, hero_lv);
@@ -135,6 +139,14 @@ export class MissionHeroCompComp extends CCComp {
return count;
}
private getMergeNeedCount(): number {
return this.merge_need_count === 2 ? 2 : 3;
}
private canMergeLevel(hero_lv: number): boolean {
return hero_lv < Math.max(1, this.merge_max_lv);
}
private mergeDestroyAtBirth(mergeHeroes: Hero[], spawnPos: Vec3): Promise<void> {
return new Promise((resolve) => {
let doneCount = 0;
@@ -194,21 +206,25 @@ export class MissionHeroCompComp extends CCComp {
const spawnPos:Vec3 = v3(landingPos.x, landingPos.y + MissionHeroCompComp.HERO_DROP_HEIGHT, 0);
await this.mergeDestroyAtBirth(mergeHeroes, spawnPos);
await this.playMergeBoomFx(spawnPos);
return this.addMergedHero(uuid, hero_lv + 1, sumAp, sumHpMax);
return this.addMergedHero(uuid, Math.min(this.merge_max_lv, hero_lv + 1), sumAp, sumHpMax);
}
private async tryChainMerge(uuid: number, startLv: number) {
let checkLv = Math.max(1, startLv);
const needCount = this.getMergeNeedCount();
let guard = 0;
while (guard < 20) {
guard += 1;
const aliveHeroes = this.getAliveHeroes();
const sameCount = this.countMergeHeroes(aliveHeroes, uuid, checkLv);
if (sameCount < 3) {
if (!this.canMergeLevel(checkLv)) {
break;
}
const mergeHeroes = this.pickMergeHeroes(aliveHeroes, uuid, checkLv, 3);
if (mergeHeroes.length < 3) {
const aliveHeroes = this.getAliveHeroes();
const sameCount = this.countMergeHeroes(aliveHeroes, uuid, checkLv);
if (sameCount < needCount) {
break;
}
const mergeHeroes = this.pickMergeHeroes(aliveHeroes, uuid, checkLv, needCount);
if (mergeHeroes.length < needCount) {
break;
}
checkLv = await this.mergeGroupHeroes(mergeHeroes, uuid, checkLv);