dc4835f14c
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(common/utils): 添加时间范围检查工具函数 添加了 IsCurrentTimeInRange 函数用于判断当前时间是否在指定的 HH:MM 时间区间内，支持当前日期的时间比较功能。 refactor(logic/controller): 重构 Boss 挑战逻辑并集成配置服务 - 集成 service 模块替代原有硬编码逻辑 - 重构 PlayerFightBoss 方法，使用新的配置数据结构 - 移除已废弃的 processMonID 函数和相关注释代码 refactor(logic/space): 优化地图 Boss 信息管理和天气系统 - 更新地图 Boss 数据
255 lines
6.5 KiB
Go
255 lines
6.5 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/data"
|
|
"blazing/common/data/xmlres"
|
|
"blazing/common/socket/errorcode"
|
|
"strings"
|
|
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/fight/info"
|
|
|
|
"blazing/logic/service/player"
|
|
"blazing/modules/config/service"
|
|
"blazing/modules/player/model"
|
|
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
"github.com/gogf/gf/v2/util/grand"
|
|
)
|
|
|
|
// PlayerFightBoss 挑战地图boss
|
|
// data: 包含挑战Boss信息的输入数据
|
|
// player: 当前玩家对象
|
|
// 返回: 战斗结果和错误码
|
|
func (Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
r := p.CanFight()
|
|
if p.CanFight() != 0 {
|
|
return nil, r
|
|
}
|
|
var monster *model.PetInfo
|
|
monsterInfo := &model.PlayerInfo{}
|
|
|
|
var taskID int
|
|
var canCapture int
|
|
mdata := service.NewMapNodeService().GetDataNode(p.Info.MapID, data.BossId)
|
|
if mdata == nil {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
|
|
bosinfo := service.NewBossService().Get(mdata.BossIds[0])
|
|
if bosinfo == nil {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
dv := 24
|
|
if bosinfo[0].IsCapture == 1 {
|
|
dv = -1
|
|
}
|
|
for i, bm := range bosinfo {
|
|
|
|
monster = model.GenPetInfo(
|
|
gconv.Int(bm.MonID), dv, //24个体
|
|
-1,
|
|
0, //野怪没特性
|
|
|
|
int(bm.Lv), nil, 0)
|
|
monster.CatchTime = uint32(i)
|
|
if bm.Hp != 0 {
|
|
monster.Hp = uint32(bm.Hp)
|
|
monster.MaxHp = uint32(bm.Hp)
|
|
}
|
|
|
|
for _, v := range bm.Effect {
|
|
idx := gconv.Uint16(v)
|
|
|
|
if idx == 0 {
|
|
continue
|
|
}
|
|
|
|
EID, args := service.NewEffectService().Args(uint32(idx))
|
|
monster.EffectInfo = append(monster.EffectInfo, model.PetEffectInfo{
|
|
Idx: idx,
|
|
EID: gconv.Uint16(EID),
|
|
Args: gconv.Ints(args),
|
|
})
|
|
}
|
|
monsterInfo.PetList = append(monsterInfo.PetList, *monster)
|
|
}
|
|
if bosinfo[0].IsCapture == 1 {
|
|
canCapture = xmlres.PetMAP[int(monster.ID)].CatchRate
|
|
if grand.Meet(1, 500) {
|
|
monsterInfo.PetList[0].RandomByWeightShiny()
|
|
}
|
|
|
|
}
|
|
monsterInfo.Nick = mdata.NodeName //xmlres.PetMAP[int(monster.ID)].DefName
|
|
// for _, bc := range mdata.Bosses {
|
|
|
|
// if bc.Id == nil {
|
|
|
|
// bc.Id = gconv.PtrInt(0)
|
|
// }
|
|
|
|
// if (bc.Id == nil && data.BossId == 0) || uint32(*bc.Id) == data.BossId { //打默认第一个boss
|
|
// if bc.TaskID != nil {
|
|
// taskID = *bc.TaskID
|
|
// }
|
|
|
|
// for i, bm := range bc.BossMon {
|
|
|
|
// monster = model.GenPetInfo(
|
|
// gconv.Int(processMonID(bm.MonID)), dv, //24个体
|
|
// -1,
|
|
// 0, //野怪没特性
|
|
|
|
// bm.Lv, nil, 0)
|
|
// monster.CatchTime = uint32(i)
|
|
// if bm.Hp != 0 {
|
|
// monster.Hp = uint32(bm.Hp)
|
|
// monster.MaxHp = uint32(bm.Hp)
|
|
// }
|
|
|
|
// for _, v := range strings.Split(bm.NewSeIdxs, " ") {
|
|
// idx := gconv.Uint16(v)
|
|
|
|
// if idx == 0 {
|
|
// continue
|
|
// }
|
|
|
|
// EID, args := service.NewEffectService().Args(uint32(idx))
|
|
// monster.EffectInfo = append(monster.EffectInfo, model.PetEffectInfo{
|
|
// Idx: idx,
|
|
// EID: gconv.Uint16(EID),
|
|
// Args: gconv.Ints(args),
|
|
// })
|
|
// }
|
|
// monsterInfo.PetList = append(monsterInfo.PetList, *monster)
|
|
// }
|
|
// if bc.BossCatchable == 1 {
|
|
// canCapture = xmlres.PetMAP[int(monster.ID)].CatchRate
|
|
// if grand.Meet(1, 500) {
|
|
// monsterInfo.PetList[0].RandomByWeightShiny()
|
|
// }
|
|
|
|
// }
|
|
// monsterInfo.Nick = bc.Name //xmlres.PetMAP[int(monster.ID)].DefName
|
|
// break
|
|
// }
|
|
|
|
// }
|
|
if len(monsterInfo.PetList) == 0 {
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
p.Fightinfo.Status = info.BattleMode.FIGHT_WITH_NPC
|
|
p.Fightinfo.Mode = info.BattleMode.MULTI_MODE
|
|
|
|
ai := player.NewAI_player(monsterInfo)
|
|
ai.CanCapture = canCapture
|
|
ai.Prop[0] = 2
|
|
fight.NewFight(p, ai, func(foi info.FightOverInfo) {
|
|
if taskID != 0 {
|
|
if foi.Reason == 0 && foi.WinnerId == p.Info.UserID {
|
|
p.SptCompletedTask(taskID, 1)
|
|
|
|
}
|
|
}
|
|
|
|
//p.Done.Exec(model.MilestoneMode.BOSS, []uint32{p.Info.MapID, data.BossId, uint32(foi.Reason)}, nil)
|
|
|
|
})
|
|
|
|
return nil, -1
|
|
}
|
|
|
|
// OnPlayerFightNpcMonster 战斗野怪
|
|
// data: 包含战斗野怪信息的输入数据
|
|
// player: 当前玩家对象
|
|
// 返回: 战斗结果和错误码
|
|
func (Controller) OnPlayerFightNpcMonster(data1 *fight.FightNpcMonsterInboundInfo, p *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
r := p.CanFight()
|
|
if p.CanFight() != 0 {
|
|
return nil, r
|
|
}
|
|
if data1.Number > 9 {
|
|
return nil, errorcode.ErrorCodes.ErrSystemError
|
|
}
|
|
refPet := p.Data[data1.Number]
|
|
if refPet.ID == 0 {
|
|
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
if refPet.Ext != 0 {
|
|
refPet.ID = refPet.Ext
|
|
|
|
}
|
|
monster := model.GenPetInfo(
|
|
int(refPet.ID), -1,
|
|
-1,
|
|
0, //野怪没特性
|
|
|
|
int(refPet.Lv),
|
|
refPet.ShinyInfo, -1)
|
|
monster.CatchMap = p.Info.MapID //设置当前地图
|
|
if refPet.Ext != 0 {
|
|
if grand.Meet(1, 500) {
|
|
monster.RandomByWeightShiny()
|
|
}
|
|
}
|
|
|
|
monsterInfo := &model.PlayerInfo{}
|
|
monsterInfo.Nick = xmlres.PetMAP[int(monster.ID)].DefName
|
|
monsterInfo.PetList = append(monsterInfo.PetList, *monster)
|
|
ai := player.NewAI_player(monsterInfo)
|
|
|
|
ai.CanCapture = refPet.IsCapture //handleNPCFightSpecial(monster.ID)
|
|
|
|
p.Fightinfo.Status = info.BattleMode.FIGHT_WITH_NPC //打野怪
|
|
p.Fightinfo.Mode = info.BattleMode.MULTI_MODE //多人模式
|
|
|
|
fight.NewFight(p, ai, func(foi info.FightOverInfo) {
|
|
//p.Done.Exec(model.MilestoneMode.Moster, []uint32{p.Info.MapID, monsterInfo.PetList[0].ID, uint32(foi.Reason)}, nil)
|
|
if foi.Reason == 0 && foi.WinnerId == p.Info.UserID {
|
|
|
|
exp := uint32(xmlres.PetMAP[int(monster.ID)].YieldingExp) * monster.Level / 7
|
|
addlevel, poolevel := p.CanGetExp()
|
|
addexp := gconv.Float32(addlevel * gconv.Float32(exp))
|
|
if addexp != 0 {
|
|
poolexp := gconv.Float32(poolevel) * gconv.Float32((exp))
|
|
items := &info.S2C_GET_BOSS_MONSTER{}
|
|
|
|
p.ItemAdd(3, int64(poolexp+addexp))
|
|
items.ItemList = append(items.ItemList, data.ItemInfo{
|
|
ItemId: 3,
|
|
ItemCnt: int64(poolexp),
|
|
})
|
|
p.AddPetExp(foi.Winpet, int64(addexp))
|
|
for _, v := range refPet.Item {
|
|
count := int64(grand.Intn(2) + 1)
|
|
ok := p.ItemAdd(v, count)
|
|
if ok {
|
|
items.ItemList = append(items.ItemList, data.ItemInfo{
|
|
ItemId: v,
|
|
ItemCnt: count,
|
|
})
|
|
}
|
|
|
|
}
|
|
|
|
p.SendPackCmd(8004, items)
|
|
}
|
|
|
|
evs := gconv.Int64s(strings.Split(xmlres.PetMAP[int(monster.ID)].YieldingEV, " "))
|
|
|
|
foi.Winpet.AddEV(evs)
|
|
//取消累计学习力掉落
|
|
// if leve == 8 {
|
|
// items.EV = lo.Sum(evs) - 1
|
|
// p.Info.EVPool += lo.Sum(evs) //给予累计学习力
|
|
// }
|
|
|
|
}
|
|
|
|
})
|
|
|
|
return nil, -1
|
|
}
|