日志打印优化

src/server/game/message_mgr.go

@@ -147,7 +147,7 @@ func (m *MessageMgr) NodeRegister() {
 func (m *MessageMgr) CenterRegister() {
 	if conf.Server.ServerType == "center" {
 		m.RegisterHandler(msg.HANDLE_MOD_PLAYER_LOGIN, MessageHandlerFunc(PlayerLoginHandler))
-		m.RegisterHandler(msg.HANDLE_MDO_PLAYER_LOGOUT, MessageHandlerFunc(PlayerLogoutHandler))
+		m.RegisterHandler(msg.HANDLE_MOD_PLAYER_LOGOUT, MessageHandlerFunc(PlayerLogoutHandler))
 		m.RegisterHandler(msg.HANDLE_MOD_PLAYER_MSG, MessageHandlerFunc(CenterPlayerMsgHandler))
 		m.RegisterHandler(msg.HANDLE_MOD_COMSUME_MSG, MessageHandlerFunc(ComsumerMsgHandler))
 		m.RegisterHandler(msg.HANDLE_MOD_VAR_SET, MessageHandlerFunc(SetVarDataHandler))

src/server/game/mod/item/Item.go

@@ -61,6 +61,10 @@ const (
 	ITEM_TYPE_PET_FUR                 = 117 // 宠物毛皮
 )
 
+func (i *Item) String() string {
+	return fmt.Sprintf("Item{Id:%d, Num:%d}", i.Id, i.Num)
+}
+
 func (i *ItemMod) InitData() {
 	if i.Data == nil {
 		i.Data = make(map[int]int)

src/server/game/mod/msg/Msg.go

@@ -1,6 +1,9 @@
 package msg
 
-import "server/game/mod/item"
+import (
+	"fmt"
+	"server/game/mod/item"
+)
 
 type Msg struct {
 	Type       int          `json:"type"`  // 消息类型
@@ -41,7 +44,7 @@ const (
 	HANDLE_MOD_PLAYER_LOGIN        = 20003 // 玩家登录消息
 	HANDLE_MOD_COMSUME_MSG         = 20004 // 消费消息
 	HANDLE_MOD_CLUSTER_SYNC        = 20005 // 集群同步消息
-	HANDLE_MDO_PLAYER_LOGOUT       = 20006 // 玩家登出消息
+	HANDLE_MOD_PLAYER_LOGOUT       = 20006 // 玩家登出消息
 	HANDLE_MOD_VAR_GET             = 20007 // 获取变量
 	HANDLE_MOD_VAR_SET             = 20008 // 设置变量
 	HANDLE_MOD_CATNIP_PARTNER      = 20009 // 猫薄荷伙伴
@@ -198,6 +201,203 @@ func (m *Msg) Reply(data interface{}) *Msg {
 	}
 }
 
+func (m *Msg) String() string {
+	typeStr := formatType(m.Type)
+	handleTypeStr := formatHandleType(m.HandleType)
+	return fmt.Sprintf("Msg{Type:%s, To:%d, From:%d, SendT:%d, End:%d, Id:%d, HandleType:%s, Items:%+v}",
+		typeStr, m.To, m.From, m.SendT, m.End, m.Id, handleTypeStr, m.Item)
+}
+
+func formatHandleType(handleType int) string {
+	switch handleType {
+	case HANDLE_MOD_PLAYER_MSG:
+		return "HANDLE_MOD_PLAYER_MSG"
+	case HANDLE_MOD_CLUSTER_MSG:
+		return "HANDLE_MOD_CLUSTER_MSG"
+	case HANDLE_MOD_PLAYER_LOGIN:
+		return "HANDLE_MOD_PLAYER_LOGIN"
+	case HANDLE_MOD_COMSUME_MSG:
+		return "HANDLE_MOD_COMSUME_MSG"
+	case HANDLE_MOD_CLUSTER_SYNC:
+		return "HANDLE_MOD_CLUSTER_SYNC"
+	case HANDLE_MOD_PLAYER_LOGOUT:
+		return "HANDLE_MOD_PLAYER_LOGOUT"
+	case HANDLE_MOD_VAR_GET:
+		return "HANDLE_MOD_VAR_GET"
+	case HANDLE_MOD_VAR_SET:
+		return "HANDLE_MOD_VAR_SET"
+	case HANDLE_MOD_CATNIP_PARTNER:
+		return "HANDLE_MOD_CATNIP_PARTNER"
+	case HANDLE_MOD_USER_VAR_GET:
+		return "HANDLE_MOD_USER_VAR_GET"
+	case HANDLE_MOD_USER_VAR_SET:
+		return "HANDLE_MOD_USER_VAR_SET"
+	case HANDLE_MOD_REPLY_PLAYER_MSG:
+		return "HANDLE_MOD_REPLY_PLAYER_MSG"
+	case HANDLE_MDO_CHAMPSHIP_INRANK:
+		return "HANDLE_MDO_CHAMPSHIP_INRANK"
+	case HANDLE_MOD_CHAMPSHIP_RANK_INFO:
+		return "HANDLE_MOD_CHAMPSHIP_RANK_INFO"
+	case HANDLE_MOD_CHAMPSHIP_RANK_LIST:
+		return "HANDLE_MOD_CHAMPSHIP_RANK_LIST"
+	case HANDLE_MOD_CHAMPSHIP_PRE_RANK:
+		return "HANDLE_MOD_CHAMPSHIP_PRE_RANK"
+	case HANDLE_MOD_CHAMPSHIP_GROUP:
+		return "HANDLE_MOD_CHAMPSHIP_GROUP"
+	case HANDLE_MOD_DAILY_VAR_GET:
+		return "HANDLE_MOD_DAILY_VAR_GET"
+	case HANDLE_MOD_DAILY_VAR_SET:
+		return "HANDLE_MOD_DAILY_VAR_SET"
+	default:
+		return fmt.Sprintf("Unknown(%d)", handleType)
+	}
+}
+
+func formatType(t int) string {
+	switch t {
+	case HANDLE_TYPE_APPLY:
+		return "apply_friend"
+	case HANDLE_TYPE_DEL:
+		return "delete_friend"
+	case HANDLE_TYPE_SYNC:
+		return "sync_request"
+	case HADNLE_TYPE_AGREE:
+		return "agree_friend"
+	case HANDLE_TYPE_REFUSE:
+		return "refuse_apply"
+	case HANDLE_TYPE_REQ_CARD:
+		return "request_card"
+	case HANDLE_TYPE_AGREE_CARD:
+		return "agree_card"
+	case HANDLE_TYPE_REG_CARD_REFUSE:
+		return "refuse_card_request"
+	case HANDLE_TYPE_REG_CARD_FINISH:
+		return "card_request_finished"
+	case HANDLE_TYPE_AGREE_CARD_FAIL:
+		return "agree_card_fail"
+	case HANDLE_TYPE_EX_CARD:
+		return "exchange_card"
+	case HANDLE_TYPE_SELECT_EX_CARD:
+		return "select_exchange_card"
+	case HANDLE_TYPE_ARGREE_EX_CARD:
+		return "agree_exchange_card"
+	case HANDLE_TYPE_REFUSE_SELECT_CARD:
+		return "refuse_select_card"
+	case HANDLE_TYPE_REFUSE_EX_CARD:
+		return "refuse_exchange_card"
+	case HANDLE_TYPE_EX_CARD_SELECT_TIMEOUT:
+		return "exchange_card_select_timeout"
+	case HANDLE_TYPE_EX_CARD_TIMEOUT:
+		return "exchange_card_timeout"
+	case HANDLE_TYPE_SEND_CARD:
+		return "send_card"
+	case HANDLE_TYPE_INVITE_FRIEND:
+		return "invite_friend"
+	case HANDLE_TYPE_INVITE_ADD_FRIEND:
+		return "invite_add_friend"
+	case HANDLE_TYPE_RANK:
+		return "rank"
+	case HANDLE_TYPE_RANK_INFO:
+		return "rank_info"
+	case HANDLE_TYPE_RANK_NOTIFY:
+		return "rank_notify"
+	case HANDLE_TYPE_MAIL:
+		return "mail"
+	case HANDLE_TYPE_CHAMPSHIP_GROUP:
+		return "champship_group"
+	case HANDLE_TYPE_CHAMPSHIP_INRANK:
+		return "champship_inrank"
+	case HANDLE_TYPE_CHAMPSHIP_AI:
+		return "champship_ai"
+	case HANDLE_TYPE_CHAMPSHIP_NOTIFY:
+		return "champship_notify"
+	case HANDLE_TYPE_CHAMPSHIP_ZERO:
+		return "champship_zero"
+	case HANDLE_TYPE_CHAMPSHIP_NOTIFY2:
+		return "champship_notify2"
+	case HANDLE_TYPE_VAR_GET:
+		return "var_get"
+	case HANDLE_TYPE_VAR_SET:
+		return "var_set"
+	case SERVER_ZERO_UPDATE:
+		return "zero_update"
+	case HANDLE_TYPE_PLAYROOM_LOSE:
+		return "playroom_lose"
+	case SERVER_NOON_UPDATE:
+		return "noon_update"
+	case FRIEND_TREASURE_HANDLE:
+		return "friend_treasure"
+	case HANDLE_TYPE_MAIL_ADD:
+		return "mail_add"
+	case HANDLE_TYPE_MAIL_RELOAD:
+		return "mail_reload"
+	case HANDLE_TYPE_HANDBOOK_COLLECTION:
+		return "handbook_collection"
+	case HANDLE_TYPE_HANDBOOK_UPVOTE:
+		return "handbook_upvote"
+	case HANDLE_TYPE_SEND_CHARGE:
+		return "send_charge"
+	case HANDLE_TYPE_CHARGE_RECEIVE:
+		return "charge_receive"
+	case HANDLE_TYPE_WISHLIST_SEND:
+		return "wishlist_send"
+	case HANDLE_TYPE_WISHLIST_AGREE:
+		return "wishlist_agree"
+	case HANDLE_TYPE_PLAYROOM_UPVOTE:
+		return "playroom_upvote"
+	case HANDLE_TYPE_CHAMPSHIP_RESULT:
+		return "champship_result"
+	case HANDLE_TYPE_TREASURE_RESULT:
+		return "treasure_result"
+	case HANDLE_TYPE_FACEBOOK_UNBIND:
+		return "facebook_unbind"
+	case HANDLE_TYPE_VAR_USER_SET:
+		return "var_user_set"
+	case HANDLE_TYPE_VAR_USER_GET:
+		return "var_user_get"
+	case HANDLE_TYPE_PLAYROOM_KISS:
+		return "playroom_kiss"
+	case HANDLE_TYPE_PLAYROOM_GAME:
+		return "playroom_game"
+	case HANDLE_TYPE_CATNIP_INVITE:
+		return "catnip_invite"
+	case HANDLE_TYPE_CATNIP_AGREE:
+		return "catnip_agree"
+	case HANDLE_TYPE_CATNIP_AGREE_DEL:
+		return "catnip_agree_del"
+	case HANDLE_TYPE_CATNIP_REFUSE:
+		return "catnip_refuse"
+	case HANDLE_TYPE_CATNIP_GROWTH:
+		return "catnip_growth"
+	case HANDLE_TYPE_CATNIP_LOCK:
+		return "catnip_lock"
+	case HANDLE_TYPE_VAR_EXPIRE_SET:
+		return "var_expire_set"
+	case HANDLE_TYPE_VAR_EXPIRE_GET:
+		return "var_expire_get"
+	case HANDLE_TYPE_FRIEND_GREETING_REPLY:
+		return "friend_greeting_reply"
+	case HANDLE_TYPE_FRIEND_SPONSOER:
+		return "friend_sponsor"
+	case HANDLE_TYPE_CHAMPSHIP_LOGIN:
+		return "champship_login"
+	case HANDLE_TYPE_CHAMPSHIP_RANK_INFO:
+		return "champship_rank_info"
+	case HANDLE_TYPE_SET_CATNIP_PARTNER:
+		return "set_catnip_partner"
+	case HANDLE_TYPE_CATNIP_SEND_EMOJI:
+		return "catnip_send_emoji"
+	case HANDLE_TYPE_CHAMPSHIP_MY_RANK:
+		return "champship_my_rank"
+	case HANDLE_TYPE_LOGIN:
+		return "player_login"
+	case SERVER_PLAYER_SYNC_LOGOUT_MSG:
+		return "player_sync_logout"
+	default:
+		return fmt.Sprintf("Unknown(%d)", t)
+	}
+}
+
 func Handle(fun func(Msg) error, m Msg) error {
 	return fun(m)
 }

src/server/game/player_data.go

@@ -534,7 +534,7 @@ func (p *Player) ClearData() {
 	G_GameLogicPtr.DelPlayer(p)
 	SendMsgToCenterAsync(&MsgMod.Msg{
 		From:       Uid,
-		HandleType: MsgMod.HANDLE_MDO_PLAYER_LOGOUT,
+		HandleType: MsgMod.HANDLE_MOD_PLAYER_LOGOUT,
 	})
 }
 

src/server/test/fix_test.go

@@ -8,6 +8,8 @@ import (
 	notification_cfg "server/conf/notification"
 	"server/db"
 	"server/game"
+	"server/game/mod/item"
+	MsgMod "server/game/mod/msg"
 	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
@@ -234,3 +236,23 @@ func formatIntSlice(slice []int) string {
 	result += "]"
 	return result
 }
+
+func TestMsgFormat(t *testing.T) {
+	m := &MsgMod.Msg{
+		From:       10002,
+		To:         10003,
+		Type:       1,
+		SendT:      179865132,
+		End:        179832654,
+		Id:         0,
+		UniKey:     "dsfjioefnefe",
+		H:          1,
+		HandleType: 20001,
+		Item: []*item.Item{
+			{Id: 1, Num: 10},
+			{Id: 2, Num: 20},
+			{Id: 3, Num: 30},
+		},
+	}
+	fmt.Printf("Msg: %v\n", m)
+}