All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(common/data/xmlres): 注释掉未使用的MonsterMap配置变量 - 将MonsterMap配置变量注释掉,因为当前不再使用该配置 - 相应地注释掉了初始化代码中的MonsterMap赋值逻辑 feat(logic/controller): 统一CanFight方法返回值为ErrorCode - 修改PlayerFightBoss等战斗控制器中的Can
245 lines
6.4 KiB
Go
245 lines
6.4 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/player/model"
|
||
|
||
"github.com/gogf/gf/v2/util/gconv"
|
||
"github.com/gogf/gf/v2/util/grand"
|
||
)
|
||
|
||
// processMonID 处理怪物ID字符串,如果是多个ID则随机选择一个
|
||
func processMonID(bm string) string {
|
||
// 按空格分割字符串
|
||
monid := strings.Split(bm, " ")
|
||
|
||
// 过滤分割后可能的空字符串(如连续空格导致的空元素)
|
||
filtered := make([]string, 0, len(monid))
|
||
for _, m := range monid {
|
||
if m != "" {
|
||
filtered = append(filtered, m)
|
||
}
|
||
}
|
||
monid = filtered
|
||
|
||
var selected string
|
||
switch len(monid) {
|
||
case 0:
|
||
// 无元素时,可返回空或默认值(根据业务需求调整)
|
||
selected = ""
|
||
case 1:
|
||
// 长度为1时,取第一个(唯一的元素)
|
||
selected = monid[0]
|
||
default:
|
||
// 长度大于1时,随机选取一个
|
||
randomIdx := grand.Intn(len(monid))
|
||
selected = monid[randomIdx]
|
||
}
|
||
return selected
|
||
}
|
||
|
||
// 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, ok := xmlres.MonsterMap[int(p.Info.MapID)]
|
||
// if !ok {
|
||
// return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
||
// }
|
||
// if len(mdata.Bosses) == 0 {
|
||
// return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
||
// }
|
||
// 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 {
|
||
|
||
// dv := 24
|
||
// if bc.BossCatchable == 1 {
|
||
// dv = -1
|
||
// }
|
||
|
||
// 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
|
||
}
|