fix: 修复战斗模式下的技能和物品使用逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful

This commit is contained in:
xinian
2026-03-14 20:02:04 +08:00
committed by cnb
parent 3a39abe9c6
commit 65d8468520
3 changed files with 14 additions and 8 deletions

View File

@@ -151,7 +151,11 @@ func (f *FightC) UseItem(c common.PlayerI, cacthid, itemid uint32) {
return
}
if f.Info.Mode== info.BattleMode.PET_MELEE {
go f.UseSkill(c, 0)
return
}
select {
case f.actionChan <- &action.UseItemAction{BaseAction: action.NewBaseAction(c.GetInfo().UserID), ItemID: itemid, CacthTime: cacthid}:
// 发送成功,可选记录日志

View File

@@ -330,12 +330,12 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
})
f.Switch = make(map[uint32]*action.ActiveSwitchAction)
if f.closefight && f.Info.Mode == info.BattleMode.PET_MELEE {
f.Broadcast(func(fighter *input.Input) {
if fighter.UserID != f.WinnerId {
fighter.Player.SendPackCmd(2505, &attackValueResult)
}
// f.Broadcast(func(fighter *input.Input) {
// if fighter.UserID != f.WinnerId {
// fighter.Player.SendPackCmd(2505, &attackValueResult)
// }
})
// })
return
}
f.Broadcast(func(fighter *input.Input) {