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

```

Browse Source 
feat(middleware): 添加WebSocket服务端处理器

添加了WebSocket服务端处理器，支持WebSocket连接的升级和处理，
包括授权验证功能的实现

fix(fight): 修复NPC战斗逻辑中的问题

移除了NPC回合结束时的调试输出，优化了NPC技能选择逻辑，
确保只选择可使用的技能，并添加了NPC动作执行
This commit is contained in:
昔念
2026-01-07 02:30:21 +08:00
parent f5eb445aa0
commit 3c5b9a4ce8
7 changed files with 183 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,7 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
//println("回合结束") //println("回合结束")
if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC { if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC {
if f.Opp.CurrentPet.Info.Hp <= 0 { if f.Opp.CurrentPet.Info.Hp <= 0 {
//println("回合结束开始执行NPC动作")
f.Opp.GetAction() f.Opp.GetAction()
//panic("AI自动技能") //panic("AI自动技能")
} }

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

@@ -191,7 +191,7 @@ func (our *Input) Damage(in *Input, sub *info.DamageZone) {
} }
func (our *Input) GetAction() { func (our *Input) GetAction() {
println("开始执行NPC动作")
next := our.Exec(func(t Effect) bool { next := our.Exec(func(t Effect) bool {
return t.HookAction() return t.HookAction()
@@ -259,17 +259,20 @@ func (our *Input) GetAction() {
maxDamage := killableSkills[0].damage maxDamage := killableSkills[0].damage
for _, ks := range killableSkills[1:] { for _, ks := range killableSkills[1:] {
if ks.damage.Cmp(maxDamage) > 0 { // 使用decimal的比较方法比较伤害值 if ks.damage.Cmp(maxDamage) > 0 { // 使用decimal的比较方法比较伤害值
maxDamage = ks.damage if ks.CanUse() {
bestKillSkill = ks.SkillEntity maxDamage = ks.damage
bestKillSkill = ks.SkillEntity
}
} }
} }
our.FightC.UseSkill(our.Player, uint32(bestKillSkill.ID)) our.FightC.UseSkill(our.Player, uint32(bestKillSkill.ID))
return return
} }
// if len(allSkills) <= 0 { if len(allSkills) <= 0 {
// our.FightC.UseSkill(our.Player, 0) our.FightC.UseSkill(our.Player, 0)
// return return
// } }
// 优化随机选择技能的逻辑，直接使用随机索引 // 优化随机选择技能的逻辑，直接使用随机索引
randomIdx := grand.Intn(len(allSkills)) randomIdx := grand.Intn(len(allSkills))

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

@@ -144,7 +144,7 @@ func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.Bat
} }
if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC && pid != 0 { if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC && pid != 0 {
f.Opp.GetAction() f.Opp.GetAction()
println("开始执行NPC动作")
} }
selfinput := f.GetInputByAction(paction, false) selfinput := f.GetInputByAction(paction, false)
if ret, ok := paction.(*action.ActiveSwitchAction); ok { if ret, ok := paction.(*action.ActiveSwitchAction); ok {

39
modules/base/middleware/middleware.go
View File

@@ -84,4 +84,43 @@ func init() {
go socket.ReadLoop() go socket.ReadLoop()
}) })
g.Server().BindHandler("/server/*", func(r *ghttp.Request) {
tt := new(ServerHandler)
upgrader := gws.NewUpgrader(tt, &gws.ServerOption{
Authorize: func(rt *http.Request, session gws.SessionStorage) bool {
//r.s\\\
// r.Get("t")
// admin := cool.GetAdmin(rt.Context())
// if admin.UserId != 10001 {
// return false
// }
// var name = r.URL.Query().Get("name")
// if name == "" {
// return false
// }
// t, _ := service.NewBaseSysUserService().Person(admin.UserID)
//Loger.Debug(context.TODO(), t.Mimi)
// session.Store("name", t.Mimi)
//session.Store("key", r.Header.Get("Sec-WebSocket-Key"))
return true
},
})
socket, err := upgrader.Upgrade(r.Response.Writer, r.Request)
if err != nil {
fmt.Println(err)
return
}
// ants.Submit(func() {
// socket.ReadLoop()
// })
// ants.Submit(func() { socket.ReadLoop() })
go socket.ReadLoop()
})
} }

97
modules/base/middleware/server.go Normal file
View File

@@ -0,0 +1,97 @@
package middleware
import (
"context"
"encoding/json"
"net"
"time"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/glog"
"github.com/gogf/gf/v2/util/gconv"
"github.com/lxzan/gws"
)
type ServerHandler struct {
gws.BuiltinEventHandler
port int
target net.Conn
}
func (c *ServerHandler) OnOpen(socket *gws.Conn) {
// target, err := net.Dial("tcp", "127.0.0.1:"+gconv.String(c.port))
// if err != nil {
// glog.Debug(context.Background(), "连接失败")
// }
// c.target = target
// //errChan := make(chan error, 2)
// if c.target == nil {
// return
// }
// go func(conn net.Conn, socket *gws.Conn) {
// reader := bufio.NewReader(conn)
// LOOP:
// for {
// // select {
// // default:
// packlen, err := reader.Peek(4)
// if err != nil {
// socket.WriteClose(1000, nil)
// break LOOP
// }
// length := int32(binary.BigEndian.Uint32(packlen))
// data := make([]byte, length)
// io.ReadFull(reader, data)
// //pack_Ver := data[4] //因为包体已经解析，所以这里直接取0
// // var pack = make([]byte, length)
// socket.WriteMessage(gws.OpcodeBinary, data)
// //t.event.RecvServerHandler(pack)
// // client.OnReceiveBase(client, pack, length)
// }
// }(c.target, socket)
// //err = <-errChan
// if err != io.EOF {
// log.Println("proxy error:", err)
// }
}
func (c *ServerHandler) OnPing(socket *gws.Conn, payload []byte) {
_ = socket.SetDeadline(time.Now().Add(2 * PingInterval))
_ = socket.WritePong(nil)
}
func (c *ServerHandler) OnPong(socket *gws.Conn, payload []byte) {}
func (c *ServerHandler) OnMessage(socket *gws.Conn, gwsmessage *gws.Message) {
//socket.WriteMessage(gwsmessage.Opcode, gwsmessage.Bytes())
for i := 0; i < 4; i++ {
jsondata := g.Map{"type": 1, "message": "hel " + gconv.String(i)}
json, _ := json.Marshal(jsondata)
socket.WriteMessage(gwsmessage.Opcode, json)
}
jsondata := g.Map{"type": 0, "message": "hel"}
json, _ := json.Marshal(jsondata)
socket.WriteMessage(gwsmessage.Opcode, json)
//fmt.Println(gwsmessage.Bytes())
}
func (c *ServerHandler) OnClose(socket *gws.Conn, err error) {
glog.Debug(context.Background(), "断开连接")
if c.target != nil {
c.target.Close()
}
}

73
modules/base/middleware/websocket.go
View File

@@ -1,16 +1,11 @@
package middleware package middleware
import ( import (
"bufio"
"context" "context"
"encoding/binary"
"io"
"log"
"net" "net"
"time" "time"
"github.com/gogf/gf/v2/os/glog" "github.com/gogf/gf/v2/os/glog"
"github.com/gogf/gf/v2/util/gconv"
"github.com/lxzan/gws" "github.com/lxzan/gws"
) )
@@ -23,49 +18,49 @@ type Handler struct {
} }
func (c *Handler) OnOpen(socket *gws.Conn) { func (c *Handler) OnOpen(socket *gws.Conn) {
target, err := net.Dial("tcp", "127.0.0.1:"+gconv.String(c.port)) // target, err := net.Dial("tcp", "127.0.0.1:"+gconv.String(c.port))
if err != nil { // if err != nil {
glog.Debug(context.Background(), "连接失败") // glog.Debug(context.Background(), "连接失败")
} // }
c.target = target // c.target = target
//errChan := make(chan error, 2) // //errChan := make(chan error, 2)
if c.target == nil { // if c.target == nil {
return // return
} // }
go func(conn net.Conn, socket *gws.Conn) { // go func(conn net.Conn, socket *gws.Conn) {
reader := bufio.NewReader(conn) // reader := bufio.NewReader(conn)
LOOP: // LOOP:
for { // for {
// select { // // select {
// default: // // default:
packlen, err := reader.Peek(4) // packlen, err := reader.Peek(4)
if err != nil { // if err != nil {
socket.WriteClose(1000, nil) // socket.WriteClose(1000, nil)
break LOOP // break LOOP
} // }
length := int32(binary.BigEndian.Uint32(packlen)) // length := int32(binary.BigEndian.Uint32(packlen))
data := make([]byte, length) // data := make([]byte, length)
io.ReadFull(reader, data) // io.ReadFull(reader, data)
//pack_Ver := data[4] //因为包体已经解析，所以这里直接取0 // //pack_Ver := data[4] //因为包体已经解析，所以这里直接取0
// var pack = make([]byte, length) // // var pack = make([]byte, length)
socket.WriteMessage(gws.OpcodeBinary, data) // socket.WriteMessage(gws.OpcodeBinary, data)
//t.event.RecvHandler(pack) // //t.event.RecvHandler(pack)
// client.OnReceiveBase(client, pack, length) // // client.OnReceiveBase(client, pack, length)
} // }
}(c.target, socket) // }(c.target, socket)
//err = <-errChan // //err = <-errChan
if err != io.EOF { // if err != io.EOF {
log.Println("proxy error:", err) // log.Println("proxy error:", err)
} // }
} }
func (c *Handler) OnPing(socket *gws.Conn, payload []byte) { func (c *Handler) OnPing(socket *gws.Conn, payload []byte) {

2
modules/config/model/server_list.go
View File

@@ -13,7 +13,7 @@ type ServerList struct {
OnlineID uint16 `gorm:"column:online_id;comment:'在线ID';uniqueIndex" json:"online_id"` OnlineID uint16 `gorm:"column:online_id;comment:'在线ID';uniqueIndex" json:"online_id"`
IP string `gorm:"type:string;comment:'服务器IP'" json:"ip"` IP string `gorm:"type:string;comment:'服务器IP'" json:"ip"`
Port uint16 `gorm:"comment:'端口号，通常是小整数'" json:"port"` Port uint16 `gorm:"comment:'端口号，通常是小整数'" json:"port"`
IsOpen bool `gorm:"default:true;not null;comment:'服务器是否开启，默认为开启状态'" json:"is_open"` IsOpen uint8 `gorm:"default:0;not null;comment:'是否开启'" json:"is_open"`
//登录地址 //登录地址
LoginAddr string `gorm:"type:string;comment:'登录地址'" json:"login_addr"` LoginAddr string `gorm:"type:string;comment:'登录地址'" json:"login_addr"`
//账号 //账号