feat: 增加GM相关接口。详情请看protoc/doc/gm.md文档

zhangqijia
1 parent 15864203
Showing 12 changed files with 189 additions and 16 deletions Show diff stats
cmd/gameserver/action/GmAction.go
cmd/gameserver/action/RoleAction.go
cmd/gameserver/main.go
cmd/gameserver/service/agent.go
cmd/gameserver/service/gm.go
common/components/connmanage.go
common/components/http.go
common/components/icompontents.go
common/conf.go
common/const.go
conf/conf.yaml
models/role.go
@@ -0,0 +1,33 @@
+package action
+
+import (
+	"pro2d/common"
+	"pro2d/common/components"
+	"pro2d/common/logger"
+	"pro2d/models"
+	"strconv"
+)
+
+type GmAction struct {
+}
+
+func (gm *GmAction) AddExp(properties map[string]interface{}) int {
+	r := properties[common.Role_]
+	c := properties[common.Conn_]
+
+	role := r.(*models.RoleModel)
+	var conn components.IConnection
+	if c == nil {
+		conn = nil
+	} else {
+		conn = c.(components.IConnection)
+	}
+
+	logger.Debug(properties)
+	exp, _ := strconv.Atoi(properties["exp"].(string))
+	logger.Debug("update before id: %s, exp: %d", role.Role.Id, role.Role.Exp)
+	role.Role.Exp += int64(exp)
+	role.UpdateProperty(conn, "exp", role.Role.Exp, true)
+	logger.Debug("update after id: %s, exp: %d", role.Role.Id, role.Role.Exp)
+	return 0
+}
@@ -48,6 +48,7 @@ func CreateRpc(agent components.IAgent, msg components.IMessage) (int32, interfa
 	roleId := common.SnowFlack.NextValStr()
 	role = models.NewRole(roleId)
+	role.Role.Uid = req.Token
 	role.Role.Nick = getRandomName()
 	if err := role.Create(); err != nil {
 		logger.Error("CreateRpc role create err: %v", err)
@@ -19,13 +19,19 @@ func main() {
 	userChan := make(chan os.Signal)
 	signal.Notify(userChan, syscall.SIGUSR1, syscall.SIGUSR2)
-	s, err1 := service.NewGameServer(common.GlobalConf.GameConf)
+	sconf := common.GlobalConf.GameConf
+	s, err1 := service.NewGameServer(sconf)
 	if err1 != nil {
 		logger.Error(err1)
 		return
 	}
 	go func() {
-		err <- http.ListenAndServe(fmt.Sprintf("localhost:%d", common.GlobalConf.GameConf.DebugPort), nil)
+		err <- http.ListenAndServe(fmt.Sprintf("localhost:%d", sconf.DebugPort), nil)
+	}()
+
+	gm := service.NewGmServer(s, fmt.Sprintf(":%d", sconf.GMPort))
+	go func() {
+		err <- gm.Start()
 	}()
 	go func() {
@@ -37,6 +37,8 @@ func NewAgent(s components.IServer) *Agent {
 func (c *Agent) SetSchema(schema components.ISchema) {
 	c.Role = schema.(*models.RoleModel)
+
+	c.Server.GetConnManage().AddRID(c.Role.Role.Id, c.IConnection.GetID())
 }
 func (c *Agent) GetSchema() components.ISchema {
@@ -110,6 +112,7 @@ func (c *Agent) OnClose() {
 		return
 	}
+	c.Server.GetConnManage().DelRID(c.Role.Role.Id)
 	c.Role.OnOfflineEvent()
 }
@@ -0,0 +1,74 @@
+package service
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"pro2d/cmd/gameserver/action"
+	"pro2d/common/components"
+	"pro2d/models"
+	"reflect"
+)
+
+type GmServer struct {
+	components.IHttp
+	Server components.IServer
+}
+
+func NewGmServer(server components.IServer, port ...string) *GmServer {
+	return &GmServer{
+		IHttp:  components.NewHttpServer("", port...),
+		Server: server,
+	}
+}
+
+func (s *GmServer) HandlerFuncObj(tvl, obj reflect.Value) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Request.ParseForm()
+		roleId, ok := c.GetPostForm("role_id")
+		if !ok {
+			c.JSON(http.StatusOK, gin.H{"code": -101, "message": "role not exist"})
+			return
+		}
+
+		conn := s.Server.GetConnManage().GetConnByRID(roleId)
+		var role *models.RoleModel
+		if conn != nil {
+			//在线
+			role = conn.(*Agent).Role
+		} else {
+			//离线
+			role = models.NewRole(roleId)
+			if err := role.Load(); err != nil {
+				c.JSON(http.StatusOK, gin.H{"code": -102, "message": "role not exist"})
+				return
+			}
+			role.LoadAll()
+		}
+
+		properties := make(map[string]interface{})
+
+		for k, v := range c.Request.PostForm {
+			properties[k] = v[0]
+		}
+
+		properties["_conn"] = conn
+		properties["_role"] = role
+
+		v := tvl.Call([]reflect.Value{obj, reflect.ValueOf(properties)})
+
+		role.SaveRoleData(0)
+
+		if len(v) != 1 {
+			c.JSON(http.StatusNotFound, gin.H{"code": -100, "message": "request param len is error"})
+			return
+		}
+		c.JSON(http.StatusOK, gin.H{"code": v[0].Interface()})
+	}
+}
+
+func (s *GmServer) Start() error {
+	s.SetHandlerFuncCallback(s.HandlerFuncObj)
+	s.BindHandler(&action.GmAction{})
+	//gin.SetMode(gin.ReleaseMode)
+	return s.IHttp.Start()
+}
@@ -5,12 +5,18 @@ import &quot;sync&quot;
 type ConnManage struct {
 	mu    sync.RWMutex
 	conns map[uint32]IConnection
+
+	r2cRW sync.RWMutex
+	r2c   map[string]uint32 // role to connID
 }
 func NewConnManage() *ConnManage {
 	return &ConnManage{
 		mu:    sync.RWMutex{},
 		conns: make(map[uint32]IConnection),
+
+		r2cRW: sync.RWMutex{},
+		r2c:   make(map[string]uint32),
 	}
 }
@@ -51,3 +57,22 @@ func (c *ConnManage) StopAllConns() {
 		return true
 	})
 }
