123

bin/client_msg/msg.ts

@@ -2,8 +2,20 @@
 export enum MsgID {
     ReqLogin = 0,
     ResLogin = 1,
-    EnterHall = 2,
-    LeaveHall = 3,
-    MatchLudo = 4,
-    ResHeartBeat = 5,
+    ReqRegister = 2,
+    ResRegister = 3,
+    EnterHall = 4,
+    ResEnterHall = 5,
+    LeaveHall = 6,
+    ResHeartBeat = 7,
+    ReqHeartBeat = 8,
+    SendColorSz = 9,
+    SendRoleMove = 10,
+    NotifyPlayerSzNumber = 11,
+    NotifyPlayerMove = 12,
+    NotifyPlayerOpt = 13,
+    NotifyPlayerStatus = 14,
+    NotifySettlement = 15,
+    MatchLudo = 16,
+    ResMatchLudo = 17,
 }

bin/conf/server.json → bin/conf/server_debug.json

@@ -2,5 +2,5 @@
 	"LogLevel": "debug",
 	"LogPath": "/Users/xy/Desktop/ludo_server/bin/log",
 	"WSAddr": "0.0.0.0:3653",
-	"MaxConnNum": 20000
+	"MaxConnNum": 200002
 }

bin/conf/server_release.json

@@ -0,0 +1,6 @@
+{
+	"LogLevel": "debug",
+	"LogPath": "/home/ludo_server/bin/log",
+	"WSAddr": "0.0.0.0:3653",
+	"MaxConnNum": 20000
+}

src/server/base/skeleton.go

@@ -1,9 +1,10 @@
 package base
 
 import (
+	"server/conf"
+
 	"github.com/name5566/leaf/chanrpc"
 	"github.com/name5566/leaf/module"
-	"server/conf"
 )
 
 func NewSkeleton() *module.Skeleton {

src/server/conf/json.go

@@ -2,9 +2,12 @@ package conf
 
 import (
 	"encoding/json"
+	"fmt"
 	"os"
 
 	"github.com/name5566/leaf/log"
+
+	"server/tools"
 )
 
 var Server struct {
@@ -20,7 +23,13 @@ var Server struct {
 }
 
 func init() {
-	data, err := os.ReadFile("../../bin/conf/server.json")
+	var path string
+	if tools.IsDebug {
+		path = fmt.Sprintf("../../bin/conf/server_%s.json", "debug")
+	} else {
+		path = fmt.Sprintf("../../bin/conf/server_%s.json", "release")
+	}
+	data, err := os.ReadFile(path)
 	if err != nil {
 		log.Fatal("%v", err)
 	}

src/server/db/redis/redismgr.go

@@ -2,6 +2,7 @@ package redismgr
 
 import (
 	"server/conf"
+
 	"time"
 
 	"github.com/gomodule/redigo/redis"

src/server/gate/internal/module.go

@@ -1,10 +1,11 @@
 package internal
 
 import (
-	"github.com/name5566/leaf/gate"
 	"server/conf"
 	"server/game"
 	"server/msg"
+
+	"github.com/name5566/leaf/gate"
 )
 
 type Module struct {

src/server/msg/msg.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"server/tools"
 	"strings"
 
 	"github.com/name5566/leaf/log"
@@ -22,11 +23,22 @@ var msgList []MsgInfo
 func init() {
 	Processor.Register(&ReqLogin{})
 	Processor.Register(&ResLogin{})
+	Processor.Register(&ReqRegister{})
+	Processor.Register(&ResRegister{})
 	Processor.Register(&EnterHall{})
+	Processor.Register(&ResEnterHall{})
 	Processor.Register(&LeaveHall{})
-	Processor.Register(&MatchLudo{})
 	Processor.Register(&ResHeartBeat{})
 	Processor.Register(&ReqHeartBeat{})
+	Processor.Register(&SendColorSz{})
+	Processor.Register(&SendRoleMove{})
+	Processor.Register(&NotifyPlayerSzNumber{})
+	Processor.Register(&NotifyPlayerMove{})
+	Processor.Register(&NotifyPlayerOpt{})
+	Processor.Register(&NotifyPlayerStatus{})
+	Processor.Register(&NotifySettlement{})
+	Processor.Register(&MatchLudo{})
+	Processor.Register(&ResMatchLudo{})
 	Processor.Range(func(id uint16, t reflect.Type) {
 		log.Debug("消息ID: %d, 消息类型: %s\n", id, t.Elem().Name())
 		msgList = append(msgList, MsgInfo{
@@ -49,8 +61,11 @@ func generateTSCode() {
 
 	tsCode.WriteString("}\n")
 
-	var path = "/home/zjh/teen_patti/bin/client_msg/msg.ts"
-	path = "/Users/xy/Desktop/ludo_server/bin/client_msg/msg.ts"
+	var path = "/home/ludo_server/bin/client_msg/msg.ts"
+	if tools.IsDebug {
+		path = "/Users/xy/Desktop/ludo_server/bin/client_msg/msg.ts"
+	}
+
 	// 写入文件
 	err := os.WriteFile(path, []byte(tsCode.String()), 0644)
 	if err != nil {

src/server/tools/conifg.go

@@ -0,0 +1,5 @@
+package tools
+
+const (
+	IsDebug = false
+)