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

refactor(英雄系统): 移除主角特殊逻辑和怪物死亡处理

Browse Source 
- 删除 HeroAttrsComp 中的 is_master 字段
- 简化 Hero.load() 方法签名，移除 is_master 和 is_friend 参数
- 移除 MissionComp 中的怪物死亡事件监听和奖励计算逻辑
- 移除 HeroViewComp 中主角复活时恢复怪物行动的逻辑
- 修改 HeroAtkSystem 中复活逻辑，不再区分主角
- 将 MissionHeroComp 中的 CallFriend 事件改为 CallHero，并清理事件监听
- 移除英雄死亡时停止怪物刷新的逻辑，简化阵营判断

这些更改旨在简化英雄系统架构，消除主角与普通英雄之间的特殊处理差异，使系统更加统一和可维护。怪物死亡奖励计算等逻辑被移至其他系统处理。
This commit is contained in:
walkpan
2026-03-14 13:20:02 +08:00
parent 2f1af99a1b
commit 6de3a105da
6 changed files with 25 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/script/game/hero/Hero.ts
View File

@@ -39,7 +39,7 @@ export class Hero extends ecs.Entity {
/** 加载角色 */
load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001,fight_pos:number=1,is_master:boolean=false,is_friend:boolean=false) {
load(pos: Vec3 = Vec3.ZERO,scale:number = 1,uuid:number=1001) {
scale = 1
// 查找空闲英雄槽位
let size=1
@@ -64,15 +64,12 @@ export class Hero extends ecs.Entity {
// 设置 View 层属性（表现相关）
hv.scale = 1;
hv.box_group = BoxSet.HERO;
// 设置 Model 层属性（数据相关）
model.hero_uuid = uuid;
model.hero_name = hero.name;
model.lv = hero.lv ? hero.lv : 1;
model.type = hero.type;
model.fac = FacSet.HERO;
model.is_master = is_master;
model.is_friend = is_friend
model.rangeType = hero.rangeType;
// 只有主角才挂载天赋组件

14
assets/script/game/hero/HeroAtkSystem.ts
View File

@@ -172,20 +172,15 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
// 检查死亡
if (TAttrsComp.hp <= 0) {
// 复活机制：如果玩家属性内的复活属性值>=1 则执行复活,原地50%血量复活
if (TAttrsComp.is_master && TAttrsComp.revive_count >= 1) {
if (TAttrsComp.revive_count >= 1) {
TAttrsComp.revive_count--;
TAttrsComp.is_reviving = true; // 标记为正在复活
// 停止怪物行动
smc.mission.stop_mon_action = true;
// 触发死亡动画（假死）
if (targetView) {
targetView.do_dead();
// 延迟1秒复活
targetView.scheduleRevive(1.0);
}
mLogger.log(this.debugMode, 'HeroAtkSystem', ` Hero waiting to revive! Lives left: ${TAttrsComp.revive_count}`);
return reDate;
}
@@ -193,13 +188,6 @@ export class HeroAtkSystem extends ecs.ComblockSystem implements ecs.ISystemUpd
// 增加被击杀计数
if (caster) CAttrsComp.killed_count++;
// 玩家英雄死亡后,怪物停止刷新和移动
if (TAttrsComp.is_master&&TAttrsComp.revive_count <= 0) {
smc.mission.stop_mon_action = true;
oops.message.dispatchEvent(GameEvent.HeroDead, { hero_uuid: TAttrsComp.hero_uuid});
mLogger.log(this.debugMode, 'HeroAtkSystem', " Hero died, stopping monster action (spawn/move)"+TAttrsComp.revive_count);
}
this.doDead(target);
// ✅ 触发死亡视图表现
if (targetView) {

1
assets/script/game/hero/HeroAttrsComp.ts
View File

@@ -540,7 +540,6 @@ export class HeroAttrsComp extends ecs.Comp {
this.is_stop = false;
this.is_boss = false;
this.is_big_boss = false;
this.is_master = false;
this.is_friend = false;
this.is_kalami = false;
this.is_reviving = false;

28
assets/script/game/hero/HeroViewComp.ts
View File

@@ -386,12 +386,7 @@ export class HeroViewComp extends CCComp {
this.model.hp =this.model.hp_max*50/100;
this.top_node.active=false
this.lastBarUpdateTime=0
// 恢复怪物行动
if (this.model.is_master) {
smc.mission.stop_mon_action = false;
mLogger.log(this.debugMode, 'HeroViewComp', "[HeroViewComp] Hero revived, resuming monster action");
}
}
/**
@@ -434,28 +429,21 @@ export class HeroViewComp extends CCComp {
mLogger.warn(this.debugMode, 'HeroViewComp', "[HeroViewComp] realDead called but model is null, skipping");
return;
}
// 根据阵营触发不同事件
if(this.model.fac === FacSet.MON){
}
if(this.model.fac === FacSet.HERO){
// 英雄死亡：延迟触发死亡事件
// 🔥 只有主角死亡才触发游戏结束判定
if (this.model.is_master) return
}
// 🔥 方案B：治理性措施 - 在销毁实体前先禁用碰撞体，从源头减少"尸体"参与碰撞
const collider = this.getComponent(Collider2D);
if (collider) {
collider.enabled = false;
}
// 根据阵营触发不同事件
if(this.model.fac === FacSet.MON){
oops.message.dispatchEvent(GameEvent.MonDead, {
uuid: this.model.hero_uuid,
lv: this.model.lv,
is_boss: this.model.is_boss,
is_elite: this.model.is_big_boss, // 暂时映射 is_big_boss 为 elite，或者由 MissionComp 二次判断
position: this.node.position
});
}
this.ent.destroy();
}

26
assets/script/game/map/MissionComp.ts
View File

@@ -56,7 +56,6 @@ export class MissionComp extends CCComp {
onLoad(){
this.on(GameEvent.MissionStart,this.mission_start,this)
this.on(GameEvent.MonDead,this.do_mon_dead,this)
// this.on(GameEvent.HeroDead,this.do_hero_dead,this)
// this.on(GameEvent.FightEnd,this.fight_end,this)
this.on(GameEvent.MissionEnd,this.mission_end,this)
@@ -106,31 +105,6 @@ export class MissionComp extends CCComp {
// 奖励发放
}
do_mon_dead(event:any,data:any){
// mLogger.log(this.debugMode, 'MissionComp', " do_mon_dead",event,data)
smc.vmdata.mission_data.mon_num--
// 计算并增加经验
// data 应该是怪物组件或包含怪物信息的对象
if (data && data.uuid) {
// 默认值处理
const level = data.lv || 1;
// 类型推断
let type = MonType.NORMAL;
if (data.is_boss) {
type = MonType.BOSS;
} else if (data.is_elite) {
type = MonType.ELITE;
} else {
// 兜底策略：根据Cost判断是否为精英怪
const cost = MonsterCost[data.uuid] || 1;``
if (cost >= 10) {
type = MonType.ELITE;
}
}
this.cal_gold_reward(data, type);
}
}
cal_gold_reward(data: any, type: MonType) {
const cost = MonsterCost[data.uuid] || 1;

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

@@ -22,12 +22,14 @@ export class MissionHeroCompComp extends CCComp {
this.on(GameEvent.FightReady,this.fight_ready,this)
this.on(GameEvent.Zhaohuan,this.zhao_huan,this)
this.on(GameEvent.MissionEnd,this.clear_heros,this)
// this.on(GameEvent.CallFriend,this.call_friend,this)
oops.message.on(GameEvent.CallFriend,this.call_friend,this)
oops.message.on(GameEvent.CallHero,this.call_hero,this)
}
onDestroy(){
oops.message.off(GameEvent.CallFriend,this.call_friend,this)
oops.message.off(GameEvent.CallHero,this.call_hero,this)
oops.message.off(GameEvent.FightReady,this.fight_ready,this)
oops.message.off(GameEvent.Zhaohuan,this.zhao_huan,this)
oops.message.off(GameEvent.MissionEnd,this.clear_heros,this)
}
start() {
@@ -37,45 +39,27 @@ export class MissionHeroCompComp extends CCComp {
}
fight_ready(){
// this.heros=[]
// for(let i=0;i<FightSet.HERO_MAX_NUM;i++){
// this.heros.push({
// uuid:0,
// count:0,
// quality:0,
// })
// }
// this.current_hero_num=-1
// this.current_hero_uuid=0
smc.vmdata.mission_data.hero_num=0
this.addHero(smc.fight_hero,true)
// for(let i=0;i<Object.keys(heros).length;i++){
// if(heros[i]!=0){
// this.addHero(heros[i],false)
// }
// }
}
protected update(dt: number): void {
if(smc.mission.status != 1) return
}
// protected update(dt: number): void {
// }
private zhao_huan(event: string, args: any){
}
private call_hero(event: string, args: any){
this.addHero(args.uuid)
}
private call_friend(event: string, args: any){
this.addHero(args.uuid,false,true)
}
/** 添加英雄 */
private addHero(uuid:number=1001,is_master:boolean=false,is_friend:boolean=false) {
private addHero(uuid:number=1001) {
let hero_pos=0
let hero = ecs.getEntity<Hero>(Hero);
let scale = 1
let pos:Vec3 = HeroPos[hero_pos].pos;
let fight_pos=1
hero.load(pos,scale,uuid,fight_pos,is_master,is_friend);
hero.load(pos,scale,uuid);
}