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

Merge branch 'main' of https://cnb.cool/blzing/blazing

Browse Source
This commit is contained in:
昔念
2026-04-07 17:26:52 +08:00
parent 3ee1283a2c 13244313f1
commit 918cdeac0e
91 changed files with 3417 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
logic/service/player/Monster.go
View File

@@ -2,7 +2,8 @@ package player
import (
"blazing/common/utils"
"blazing/modules/config/model"
configmodel "blazing/modules/config/model"
playermodel "blazing/modules/player/model"
"sync/atomic"
"time"
@@ -10,15 +11,17 @@ import (
"github.com/samber/lo"
)
func (p *Player) IsMatch(t model.Event) bool {
_, ok := lo.Find(t.Weather, func(item int32) bool {
return item == int32(p.GetSpace().MapBossSInfo.Wer)
})
if !ok {
// 不在同一天气下
return false
func (p *Player) IsMatch(t configmodel.Event) bool {
if len(t.Weather) > 0 {
_, ok := lo.Find(t.Weather, func(item int32) bool {
return item == int32(p.GetSpace().MapBossSInfo.Wer)
})
if !ok {
// 不在同一天气下
return false
}
}
if t.StartTime != "" && t.EndTime != "" {
ok, _ := utils.IsCurrentTimeInRange(t.StartTime, t.EndTime)
if !ok {
@@ -26,8 +29,74 @@ func (p *Player) IsMatch(t model.Event) bool {
}
}
return true
if len(t.Week) > 0 {
week := int32(time.Now().Weekday())
if week == 0 {
week = 7
}
_, ok := lo.Find(t.Week, func(item int32) bool {
return item == week
})
if !ok {
return false
}
}
if len(t.Sprites) > 0 && !matchPetIDInList(t.Sprites, p.Info.PetList, p.Info.BackupPetList) {
return false
}
if len(t.FirstSprites) > 0 {
if len(p.Info.PetList) == 0 {
return false
}
firstPetID := int32(p.Info.PetList[0].ID)
_, ok := lo.Find(t.FirstSprites, func(item int32) bool {
return item == firstPetID
})
if !ok {
return false
}
}
if len(t.MustTask) > 0 {
for _, taskID := range t.MustTask {
if p.Info.GetTask(int(taskID)) != playermodel.Completed {
return false
}
}
}
if len(t.MustItem) > 0 {
if p.Service == nil || p.Service.Item == nil {
return false
}
for _, itemID := range t.MustItem {
if p.Service.Item.CheakItem(uint32(itemID)) <= 0 {
return false
}
}
}
return true
}
func matchPetIDInList(targetIDs []int32, petLists ...[]playermodel.PetInfo) bool {
for _, pets := range petLists {
for _, pet := range pets {
petID := int32(pet.ID)
_, ok := lo.Find(targetIDs, func(item int32) bool {
return item == petID
})
if ok {
return true
}
}
}
return false
}
// 应该根据怪物信息决定后端生成

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

@@ -4,5 +4,5 @@ type AI_player struct {
baseplayer
CanCapture int
BossScript string
}

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

@@ -44,6 +44,27 @@ func (p *baseplayer) GetPetInfo(limitlevel uint32) []model.PetInfo {
}
return ret
}
func (p *baseplayer) AddBattleProp(index int, level int8) {
if p == nil || index < 0 || index >= len(p.Prop) || level == 0 {
return
}
p.Prop[index] += level
if p.Prop[index] > 6 {
p.Prop[index] = 6
}
if p.Prop[index] < -6 {
p.Prop[index] = -6
}
}
func (p *baseplayer) ApplyBattleProps(target *model.AttackValue) {
if p == nil || target == nil {
return
}
target.Prop = p.Prop
}
func (f *baseplayer) InvitePlayer(ff common.PlayerI) {
}

146
logic/service/player/pack.go
View File

@@ -7,6 +7,7 @@ import (
"encoding/binary"
"encoding/hex"
"sync"
"sync/atomic"
"context"
@@ -22,6 +23,11 @@ import (
"github.com/panjf2000/gnet/v2"
)
const (
minPacketLen = 17
maxPacketLen = 10 * 1024
)
// getUnderlyingValue 递归解析reflect.Value，解包指针、interface{}到底层具体类型
func getUnderlyingValue(val reflect.Value) (reflect.Value, error) {
for {
@@ -47,6 +53,44 @@ func getUnderlyingValue(val reflect.Value) (reflect.Value, error) {
}
}
func setFieldByIndex(root reflect.Value, index []int, value reflect.Value) bool {
current := root
for pos, idx := range index {
if current.Kind() == reflect.Ptr {
if current.IsNil() {
current.Set(reflect.New(current.Type().Elem()))
}
current = current.Elem()
}
if current.Kind() != reflect.Struct || idx < 0 || idx >= current.NumField() {
return false
}
field := current.Field(idx)
if pos == len(index)-1 {
if !field.CanSet() {
return false
}
if value.Type().AssignableTo(field.Type()) {
field.Set(value)
return true
}
if field.Kind() == reflect.Ptr && value.Type().AssignableTo(field.Type().Elem()) {
ptr := reflect.New(field.Type().Elem())
ptr.Elem().Set(value)
field.Set(ptr)
return true
}
return false
}
current = field
}
return false
}
// XORDecryptU 原地执行异或解密，避免额外分配和拷贝。
func XORDecryptU(encryptedData []byte, key uint32) []byte {
if len(encryptedData) == 0 {
@@ -102,6 +146,16 @@ func putPacketData(buf []byte) {
}
func (h *ClientData) PushEvent(v []byte, submit func(task func()) error) {
if h == nil || h.IsClosed() {
return
}
if len(v) < minPacketLen || len(v) > maxPacketLen {
return
}
if binary.BigEndian.Uint32(v[0:4]) != uint32(len(v)) {
return
}
var header common.TomeeHeader
header.Len = binary.BigEndian.Uint32(v[0:4])
header.CMD = binary.BigEndian.Uint32(v[5:9])
@@ -111,9 +165,18 @@ func (h *ClientData) PushEvent(v []byte, submit func(task func()) error) {
copy(header.Data, v[17:])
}
_ = submit(func() {
h.LF.Producer().Write(header)
err := submit(func() {
if h.IsClosed() || h.LF == nil || !h.LF.Running() {
putPacketData(header.Data)
return
}
if err := h.LF.Producer().Write(header); err != nil {
putPacketData(header.Data)
}
})
if err != nil {
putPacketData(header.Data)
}
}
// 重写
@@ -168,45 +231,38 @@ func (h *ClientData) OnEvent(data common.TomeeHeader) {
return //TODO 待实现cmd未注册
}
params := []reflect.Value{}
var ptrValue reflect.Value
if cmdlister.NewReqValue != nil {
ptrValue = cmdlister.NewReqValue()
} else {
ptrValue = reflect.New(cmdlister.Req)
}
//funct := cmdlister.Type().NumIn()
// 如果需要可设置的变量（用于修改值），创建指针并解引用
ptrValue := reflect.New(cmdlister.Req)
// fmt.Println(tt1)
if data.Res != nil {
tt1 := ptrValue.Elem().Addr().Interface()
err := struc.Unpack(bytes.NewBuffer(data.Res), tt1)
err := struc.Unpack(bytes.NewBuffer(data.Res), ptrValue.Interface())
if err != nil {
cool.Logger.Error(context.Background(), data.UserID, data.CMD, "解包失败,", err, hex.EncodeToString(data.Res))
//fmt.Println(data.UserID, data.CMD, "解包失败,", hex.EncodeToString(data.Data))
data.Result = uint32(errorcode.ErrorCodes.ErrSystemProcessingError)
h.SendPack(data.Pack(nil))
return
}
}
ptrValue1 := ptrValue.Elem().Addr()
// 设置 Name 字段
nameField := ptrValue.Elem().Field(0) //首个为header
nameField.Set(reflect.ValueOf(data))
if data.CMD > 1001 { //if cmdlister.Type().In(1) == reflect.TypeOf(&Player{}) {
//t := GetPlayer(c, data.UserID)
// fmt.Println(data.CMD, "接收 变量的地址 ", &t.Info, t.Info.UserID)
params = append(params, ptrValue1, reflect.ValueOf(h.Player))
} else {
params = append(params, ptrValue1, reflect.ValueOf(h.Conn))
if !setFieldByIndex(ptrValue.Elem(), cmdlister.HeaderFieldIndex, reflect.ValueOf(data)) {
cool.Logger.Warning(context.Background(), data.UserID, data.CMD, "设置请求头失败")
return
}
ret := cmdlister.Func.Call(params)
var params [2]reflect.Value
params[0] = ptrValue
if cmdlister.UseConn {
params[1] = reflect.ValueOf(h.Conn)
} else {
params[1] = reflect.ValueOf(h.Player)
}
ret := cmdlister.Func.Call(params[:])
if len(ret) <= 0 { //如果判断没有参数,那就说明这个包没有返回参数
return
@@ -235,12 +291,34 @@ func (h *ClientData) OnEvent(data common.TomeeHeader) {
}
type ClientData struct {
IsCrossDomain sync.Once //是否跨域过
Player *Player //客户实体
ERROR_CONNUT int
Wsmsg *WsCodec
Conn gnet.Conn
LF *lockfree.Lockfree[common.TomeeHeader]
Player *Player //客户实体
ERROR_CONNUT int
Wsmsg *WsCodec
Conn gnet.Conn
LF *lockfree.Lockfree[common.TomeeHeader]
closed int32
crossDomainChecked uint32
}
func (p *ClientData) IsClosed() bool {
return atomic.LoadInt32(&p.closed) == 1
}
func (p *ClientData) Close() {
if !atomic.CompareAndSwapInt32(&p.closed, 0, 1) {
return
}
if p.LF != nil && p.LF.Running() {
_ = p.LF.Close()
}
}
func (p *ClientData) IsCrossDomainChecked() bool {
return atomic.LoadUint32(&p.crossDomainChecked) == 1
}
func (p *ClientData) MarkCrossDomainChecked() {
atomic.StoreUint32(&p.crossDomainChecked, 1)
}
func (p *ClientData) GetPlayer(userid uint32) *Player { //TODO 这里待优化,可能存在内存泄漏问题

7
logic/service/player/server.go
View File

@@ -1,13 +1,16 @@
package player
import "blazing/common/data/share"
func KickPlayer(userid uint32) error { //踢出玩家
//TODO 返回错误码
//var player *entity.Player
if player1, ok := Mainplayer.Load(userid); ok {
player1.Player.Kick(false)
return nil
}
//return player
// 已不在本服在线列表，视为离线并清理僵尸在线标记
_ = share.ShareManager.DeleteUserOnline(userid)
return nil
}

149
logic/service/player/wscodec.go
View File

@@ -2,6 +2,7 @@ package player
import (
"bytes"
"encoding/binary"
"errors"
"io"
@@ -11,12 +12,18 @@ import (
"github.com/panjf2000/gnet/v2/pkg/logging"
)
const (
minTCPPacketLen = 17
maxTCPPacketLen = 10 * 1024
tomeeVersion = 49
)
type WsCodec struct {
Tcp bool
Upgraded bool // 链接是否升级
Buf bytes.Buffer // 从实际socket中读取到的数据缓存
wsMsgBuf wsMessageBuf // ws 消息缓存
//Isinitws bool
Tcp bool
Upgraded bool // 链接是否升级
Buf bytes.Buffer // 从实际socket中读取到的数据缓存
wsMsgBuf wsMessageBuf // ws 消息缓存
bufferedInbound int // 已镜像到 Buf 中的 inbound 字节数
}
type wsMessageBuf struct {
@@ -24,92 +31,115 @@ type wsMessageBuf struct {
cachedBuf bytes.Buffer
}
type UpgradeState uint8
const (
UpgradeNeedMoreData UpgradeState = iota
UpgradeUseTCP
UpgradeUseWS
)
type readWrite struct {
io.Reader
io.Writer
}
func CompareLeftBytes(array1, array2 []byte, leftBytesCount int) bool {
// 检查切片长度是否足够比较左边的字节
if len(array1) < leftBytesCount || len(array2) < leftBytesCount {
return false
}
// 提取左边的字节切片
left1 := array1[:leftBytesCount]
left2 := array2[:leftBytesCount]
// 比较左边的字节切片
for i := 0; i < leftBytesCount; i++ {
if left1[i] != left2[i] {
return false
}
}
return true
}
func (w *WsCodec) Upgrade(c gnet.Conn) (ok bool, action gnet.Action) {
func (w *WsCodec) Upgrade(c gnet.Conn) (state UpgradeState, action gnet.Action) {
if w.Upgraded {
ok = true
state = UpgradeUseWS
return
}
if w.Tcp {
ok = false
state = UpgradeUseTCP
return
}
buf := &w.Buf
if CompareLeftBytes(buf.Bytes(), []byte{0, 0}, 2) {
w.Tcp = true
return
}
tmpReader := bytes.NewReader(buf.Bytes())
oldLen := tmpReader.Len()
//logging.Infof("do Upgrade")
buf := w.Buf.Bytes()
if looksLikeTCPPacket(buf) {
w.SwitchToTCP()
state = UpgradeUseTCP
return
}
if len(buf) == 0 {
state = UpgradeNeedMoreData
return
}
tmpReader := bytes.NewReader(buf)
oldLen := tmpReader.Len()
hs, err := ws.Upgrade(readWrite{tmpReader, c})
skipN := oldLen - tmpReader.Len()
if err != nil {
if err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF) { //数据不完整，不跳过 buf 中的 skipN 字节（此时 buf 中存放的仅是部分 "handshake data" bytes），下次再尝试读取
if err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF) {
state = UpgradeNeedMoreData
return
}
buf.Next(skipN)
w.Buf.Next(skipN)
logging.Errorf("conn[%v] [err=%v]", c.RemoteAddr().String(), err.Error())
action = gnet.Close
//ok = true
//w.Tcp = true
return
}
buf.Next(skipN)
logging.Infof("conn[%v] upgrade websocket protocol! Handshake: %v", c.RemoteAddr().String(), hs)
ok = true
w.Buf.Next(skipN)
logging.Infof("conn[%v] upgrade websocket protocol! Handshake: %v", c.RemoteAddr().String(), hs)
w.Upgraded = true
state = UpgradeUseWS
return
}
func looksLikeTCPPacket(buf []byte) bool {
if len(buf) < 4 {
return false
}
packetLen := binary.BigEndian.Uint32(buf[:4])
if packetLen < minTCPPacketLen || packetLen > maxTCPPacketLen {
return false
}
if len(buf) >= 5 && buf[4] != tomeeVersion {
return false
}
return true
}
func (w *WsCodec) ReadBufferBytes(c gnet.Conn) (gnet.Action, int) {
size := c.InboundBuffered()
//buf := make([]byte, size)
if size < w.bufferedInbound {
w.bufferedInbound = 0
}
if size == w.bufferedInbound {
return gnet.None, size
}
read, err := c.Peek(size)
if err != nil {
logging.Errorf("read err! %v", err)
return gnet.Close, 0
}
// if read < size {
// logging.Errorf("read bytes len err! size: %d read: %d", size, read)
// return gnet.Close
// }
w.Buf.Write(read)
w.Buf.Write(read[w.bufferedInbound:])
w.bufferedInbound = size
return gnet.None, size
}
func (w *WsCodec) ResetInboundMirror() {
w.bufferedInbound = 0
}
func (w *WsCodec) SwitchToTCP() {
w.Tcp = true
w.Upgraded = false
w.bufferedInbound = 0
w.Buf.Reset()
w.wsMsgBuf.curHeader = nil
w.wsMsgBuf.cachedBuf.Reset()
}
func (w *WsCodec) Decode(c gnet.Conn) (outs []wsutil.Message, err error) {
// fmt.Println("do Decode")
messages, err := w.readWsMessages()
if err != nil {
logging.Errorf("Error reading message! %v", err)
return nil, err
}
if len(messages) <= 0 { //没有读到完整数据 不处理
if len(messages) <= 0 {
return
}
for _, message := range messages {
@@ -131,9 +161,8 @@ func (w *WsCodec) readWsMessages() (messages []wsutil.Message, err error) {
msgBuf := &w.wsMsgBuf
in := &w.Buf
for {
// 从 in 中读出 header，并将 header bytes 写入 msgBuf.cachedBuf
if msgBuf.curHeader == nil {
if in.Len() < ws.MinHeaderSize { //头长度至少是2
if in.Len() < ws.MinHeaderSize {
return
}
var head ws.Header
@@ -142,13 +171,13 @@ func (w *WsCodec) readWsMessages() (messages []wsutil.Message, err error) {
if err != nil {
return messages, err
}
} else { //有可能不完整，构建新的 reader 读取 head，读取成功才实际对 in 进行读操作
} else {
tmpReader := bytes.NewReader(in.Bytes())
oldLen := tmpReader.Len()
head, err = ws.ReadHeader(tmpReader)
skipN := oldLen - tmpReader.Len()
if err != nil {
if err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF) { //数据不完整
if err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF) {
return messages, nil
}
in.Next(skipN)
@@ -163,21 +192,19 @@ func (w *WsCodec) readWsMessages() (messages []wsutil.Message, err error) {
return nil, err
}
}
dataLen := (int)(msgBuf.curHeader.Length)
// 从 in 中读出 data，并将 data bytes 写入 msgBuf.cachedBuf
if dataLen > 0 {
if in.Len() < dataLen { //数据不完整
dataLen := int(msgBuf.curHeader.Length)
if dataLen > 0 {
if in.Len() < dataLen {
logging.Infof("incomplete data")
return
}
_, err = io.CopyN(&msgBuf.cachedBuf, in, int64(dataLen))
if err != nil {
return
}
}
if msgBuf.curHeader.Fin { //当前 header 已经是一个完整消息
if msgBuf.curHeader.Fin {
messages, err = wsutil.ReadClientMessage(&msgBuf.cachedBuf, messages)
if err != nil {
return nil, err