昔念
79213c67d6
fix(socket): 修复TCP连接处理中逻辑取反错误 修复了`handleTcp`函数中对`s.discorse`的判断条件错误，导致CORS配置未正确应用的问题。 feat(player): 增加地图切换标记支持 在`Player`结构体中新增`Changemap`字段，用于标识玩家是否切换过地图，并在相关业务逻辑中进行设置和判断。 feat(pet): 重构精灵生成与经验处理逻辑 将`GenPetInfo`方法从model包迁移至player包，增加个体值、性格、特性等随机生成逻辑，优化技能学习处理方式。 refactor(service): 优化定时任务与连接管理 使用`cool.Cron`替代原生ticker实现刷怪定时任务，优化连接获取方式，确保并发安全。 refactor(model): 移除冗余代码并优化结构 从`pet.go`中移除已迁移至`player`包的函数定义，精简模型结构，提升模块清晰度。 refactor(config): 更新部门及字典名称配置 将`base_sys_department.json`和
134 lines
3.8 KiB
Go
134 lines
3.8 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/data/xmlres"
|
|
"blazing/common/socket/errorcode"
|
|
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/fight/info"
|
|
"blazing/logic/service/player"
|
|
"blazing/modules/blazing/model"
|
|
)
|
|
|
|
// 挑战地图boss
|
|
func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
var petid int
|
|
var mo *model.PetInfo
|
|
if c.Info.MapID == 515 && data.BossId == 0 { //说明是新手,随机生成
|
|
switch c.Info.PetList[0].ID {
|
|
|
|
case 1:
|
|
petid = 4
|
|
|
|
case 7:
|
|
petid = 1
|
|
|
|
case 4:
|
|
petid = 7
|
|
}
|
|
|
|
mo = c.GenPetInfo(
|
|
int(petid), 24, //24个体
|
|
-1,
|
|
0, //野怪没特性
|
|
0,
|
|
2)
|
|
}
|
|
|
|
if c.FightC != nil {
|
|
return nil, errorcode.ErrorCodes.ErrOnlineOver6HoursCannotFight
|
|
}
|
|
moinfo := &model.PlayerInfo{}
|
|
moinfo.Nick = xmlres.PetMAP[int(mo.ID)].DefName
|
|
moinfo.PetList = append(moinfo.PetList, *mo)
|
|
ai := player.NewAI_player(moinfo)
|
|
fight.NewFight(info.BattleMode.MULTI_MODE, info.BattleStatus.FIGHT_WITH_BOSS, c, ai)
|
|
|
|
return nil, -1
|
|
}
|
|
|
|
// 战斗野怪
|
|
func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
refpet := c.OgreInfo.Data[data.Number]
|
|
if refpet.Id == 0 {
|
|
|
|
return nil, errorcode.ErrorCodes.ErrPokemonNotExists
|
|
}
|
|
mo := c.GenPetInfo(
|
|
int(refpet.Id), -1,
|
|
-1,
|
|
0, //野怪没特性
|
|
int(refpet.Shiny),
|
|
int(refpet.Lv))
|
|
|
|
if c.FightC != nil {
|
|
return nil, errorcode.ErrorCodes.ErrOnlineOver6HoursCannotFight
|
|
}
|
|
moinfo := &model.PlayerInfo{}
|
|
moinfo.Nick = xmlres.PetMAP[int(mo.ID)].DefName
|
|
moinfo.PetList = append(moinfo.PetList, *mo)
|
|
ai := player.NewAI_player(moinfo)
|
|
|
|
fight.NewFight(info.BattleMode.MULTI_MODE, info.BattleStatus.FIGHT_WITH_NPC, c, ai)
|
|
|
|
return nil, -1
|
|
}
|
|
|
|
// 准备战斗
|
|
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.ReadyFight(c)
|
|
return nil, -1
|
|
}
|
|
|
|
// 接收战斗或者取消战斗的包
|
|
func (h Controller) OnPlayerHandleFightInvite(data *fight.HandleFightInviteInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
if ok, p1 := c.AgreeBattle(data.UserID, data.Flag, data.Mode); ok {
|
|
fight.NewFight(data.Mode, info.BattleStatus.FIGHT_WITH_PLAYER, p1, c) ///开始对战,房主方以及被邀请方
|
|
}
|
|
return nil, -1
|
|
}
|
|
|
|
// 邀请其他人进行战斗
|
|
func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
c.InvitePlayerToBattle(&info.PVPinfo{PlayerID: data.UserID, Mode: data.Mode})
|
|
|
|
return nil, 0
|
|
}
|
|
|
|
// 使用技能包
|
|
func (h Controller) UseSkill(data *fight.UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
c.FightC.UseSkill(c, int32(data.SkillId))
|
|
return nil, 0
|
|
}
|
|
|
|
// 战斗逃跑
|
|
func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.Over(c, info.BattleOverReason.PlayerEscape)
|
|
return nil, 0
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) ChangePet(data *fight.ChangePetInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.ChangePet(c, data.CatchTime)
|
|
return nil, -1
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *player.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.Capture(c, (data.CapsuleId))
|
|
return nil, -1
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) LoadPercent(data *fight.LoadPercentInboundInfo, c *player.Player) (result *info.LoadPercentOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.FightC.LoadPercent(c, (int32(data.Percent)))
|
|
return nil, -1
|
|
}
|