+
+func (c *ConnManage) AddRID(rid string, id uint32) {
+	c.r2cRW.Lock()
+	defer c.r2cRW.Unlock()
+	c.r2c[rid] = id
+}
+
+func (c *ConnManage) DelRID(rid string) {
+	c.r2cRW.Lock()
+	defer c.r2cRW.Unlock()
+	delete(c.r2c, rid)
+}
+
+func (c *ConnManage) GetConnByRID(rid string) IConnection {
+	c.r2cRW.RLock()
+	defer c.r2cRW.RUnlock()
+	cid := c.r2c[rid]
+	return c.GetConn(cid)
+}
@@ -9,9 +9,10 @@ import (
 type HttpServer struct {
 	IHttp
-	version string
-	port    []string
-	Handler interface{}
+	version             string
+	port                []string
+	Handler             interface{}
+	HandlerFuncCallBack func(tvl, obj reflect.Value) gin.HandlerFunc
 }
 func Pong(c *gin.Context) {
@@ -29,6 +30,10 @@ func GetRoutePath(objName, objFunc string) string {
 }
 func (h *HttpServer) HandlerFuncObj(tvl, obj reflect.Value) gin.HandlerFunc {
+	if h.HandlerFuncCallBack != nil {
+		return h.HandlerFuncCallBack(tvl, obj)
+	}
+
 	return func(c *gin.Context) {
 		v := tvl.Call([]reflect.Value{obj, reflect.ValueOf(c)})
 		if len(v) != 2 {
@@ -44,6 +49,10 @@ func (h *HttpServer) HandlerFuncObj(tvl, obj reflect.Value) gin.HandlerFunc {
 	}
 }
+func (h *HttpServer) SetHandlerFuncCallback(gh func(tvl, obj reflect.Value) gin.HandlerFunc) {
+	h.HandlerFuncCallBack = gh
+}
+
 func (h *HttpServer) BindHandler(handler interface{}) {
 	h.Handler = handler
 }
 package components
-import "google.golang.org/protobuf/reflect/protoreflect"
+import (
+	"github.com/gin-gonic/gin"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"reflect"
+)
 //-----------------
 //----net start----
@@ -60,6 +64,10 @@ type (
 		DelConn(id uint32) IConnection
 		Range(f func(key interface{}, value interface{}) bool)
 		StopAllConns()
+
+		AddRID(rid string, id uint32)
+		DelRID(rid string)
+		GetConnByRID(rid string) IConnection
 	}
 	//server
 	IServer interface {
@@ -97,6 +105,7 @@ type (
 	IHttp interface {
 		Start() error
 		Stop()
+		SetHandlerFuncCallback(func(tvl, obj reflect.Value) gin.HandlerFunc)
 		BindHandler(interface{})
 	}
 	ActionHandler func(msg IMessage) (int32, interface{})
@@ -36,8 +36,9 @@ type SConf struct {
 	Name           string     `yaml:"name"`
 	IP             string     `yaml:"ip"`
 	Port           int        `yaml:"port"`
-	Encipher       bool       `yaml:"encipher"`
 	DebugPort      int        `yaml:"debugport"`
+	GMPort         int        `yaml:"gm"`
+	Encipher       bool       `yaml:"encipher"`
 	MongoConf      *MongoConf `yaml:"mongo"`
 	RedisConf      *RedisConf `yaml:"redis"`
 	WorkerPoolSize int        `yaml:"pool_size"`
@@ -3,7 +3,7 @@ package common
 const (
 	//最大包大
 	MaxPacketLength = 10 * 1024 * 1024
-	MaxMsgChan = 100
+	MaxMsgChan      = 100
 	//心跳
 	HeartTimerInterval   = 5  //s
@@ -11,10 +11,20 @@ const (
 	//保存数据时间
 	SaveDataInterval = 5 //s
+
+	//id相关
+	MaxRoleNum = 1000000
+	MaxUidNum  = 1000000
+	MaxHeroNum = 1000000
+	MaxTeamNum = 1000000
+
+	//gm参数属性
+	Role_ = "_role"
+	Conn_ = "_conn"
 )
 //redis keys
 const (
 	NickNames = "name:%s"
-	SMSCode = "smscode:%s"
+	SMSCode   = "smscode:%s"
 )
@@ -40,8 +40,9 @@ server_game:
   ip: "192.168.0.206"
   encipher: false
   port: 8850
-  pool_size: 1
   debugport: 6061
+  gm: 8881
+  pool_size: 1
   plugin_path: "./bin/plugin.so"
   mongo:
     <<: *default-mongo
@@ -24,7 +24,7 @@ func RoleExistByUid(uid string) *RoleModel {
 	data := &pb.Role{Uid: uid}
 	if err := mongoproxy.FindOne(mongoproxy.GetBsonM("uid", uid), data); err != nil {
-		logger.Error("Role exist err: %v", err)
+		logger.Error("Role not exist err: %v", err)
 		return nil
 	}
@@ -35,6 +35,7 @@ func RoleExistByUid(uid string) *RoleModel {
 		Teams:   make(SchemaMap),
 		Prop:    new(PropModel),
 	}
+	r.Load()
 	r.LoadAll()
 	return r
 }
@@ -154,7 +155,7 @@ func (m *RoleModel) UpdateProperties(conn components.IConnection, property map[s
 		logger.Error("id %s, err:", m.Role.Id, err)
 		return
 	} else {
-		if conn != nil {
+		if conn != nil && notify {
 			conn.Send(0, uint32(pb.ProtoCode_UpdateRolePropertyRsp), rsp)
 		}
 	}
@@ -199,16 +200,16 @@ func (m *RoleModel) UpdateTeam(teams []*pb.Team) {
 }
 func (m *RoleModel) OnRecoverTimer(now int64) {
-	m.saveRoleData(now)
+	m.SaveRoleData(now)
 }
 func (m *RoleModel) OnOfflineEvent() {
 	// 设置最新的登录时间
-	m.saveRoleData(common.Timex())
+	m.SaveRoleData(common.Timex())
 }
-func (m *RoleModel) saveRoleData(now int64) {
-	if now-m.lastSaveTs < common.SaveDataInterval {
+func (m *RoleModel) SaveRoleData(now int64) {
+	if now > 0 && now-m.lastSaveTs < common.SaveDataInterval {
 		return
 	}
 	atomic.StoreInt64(&m.lastSaveTs, now)