admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复空提交问题

Browse Source
This commit is contained in:
1
2025-11-18 22:16:55 +00:00
parent f164d3c358
commit 6831861e0d
15 changed files with 92 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/controller/fight_boss.go
View File

@@ -94,7 +94,7 @@ func (h Controller) PlayerFightBoss(data *fight.ChallengeBossInboundInfo, c *pla
}
}
c.PVPinfo = &info.PVPinfo{
c.Fightinfo = &info.Fightinfo{
Status: info.BattleStatus.FIGHT_WITH_BOSS,
Mode: info.BattleMode.MULTI_MODE,
@@ -134,7 +134,7 @@ func (h Controller) OnPlayerFightNpcMonster(data *fight.FightNpcMonsterInboundIn
moinfo.Nick = xmlres.PetMAP[int(mo.ID)].DefName
moinfo.PetList = append(moinfo.PetList, *mo)
ai := player.NewAI_player(moinfo)
c.PVPinfo = &info.PVPinfo{
c.Fightinfo = &info.Fightinfo{
Mode: info.BattleMode.MULTI_MODE,
Status: info.BattleStatus.FIGHT_WITH_NPC,
}

15
logic/controller/fight_leitai.go
View File

@@ -3,6 +3,7 @@ package controller
import (
"blazing/common/socket/errorcode"
"blazing/logic/service/common"
"blazing/logic/service/fight"
"blazing/logic/service/fight/info"
"blazing/logic/service/player"
@@ -33,17 +34,21 @@ func (h Controller) ARENA_FIGHT_OWENR(data *fight.ARENA_FIGHT_OWENR, c *player.P
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
}
t := space.GetSpace(c.Info.MapID).Can_ARENA(c)
if t != nil {
t.(*player.Player).PVPinfo = &info.PVPinfo{
space.GetSpace(c.Info.MapID).Can_ARENA(func(ownerID common.PlayerI) common.PlayerI {
c.Fightinfo = &info.Fightinfo{
Mode: info.BattleMode.SINGLE_MODE,
Status: info.BattleStatus.FIGHT_WITH_PLAYER,
}
fight.NewFight(t, c, func(foi *info.FightOverInfo) {
_, fighterr := fight.NewFight(c, ownerID, func(foi *info.FightOverInfo) { //我方邀请擂主挑战，我方先手
}) ///开始对战,房主方以及被邀请方
}
if fighterr != nil {
return nil
}
return c
})
return
}

8
logic/controller/fight_pvp_king.go
View File

@@ -15,7 +15,7 @@ func (h Controller) PET_MELEE(data *fight.StartPetWarInboundInfo, c *player.Play
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
}
c.PVPinfo = &info.PVPinfo{
c.Fightinfo = &info.Fightinfo{
Mode: info.BattleMode.PET_MELEE,
Status: info.BattleStatus.FIGHT_WITH_PLAYER}
g := c.Pet_joinFight()
@@ -33,15 +33,15 @@ func (h Controller) PET_King(data *fight.PetKingJoinInboundInfo, c *player.Playe
return nil, errorcode.ErrorCodes.ErrPokemonNotEligible
}
c.PVPinfo = &info.PVPinfo{
c.Fightinfo = &info.Fightinfo{
Status: info.BattleStatus.FIGHT_WITH_PLAYER}
switch data.Type {
case 5:
c.PVPinfo.Mode = info.BattleMode.SINGLE_MODE
c.Fightinfo.Mode = info.BattleMode.SINGLE_MODE
case 6:
c.PVPinfo.Mode = info.BattleMode.MULTI_MODE
c.Fightinfo.Mode = info.BattleMode.MULTI_MODE
}
g := c.Pet_joinFight()
if g != nil {

6
logic/controller/fight_pvp_withplayer.go
View File

@@ -2,6 +2,8 @@ package controller
import (
"blazing/common/socket/errorcode"
"sync/atomic"
"unsafe"
"blazing/logic/service/fight"
"blazing/logic/service/fight/info"
@@ -31,7 +33,7 @@ func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInf
//进入邀请,以及确认对战模式
c.PVPinfo = &info.PVPinfo{PlayerID: data.UserID,
c.Fightinfo = &info.Fightinfo{PlayerID: data.UserID,
Mode: data.Mode,
Status: info.BattleStatus.FIGHT_WITH_PLAYER}
@@ -42,7 +44,7 @@ func (h Controller) OnPlayerInviteOtherFight(data *fight.InviteToFightInboundInf
// 取消和他人战斗
func (h Controller) OnPlayerCanceledOtherInviteFight(data *fight.InviteFightCancelInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
c.PVPinfo = nil
atomic.StorePointer(unsafe.Pointer(c.Fightinfo), nil)
return nil, 0
}

12
logic/controller/map.go
View File

@@ -10,11 +10,8 @@ import (
"blazing/logic/service/space"
"github.com/jinzhu/copier"
"github.com/panjf2000/ants/v2"
)
var mappool, _ = ants.NewPool(-1)
func (h *Controller) MapEnter(data *maps.InInfo, c *player.Player) (result *info.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
c.Info.MapID = data.MapId //登录地图
@@ -23,10 +20,8 @@ func (h *Controller) MapEnter(data *maps.InInfo, c *player.Player) (result *info
result = info.NewOutInfo()
c.Info.Pos = data.Point
copier.Copy(result, c.Info)
mappool.Submit(func() {
c.GetSpace().EnterMap(c)
})
defer c.GetSpace().EnterMap(c)
return result, 0
}
func (h Controller) MapHot(data *maphot.InInfo, c *player.Player) (result *maphot.OutInfo, err errorcode.ErrorCode) {
@@ -43,9 +38,8 @@ func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *player.Player)
c.Canmon = false
c.Changemap = true //可以刷怪
//data.Broadcast(c.Info.MapID, info.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
mappool.Submit(func() {
c.GetSpace().LeaveMap(c) //玩家离开地图
})
defer c.GetSpace().LeaveMap(c) //玩家离开地图
// 如果有正在运行的刷怪协程，发送停止信号

4
logic/service/common/playeri.go
View File

@@ -9,11 +9,11 @@ type PlayerI interface {
GetPlayerCaptureContext() *info.PlayerCaptureContext
Roll(int, int) (bool, float64, float64)
//SendPack(b []byte) error
Getfightinfo() info.PVPinfo
Getfightinfo() info.Fightinfo
GetInfo() *model.PlayerInfo
SetFightC(FightI)
QuitFight()
SendPackCmd(cmd uint32, b any)
}

2
logic/service/fight/info/info.go
View File

@@ -43,7 +43,7 @@ type S2C_NOTE_HANDLE_FIGHT_INVITE struct {
// 4=对方不在线
Result uint32
}
type PVPinfo struct {
type Fightinfo struct {
PlayerID uint32
Mode EnumBattleMode
Status EnumBattleMode

6
logic/service/fight/input.go
View File

@@ -18,7 +18,7 @@ import (
type FightC struct {
ReadyInfo info.NoteReadyToFightInfo
Info info.PVPinfo
Info info.Fightinfo
IsReady bool
ownerID uint32 // 战斗发起者ID
Our *input.Input //始终等于房主ID
@@ -195,7 +195,7 @@ func NewFight(p1, p2 common.PlayerI, fn func(*info.FightOverInfo)) (*FightC, err
f.Info = p1.Getfightinfo()
//这里应该挪到玩家初始化执行
p1.(*player.Player).PVPinfo = nil //清空战斗消息
p1.(*player.Player).Fightinfo = nil //清空战斗消息
f.ReadyInfo.Mode = f.Info.Mode
@@ -235,7 +235,7 @@ func NewFight(p1, p2 common.PlayerI, fn func(*info.FightOverInfo)) (*FightC, err
//todo 将血量和技能pp传回enterturn
ff.Player.SendPackCmd(2506, f.FightOverInfo)
ff.Player.QuitFight()
})
}

2
logic/service/fight/loop.go
View File

@@ -65,6 +65,8 @@ func (f *FightC) battleLoop() {
}
ff.Player.SendPackCmd(2506, f.FightOverInfo)
ff.Player.QuitFight()
//待退出玩家战斗状态
})

4
logic/service/player/ai.go
View File

@@ -12,8 +12,8 @@ type AI_player struct {
CanCapture bool
}
func (p *AI_player) Getfightinfo() info.PVPinfo {
return info.PVPinfo{}
func (p *AI_player) Getfightinfo() info.Fightinfo {
return info.Fightinfo{}
}
func (f *AI_player) SendPack(b []byte) error {
return nil

12
logic/service/player/base.go
View File

@@ -5,12 +5,14 @@ import (
"blazing/logic/service/fight/info"
"blazing/modules/blazing/model"
"math/rand"
"sync/atomic"
"time"
)
type baseplayer struct {
Info *model.PlayerInfo
FightC common.FightI //绑定战斗标识 替代本身的是否战斗标记 //IsFighting bool
Info *model.PlayerInfo
canFight uint32
FightC common.FightI //绑定战斗标识 替代本身的是否战斗标记 //IsFighting bool
*info.PlayerCaptureContext
}
@@ -32,9 +34,13 @@ func (p *baseplayer) GetInfo() *model.PlayerInfo {
return p.Info
}
func (f *baseplayer) SetFightC(ff common.FightI) {
f.FightC = ff
}
func (f *baseplayer) QuitFight() {
//将战斗标记设置为0 这里的标记是
atomic.StoreUint32(&f.canFight, 0)
}
func (f *baseplayer) GetPlayerCaptureContext() *info.PlayerCaptureContext {
return f.PlayerCaptureContext
}

12
logic/service/player/fight.go
View File

@@ -10,7 +10,7 @@ import (
// 邀请玩家加入战斗 邀请者,被邀请者,邀请模式
func (lw *Player) InvitePlayerToBattle() {
pinfo := lw.PVPinfo
pinfo := lw.Fightinfo
space.GetSpace(lw.Info.MapID).User.Range(func(key uint32, v common.PlayerI) bool {
value := v.(*Player)
@@ -37,11 +37,11 @@ func (p *Player) Pet_joinFight() *Player {
value := v.(*Player)
if value.PVPinfo != nil && value != p {
if value.Fightinfo != nil && value != p {
//确认是乱斗模式
if *value.PVPinfo == *p.PVPinfo {
p.PVPinfo = nil //先将自身的准备信息置空
if *value.Fightinfo == *p.Fightinfo {
p.Fightinfo = nil //先将自身的准备信息置空
//value.PVPinfo = nil
lw = value
return true
@@ -100,14 +100,14 @@ func (lw *Player) AgreeBattle(userid, flag uint32, mode info.EnumBattleMode) (bo
}
// 检查邀请者的邀请是否有效（对方已取消邀请）
if inviter.PVPinfo == nil {
if inviter.Fightinfo == nil {
resp.Result = 4 // 邀请已取消
inviter.SendPack(respHeader.Pack(resp))
return false, nil
}
// 检查战斗模式是否匹配
if inviter.PVPinfo.Mode != mode {
if inviter.Fightinfo.Mode != mode {
return false, nil // 模式不匹配，不响应（或根据业务加错误码）
}

39
logic/service/player/player.go
View File

@@ -9,6 +9,7 @@ import (
"blazing/logic/service/space"
"math/rand"
"strings"
"sync/atomic"
"blazing/modules/blazing/model"
blservice "blazing/modules/blazing/service"
@@ -52,8 +53,9 @@ type Player struct {
StopChan timer.TimeNoder
context.Context
PVPinfo *info.PVPinfo //当前邀请的玩家ID
Logintime uint32 //当前登录时间
Fightinfo *info.Fightinfo //当前邀请的玩家ID
Logintime uint32 //当前登录时间
OgreInfo OgreInfo
Service *blservice.UserService
@@ -84,27 +86,36 @@ func (p *Player) UseCoins(t uint32) bool {
func (p *Player) GetAction() {
}
func (p *Player) Getfightinfo() info.PVPinfo {
return *p.PVPinfo
func (p *Player) Getfightinfo() info.Fightinfo {
return *p.Fightinfo
}
func (p *Player) GetSpace() *space.Space {
return space.GetSpace(p.Info.MapID)
}
func (p *Player) CanFight() bool {
if p.FightC != nil {
return false
}
if p.GetSpace().ARENA.ChallengerID == p.Info.UserID || p.GetSpace().ARENA.Id == p.Info.UserID {
if atomic.CompareAndSwapUint32(&p.canFight, 0, 1) { //先判断是否竞态条件被挑战
//成功，继续判断
if p.FightC != nil {
return false
}
// if p.GetSpace().ARENA.ChallengerID == p.Info.UserID || p.GetSpace().ARENA.Id == p.Info.UserID {
// return false
// }
for _, v := range p.Info.PetList {
if v.Hp > 0 { // 只要找到一个血量大于0的宠物，就可以战斗
return true
}
}
// 遍历完所有宠物，都没有血量大于0的，才不能战斗
return false
}
for _, v := range p.Info.PetList {
if v.Hp > 0 { // 只要找到一个血量大于0的宠物，就可以战斗
return true
}
}
// 遍历完所有宠物，都没有血量大于0的，才不能战斗
return false
}

15
logic/service/space/in_out.go
View File

@@ -7,19 +7,24 @@ import (
"sync/atomic"
"github.com/jinzhu/copier"
"github.com/panjf2000/ants/v2"
"golang.org/x/time/rate"
)
var mappool, _ = ants.NewPool(-1)
// 向其他人广播，不含自己
func (s *Space) Broadcast(c common.PlayerI, cmd uint32, data any) {
mappool.Submit(func() {
go s.User.Range(func(k uint32, v common.PlayerI) (stop bool) {
s.User.Range(func(k uint32, v common.PlayerI) (stop bool) {
if k != c.GetInfo().UserID {
v.SendPackCmd(cmd, data)
if k != c.GetInfo().UserID {
v.SendPackCmd(cmd, data)
}
return false
}
return false
})
})
}

18
logic/service/space/space.go
View File

@@ -3,6 +3,7 @@ package space
import (
"blazing/common/data/xmlres"
"blazing/common/utils"
"sync/atomic"
"blazing/logic/service/common"
"blazing/logic/service/fight/info"
@@ -22,19 +23,18 @@ type Space struct {
Name string //地图名称
ARENA info.S2C_ARENA_GET_INFO
ARENA_Player common.PlayerI
// DefaultPos model.Pos //默认位置DefaultPos
//Positions map[uint32]model.Pos //从上一个地图跳转后默认位置 无任何写操作
}
func (s *Space) Can_ARENA(c common.PlayerI) common.PlayerI {
func (s *Space) Can_ARENA(tt func(c common.PlayerI) common.PlayerI) {
//原子操作，修改擂台状态
if atomic.CompareAndSwapUint32(&s.ARENA.Flag, 1, 2) {
r := tt(s.ARENA_Player)
if r != nil {
atomic.SwapUint32(&s.ARENA.ChallengerID, r.GetInfo().UserID) //传回的指针赋值给ID
}
if s.ARENA.Flag == 1 {
s.ARENA.Flag = 2
s.ARENA.ChallengerID = c.GetInfo().UserID
return s.ARENA_Player
}
return nil
}