From 434c4ca9da690d0c35f89a938d4ea003abaf431b Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 9 Apr 2026 16:30:43 +0800
Subject: [PATCH 01/25] =?UTF-8?q?thrift=E5=8D=8F=E8=AE=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +-
 src/server/conf/item/Item_cfg.go              |   4 +-
 src/server/conf/language/language_cfg.go      |  18 +-
 src/server/conf/mail/mail_cfg.go              |  26 +-
 src/server/db/Mysql.go                        |   2 +-
 src/server/db/SqlStruct.go                    |   2 +-
 src/server/game/GameLogic.go                  |  35 +-
 src/server/game/activity_func.go              |  58 +-
 src/server/game/activity_mgr.go               |  11 +-
 src/server/game/admin.go                      |  29 +-
 src/server/game/charge_func.go                |   2 +-
 src/server/game/external.go                   |  50 +-
 src/server/game/gm_handler.go                 |   8 +-
 src/server/game/limited_time_trigger.go       |   2 +-
 src/server/game/message_handler.go            |  14 +-
 src/server/game/mod/avatar/Avatar.go          |   2 +-
 src/server/game/mod/base/Base.go              |   2 +-
 src/server/game/mod/card/Card.go              |   2 +-
 src/server/game/mod/champship/Champship.go    |   2 +-
 src/server/game/mod/charge/Charge.go          |   2 +-
 src/server/game/mod/chess/Chess.go            |   6 +-
 src/server/game/mod/collect/Collect.go        |   2 +-
 src/server/game/mod/daily_task/DailyTask.go   |   2 +-
 src/server/game/mod/decorate/Decorate.go      |   2 +-
 src/server/game/mod/emoji/emoji.go            |   2 +-
 src/server/game/mod/endless/Endless.go        |   2 +-
 src/server/game/mod/face/Face.go              |   2 +-
 src/server/game/mod/friend/Friend.go          |   2 +-
 .../mod/friend_treasure.go/friend_treasure.go |   2 +-
 src/server/game/mod/fur/fur.go                |   2 +-
 src/server/game/mod/guide/Guide.go            |   2 +-
 src/server/game/mod/guide_task/guide_task.go  |   2 +-
 src/server/game/mod/handbook/Handbook.go      |   2 +-
 src/server/game/mod/invite/invite.go          |   2 +-
 src/server/game/mod/item/Item.go              |   2 +-
 src/server/game/mod/kv/kv.go                  |   2 +-
 .../limited_time_event/limited_time_event.go  |  12 +-
 src/server/game/mod/mail/Mail.go              |   2 +-
 src/server/game/mod/order/Order.go            |  20 +-
 src/server/game/mod/piggy_bank/piggy_bank.go  |   2 +-
 src/server/game/mod/playroom/playroom.go      |   2 +-
 src/server/game/mod/quest/Quest.go            |   2 +-
 .../game/mod/seven_login/seven_login.go       |   2 +-
 src/server/game/notification.go               |   2 +-
 src/server/game/player_back.go                |  10 +-
 src/server/game/player_base_mod.go            |  37 +-
 src/server/game/player_chess_mod.go           |  44 +-
 src/server/game/player_data.go                |  23 +-
 src/server/game/proto_factory.go              |  66 +-
 src/server/game/register_network_func.go      | 740 +++++++++---------
 src/server/game/req_func_friend.go            |  62 +-
 src/server/game/req_func_fur.go               |   2 +-
 src/server/game/trigger_func.go               |  22 +-
 src/server/game/unit_test.go                  |   2 +-
 src/server/game_util/GoUtil.go                |  22 +
 src/server/gate/router.go                     |   9 +-
 src/server/go.mod                             |   3 +-
 src/server/go.sum                             |   4 +
 src/server/msg/msg.go                         |  14 +-
 59 files changed, 741 insertions(+), 673 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41bb583f..db214c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ src/server/GeoLite2-Country
 src/server/test/GeoLite2-Country
 src/server/msg/Gameapi_grpc.pb.go
 src/server/unit_test/*.exe*
-src/server/unit_test/log*
\ No newline at end of file
+src/server/unit_test/log*
+src/server/msg/meowmentnet
diff --git a/src/server/conf/item/Item_cfg.go b/src/server/conf/item/Item_cfg.go
index c904b16f..016619fc 100644
--- a/src/server/conf/item/Item_cfg.go
+++ b/src/server/conf/item/Item_cfg.go
@@ -3,7 +3,7 @@ package itemCfg
 import (
 	languageCfg "server/conf/language"
 	"server/gamedata"
-	"server/msg"
+	"server/msg/meowmentnet"
 	"strconv"
 	"strings"
 
@@ -61,5 +61,5 @@ func GetItemName(Id int) (string, string) {
 		return "", ""
 	}
 	name := gamedata.GetStringValue(data, "Name")
-	return languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, name), languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, name)
+	return languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, name), languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, name)
 }
diff --git a/src/server/conf/language/language_cfg.go b/src/server/conf/language/language_cfg.go
index 53bdce56..ffcb9462 100644
--- a/src/server/conf/language/language_cfg.go
+++ b/src/server/conf/language/language_cfg.go
@@ -2,7 +2,7 @@ package languageCfg
 
 import (
 	"server/gamedata"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 const (
@@ -31,13 +31,13 @@ func _GetClientLanguage(lang msg.LANG_TYPE, key string) string {
 		return key
 	}
 	switch lang {
-	case msg.LANG_TYPE_LANG_EN:
+	case msg.LANG_TYPE_LangEn:
 		return gamedata.GetStringValue(data, "en_US")
-	case msg.LANG_TYPE_LANG_PTBR:
+	case msg.LANG_TYPE_LangPtbr:
 		return gamedata.GetStringValue(data, "pt_BR")
-	case msg.LANG_TYPE_LANG_CN:
+	case msg.LANG_TYPE_LangCn:
 		return gamedata.GetStringValue(data, "zh_CN")
-	case msg.LANG_TYPE_LANG_ES_LATAM:
+	case msg.LANG_TYPE_LangEsLatam:
 		return gamedata.GetStringValue(data, "es_LATAM")
 	default:
 		return key
@@ -50,13 +50,13 @@ func _GetBackendLanguage(lang msg.LANG_TYPE, key string) string {
 		return key
 	}
 	switch lang {
-	case msg.LANG_TYPE_LANG_EN:
+	case msg.LANG_TYPE_LangEn:
 		return gamedata.GetStringValue(data, "en_US")
-	case msg.LANG_TYPE_LANG_PTBR:
+	case msg.LANG_TYPE_LangPtbr:
 		return gamedata.GetStringValue(data, "pt_BR")
-	case msg.LANG_TYPE_LANG_CN:
+	case msg.LANG_TYPE_LangCn:
 		return gamedata.GetStringValue(data, "zh_CN")
-	case msg.LANG_TYPE_LANG_ES_LATAM:
+	case msg.LANG_TYPE_LangEsLatam:
 		return gamedata.GetStringValue(data, "es_LATAM")
 	default:
 		return key
diff --git a/src/server/conf/mail/mail_cfg.go b/src/server/conf/mail/mail_cfg.go
index c237068a..478897b3 100644
--- a/src/server/conf/mail/mail_cfg.go
+++ b/src/server/conf/mail/mail_cfg.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	GoUtil "server/game_util"
 	"server/gamedata"
-	"server/msg"
+	"server/msg/meowmentnet"
 	"strings"
 )
 
@@ -80,10 +80,10 @@ func GetRecallMail(Title, ItemName, TitleEn, ItemNameEn string) (string, string,
 	if err != nil {
 		return "", "", "", ""
 	}
-	mt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title"))
-	mc := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Content"))
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title"))
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Content"))
+	mt := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Title"))
+	mc := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Content"))
+	mt_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Title"))
+	mc_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Content"))
 	return fmt.Sprintf(mt, Title), fmt.Sprintf(mc, Title, ItemName), fmt.Sprintf(mt_en, TitleEn), fmt.Sprintf(mc_en, Title, ItemNameEn)
 }
 
@@ -92,10 +92,10 @@ func GetChargeSendMail(PlayerName string) (string, string, string, string) {
 	if err != nil {
 		return "", "", "", ""
 	}
-	mt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title"))
-	mc := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Content"))
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title"))
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Content"))
+	mt := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Title"))
+	mc := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Content"))
+	mt_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Title"))
+	mc_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Content"))
 	return mt, fmt.Sprintf(mc, PlayerName), mt_en, fmt.Sprintf(mc_en, PlayerName)
 }
 
@@ -104,9 +104,9 @@ func GetChargeReceiveMail(PlayerName string, Content string) (string, string, st
 	if err != nil {
 		return "", "", "", ""
 	}
-	mt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title"))
-	mc := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Content"))
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title"))
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Content"))
+	mt := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Title"))
+	mc := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Content"))
+	mt_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Title"))
+	mc_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Content"))
 	return fmt.Sprintf(mt, PlayerName), fmt.Sprintf(mc, Content), fmt.Sprintf(mt_en, PlayerName), fmt.Sprintf(mc_en, Content)
 }
diff --git a/src/server/db/Mysql.go b/src/server/db/Mysql.go
index 5845af96..91249688 100644
--- a/src/server/db/Mysql.go
+++ b/src/server/db/Mysql.go
@@ -417,7 +417,7 @@ func GetServerMailData(data *[]*SqlServerMailStruct) error {
 }
 
 func GetActivityData(data *[]*SqlActivityCfgStruct) error {
-	sql := "select `id`, `type`, `title`, `mail_title`, `mail_content`, `level_limit`, `start_time`, `end_time`, `cfg_buf`, `extra`, `interval` from t_activity_mod"
+	sql := "select `id`, `type`, `title`, `mail_title`, `mail_content`, `level_limit`, `start_time`, `end_time`, `cfg`, `extra`, `interval` from t_activity_mod"
 	err := SqlDb.Select(data, sql)
 	return err
 }
diff --git a/src/server/db/SqlStruct.go b/src/server/db/SqlStruct.go
index c7135689..41744f98 100644
--- a/src/server/db/SqlStruct.go
+++ b/src/server/db/SqlStruct.go
@@ -506,7 +506,7 @@ type SqlActivityCfgStruct struct {
 	Level       int    `db:"level_limit"`
 	Start_time  int64  `db:"start_time"`
 	End_time    int64  `db:"end_time"`
-	Cfg         []byte `db:"cfg_buf"`
+	Cfg         []byte `db:"cfg"`
 	Interval    int64  `db:"interval"`
 	Extra       string `db:"extra"`
 }
diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index a598cb0e..b9b1195b 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -19,13 +19,12 @@ import (
 	"server/game/internal"
 
 	MsgMod "server/game/mod/msg"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"time"
 
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/robfig/cron/v3"
 
-	"google.golang.org/protobuf/proto"
-
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
 	"gitea.bywaystudios.com/pet_home/leaf/timer"
 
@@ -38,7 +37,7 @@ var (
 
 var isInitGameLogic = false
 var RegisterNetWorkFunc = make(map[string]interface{})
-var NewRegisterNetWorkFunc = make(map[string]func(*Player, *proto.Message) error)
+var NewRegisterNetWorkFunc = make(map[string]func(*Player, *thrift.TStruct) error)
 
 const (
 	SERVER_STATUS_OPEN     = 1 // 服务器状态 开放
@@ -59,8 +58,8 @@ func RegisterNewMsgProcessFunc(key string, value interface{}) {
 	NewRegisterNetWorkFunc[key] = handler
 }
 
-func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message) error, error) {
-	if fn, ok := value.(func(*Player, *proto.Message) error); ok {
+func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *thrift.TStruct) error, error) {
+	if fn, ok := value.(func(*Player, *thrift.TStruct) error); ok {
 		return fn, nil
 	}
 
@@ -84,10 +83,10 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message)
 		return nil, fmt.Errorf("return type must be error")
 	}
 
-	msgIfaceType := reflect.TypeOf((*proto.Message)(nil)).Elem()
+	msgIfaceType := reflect.TypeOf((*thrift.TStruct)(nil)).Elem()
 	msgArgType := rt.In(1)
-	if msgArgType == reflect.TypeOf((*proto.Message)(nil)) {
-		return func(player *Player, msg *proto.Message) error {
+	if msgArgType == reflect.TypeOf((*thrift.TStruct)(nil)) {
+		return func(player *Player, msg *thrift.TStruct) error {
 			results := rv.Call([]reflect.Value{reflect.ValueOf(player), reflect.ValueOf(msg)})
 			if results[0].IsNil() {
 				return nil
@@ -96,12 +95,12 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message)
 		}, nil
 	}
 	if msgArgType.Kind() != reflect.Ptr || !msgArgType.Implements(msgIfaceType) {
-		return nil, fmt.Errorf("second arg must be *proto.Message or pointer type implementing proto.Message")
+		return nil, fmt.Errorf("second arg must be *thrift.TStruct or pointer type implementing thrift.TStruct")
 	}
 
-	return func(player *Player, msg *proto.Message) error {
+	return func(player *Player, msg *thrift.TStruct) error {
 		if msg == nil || *msg == nil {
-			return fmt.Errorf("nil proto message")
+			return fmt.Errorf("nil thrift message")
 		}
 
 		raw := *msg
@@ -118,7 +117,7 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message)
 	}, nil
 }
 
-func RunNewNetProcessByKey(key string, player *Player, msg *proto.Message) error {
+func RunNewNetProcessByKey(key string, player *Player, msg *thrift.TStruct) error {
 	fun, ok := NewRegisterNetWorkFunc[key]
 	if ok {
 		err := fun(player, msg)
@@ -300,8 +299,8 @@ func (ad *GameLogic) NewAccountInsertDataToDB() bool {
 }
 
 func (ad *GameLogic) PackLoginResInfo(a gate.Agent, ResLogin *msg.ResLogin) {
-	resBuff, _ := proto.Marshal(ResLogin)
-	ad.PackResInfo(a, "ResLogin", resBuff)
+	data := GoUtil.Marshal(ResLogin)
+	ad.PackResInfo(a, "ResLogin", data)
 }
 
 func (ad *GameLogic) PackResInfo(a gate.Agent, Func string, data []byte) {
@@ -322,7 +321,7 @@ func (ad *GameLogic) CreateNewPlayer(a gate.Agent, UserName string) *Player {
 	player.agent = a
 	err := player.InitPlayer(UserName)
 	if err != nil {
-		data, _ := proto.Marshal(&msg.ResLogin{ResultCode: MergeConst.Protocol_Error_Account_Fail})
+		data := GoUtil.Marshal(&msg.ResLogin{ResultCode: MergeConst.Protocol_Error_Account_Fail})
 		G_GameLogicPtr.PackResInfo(a, "ResLogin", data)
 		panic(err)
 	}
@@ -594,7 +593,7 @@ func (ad *GameLogic) InitServerInfo() {
 func (ad *GameLogic) SendServerVersion(a gate.Agent) {
 	res := &msg.ResServerVersion{}
 	res.Version = G_GameLogicPtr.Version
-	data, _ := proto.Marshal(res)
+	data := GoUtil.Marshal(res)
 	G_getGameLogic().PackResInfo(a, "ResServerVersion", data)
 }
 
@@ -641,7 +640,7 @@ func (ad *GameLogic) ReplaceExistPlayerAndAgent(a gate.Agent, player *Player) er
 	}
 	agent := player.GetAgentByPlayer()
 	notify := &msg.ForceKickOut{}
-	data, _ := proto.Marshal(notify)
+	data := GoUtil.Marshal(notify)
 	if agent != nil && a != agent {
 		G_getGameLogic().PackResInfo(agent, "ForceKickOut", data)
 		internal.AsignPlayerToAgents(agent, ad.NotInitPlayer)
diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 4337ec07..39303b00 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -15,7 +15,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/mail"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 )
@@ -64,14 +64,14 @@ func (p *Player) ActivityLogin() {
 		// 清空猫草大作战数据无需发邮件
 		MailMod := p.PlayMod.getMailMod()
 		MailMod.SendMail(&mail.MailStruct{
-			Title:          languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_title"),
-			TitleEn:        languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_title"),
-			Content:        languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_content"),
-			ContentEn:      languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_content"),
-			TitlePtBr:      languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, "backend_gardenend_mail_title"),
-			ContentPtBr:    languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, "backend_gardenend_mail_content"),
-			TitleEsLatam:   languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, "backend_gardenend_mail_title"),
-			ContentEsLatam: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, "backend_gardenend_mail_content"),
+			Title:          languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, "backend_gardenend_mail_title"),
+			TitleEn:        languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, "backend_gardenend_mail_title"),
+			Content:        languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, "backend_gardenend_mail_content"),
+			ContentEn:      languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, "backend_gardenend_mail_content"),
+			TitlePtBr:      languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, "backend_gardenend_mail_title"),
+			ContentPtBr:    languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, "backend_gardenend_mail_content"),
+			TitleEsLatam:   languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, "backend_gardenend_mail_title"),
+			ContentEsLatam: languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, "backend_gardenend_mail_content"),
 			Items:          catnipUnReward,
 			Type:           mail.MAIL_TYPE_NORMAL,
 		})
@@ -105,18 +105,18 @@ func (p *Player) ActivityLogin() {
 func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems []*item.Item) {
 	MailMod := p.PlayMod.getMailMod()
 	activity_title_key, mail_title_key, mail_content_key := activityCfg.GetActivityRecycleMail(ActivityId)
-	activity_title_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, activity_title_key)
-	activity_title_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, activity_title_key)
-	activity_title_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, activity_title_key)
-	activity_title_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, activity_title_key)
-	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_title_key)
-	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_content_key)
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_title_key)
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_content_key)
-	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_title_key)
-	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_content_key)
-	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_title_key)
-	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_content_key)
+	activity_title_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, activity_title_key)
+	activity_title_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, activity_title_key)
+	activity_title_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, activity_title_key)
+	activity_title_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, activity_title_key)
+	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_title_key)
+	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_content_key)
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_title_key)
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_content_key)
+	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_title_key)
+	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_content_key)
+	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_title_key)
+	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_content_key)
 	Items := []*item.Item{item.NewItem(ItemId, ItemNum)}
 	Items = append(Items, RewardItems...)
 	MailMod.SendMail(&mail.MailStruct{
@@ -136,14 +136,14 @@ func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems [
 // 发送活动邮件
 func (p *Player) SendActivityMail2(items []*item.Item, mail_title, mail_content string) {
 	MailMod := p.PlayMod.getMailMod()
-	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_title)
-	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_content)
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_title)
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_content)
-	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_title)
-	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_content)
-	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_title)
-	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_content)
+	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_title)
+	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_content)
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_title)
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_content)
+	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_title)
+	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_content)
+	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_title)
+	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_content)
 	MailMod.SendMail(&mail.MailStruct{
 		Title:          mt_zh,
 		Content:        mc_zh,
diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go
index 4b26b1de..3c3878b5 100644
--- a/src/server/game/activity_mgr.go
+++ b/src/server/game/activity_mgr.go
@@ -1,18 +1,17 @@
 package game
 
 import (
+	"encoding/json"
 	"fmt"
 	"server/db"
 	"server/game/mod/activity"
 	"server/game/mod/msg"
 	Msg "server/game/mod/msg"
 	GoUtil "server/game_util"
-	protoMsg "server/msg"
+	protoMsg "server/msg/meowmentnet"
 	"sync"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
-
-	"google.golang.org/protobuf/proto"
 )
 
 type ActivityMgr struct {
@@ -155,21 +154,21 @@ func unmarshalActivityCfg(atype int, buf []byte) (interface{}, error) {
 	switch atype {
 	case 1:
 		cfg := &protoMsg.MiningCfg{}
-		err := proto.Unmarshal(buf, cfg)
+		err := json.Unmarshal(buf, cfg)
 		if err != nil {
 			return nil, err
 		}
 		return cfg, nil
 	case 9:
 		cfg := &protoMsg.ChampionshipCfg{}
-		err := proto.Unmarshal(buf, cfg)
+		err := json.Unmarshal(buf, cfg)
 		if err != nil {
 			return nil, err
 		}
 		return cfg, nil
 	case 10:
 		cfg := &protoMsg.CatReturnGiftCfg{}
-		err := proto.Unmarshal(buf, cfg)
+		err := json.Unmarshal(buf, cfg)
 		if err != nil {
 			return nil, err
 		}
diff --git a/src/server/game/admin.go b/src/server/game/admin.go
index 5c00ded4..5674ba9b 100644
--- a/src/server/game/admin.go
+++ b/src/server/game/admin.go
@@ -11,6 +11,7 @@ import (
 	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
+	"server/msg/meowmentnet"
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
@@ -49,18 +50,18 @@ func AdminProcess(funcName string, args []interface{}) {
 	log.Debug("AdminProcess error: %v", "Func not found")
 }
 
-func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg.ResLogin, accountInfoOut *db.Db_Account) {
-	if detail.Type == msg.LOGIN_TYPE_CODE_LOGIN {
+func VerifyUser(accountInfo *db.Db_Account, detail *meowmentnet.ReqLogin) (ResLogin *meowmentnet.ResLogin, accountInfoOut *db.Db_Account) {
+	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_CodeLogin) {
 		err := VerifyCode(detail.UserName, detail.Code)
 		if err != nil {
-			ResLogin = &msg.ResLogin{
+			ResLogin = &meowmentnet.ResLogin{
 				ResultCode: MergeConst.Protocol_Error_Account_Code_Error,
 				DwUin:      0,
 			}
 			return
 		}
 	}
-	if detail.Type == msg.LOGIN_TYPE_SDK_LOGIN {
+	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_SdkLogin) {
 		if accountInfo == nil {
 			accountInfo = db.GetAccountInfoFromDb(detail.Device)
 		}
@@ -71,22 +72,22 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg
 		}
 	}
 	if accountInfo == nil {
-		ResLogin = &msg.ResLogin{
+		ResLogin = &meowmentnet.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_NoExsit,
 			DwUin:      0,
 		}
 		return
 	}
-	if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN && accountInfo.UserPassword != detail.UserPwd {
-		ResLogin = &msg.ResLogin{
+	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_AccountLogin) && accountInfo.UserPassword != detail.UserPwd {
+		ResLogin = &meowmentnet.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_OR_PWD_ERROR,
 			DwUin:      0,
 		}
 		return
 	}
-	if detail.Type == msg.LOGIN_TYPE_DEVICE_LOGIN {
+	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_DeviceLogin) {
 		if detail.Device != accountInfo.DeviceId {
-			ResLogin = &msg.ResLogin{
+			ResLogin = &meowmentnet.ResLogin{
 				ResultCode: MergeConst.Protocol_Error_Account_Device_Error,
 				DwUin:      0,
 			}
@@ -96,7 +97,7 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg
 
 	playerbaseinfo := db.GetPlayerBaseInfoFromDbByName(detail.UserName)
 	if playerbaseinfo == nil {
-		ResLogin = &msg.ResLogin{
+		ResLogin = &meowmentnet.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_NoExsit,
 			DwUin:      0,
 		}
@@ -104,14 +105,14 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg
 	}
 
 	if playerbaseinfo.Ban > GoUtil.Now() || playerbaseinfo.Ban == -1 {
-		ResLogin = &msg.ResLogin{
+		ResLogin = &meowmentnet.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_Ban,
 			DwUin:      0,
 		}
 		return
 	}
 	accountInfoOut = accountInfo
-	ResLogin = &msg.ResLogin{
+	ResLogin = &meowmentnet.ResLogin{
 		ResultCode: 0,
 		DwUin:      playerbaseinfo.DwUin,
 		FaceBookId: playerbaseinfo.FaceBookId,
@@ -137,7 +138,7 @@ func ReqAdminShipping(args []interface{}) error {
 	}
 	player := G_GameLogicPtr.GetPlayer(int64(orderInfo.Uid))
 	if player != nil {
-		go player.TriggerShippingOrderOrigin(&msg.ReqShippingOrder{
+		go player.TriggerShippingOrderOrigin(&meowmentnet.ReqShippingOrder{
 			OrderSn: req.OrderSn,
 		})
 		res["Msg"] = "player online,triggered sync"
@@ -343,7 +344,7 @@ func AdminShipping(req *msg.ReqOrderShipping) (*msg.ResOrderShipping, error) {
 	// 玩家在线，通知发货
 	player := G_GameLogicPtr.GetPlayer(int64(orderInfo.Uid))
 	if player != nil {
-		go player.TriggerShippingOrderOrigin(&msg.ReqShippingOrder{
+		go player.TriggerShippingOrderOrigin(&meowmentnet.ReqShippingOrder{
 			OrderSn: req.OrderSn,
 		})
 		res.Msg = "player online,triggered sync"
diff --git a/src/server/game/charge_func.go b/src/server/game/charge_func.go
index 8d945e98..427fec7c 100644
--- a/src/server/game/charge_func.go
+++ b/src/server/game/charge_func.go
@@ -16,7 +16,7 @@ import (
 	piggyBank "server/game/mod/piggy_bank"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	proto "server/msg"
+	proto "server/msg/meowmentnet"
 	"strings"
 	"time"
 
diff --git a/src/server/game/external.go b/src/server/game/external.go
index fb6b2733..6242df30 100644
--- a/src/server/game/external.go
+++ b/src/server/game/external.go
@@ -1,6 +1,7 @@
 package game
 
 import (
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"server/MergeConst"
@@ -10,15 +11,12 @@ import (
 	"strings"
 	"time"
 
-	"server/msg"
+	msg "server/msg/meowmentnet"
 
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-
 	"server/db"
 )
 
@@ -73,46 +71,46 @@ func HandleClientReq(args []interface{}) {
 	case "ClientTick":
 	case "ReqChangePassword":
 		detail := &msg.ReqChangePassword{}
-		proto.Unmarshal(buf, detail)
+		GoUtil.Unmarshal(buf, detail)
 		accountInfo := db.GetAccountInfoFromDb(detail.UserName)
 		if accountInfo == nil {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_NoExsit
-			data, _ := proto.Marshal(ResChangePassword)
+			data := GoUtil.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
 		if accountInfo.UserPassword != detail.OldPwd && detail.OldPwd != "-1" {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_OR_PWD_ERROR
-			data, _ := proto.Marshal(ResChangePassword)
+			data := GoUtil.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
-		if strings.Count(detail.NewPwd, "")-1 < 6 {
+		if strings.Count(detail.NewPwd_, "")-1 < 6 {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_OR_PWD_Short
-			data, _ := proto.Marshal(ResChangePassword)
+			data := GoUtil.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
-		accountInfo.UserPassword = detail.NewPwd
+		accountInfo.UserPassword = detail.NewPwd_
 		err := db.UpdateAccountInfoToDb(accountInfo)
 		if err != nil {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_Fail
-			data, _ := proto.Marshal(ResChangePassword)
+			data := GoUtil.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
 		ResChangePassword := &msg.ResChangePassword{}
 		ResChangePassword.ResultCode = 0
-		data, _ := proto.Marshal(ResChangePassword)
+		data := GoUtil.Marshal(ResChangePassword)
 		G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 	case "ReqAdminInfo": // 后台接口
 		AdminProcess(m.GetFunc(), []interface{}{a, buf})
 	case "ReqLoginCode":
-		detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf)
+		detailMsg, err := UnmarshalThriftMessageByName(m.GetFunc(), buf)
 		if err != nil {
 			log.Error("unmarshal %s failed: %v", m.GetFunc(), err)
 			return
@@ -125,13 +123,13 @@ func HandleClientReq(args []interface{}) {
 			ResLoginCode.Msg = err.Error()
 		}
 		ResLoginCode.Code = Code
-		data, _ := proto.Marshal(ResLoginCode)
+		data := GoUtil.Marshal(ResLoginCode)
 		G_GameLogicPtr.PackResInfo(a, "ResLoginCode", data)
 	case "ReqServerVersion":
 		G_GameLogicPtr.SendServerVersion(a)
 	case "ReqRegisterAccount":
 		detail := &msg.ReqRegisterAccount{}
-		proto.Unmarshal(buf, detail)
+		GoUtil.Unmarshal(buf, detail)
 		log.Debug("player %s start register", detail.UserName)
 		gl := G_getGameLogic()
 		defer func() {
@@ -143,7 +141,7 @@ func HandleClientReq(args []interface{}) {
 		if gl.IsExsitAccount(detail.UserName) {
 			ResRegisterAccount := &msg.ResRegisterAccount{}
 			ResRegisterAccount.ResultCode = MergeConst.Protocol_Error_Account_Exist
-			data, _ := proto.Marshal(ResRegisterAccount)
+			data := GoUtil.Marshal(ResRegisterAccount)
 			gl.PackResInfo(a, "ResRegisterAccount", data)
 			break
 		}
@@ -152,17 +150,17 @@ func HandleClientReq(args []interface{}) {
 		if !gl.NewAccountInsertDataToDB() {
 			ResRegisterAccount := &msg.ResRegisterAccount{}
 			ResRegisterAccount.ResultCode = MergeConst.Protocol_Error_Account_Fail
-			data, _ := proto.Marshal(ResRegisterAccount)
+			data := GoUtil.Marshal(ResRegisterAccount)
 			gl.PackResInfo(a, "ResRegisterAccount", data)
 			break
 		}
 		ResRegisterAccount := &msg.ResRegisterAccount{}
 		ResRegisterAccount.ResultCode = 0
-		data, _ := proto.Marshal(ResRegisterAccount)
+		data := GoUtil.Marshal(ResRegisterAccount)
 		gl.PackResInfo(a, "ResRegisterAccount", data)
 	case "ReqLogin": // 登录请求
 		detail := &msg.ReqLogin{}
-		proto.Unmarshal(buf, detail)
+		GoUtil.Unmarshal(buf, detail)
 		accountInfo := db.GetAccountInfoFromDb(detail.UserName)
 		log.Debug("player %s start login", detail.UserName)
 		defer func() {
@@ -206,10 +204,10 @@ func HandleClientReq(args []interface{}) {
 		log.Debug("uid : %d, init user process : %s, execTime : %v , isNew: %v", p.(*Player).M_DwUin, m.GetFunc(), time.Since(start), newPlayer)
 	case "ReqServerTime": // 获取服务器时间
 		detail := &msg.ReqServerTime{}
-		proto.Unmarshal(buf, detail)
+		GoUtil.Unmarshal(buf, detail)
 		res := &msg.ResServerTime{}
 		res.ServerTime = (int32)(time.Now().Unix())
-		data, _ := proto.Marshal(res)
+		data := GoUtil.Marshal(res)
 		G_getGameLogic().PackResInfo(a, "ResServerTime", data)
 	case "ReqOfflineReconnect": // 断线重连
 		ReqOfflineReconnectFunc(a, buf)
@@ -232,7 +230,7 @@ func HandleClientReq(args []interface{}) {
 			p.(*Player).args = make(map[string]interface{})
 			p.(*Player).args["func"] = m
 			p.(*Player).args["agent"] = a
-			detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf)
+			detailMsg, err := UnmarshalThriftMessageByName(m.GetFunc(), buf)
 			if err != nil {
 				log.Error("uid : %d, func : %s, unmarshal error : %s", p.(*Player).M_DwUin, m.GetFunc(), err)
 				p.(*Player).TeLog("func_unmarshal_error", map[string]interface{}{
@@ -253,8 +251,12 @@ func HandleClientReq(args []interface{}) {
 			}
 			str := ""
 			if conf.Server.GameName == "pet_home" || conf.Server.GameName == "merge_pet_sdk" {
-				strbuf, _ := protojson.Marshal(detailMsg)
-				str = string(strbuf)
+				jsonBuf, err := json.Marshal(detailMsg)
+				if err != nil {
+					log.Error("marshal %s to json failed: %v", m.GetFunc(), err)
+					return
+				}
+				str = string(jsonBuf)
 			}
 			p.(*Player).ProcessTrigger()
 			p.(*Player).TeLog("func_exec_time", map[string]interface{}{
diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go
index a9798d7d..711e9a9d 100644
--- a/src/server/game/gm_handler.go
+++ b/src/server/game/gm_handler.go
@@ -30,7 +30,7 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/playroom"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"strconv"
 	"strings"
 	"time"
@@ -58,11 +58,11 @@ func ReqGmCommand_(player *Player, Command string) error {
 	case "additem":
 		id, _ := strconv.Atoi(arg[1])
 		num, _ := strconv.Atoi(arg[2])
-		player.HandleItem([]*item.Item{item.NewItem(id, num)}, msg.ITEM_POP_LABEL_GM.String())
+		player.HandleItem([]*item.Item{item.NewItem(id, num)}, msg.ITEM_POP_LABEL_Gm.String())
 	case "subitem":
 		id, _ := strconv.Atoi(arg[1])
 		num, _ := strconv.Atoi(arg[2])
-		player.HandleItem([]*item.Item{item.NewItem(id, -num)}, msg.ITEM_POP_LABEL_GM.String())
+		player.HandleItem([]*item.Item{item.NewItem(id, -num)}, msg.ITEM_POP_LABEL_Gm.String())
 	case "reset_order":
 		player.PlayMod.mod_list.Order.Step = 0
 		player.PlayMod.mod_list.Order.InitData()
@@ -562,7 +562,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 				})
 			}
 		}
-		player.HandleItem(items, msg.ITEM_POP_LABEL_GM.String())
+		player.HandleItem(items, msg.ITEM_POP_LABEL_Gm.String())
 	case "resetCompensation":
 		compensationMod := player.PlayMod.getCompensationMod()
 		compensationMod.C20250910 = false
diff --git a/src/server/game/limited_time_trigger.go b/src/server/game/limited_time_trigger.go
index 43b7e824..42347fb8 100644
--- a/src/server/game/limited_time_trigger.go
+++ b/src/server/game/limited_time_trigger.go
@@ -11,7 +11,7 @@ import (
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/playroom"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"time"
 )
 
diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go
index 873c7ec3..de215b84 100644
--- a/src/server/game/message_handler.go
+++ b/src/server/game/message_handler.go
@@ -24,7 +24,7 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/playroom"
 	GoUtil "server/game_util"
-	proto "server/msg"
+	proto "server/msg/meowmentnet"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
@@ -905,12 +905,12 @@ func (player *Player) AddOrder() {
 		preheatStep := OrderMod.PreheatStep[chessColor]
 		OrderMod.PreheatStep[chessColor]++
 		if preheatStep < 4 {
-			newChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+preheatStep+1, chessColor)
+			NewChessId_ := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+preheatStep+1, chessColor)
 			items, ok := order.PreheatItems[OrderMod.PreheatStep[chessColor]]
 			if !ok {
-				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{newChessId}, ChessMod.GetStarEmitList()))}
+				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId_}, ChessMod.GetStarEmitList()))}
 			}
-			OrderMod.AddPreheatOrder([]int{newChessId}, order.DIFF_LOW, order.Preheat_type, items)
+			OrderMod.AddPreheatOrder([]int{NewChessId_}, order.DIFF_LOW, order.Preheat_type, items)
 		}
 	}
 	for _, v := range OrderMod.OrderList {
@@ -946,13 +946,13 @@ func (player *Player) FixOrderBug() {
 		if exit {
 			continue
 		}
-		newChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+v+1, k)
+		NewChessId_ := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+v+1, k)
 		OrderMod.PreheatStep[k]++
 		items, ok := order.PreheatItems[OrderMod.PreheatStep[k]]
 		if !ok {
-			items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{newChessId}, ChessMod.GetStarEmitList()))}
+			items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId_}, ChessMod.GetStarEmitList()))}
 		}
-		OrderMod.AddPreheatOrder([]int{newChessId}, order.DIFF_LOW, order.Preheat_type, items)
+		OrderMod.AddPreheatOrder([]int{NewChessId_}, order.DIFF_LOW, order.Preheat_type, items)
 	}
 }
 
diff --git a/src/server/game/mod/avatar/Avatar.go b/src/server/game/mod/avatar/Avatar.go
index da2f3ca4..9bd58150 100644
--- a/src/server/game/mod/avatar/Avatar.go
+++ b/src/server/game/mod/avatar/Avatar.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	avatarCfg "server/conf/avatar"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type AvatarMod struct {
diff --git a/src/server/game/mod/base/Base.go b/src/server/game/mod/base/Base.go
index 85fbf4b0..fc06fc93 100644
--- a/src/server/game/mod/base/Base.go
+++ b/src/server/game/mod/base/Base.go
@@ -6,7 +6,7 @@ import (
 	baseCfg "server/conf/base"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 const (
diff --git a/src/server/game/mod/card/Card.go b/src/server/game/mod/card/Card.go
index 7f9f5c51..ddf4224e 100644
--- a/src/server/game/mod/card/Card.go
+++ b/src/server/game/mod/card/Card.go
@@ -5,7 +5,7 @@ import (
 	cardCfg "server/conf/card"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 )
diff --git a/src/server/game/mod/champship/Champship.go b/src/server/game/mod/champship/Champship.go
index 4f961b76..cb4cee00 100644
--- a/src/server/game/mod/champship/Champship.go
+++ b/src/server/game/mod/champship/Champship.go
@@ -6,7 +6,7 @@ import (
 	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type ChampshipMod struct {
diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go
index 6103ace3..f48ee622 100644
--- a/src/server/game/mod/charge/Charge.go
+++ b/src/server/game/mod/charge/Charge.go
@@ -9,7 +9,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/order"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 )
diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go
index a89b1d57..7b498bc7 100644
--- a/src/server/game/mod/chess/Chess.go
+++ b/src/server/game/mod/chess/Chess.go
@@ -8,7 +8,7 @@ import (
 	userCfg "server/conf/user"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 	"strings"
 )
@@ -401,7 +401,7 @@ func (cb *ChessBorad) FinishOrderChessByBag(chess int) error {
 }
 
 // 棋子转换
-func (cb *ChessBorad) ExChess(oldChessId, newChessId int) error {
+func (cb *ChessBorad) ExChess(oldChessId, NewChessId_ int) error {
 	if oldChessId > 0 {
 		newList, b := GoUtil.PopElemSlice(cb.ChessList, oldChessId)
 		if !b {
@@ -409,7 +409,7 @@ func (cb *ChessBorad) ExChess(oldChessId, newChessId int) error {
 		}
 		cb.ChessList = newList
 	}
-	return cb.AddChess(newChessId)
+	return cb.AddChess(NewChessId_)
 }
 
 // 增加棋盘缓冲器
diff --git a/src/server/game/mod/collect/Collect.go b/src/server/game/mod/collect/Collect.go
index d6eac176..cc509c4c 100644
--- a/src/server/game/mod/collect/Collect.go
+++ b/src/server/game/mod/collect/Collect.go
@@ -5,7 +5,7 @@ import (
 	collectCfg "server/conf/collect"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type Collect struct {
diff --git a/src/server/game/mod/daily_task/DailyTask.go b/src/server/game/mod/daily_task/DailyTask.go
index 8a2ec057..b673f024 100644
--- a/src/server/game/mod/daily_task/DailyTask.go
+++ b/src/server/game/mod/daily_task/DailyTask.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go
index b5bfac39..ba5b691d 100644
--- a/src/server/game/mod/decorate/Decorate.go
+++ b/src/server/game/mod/decorate/Decorate.go
@@ -8,7 +8,7 @@ import (
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 )
 
diff --git a/src/server/game/mod/emoji/emoji.go b/src/server/game/mod/emoji/emoji.go
index f55a1669..fcaa48bc 100644
--- a/src/server/game/mod/emoji/emoji.go
+++ b/src/server/game/mod/emoji/emoji.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	emojiCfg "server/conf/emoji"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type EmojiMod struct {
diff --git a/src/server/game/mod/endless/Endless.go b/src/server/game/mod/endless/Endless.go
index 7fcbd28a..f5e75b96 100644
--- a/src/server/game/mod/endless/Endless.go
+++ b/src/server/game/mod/endless/Endless.go
@@ -5,7 +5,7 @@ import (
 	"math"
 	endlessCfg "server/conf/endless"
 	"server/game/mod/item"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 )
 
diff --git a/src/server/game/mod/face/Face.go b/src/server/game/mod/face/Face.go
index 91c8050d..a670541f 100644
--- a/src/server/game/mod/face/Face.go
+++ b/src/server/game/mod/face/Face.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	faceCfg "server/conf/face"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type FaceMod struct {
diff --git a/src/server/game/mod/friend/Friend.go b/src/server/game/mod/friend/Friend.go
index 23955cf1..e46c7d53 100644
--- a/src/server/game/mod/friend/Friend.go
+++ b/src/server/game/mod/friend/Friend.go
@@ -7,7 +7,7 @@ import (
 	"server/game/mod/card"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 )
 
diff --git a/src/server/game/mod/friend_treasure.go/friend_treasure.go b/src/server/game/mod/friend_treasure.go/friend_treasure.go
index 6f7e086d..a9ca4cd2 100644
--- a/src/server/game/mod/friend_treasure.go/friend_treasure.go
+++ b/src/server/game/mod/friend_treasure.go/friend_treasure.go
@@ -5,7 +5,7 @@ import (
 	friendTreasureCfg "server/conf/friend_treasure"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type FriendTreasureMod struct {
diff --git a/src/server/game/mod/fur/fur.go b/src/server/game/mod/fur/fur.go
index 6a68f166..6c783c2f 100644
--- a/src/server/game/mod/fur/fur.go
+++ b/src/server/game/mod/fur/fur.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	fur_cfg "server/conf/fur"
 	"server/game/mod/item"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type FurMod struct {
diff --git a/src/server/game/mod/guide/Guide.go b/src/server/game/mod/guide/Guide.go
index 6a6c4785..caba0c97 100644
--- a/src/server/game/mod/guide/Guide.go
+++ b/src/server/game/mod/guide/Guide.go
@@ -5,7 +5,7 @@ import (
 	guidecfg "server/conf/guide"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type Guide struct {
diff --git a/src/server/game/mod/guide_task/guide_task.go b/src/server/game/mod/guide_task/guide_task.go
index 7df792f8..f9d5d374 100644
--- a/src/server/game/mod/guide_task/guide_task.go
+++ b/src/server/game/mod/guide_task/guide_task.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type GuideTaskMod struct {
diff --git a/src/server/game/mod/handbook/Handbook.go b/src/server/game/mod/handbook/Handbook.go
index 7bd3ee6c..ec2f1e1a 100644
--- a/src/server/game/mod/handbook/Handbook.go
+++ b/src/server/game/mod/handbook/Handbook.go
@@ -6,7 +6,7 @@ import (
 	handbookCfg "server/conf/handbook"
 	startMergeCfg "server/conf/start_merge"
 	"server/game/mod/item"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type Handbook struct {
diff --git a/src/server/game/mod/invite/invite.go b/src/server/game/mod/invite/invite.go
index b737b9dc..bc287571 100644
--- a/src/server/game/mod/invite/invite.go
+++ b/src/server/game/mod/invite/invite.go
@@ -5,7 +5,7 @@ import (
 	inviteCfg "server/conf/invite"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type InviteMod struct {
diff --git a/src/server/game/mod/item/Item.go b/src/server/game/mod/item/Item.go
index a5b3f892..c1690b80 100644
--- a/src/server/game/mod/item/Item.go
+++ b/src/server/game/mod/item/Item.go
@@ -3,7 +3,7 @@ package item
 import (
 	"fmt"
 	"math"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type Item struct {
diff --git a/src/server/game/mod/kv/kv.go b/src/server/game/mod/kv/kv.go
index 6700eac5..640179ea 100644
--- a/src/server/game/mod/kv/kv.go
+++ b/src/server/game/mod/kv/kv.go
@@ -2,7 +2,7 @@ package kv
 
 import (
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type KvMod struct {
diff --git a/src/server/game/mod/limited_time_event/limited_time_event.go b/src/server/game/mod/limited_time_event/limited_time_event.go
index 2d8f7423..20014970 100644
--- a/src/server/game/mod/limited_time_event/limited_time_event.go
+++ b/src/server/game/mod/limited_time_event/limited_time_event.go
@@ -7,7 +7,7 @@ import (
 	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 const (
@@ -537,29 +537,29 @@ func getLimitEventMsg(eType int, event *LTEInfo) *msg.LimitEvent {
 		if !ok {
 			return nil
 		}
-		param[msg.LimitEventParam_LUCKY_CAT_EARNINGS.String()] = int32(d.MaxEarings)
+		param[msg.LimitEventParam_LuckyCatEarnings.String()] = int32(d.MaxEarings)
 	case EVENT_TYPE_CAT_TRICK:
 		d, ok := event.D.(*CatTrick)
 		if !ok {
 			return nil
 		}
 		energy := d.Energy
-		param[msg.LimitEventParam_CAT_TRICK_ENERGY.String()] = int32(energy)
+		param[msg.LimitEventParam_CatTrickEnergy.String()] = int32(energy)
 	case EVENT_TYPE_PAYBACK_DAY:
 		d, ok := event.D.(*PaybackDay)
 		if !ok {
 			return nil
 		}
-		param[msg.LimitEventParam_PAYBACK_DAY_COUNT.String()] = int32(d.Count)
+		param[msg.LimitEventParam_PaybackDayCount.String()] = int32(d.Count)
 	case EVENT_TYPE_SENCE_DASH:
 		times := GoUtil.Int(event.Info["Times"])
-		param[msg.LimitEventParam_SENCE_DASH_TIMES.String()] = int32(times)
+		param[msg.LimitEventParam_SenceDashTimes.String()] = int32(times)
 	}
 	return &msg.LimitEvent{
 		EndTime:   endTime,
 		ShowTime:  showTime,
 		Cd:        int32(cd),
-		Mul:       float32(mul),
+		Mul:       float64(mul),
 		StartTime: int32(event.StartT),
 		Param:     param,
 	}
diff --git a/src/server/game/mod/mail/Mail.go b/src/server/game/mod/mail/Mail.go
index 7bd16127..fe5eeac9 100644
--- a/src/server/game/mod/mail/Mail.go
+++ b/src/server/game/mod/mail/Mail.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type MailMod struct {
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index 3be4d046..fe8992d0 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -6,7 +6,7 @@ import (
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"strings"
 	"time"
 )
@@ -344,19 +344,19 @@ func (o *OrderMod) CreatePriorityOrder(lv int, emit []int) bool {
 					if B == 1 {
 						newColor := GoUtil.RandStringSlice(produce[1:])
 						diffLv := GoUtil.RandMap(map[int]int{DIFF_LOW: 70, DIFF_MID: 30})
-						newChessId := 0
+						NewChessId_ := 0
 						switch diffLv {
 						case DIFF_LOW:
 							newLv := GoUtil.RandNum(4, 3+durLv)
-							newChessId = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
+							NewChessId_ = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
 						case DIFF_MID:
 							newLv := GoUtil.RandNum(4+durLv, 3+durLv*2)
-							newChessId = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
+							NewChessId_ = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
 						}
-						if newChessId == 0 {
+						if NewChessId_ == 0 {
 							continue
 						}
-						o.addOrder([]int{newChessId}, diffLv, Common_type)
+						o.addOrder([]int{NewChessId_}, diffLv, Common_type)
 						return true
 					}
 				}
@@ -701,16 +701,16 @@ func (o *OrderMod) ChangeEnergyMul(lv int, emit []int, energyMul int, chessList
 			chessId := v.MergeId[0]
 			chessColor := mergeDataCfg.GetColorById(chessId)
 			preheatStep := o.PreheatStep[chessColor]
-			newChessId := mergeDataCfg.GetChessIdByLvAndColor(energyMul+preheatStep, chessColor)
-			if newChessId == 0 {
+			NewChessId_ := mergeDataCfg.GetChessIdByLvAndColor(energyMul+preheatStep, chessColor)
+			if NewChessId_ == 0 {
 				continue
 			}
 			delete(o.OrderList, k)
 			items, ok := PreheatItems[preheatStep]
 			if !ok {
-				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, GetOrderStar([]int{newChessId}, emit))}
+				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, GetOrderStar([]int{NewChessId_}, emit))}
 			}
-			o.addPreheatOrder([]int{newChessId}, DIFF_LOW, Preheat_type, items)
+			o.addPreheatOrder([]int{NewChessId_}, DIFF_LOW, Preheat_type, items)
 		}
 	}
 
diff --git a/src/server/game/mod/piggy_bank/piggy_bank.go b/src/server/game/mod/piggy_bank/piggy_bank.go
index 32d40731..94be5d0c 100644
--- a/src/server/game/mod/piggy_bank/piggy_bank.go
+++ b/src/server/game/mod/piggy_bank/piggy_bank.go
@@ -4,7 +4,7 @@ import (
 	chargeCfg "server/conf/charge"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type PiggyBankMod struct {
diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go
index 7fb17dda..418472b7 100644
--- a/src/server/game/mod/playroom/playroom.go
+++ b/src/server/game/mod/playroom/playroom.go
@@ -8,7 +8,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 )
 
diff --git a/src/server/game/mod/quest/Quest.go b/src/server/game/mod/quest/Quest.go
index a3226e80..9f51fe4e 100644
--- a/src/server/game/mod/quest/Quest.go
+++ b/src/server/game/mod/quest/Quest.go
@@ -3,7 +3,7 @@ package quest
 import (
 	"fmt"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"strconv"
 	"strings"
 )
diff --git a/src/server/game/mod/seven_login/seven_login.go b/src/server/game/mod/seven_login/seven_login.go
index e07bfb3d..7aa0dee9 100644
--- a/src/server/game/mod/seven_login/seven_login.go
+++ b/src/server/game/mod/seven_login/seven_login.go
@@ -5,7 +5,7 @@ import (
 	sevenLoginCfg "server/conf/seven_login"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 type SevenLoginMod struct {
diff --git a/src/server/game/notification.go b/src/server/game/notification.go
index 00528b59..b14d66b3 100644
--- a/src/server/game/notification.go
+++ b/src/server/game/notification.go
@@ -5,7 +5,7 @@ import (
 	languageCfg "server/conf/language"
 	notification_cfg "server/conf/notification"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 const (
diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go
index 84a000d9..b966f056 100644
--- a/src/server/game/player_back.go
+++ b/src/server/game/player_back.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	limitedTimeEvent "server/game/mod/limited_time_event"
 	GoUtil "server/game_util"
-	proto "server/msg"
+	proto "server/msg/meowmentnet"
 )
 
 func (p *Player) NotifyPlayroomTask() {
@@ -286,7 +286,7 @@ func (p *Player) ChargeBackData() {
 		specialChargeWeek = int32(GoUtil.FullWeeksSince(c.LastSpecialCharge))
 	}
 	p.PushClientRes(&proto.ResCharge{
-		Charge:            float32(c.Charge),
+		Charge:            float64(c.Charge),
 		Total:             int32(c.Total),
 		First:             GoUtil.MapIntToSlice(c.EnergyShop),
 		SpecialShop:       specialShop,
@@ -294,10 +294,10 @@ func (p *Player) ChargeBackData() {
 		ChessShop:         chessShop,
 		Gift:              GoUtil.MapIntToInt32(c.Gift),
 		Ad:                c.Ad,
-		SpecialCharge:     float32(c.SpecialCharge),
+		SpecialCharge:     float64(c.SpecialCharge),
 		SpecialChargeWeek: specialChargeWeek,
-		TodayCharge:       float32(c.TodayCharge),
-		MonthCharge:       float32(c.MonthCharge),
+		TodayCharge:       float64(c.TodayCharge),
+		MonthCharge:       float64(c.MonthCharge),
 		Wish:              resWish,
 		AdEndTime:         c.AdEndTime,
 		WeeklyDiscount:    weeklyDiscount,
diff --git a/src/server/game/player_base_mod.go b/src/server/game/player_base_mod.go
index cedc8ad1..5145f32d 100644
--- a/src/server/game/player_base_mod.go
+++ b/src/server/game/player_base_mod.go
@@ -14,12 +14,10 @@ import (
 	Msg "server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/quest"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
-
-	"google.golang.org/protobuf/proto"
 )
 
 type PlayerBaseData struct {
@@ -203,10 +201,7 @@ func (p *PlayerBaseData) ReqRemoveAd(player *Player, req *msg.ReqRemoveAd) {
 	res := &msg.ResRemoveAd{}
 	p.Data.NoAd = 1
 	res.ResultCode = 0
-
-	agent := player.GetAgentByPlayer()
-	data, _ := proto.Marshal(res)
-	G_getGameLogic().PackResInfo(agent, "ResRemoveAd", data)
+	player.PushClientRes(res)
 }
 
 func (p *PlayerBaseData) ResPlayerBaseInfo(player *Player) {
@@ -255,10 +250,8 @@ func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, req *msg.ReqBind
 	}
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.FackBookId = req.BindAccountId
-	agent := player.GetAgentByPlayer()
-	data, _ := proto.Marshal(res)
 	p.SaveDataFromDB("")
-	G_getGameLogic().PackResInfo(agent, "ResBindFacebookAccount", data)
+	player.PushAndSendClienRes(res)
 }
 
 func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFacebook) {
@@ -268,10 +261,8 @@ func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFac
 	p.Data.FaceBookId = ""
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.FackBookId = ""
-	agent := player.GetAgentByPlayer()
-	data, _ := proto.Marshal(res)
-	G_getGameLogic().PackResInfo(agent, "ResUnBindFacebook", data)
 	p.SaveDataFromDB("")
+	player.PushAndSendClienRes(res)
 	player.TeLog("platform_disconnect", map[string]interface{}{
 		"platform_type": "Facebook",
 		"platform_id":   req.BindAccountId,
@@ -332,9 +323,7 @@ func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, req *msg.ReqOnlyBin
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.FackBookId = req.BindAccountId
 	p.SaveDataFromDB("")
-	agent := player.GetAgentByPlayer()
-	data, _ := proto.Marshal(res)
-	G_getGameLogic().PackResInfo(agent, "ResOnlyBindFacebook", data)
+	player.PushAndSendClienRes(res)
 }
 
 func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData) {
@@ -342,7 +331,7 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 	sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?"
 	sqlStruck := db.ResPlayerBaseInfo{}
 	isHaveOther := false
-	if err := db.SqlDb.Get(&sqlStruck, sqlStr, req.NewFBId); err != nil {
+	if err := db.SqlDb.Get(&sqlStruck, sqlStr, req.NewFBId_); err != nil {
 		isHaveOther = false
 	} else {
 		isHaveOther = true
@@ -352,13 +341,9 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 	}
 	oldPlayer := G_GameLogicPtr.GetPlayer(sqlStruck.DwUin)
 	if oldPlayer != nil {
-		agent := oldPlayer.GetAgentByPlayer()
 		// notify := &msg.ForceKickOut{}
 		notify := &msg.ResSynGameData{}
-		data, _ := proto.Marshal(notify)
-		if agent != nil {
-			G_getGameLogic().PackResInfo(agent, "ResSynGameData", data)
-		}
+		oldPlayer.PushAndSendClienRes(notify)
 		oldPlayer.ClearData()
 		G_GameLogicPtr.M_Players.Delete(sqlStruck.DwUin)
 	}
@@ -392,9 +377,9 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 				return
 			}
 
-			sqlStruck.FaceBookId = req.NewFBId
+			sqlStruck.FaceBookId = req.NewFBId_
 			sqlStruck.UserName = userName
-			_, err = db.SqlDb.Exec("update t_player_baseinfo set user_name = ?, FaceBookId = ? where dwUin = ?", userName, req.NewFBId, sqlStruck.DwUin)
+			_, err = db.SqlDb.Exec("update t_player_baseinfo set user_name = ?, FaceBookId = ? where dwUin = ?", userName, req.NewFBId_, sqlStruck.DwUin)
 			if err != nil {
 				tx.Rollback()
 				return
@@ -421,9 +406,7 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 		"platform_type": "facebook",
 	})
 	p.SaveDataFromDB("")
-	agent := player.GetAgentByPlayer()
-	data, _ := proto.Marshal(res)
-	G_getGameLogic().PackResInfo(agent, "ResSynGameData", data)
+	player.PushAndSendClienRes(res)
 }
 
 func (p *PlayerBaseData) ClearData() bool {
diff --git a/src/server/game/player_chess_mod.go b/src/server/game/player_chess_mod.go
index fb34d214..cc054398 100644
--- a/src/server/game/player_chess_mod.go
+++ b/src/server/game/player_chess_mod.go
@@ -11,12 +11,10 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
-
-	"google.golang.org/protobuf/proto"
 )
 
 type PlayerChessData struct {
@@ -35,19 +33,15 @@ func (p *PlayerChessData) SaveDataFromDB(key interface{}) bool {
 }
 
 func (p *PlayerChessData) ResPlayerChessData(player *Player) {
-	agent := player.GetAgentByPlayer()
 	res := &p.Data
 	ChessMod := player.PlayMod.getChessMod()
 	res.ChessList = ChessMod.BackData().ChessList
 	res.MChessData = ChessMod.ChessMap
-	data, _ := proto.Marshal(res)
-	G_getGameLogic().PackResInfo(agent, "ResPlayerChessData", data)
+	player.PushClientRes(res)
 }
 
 func (p *PlayerChessData) ResChessColorData(player *Player) {
-	agent := player.GetAgentByPlayer()
-	data, _ := proto.Marshal(&p.ColorData)
-	G_getGameLogic().PackResInfo(agent, "ResChessColorData", data)
+	player.PushClientRes(&p.ColorData)
 }
 
 // 同步棋盘数据
@@ -57,7 +51,7 @@ func (p *PlayerChessData) UpdatePlayerChessData(player *Player, req *msg.UpdateP
 	addChessList, addNewEmit, err := p.HandleChess(player, update.MChessHandle)
 	if err != nil {
 		res := &msg.ResUpdatePlayerChessData{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		}
 		handleStr := ""
@@ -72,12 +66,12 @@ func (p *PlayerChessData) UpdatePlayerChessData(player *Player, req *msg.UpdateP
 		return err
 	}
 	player.PushClientRes(&msg.ResUpdatePlayerChessData{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	p.Data.MChessData = update.MChessData
 	if !p.checkChessEqual(player) {
 		res := &msg.ResUpdatePlayerChessData{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "棋子数据不一致",
 		}
 		handleStr := ""
@@ -110,7 +104,7 @@ func (p *PlayerChessData) UpdateChessData(player *Player, mChessData map[string]
 	p.Data.MChessData = mChessData
 	if !p.checkChessEqual(player) {
 		res := &msg.ResUpdatePlayerChessData{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "棋子数据不一致",
 		}
 		log.Debug("棋子数据不一致地图, %v---%v---%v", player.PlayMod.getChessMod().ChessMap, p.Data.MChessData, player.PlayMod.getChessMod().GetChessList())
@@ -202,7 +196,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 		chessId := int(v.ChessId)
 		emitId := int(v.Emit)
 		switch v.Type {
-		case msg.HANDLE_TYPE_ADD: //增加棋子
+		case msg.HANDLE_TYPE_Add: //增加棋子
 			err := ChessMod.AddChess(chessId)
 			if err != nil {
 				return nil, nil, err
@@ -222,25 +216,25 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 				addNewEmit = append(addNewEmit, chessId)
 			}
 			player.PushClientRes(HandbookMod.BackData())
-		case msg.HANDLE_TYPE_COMPOSE: //合成棋子
-			newChessId, err := ChessMod.ComposeChess(chessId)
+		case msg.HANDLE_TYPE_Compose: //合成棋子
+			NewChessId_, err := ChessMod.ComposeChess(chessId)
 			if err != nil {
 				return nil, nil, err
 			}
-			b := HandbookMod.SetHandbook(newChessId) // 添加图鉴
+			b := HandbookMod.SetHandbook(NewChessId_) // 添加图鉴
 			if b {
-				addNewEmit = append(addNewEmit, newChessId)
+				addNewEmit = append(addNewEmit, NewChessId_)
 			}
-			addChessList = append(addChessList, newChessId)
-			newChessIdLv := mergeDataCfg.GetLvById(newChessId)
-			TriggerList = append(TriggerList, &quest.Trigger{Label: quest.TRIGGER_LABEL_MERGELVTIME, A: []interface{}{newChessIdLv}})
+			addChessList = append(addChessList, NewChessId_)
+			NewChessId_Lv := mergeDataCfg.GetLvById(NewChessId_)
+			TriggerList = append(TriggerList, &quest.Trigger{Label: quest.TRIGGER_LABEL_MERGELVTIME, A: []interface{}{NewChessId_Lv}})
 			TriggerList = append(TriggerList, &quest.Trigger{Label: quest.TRIGGER_LABEL_MERGETIME})
 			player.PushClientRes(HandbookMod.BackData())
-			triggerComposeChess(player, newChessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
+			triggerComposeChess(player, NewChessId_, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
 			// 获取活动道具
 			ActItem := player.GetActivityItem(GoUtil.Int32ToInt(v.ActType))
 			itemList = item.Merge(itemList, ActItem)
-		case msg.HANDLE_TYPE_BUY: //购买棋子
+		case msg.HANDLE_TYPE_Buy: //购买棋子
 			loseGold, err := ChessMod.BuyChess(chessId)
 			if err != nil {
 				return nil, nil, err
@@ -248,7 +242,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 			addChessList = append(addChessList, chessId)
 			buyChess += loseGold
 			itemList = append(itemList, &item.Item{Id: item.ITEM_STAR_ID, Num: int(-loseGold)})
-		case msg.HANDLE_TYPE_SELL: //出售棋子
+		case msg.HANDLE_TYPE_Sell: //出售棋子
 			items, err := ChessMod.SellChess(chessId)
 			if checkChess(chessId, BaseMod.GetEnergyMul(), ChessMod.GetEmitList()) { // 在订单中无法生成的棋子 出售获得原价宠物币
 				items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: mergeDataCfg.GetStarById(chessId)}}
@@ -278,7 +272,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 			// 获取活动道具
 			ActItem := player.GetActivityItem(GoUtil.Int32ToInt(v.ActType))
 			itemList = item.Merge(itemList, ActItem)
-		case msg.HANDLE_TYPE_REMOVE: //移除棋子
+		case msg.HANDLE_TYPE_Remove: //移除棋子
 			ChessMod.RemoveChess(chessId)
 		}
 
diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index abfc26ab..dac0e32d 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -28,7 +28,7 @@ import (
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"strconv"
 	"sync"
 	"time"
@@ -38,9 +38,8 @@ import (
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/robfig/cron/v3"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // import "reflect"
@@ -147,25 +146,25 @@ func (p *Player) SendClientRes() {
 	p.Msg = make([]PlayerMsg, 0)
 }
 
-func (p *Player) PushClientRes(m proto.Message) {
+func (p *Player) PushClientRes(m thrift.TStruct) {
 	key := GetStructName(m)
-	buff, _ := proto.Marshal(m)
+	data := GoUtil.Marshal(m)
 	p.Msg = append(p.Msg, PlayerMsg{
 		F: key,
-		B: buff,
+		B: data,
 	})
 }
 
-func (p *Player) PushAndSendClienRes(m proto.Message) {
+func (p *Player) PushAndSendClienRes(m thrift.TStruct) {
 	key := GetStructName(m)
-	buff, _ := proto.Marshal(m)
-	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, buff)
+	data := GoUtil.Marshal(m)
+	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, data)
 }
 
-func (p *Player) SendErrClienRes(m proto.Message) {
+func (p *Player) SendErrClienRes(m thrift.TStruct) {
 	key := GetStructName(m)
-	buff, _ := proto.Marshal(m)
-	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, buff)
+	data := GoUtil.Marshal(m)
+	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, data)
 }
 
 func (p *Player) QuestTrigger(tr *quest.Trigger) {
diff --git a/src/server/game/proto_factory.go b/src/server/game/proto_factory.go
index 30be0252..a9afb006 100644
--- a/src/server/game/proto_factory.go
+++ b/src/server/game/proto_factory.go
@@ -1,17 +1,23 @@
 package game
 
 import (
+	"context"
 	"fmt"
+	"reflect"
+	"server/msg"
 	"sync"
 
+	thrift "github.com/apache/thrift/lib/go/thrift"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
 var (
-	protoMessageTypeCacheOnce sync.Once
-	protoMessageTypeByName    sync.Map
+	protoMessageTypeCacheOnce  sync.Once
+	protoMessageTypeByName     sync.Map
+	thriftMessageTypeCacheOnce sync.Once
+	thriftMessageTypeByName    sync.Map
 )
 
 func buildProtoMessageTypeCache() {
@@ -26,6 +32,24 @@ func buildProtoMessageTypeCache() {
 	})
 }
 
+func buildThriftMessageTypeCache() {
+	msg.Processor.Range(func(_ uint16, msgType reflect.Type) {
+		if msgType == nil || msgType.Kind() != reflect.Ptr {
+			return
+		}
+
+		elemType := msgType.Elem()
+		if elemType.Name() != "" {
+			thriftMessageTypeByName.Store(elemType.Name(), msgType)
+		}
+		thriftMessageTypeByName.Store(msgType.String(), msgType)
+		thriftMessageTypeByName.Store(elemType.String(), msgType)
+		if elemType.PkgPath() != "" && elemType.Name() != "" {
+			thriftMessageTypeByName.Store(elemType.PkgPath()+"."+elemType.Name(), msgType)
+		}
+	})
+}
+
 func FindProtoMessageTypeByName(name string) (protoreflect.MessageType, error) {
 	messageType, err := protoregistry.GlobalTypes.FindMessageByName(protoreflect.FullName(name))
 	if err == nil {
@@ -40,6 +64,15 @@ func FindProtoMessageTypeByName(name string) (protoreflect.MessageType, error) {
 	return nil, fmt.Errorf("protobuf message type not found: %s", name)
 }
 
+func FindThriftMessageTypeByName(name string) (reflect.Type, error) {
+	thriftMessageTypeCacheOnce.Do(buildThriftMessageTypeCache)
+	if cachedType, ok := thriftMessageTypeByName.Load(name); ok {
+		return cachedType.(reflect.Type), nil
+	}
+
+	return nil, fmt.Errorf("thrift message type not found: %s", name)
+}
+
 func NewProtoMessageByName(name string) (proto.Message, error) {
 	messageType, err := FindProtoMessageTypeByName(name)
 	if err != nil {
@@ -49,6 +82,21 @@ func NewProtoMessageByName(name string) (proto.Message, error) {
 	return messageType.New().Interface(), nil
 }
 
+func NewThriftMessageByName(name string) (thrift.TStruct, error) {
+	messageType, err := FindThriftMessageTypeByName(name)
+	if err != nil {
+		return nil, err
+	}
+
+	message := reflect.New(messageType.Elem()).Interface()
+	thriftMessage, ok := message.(thrift.TStruct)
+	if !ok {
+		return nil, fmt.Errorf("thrift message type %s does not implement thrift.TStruct", messageType)
+	}
+
+	return thriftMessage, nil
+}
+
 func UnmarshalProtoMessageByName(name string, data []byte) (proto.Message, error) {
 	message, err := NewProtoMessageByName(name)
 	if err != nil {
@@ -61,3 +109,17 @@ func UnmarshalProtoMessageByName(name string, data []byte) (proto.Message, error
 
 	return message, nil
 }
+
+func UnmarshalThriftMessageByName(name string, data []byte) (thrift.TStruct, error) {
+	message, err := NewThriftMessageByName(name)
+	if err != nil {
+		return nil, err
+	}
+
+	deserializer := thrift.NewTDeserializer()
+	if err := deserializer.Read(context.Background(), message, data); err != nil {
+		return nil, err
+	}
+
+	return message, nil
+}
diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go
index 790523bd..7ad119f2 100644
--- a/src/server/game/register_network_func.go
+++ b/src/server/game/register_network_func.go
@@ -30,15 +30,13 @@ import (
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"strconv"
 	"strings"
 
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
-
-	"google.golang.org/protobuf/proto"
 )
 
 func ReqPlayerAsset(player *Player, req *msg.ReqPlayerAsset) error {
@@ -129,7 +127,7 @@ func ReqSetEnergyMul(player *Player, req *msg.ReqSetEnergyMul) error {
 	energyMul := BaseMod.GetEnergyMul()
 	if int(req.EnergyMul) > energyMul && int(req.EnergyMul) > maxEnergyMul {
 		player.SendErrClienRes(&msg.ResSetEnergyMul{
-			ResultCode: msg.RES_CODE_FAIL,
+			ResultCode: msg.RES_CODE_Fail,
 			Msg:        "能量倍数超过最大值",
 		})
 		return errors.New("能量倍数超过最大值")
@@ -157,7 +155,7 @@ func ReqGetHandbookReward(player *Player, req *msg.ReqGetHandbookReward) error {
 	err := player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetHandbookReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -167,13 +165,13 @@ func ReqGetHandbookReward(player *Player, req *msg.ReqGetHandbookReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_HandbookReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetHandbookReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PushClientRes(&msg.ResGetHandbookReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.PushClientRes(player.PlayMod.getHandbookMod().BackData())
 	player.PlayMod.save()
@@ -189,7 +187,7 @@ func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error {
 	items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, allChess)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResHandbookAllReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -197,7 +195,7 @@ func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_HandbookAllReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResHandbookAllReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -206,7 +204,7 @@ func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error {
 	FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_HANDBOOK_ACHIEVEMENT, req.Type)
 	player.UpdateUserInfo()
 	player.PushClientRes(&msg.ResHandbookAllReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	now := GoUtil.Now()
 	NotifyAllFriend(player, &MsqMod.Msg{
@@ -275,7 +273,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	}
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -284,7 +282,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	err = ChessMod.FinishOrder(mergeList)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -293,7 +291,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_OrderReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -305,7 +303,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 		err = player.HandleItem(chestRainItems, msg.ITEM_POP_LABEL_LimitEventChestRain.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResRewardOrder{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -326,7 +324,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -404,7 +402,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
 	player.PushClientRes(&msg.ResRewardOrder{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -421,13 +419,13 @@ func ReqDelOrder(player *Player, req *msg.ReqDelOrder) error {
 	delOrder, err := OrderMod.DelOrder(int(req.OrderId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDelOrder{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PushAndSendClienRes(&msg.ResDelOrder{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("order_delete", map[string]interface{}{
 		"order_id": int(req.OrderId),
@@ -448,7 +446,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	err := player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -456,7 +454,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	addItem, err := DecorateMod.Decorate(areaId, decorateId) // 装饰
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -467,7 +465,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	err = player.HandleItem(addItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -475,7 +473,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	_, err = player.GetPlayerBaseMod().AddExp(player, 10, petExp)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -519,7 +517,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	player.PlayMod.save()
 	player.PushClientRes(DecorateMod.BackData())
 	player.PushClientRes(&msg.ResDecorate{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.HandleInUserRank()
 	player.BackUserInfo()
@@ -534,7 +532,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	unLockLv := decorateCfg.GetOneKeyDecorateUnlockLv()
 	if player.GetPlayerBaseMod().GetLevel() < unLockLv {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  fmt.Sprintf("等级不足%d级", unLockLv),
 		})
 		return errors.New("等级不足")
@@ -546,7 +544,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	err := player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -557,7 +555,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	err = player.HandleItem(addItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -565,7 +563,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	_, err = player.GetPlayerBaseMod().AddExp(player, 10*decorateNum, PetExp)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -596,7 +594,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	player.PlayMod.save()
 	player.PushClientRes(DecorateMod.BackData())
 	player.PushClientRes(&msg.ResDecorate{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.HandleInUserRank()
 	player.BackUserInfo()
@@ -609,7 +607,7 @@ func ReqAreaReward(player *Player, req *msg.ReqAreaReward) error {
 	rewardItem, err := DecorateMod.GetDecorateReward(int(req.AreaId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAreaReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -617,13 +615,13 @@ func ReqAreaReward(player *Player, req *msg.ReqAreaReward) error {
 	err = player.HandleItem(rewardItem, msg.ITEM_POP_LABEL_DecorateReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAreaReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PushClientRes(&msg.ResAreaReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.PushClientRes(DecorateMod.BackData())
 	player.PlayMod.save()
@@ -659,7 +657,7 @@ func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error {
 	}
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessFromBuff{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -668,7 +666,7 @@ func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessFromBuff{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -685,7 +683,7 @@ func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error {
 	player.PushClientRes(OrderMod.BackData())
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResGetChessFromBuff{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -697,7 +695,7 @@ func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error {
 	err := ChessMod.PutPartInBag(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutPartInBag{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -706,7 +704,7 @@ func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutPartInBag{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -717,7 +715,7 @@ func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResPutPartInBag{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -729,7 +727,7 @@ func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error {
 	err := ChessMod.PutChessInBag(int(req.BagId), int(req.ChessId), int(req.EmitId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutChessInBag{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -738,7 +736,7 @@ func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutChessInBag{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -751,7 +749,7 @@ func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResPutChessInBag{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -762,7 +760,7 @@ func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error {
 	chessId, err := ChessMod.TakeChessOutBag(int(req.BagId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResTakeChessOutBag{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -771,7 +769,7 @@ func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResTakeChessOutBag{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -790,7 +788,7 @@ func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResTakeChessOutBag{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -801,7 +799,7 @@ func ReqTakeChessOutBagToHonor(player *Player, req *msg.ReqTakeChessOutBagToHono
 	chessId, err := ChessMod.TakeChessOutBagToHonor(int(req.BagId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResTakeChessOutBagToHonor{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -815,7 +813,7 @@ func ReqTakeChessOutBagToHonor(player *Player, req *msg.ReqTakeChessOutBagToHono
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResTakeChessOutBagToHonor{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -827,7 +825,7 @@ func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error {
 	err := player.HandleItem(costItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessBagGrid{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -835,7 +833,7 @@ func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error {
 	err = ChessMod.BuyChessBagGrid()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessBagGrid{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -844,7 +842,7 @@ func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResBuyChessBagGrid{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	if len(costItem) > 0 {
 		player.TeLog("warehouse_unlock", map[string]interface{}{
@@ -860,7 +858,7 @@ func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error {
 	newChess, err := ChessMod.SeparateChess(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSeparateChess{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -869,7 +867,7 @@ func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSeparateChess{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -881,7 +879,7 @@ func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResSeparateChess{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
 	triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
@@ -897,7 +895,7 @@ func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error {
 	newChess, err := ChessMod.UpgradeChess(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResUpgradeChess{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -906,7 +904,7 @@ func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResUpgradeChess{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -921,7 +919,7 @@ func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResUpgradeChess{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.PushClientRes(Handbook.BackData())
 	player.UpdateUserInfo()
@@ -938,7 +936,7 @@ func ReqChessEx(player *Player, req *msg.ReqChessEx) error {
 		err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResChessEx{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -946,67 +944,67 @@ func ReqChessEx(player *Player, req *msg.ReqChessEx) error {
 		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_BUBBLE, A: []interface{}{}})
 	}
 
-	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId))
+	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId_))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChessEx{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	HandbookMod := player.PlayMod.getHandbookMod()
-	HandbookMod.SetHandbook(int(req.NewChessId))
+	HandbookMod.SetHandbook(int(req.NewChessId_))
 	data := &PlayerChessData{}
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChessEx{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	// 限时事件气泡 幸运猫
-	if req.Type == msg.CHESS_EX_TYPE_CHESS_EX_EVENT {
+	if req.Type == msg.CHESS_EX_TYPE_ChessExEvent {
 		LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
-		err := LimitedTimeEventMod.LuckyCat(int(req.NewChessId))
+		err := LimitedTimeEventMod.LuckyCat(int(req.NewChessId_))
 		if err != nil {
 			player.SendErrClienRes(&msg.ResChessEx{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
 		}
 		player.TeLog("LimitEventLuckyCat", map[string]interface{}{
-			"req": int(req.NewChessId),
+			"req": int(req.NewChessId_),
 		})
 	}
 
 	// 限时事件 小学徒
-	if req.Type == msg.CHESS_EX_TYPE_CHESS_EX_EVENT_LITTLE_APPRENTICE {
+	if req.Type == msg.CHESS_EX_TYPE_ChessExEventLittleApprentice {
 		LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
 		if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_LITTLE_APPRENTICE) {
 			player.SendErrClienRes(&msg.ResChessEx{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  "小学徒活动已结束",
 			})
 			return err
 		}
 
 		player.TeLog("LimitEventLittleApprentice", map[string]interface{}{
-			"req":  int(req.NewChessId),
+			"req":  int(req.NewChessId_),
 			"star": req.CostStar,
 		})
 	}
 	player.TeLog("ReqChessEx", map[string]interface{}{
 		"old_chess_id": int(req.OldChessId),
-		"new_chess_id": int(req.NewChessId),
+		"new_chess_id": int(req.NewChessId_),
 		"cost_dia":     req.CostDia,
 		"cost_star":    req.CostStar,
 	})
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResChessEx{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1018,7 +1016,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	items, err := ChessMod.SourceChest(chestId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSourceChest{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1026,7 +1024,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_SourceChest.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSourceChest{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1035,7 +1033,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSourceChest{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1047,7 +1045,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	})
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResSourceChest{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -1066,7 +1064,7 @@ func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward)
 	itemList, err := CardMod.SeasonFirstReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardSeasonFirstReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1074,7 +1072,7 @@ func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward)
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_CardSeasonFirstReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardSeasonFirstReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1085,7 +1083,7 @@ func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward)
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCardSeasonFirstReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1096,7 +1094,7 @@ func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error {
 	itemList, chess, err := CardMod.GetCollectReward(int(req.Color))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardCollectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1105,7 +1103,7 @@ func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_CardCollectReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardCollectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1120,7 +1118,7 @@ func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(&msg.ResCardCollectReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("card_book", map[string]interface{}{
 		"season_id":    CardMod.EndTime,
@@ -1136,7 +1134,7 @@ func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error {
 	itemList, costStar, err := CardMod.ExStarReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResExStarReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1145,7 +1143,7 @@ func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_ExStarReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResExStarReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1157,7 +1155,7 @@ func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResExStarReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 
 	return nil
@@ -1169,7 +1167,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	itemList, itemList2, err := CardMod.AllCollectReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAllCollectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1178,7 +1176,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_AllCollectReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAllCollectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1186,7 +1184,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	err = player.HandleItem(itemList2, msg.ITEM_POP_LABEL_AllCollectRewardHB.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAllCollectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1201,7 +1199,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	})
 	player.PushClientRes(CardMod.BackData())
 	player.PushClientRes(&msg.ResAllCollectReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1212,7 +1210,7 @@ func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error {
 	itemList, err := GuideMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuideReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1221,7 +1219,7 @@ func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuideReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1233,7 +1231,7 @@ func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(GuideMod.BackData())
 	player.PushClientRes(&msg.ResGuideReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1244,7 +1242,7 @@ func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error
 	itemList, err := DailyTaskMod.GetDailyReward(int(req.Id), player.GetDailyTaskActivityId())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyTaskReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1253,7 +1251,7 @@ func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_DailyTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyTaskReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1261,7 +1259,7 @@ func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error
 	player.PlayMod.save()
 	player.PushClientRes(DailyTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetDailyTaskReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("daily_task", map[string]interface{}{
 		"task_id":           int(req.Id),
@@ -1277,7 +1275,7 @@ func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error
 	itemList, err := DailyTaskMod.GetWeekReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyWeekReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1286,7 +1284,7 @@ func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_DailyWeekReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyWeekReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1300,7 +1298,7 @@ func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error
 	player.PlayMod.save()
 	player.PushClientRes(DailyTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetDailyWeekReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1311,7 +1309,7 @@ func ReqDailyUnlock(player *Player, req *msg.ReqDailyUnlock) error {
 	player.PlayMod.save()
 	player.PushClientRes(DailyTaskMod.BackData())
 	player.PushClientRes(&msg.ResDailyUnlock{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1321,7 +1319,7 @@ func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error
 	itemList, err := GuideTaskMod.GetTaskReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideTaskReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1330,7 +1328,7 @@ func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideTaskReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1344,7 +1342,7 @@ func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error
 	player.PlayMod.save()
 	player.PushClientRes(GuideTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetGuideTaskReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -1355,7 +1353,7 @@ func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) e
 	itemList, err := GuideTaskMod.GetActiveReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideActiveReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1364,7 +1362,7 @@ func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) e
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideActiveReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideActiveReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1376,7 +1374,7 @@ func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) e
 	player.PlayMod.save()
 	player.PushClientRes(GuideTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetGuideActiveReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -1388,14 +1386,14 @@ func ReqSetAvatar(player *Player, req *msg.ReqSetAvatar) error {
 	err := avatarMod.SetAvatar(int(req.Avatar))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSetAvatar{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetAvatar{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.BackUserInfo()
 	player.UpdateUserInfo()
@@ -1417,14 +1415,14 @@ func ReqSetFace(player *Player, req *msg.ReqSetFace) error {
 	err := FaceMod.SetFace(int(req.Face))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSetFace{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetFace{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	is_platform := false
 	if req.Face == 0 {
@@ -1448,7 +1446,7 @@ func ReqBuyEnergy(player *Player, req *msg.ReqBuyEnergy) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyEnergy{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1456,7 +1454,7 @@ func ReqBuyEnergy(player *Player, req *msg.ReqBuyEnergy) error {
 	player.PlayMod.save()
 	player.PushClientRes(BaseMod.BackData())
 	player.PushClientRes(&msg.ResBuyEnergy{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.ChargeBackData()
 	player.TeLog("buy_energy_diamond", map[string]interface{}{
@@ -1471,7 +1469,7 @@ func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error {
 	items, err := BaseMod.GetEnergyByAD()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetEnergyByAD{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1479,7 +1477,7 @@ func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetEnergyByAD.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetEnergyByAD{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1490,7 +1488,7 @@ func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error {
 	player.PlayMod.save()
 	player.PushClientRes(BaseMod.BackData())
 	player.PushClientRes(&msg.ResGetEnergyByAD{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1501,7 +1499,7 @@ func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) err
 	itemList, err := SevenLoginMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetSevenLoginReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1510,7 +1508,7 @@ func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) err
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_SevenLoginRewardLabel.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetSevenLoginReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1518,7 +1516,7 @@ func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) err
 	player.PlayMod.save()
 	player.PushClientRes(SevenLoginMod.BackData())
 	player.PushClientRes(&msg.ResGetSevenLoginReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("weekly_gift", map[string]interface{}{
 		"reward_type": "week",
@@ -1534,7 +1532,7 @@ func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) err
 	itemList, err := SevenLoginMod.GetMonthReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMonthLoginReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1543,7 +1541,7 @@ func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) err
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MonthLoginReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMonthLoginReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1556,7 +1554,7 @@ func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) err
 	player.PlayMod.save()
 	player.PushClientRes(SevenLoginMod.BackData())
 	player.PushClientRes(&msg.ResGetMonthLoginReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1577,7 +1575,7 @@ func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error {
 	itemList, err := LimitedTimeEventMod.GetFastProduceReward(int(req.Energy))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFastProduceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1585,7 +1583,7 @@ func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_FastProduceReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFastProduceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1597,7 +1595,7 @@ func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error {
 	})
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(&msg.ResFastProduceReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1606,7 +1604,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
 	if !limitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_SENCE_DASH) { // 场景冲刺奖励
 		player.SendErrClienRes(&msg.ResLimitSenceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "not exist",
 		})
 		return fmt.Errorf("not exist")
@@ -1615,7 +1613,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	id, items, err := limitedTimeEventMod.GetSceneDashReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitSenceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1624,7 +1622,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_LimitSenceReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitSenceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1635,7 +1633,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResLimitSenceReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -1664,7 +1662,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 	err := CardMod.RequestCard()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardGive{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1672,7 +1670,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 
 	if len(req.Uid) == 0 { // 请求的UID列表不为空
 		player.SendErrClienRes(&msg.ResCardGive{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "uid empty",
 		})
 		return fmt.Errorf("uid empty")
@@ -1680,7 +1678,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 	cardId := int(req.CardId)
 	if cardId == 0 { // 请求交换的卡牌ID不为空
 		player.SendErrClienRes(&msg.ResCardGive{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card id empty",
 		})
 		return fmt.Errorf("card id empty")
@@ -1690,7 +1688,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 		uid := int(v)
 		if !FriendMod.CheckFriend(uid) {
 			player.SendErrClienRes(&msg.ResCardGive{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  "not friend",
 			})
 			return fmt.Errorf("not friend")
@@ -1709,7 +1707,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 		err = CardMod.AddRequestCard(CardInfo) // 添加请求卡牌
 		if err != nil {
 			player.SendErrClienRes(&msg.ResCardGive{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -1725,7 +1723,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 		FriendMgrSend(m)
 	}
 	player.PushClientRes(&msg.ResCardGive{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(CardMod.NotifyTimes())
@@ -1743,7 +1741,7 @@ func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil {
 		player.SendErrClienRes(&msg.ResAgreeCardGive{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card apply not exist",
 		})
 		return fmt.Errorf("card apply not exist")
@@ -1752,7 +1750,7 @@ func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error {
 	err := player.SubCard(cardInfo.CardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAgreeCardGive{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card not exist",
 		})
 		return fmt.Errorf("card  not exist")
@@ -1770,7 +1768,7 @@ func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error {
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(CardMod.NotifyTimes())
 	player.PushClientRes(&msg.ResAgreeCardGive{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	player.AddLog(cardInfo.AUid, friend.LOG_TYPE_CARD_GIVE_ACCEPT, strconv.Itoa(cardInfo.CardId), GoUtil.Now())
@@ -1788,7 +1786,7 @@ func ReqRefuseCardGive(player *Player, req *msg.ReqRefuseCardGive) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil {
 		player.SendErrClienRes(&msg.ResRefuseCardGive{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card apply not exist",
 		})
 		return fmt.Errorf("card apply not exist")
@@ -1796,7 +1794,7 @@ func ReqRefuseCardGive(player *Player, req *msg.ReqRefuseCardGive) error {
 	FriendMod.DelCardInfo(req.Id)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResRefuseCardGive{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	player.TeLog("ReqRefuseCardGive", map[string]interface{}{
@@ -1822,7 +1820,7 @@ func ReqCardSend(player *Player, req *msg.ReqCardSend) error {
 	cardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), cardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardSend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1838,7 +1836,7 @@ func ReqCardSend(player *Player, req *msg.ReqCardSend) error {
 	}
 	player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_SEND, strconv.Itoa(cardId), GoUtil.Now())
 	player.PushClientRes(&msg.ResCardSend{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("card_exchange", map[string]interface{}{
 		"card_id":          cardId,
@@ -1860,7 +1858,7 @@ func ReqCardExchange(player *Player, req *msg.ReqCardExchange) error {
 	cardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), cardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1877,7 +1875,7 @@ func ReqCardExchange(player *Player, req *msg.ReqCardExchange) error {
 	player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_EX_SEND, fmt.Sprintf("%d", cardId), GoUtil.Now())
 
 	player.PushClientRes(&msg.ResCardExchange{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PlayMod.save()
@@ -1899,14 +1897,14 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() {
 		player.SendErrClienRes(&msg.ResSelectCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
 	}
 	if cardInfo.ExId != 0 {
 		player.SendErrClienRes(&msg.ResSelectCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card already selected",
 		})
 		return fmt.Errorf("card already selected")
@@ -1917,7 +1915,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 		err := CardMod.SubGoldTimes()
 		if err != nil {
 			player.SendErrClienRes(&msg.ResSelectCardExchange{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -1928,7 +1926,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 	err := player.SubCard(cardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1936,7 +1934,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 	player.PlayMod.save()
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(&msg.ResSelectCardExchange{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	player.PushClientRes(CardMod.NotifyCard())
@@ -1964,7 +1962,7 @@ func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error {
 
 	if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() {
 		player.SendErrClienRes(&msg.ResAgreeCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
@@ -1976,7 +1974,7 @@ func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error {
 		err := CardMod.SubGoldTimes()
 		if err != nil {
 			player.SendErrClienRes(&msg.ResAgreeCardExchange{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -1988,7 +1986,7 @@ func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error {
 	player.PlayMod.save()
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(&msg.ResAgreeCardExchange{
-		Code:  msg.RES_CODE_SUCCESS,
+		Code:  msg.RES_CODE_Success,
 		Id:    req.Id,
 		Emoji: int32(cardInfo.Emoji),
 	})
@@ -2022,14 +2020,14 @@ func ReqRefuseCardSelect(player *Player, req *msg.ReqRefuseCardSelect) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil {
 		player.SendErrClienRes(&msg.ResRefuseCardSelect{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
 	}
 	if cardInfo.Status != 1 {
 		player.SendErrClienRes(&msg.ResRefuseCardSelect{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card is not select status",
 		})
 		return fmt.Errorf("card is not select status")
@@ -2044,7 +2042,7 @@ func ReqRefuseCardSelect(player *Player, req *msg.ReqRefuseCardSelect) error {
 	}
 	FriendMgrSend(m)
 	player.PushClientRes(&msg.ResRefuseCardSelect{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	player.PlayMod.save()
@@ -2058,14 +2056,14 @@ func ReqRefuseCardExchange(player *Player, req *msg.ReqRefuseCardExchange) error
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() {
 		player.SendErrClienRes(&msg.ResRefuseCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
 	}
 	if cardInfo.Status != 2 {
 		player.SendErrClienRes(&msg.ResRefuseCardExchange{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "card is not status 2",
 		})
 		return fmt.Errorf("card is not status 2")
@@ -2076,7 +2074,7 @@ func ReqRefuseCardExchange(player *Player, req *msg.ReqRefuseCardExchange) error
 	CardMod.AddExTimes(cardInfo)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResRefuseCardExchange{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	m := &MsqMod.Msg{
@@ -2099,7 +2097,7 @@ func ReqGetFriendCard(player *Player, req *msg.ReqGetFriendCard) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil || cardInfo.EndTime != 0 {
 		player.SendErrClienRes(&msg.ResGetFriendCard{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
@@ -2115,7 +2113,7 @@ func ReqGetFriendCard(player *Player, req *msg.ReqGetFriendCard) error {
 	player.AddLog(uid, friend.LOG_TYPE_CARD_SEND_ACCEPT, fmt.Sprintf("%d", cardInfo.CardId), GoUtil.Now())
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGetFriendCard{
-		Code:   msg.RES_CODE_SUCCESS,
+		Code:   msg.RES_CODE_Success,
 		Id:     req.Id,
 		CardId: int32(cardInfo.CardId),
 		Emoji:  int32(cardInfo.Emoji),
@@ -2151,7 +2149,7 @@ func ReqRank(player *Player, req *msg.ReqRank) error {
 		Type:     req.Type,
 		RankList: res,
 		MyRank:   int32(rankInfo.MyRank),
-		MyScore:  float32(rankInfo.MyScore),
+		MyScore:  float64(rankInfo.MyScore),
 	})
 	return nil
 }
@@ -2209,7 +2207,7 @@ func ReqReadMail(player *Player, req *msg.ReqReadMail) error {
 	err := MailMod.Read(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResReadMail{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2217,7 +2215,7 @@ func ReqReadMail(player *Player, req *msg.ReqReadMail) error {
 	player.PlayMod.save()
 	player.PushClientRes(MailMod.NotifyMail(int(req.Id)))
 	player.PushClientRes(&msg.ResReadMail{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -2229,7 +2227,7 @@ func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error {
 	itemList, err := MailMod.Reward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMailReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2237,7 +2235,7 @@ func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MailReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMailReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2250,7 +2248,7 @@ func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(MailMod.NotifyMail(int(req.Id)))
 	player.PushClientRes(&msg.ResGetMailReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -2262,7 +2260,7 @@ func ReqDeleteMail(player *Player, req *msg.ReqDeleteMail) error {
 	err := MailMod.Del(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDeleteMail{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2270,7 +2268,7 @@ func ReqDeleteMail(player *Player, req *msg.ReqDeleteMail) error {
 	player.PlayMod.save()
 	player.PushClientRes(MailMod.NotifyMail(int(req.Id)))
 	player.PushClientRes(&msg.ResDeleteMail{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -2282,14 +2280,14 @@ func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error {
 	items, err := ChargeMod.FireFreeShop()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFreeShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	if len(items) == 0 {
 		player.SendErrClienRes(&msg.ResFreeShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "no reward",
 		})
 		return fmt.Errorf("no reward")
@@ -2297,7 +2295,7 @@ func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_FreeShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFreeShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2305,7 +2303,7 @@ func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error {
 	player.PlayMod.save()
 	player.ChargeBackData()
 	player.PushClientRes(&msg.ResFreeShop{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("gift_free", map[string]interface{}{
 		"gift_type": "store",
@@ -2321,7 +2319,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	lostItems, items, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2333,7 +2331,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	err = player.HandleLoseItem(lostItems, "ChessShop")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2341,7 +2339,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_ChessShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2355,7 +2353,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	player.PlayMod.save()
 	player.ChargeBackData()
 	player.PushClientRes(&msg.ResBuyChessShop{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("buy_product_diamond", map[string]interface{}{
 		"diamond_cost": -lostNum,
@@ -2371,7 +2369,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	lostItems, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2379,7 +2377,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	err = player.HandleLoseItem(lostItems, "ChessShop")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2388,7 +2386,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	err = ChessMod.AddChess(ChessId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2397,7 +2395,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2415,7 +2413,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	player.PlayMod.save()
 	player.ChargeBackData()
 	player.PushClientRes(&msg.ResBuyChessShop2{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("buy_product_diamond", map[string]interface{}{
 		"diamond_cost": lostNum,
@@ -2434,7 +2432,7 @@ func ReqRefreshChessShop(player *Player, req *msg.ReqRefreshChessShop) error {
 	err := player.HandleItem(costItems, msg.ITEM_POP_LABEL_RefreshChessShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRefreshChessShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2454,7 +2452,7 @@ func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error {
 	itemList, err := EndlessMod.GetReward(BaseMod.GetLevel())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResEndlessReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2462,7 +2460,7 @@ func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_EndlessReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResEndlessReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2470,7 +2468,7 @@ func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(EndlessMod.BackData())
 	player.PushClientRes(&msg.ResEndlessReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	ids := make([]int, 0)
 	nums := make([]int, 0)
@@ -2500,7 +2498,7 @@ func ReqPiggyBankReward(player *Player, req *msg.ReqPiggyBankReward) error {
 	err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_PiggyBankReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPiggyBankReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2508,7 +2506,7 @@ func ReqPiggyBankReward(player *Player, req *msg.ReqPiggyBankReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(PiggyBankMod.BackData())
 	player.PushClientRes(&msg.ResPiggyBankReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("piggy_bank_open", map[string]interface{}{
 		"piggy_bank_type": piggyBank.PIGGY_BANK_TYPE_AD,
@@ -2546,7 +2544,7 @@ func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error {
 	err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2555,7 +2553,7 @@ func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error {
 	player.BackChampship()
 	player.TriggerSeed()
 	player.PushClientRes(&msg.ResChampshipReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	maxId := champshipCfg.GetMaxRewardId()
 	if maxId == ChampshipMod.Reward {
@@ -2597,7 +2595,7 @@ func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) err
 	itemList, err := player.GetChampshipRankReward(myPreRank, yesterdayActivityId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipRankReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2605,7 +2603,7 @@ func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) err
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipRankReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipRankReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2618,7 +2616,7 @@ func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) err
 	player.PlayMod.save()
 	player.BackChampship()
 	player.PushClientRes(&msg.ResChampshipRankReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("championship_reward", map[string]interface{}{
 		"season_id":         GoUtil.ZeroTimestamp() - 86400,
@@ -2634,7 +2632,7 @@ func ReqSetName(player *Player, req *msg.ReqSetName) error {
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.SetNickName(req.Name)
 	player.PushClientRes(&msg.ResSetName{
-		ResultCode: msg.RES_CODE_SUCCESS,
+		ResultCode: msg.RES_CODE_Success,
 	})
 	player.PlayMod.save()
 	player.BackUserInfo()
@@ -2649,7 +2647,7 @@ func ReqSetPetName(player *Player, req *msg.ReqSetPetName) error {
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.SetPetName(req.Name)
 	player.PushClientRes(&msg.ResSetPetName{
-		ResultCode: msg.RES_CODE_SUCCESS,
+		ResultCode: msg.RES_CODE_Success,
 	})
 	player.PlayMod.save()
 	player.BackUserInfo()
@@ -2671,14 +2669,14 @@ func ReqMasterCard(player *Player, req *msg.ReqMasterCard) error {
 	err := CardMod.MasterCardEx(int(req.Id), int(req.CardId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMasterCard{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResMasterCard{
-		Code:     msg.RES_CODE_SUCCESS,
+		Code:     msg.RES_CODE_Success,
 		MasterId: req.Id,
 		CardId:   req.CardId,
 	})
@@ -2695,7 +2693,7 @@ func ReqSetFacebookUrl(player *Player, req *msg.ReqSetFacebookUrl) error {
 	BaseMod.SetFacebookUrl(req.Url)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetFacebookUrl{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -2762,7 +2760,7 @@ func ReqAutoAddInviteFriend(player *Player, req *msg.ReqAutoAddInviteFriend) err
 	uid := int(req.Id)
 	if uid == 0 && uid == int(player.M_DwUin) {
 		player.PushClientRes(&msg.ResAutoAddInviteFriend{
-			ResultCode: int32(msg.RES_CODE_FAIL),
+			ResultCode: int32(msg.RES_CODE_Fail),
 		})
 		return fmt.Errorf("uid wrong %d", uid)
 	}
@@ -2825,7 +2823,7 @@ func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error {
 	items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2833,7 +2831,7 @@ func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2847,7 +2845,7 @@ func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error {
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
 	player.PushClientRes(&msg.ResSelectLimitEvent{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -2865,7 +2863,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_MINING)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -2874,7 +2872,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	err := player.HandleLoseItem(loseItem, "MiningLose")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2883,7 +2881,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	itemList, err := MiningMod.Take(req.Map, int(req.Gem))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2891,7 +2889,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MiningTake.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2909,7 +2907,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_MINING)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResMiningReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -2919,7 +2917,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 	itemList, mining, err := MiningMod.GetReward(orderFactor)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2927,7 +2925,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MiningReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2943,7 +2941,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 		"event_id":         aId,
 	})
 	player.PushClientRes(&msg.ResMiningReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.PlayMod.save()
 	player.MiningBackData()
@@ -2968,7 +2966,7 @@ func ReqGuessColorTake(player *Player, req *msg.ReqGuessColorTake) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResGuessColorTake{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -2978,7 +2976,7 @@ func ReqGuessColorTake(player *Player, req *msg.ReqGuessColorTake) error {
 	err := player.HandleLoseItem(loseItems, "GuessColorLose")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuessColorTake{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3003,7 +3001,7 @@ func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResGuessColorReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -3012,7 +3010,7 @@ func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error {
 	items, err := GuessColorMod.GetReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuessColorReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3020,7 +3018,7 @@ func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_GuessColorReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuessColorReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3045,14 +3043,14 @@ func ReqRaceStart(player *Player, req *msg.ReqRaceStart) error {
 	err := RaceMod.StartGame()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRaceStart{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.RaceBackData()
 	player.PushClientRes(&msg.ResRaceStart{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3063,7 +3061,7 @@ func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error {
 	items, err := RaceMod.GetReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRaceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3071,7 +3069,7 @@ func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_RaceReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRaceReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3081,7 +3079,7 @@ func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error {
 		"item_list": items,
 	})
 	player.PushClientRes(&msg.ResRaceReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3165,7 +3163,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 	items, pType, err := PlayroomMod.Interact(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3173,7 +3171,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 	err = player.HandleLoseItem(items, "PlayroomInteract")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3185,7 +3183,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 	_, err = player.GetPlayerBaseMod().AddExp(player, 0, pExp)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 	}
@@ -3200,7 +3198,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 		"interact_type": int(req.Type),
 	})
 	player.PushClientRes(&msg.ResPlayroomInteract{
-		Code:        msg.RES_CODE_SUCCESS,
+		Code:        msg.RES_CODE_Success,
 		InteractNum: int32(PlayroomMod.InteractNum),
 	})
 	return nil
@@ -3212,7 +3210,7 @@ func ReqPlayroomSetRoom(player *Player, req *msg.ReqPlayroomSetRoom) error {
 	_, err := PlayroomMod.SetRoom(GoUtil.MapInt32ToInt(req.Playroom))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomSetRoom{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3221,7 +3219,7 @@ func ReqPlayroomSetRoom(player *Player, req *msg.ReqPlayroomSetRoom) error {
 	player.PlayMod.save()
 	//player.RoomDecoSetLog(Diff)
 	player.PushClientRes(&msg.ResPlayroomSetRoom{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3232,7 +3230,7 @@ func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error {
 	target := PlayroomMod.GetTarget()
 	if target == 0 {
 		player.SendErrClienRes(&msg.ResPlayroomGame{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "no target",
 		})
 		return fmt.Errorf("no target")
@@ -3241,7 +3239,7 @@ func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomGame{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3274,7 +3272,7 @@ func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error {
 	player.PlayroomBackData()
 	player.PlayerDecoSetLog("emoji", int(req.EmojiId), "playroom_game")
 	player.PushClientRes(&msg.ResPlayroomGame{
-		Code:  msg.RES_CODE_SUCCESS,
+		Code:  msg.RES_CODE_Success,
 		Type:  req.Type,
 		Items: itemsMsg,
 	})
@@ -3289,7 +3287,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomSelectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3298,7 +3296,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
 	target := PlayroomMod.GetTarget()
 	if gameId == 0 || target == 0 {
 		player.SendErrClienRes(&msg.ResPlayroomSelectReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "no game or target",
 		})
 		return fmt.Errorf("no game or target")
@@ -3336,7 +3334,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
 	go NotifyPetroomGame(target)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomSelectReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3355,7 +3353,7 @@ func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error {
 	items, err := PlayroomMod.Work()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomWork{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3368,7 +3366,7 @@ func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error {
 	err = player.HandleLoseItem(items, "playroomWork")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomWork{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3381,7 +3379,7 @@ func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error {
 	player.PushClientRes(PlayroomMod.NotifyWork())
 	// player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomWork{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3403,7 +3401,7 @@ func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error {
 	id, items, err := PlayroomMod.Draw()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomDraw{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3412,7 +3410,7 @@ func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomDraw.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomDraw{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3425,7 +3423,7 @@ func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error {
 		"item_list": items,
 	})
 	player.PushClientRes(&msg.ResPlayroomDraw{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   int32(id),
 	})
 	return nil
@@ -3437,7 +3435,7 @@ func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error {
 	items, chipNum, err := PlayroomMod.RemoveChip(req.Uid)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomChip{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3445,7 +3443,7 @@ func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error {
 	err = player.HandleLoseItem(items, msg.ITEM_POP_LABEL_PlayroomChip.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomChip{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3459,7 +3457,7 @@ func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error {
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomChip{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3470,7 +3468,7 @@ func ReqPlayroomFlip(player *Player, req *msg.ReqPlayroomFlip) error {
 	cardId, err := PlayroomMod.FlipCard(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomFlip{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3482,7 +3480,7 @@ func ReqPlayroomFlip(player *Player, req *msg.ReqPlayroomFlip) error {
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomFlip{
-		Code:   msg.RES_CODE_SUCCESS,
+		Code:   msg.RES_CODE_Success,
 		Id:     req.Id,
 		CardId: int32(cardId),
 	})
@@ -3494,7 +3492,7 @@ func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error
 	items, target, result, err := PlayroomMod.GetFlipReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomFlipReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3516,7 +3514,7 @@ func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomFlip.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomFlip{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3549,7 +3547,7 @@ func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomFlipReward{
-		Code:   msg.RES_CODE_SUCCESS,
+		Code:   msg.RES_CODE_Success,
 		Broken: broken,
 	})
 	return nil
@@ -3561,7 +3559,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	if costItems == nil {
 		err := fmt.Errorf("can not buy item")
 		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3570,7 +3568,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	err := player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3578,7 +3576,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	err = player.HandleItem(addItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3588,7 +3586,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomBuyItem{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3598,7 +3596,7 @@ func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error {
 	items, err := PlayroomMod.GiveUpvote(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomUpvote{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3606,7 +3604,7 @@ func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomUpvote.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomUpvote{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 	}
@@ -3633,7 +3631,7 @@ func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomUpvote{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3643,7 +3641,7 @@ func ReqPlayroomUnlock(player *Player, req *msg.ReqPlayroomUnlock) error {
 	err := PlayroomMod.Unlock(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomUnlock{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3653,7 +3651,7 @@ func ReqPlayroomUnlock(player *Player, req *msg.ReqPlayroomUnlock) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomUnlock{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   int32(req.Id),
 	})
 	player.PlayroomBackData()
@@ -3665,7 +3663,7 @@ func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error {
 	items, err := PlayroomMod.GetDailyTaskReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTask{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3673,7 +3671,7 @@ func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomTask.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTask{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3685,7 +3683,7 @@ func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomTask{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   int32(req.Id),
 	})
 	player.PlayroomBackData()
@@ -3697,7 +3695,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 	id, items, err := PlayroomMod.GetTaskReward(int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTaskReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3706,7 +3704,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTaskReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3718,7 +3716,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomTaskReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   int32(id),
 		Type: req.Type,
 	})
@@ -3728,7 +3726,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 
 func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error {
 	req := &msg.ReqOfflineReconnect{}
-	err := proto.Unmarshal(buf, req)
+	err := GoUtil.Unmarshal(buf, req)
 	if err != nil {
 		return err
 	}
@@ -3743,11 +3741,11 @@ func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error {
 			internal.Agents.Delete(agent)
 		}
 		player.TeLog("reconnect", map[string]interface{}{})
-		res.Result = 3
+		res.Result_ = 3
 	} else {
-		res.Result = 2
+		res.Result_ = 2
 	}
-	data, _ := proto.Marshal(res)
+	data := GoUtil.Marshal(res)
 	G_GameLogicPtr.PackResInfo(a, "ResOfflineReconnect", data)
 	return nil
 }
@@ -3762,28 +3760,28 @@ func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error {
 		err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResPlayroomOutline{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
 		}
 	}
 
-	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId))
+	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId_))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomOutline{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	HandbookMod := player.PlayMod.getHandbookMod()
-	HandbookMod.SetHandbook(int(req.NewChessId))
+	HandbookMod.SetHandbook(int(req.NewChessId_))
 	data := &PlayerChessData{}
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomOutline{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3792,7 +3790,7 @@ func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResPlayroomOutline{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3803,7 +3801,7 @@ func ReqPlayroomWorkOutline(player *Player, req *msg.ReqPlayroomWorkOutline) err
 	player.PlayMod.save()
 	player.PushClientRes(PlayroomMod.NotifyStatus())
 	player.PushClientRes(&msg.ResPlayroomWorkOutline{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3813,7 +3811,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	addItems, loseItems, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3823,7 +3821,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 		err := PlayroomMod.AdWatch(addItems[0].Id)
 		if err != nil {
 			player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -3832,7 +3830,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	err = player.HandleLoseItem(loseItems, msg.ITEM_POP_LABEL_PlayroomShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3840,7 +3838,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	err = player.HandleItem(addItems, msg.ITEM_POP_LABEL_PlayroomShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomShop{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3855,7 +3853,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	player.PushClientRes(PlayroomMod.NotifyMood())
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomShop{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3870,7 +3868,7 @@ func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) err
 	FriendTreasureMod := player.PlayMod.getFriendTreasureMod()
 	if FriendTreasureMod.Status == 1 {
 		player.SendErrClienRes(&msg.ResFriendTreasureStart{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "game not over",
 		})
 		return fmt.Errorf("game not over")
@@ -3878,7 +3876,7 @@ func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) err
 
 	if FriendTreasureMod.Star < 100 {
 		player.SendErrClienRes(&msg.ResFriendTreasureStart{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "not enough star",
 		})
 		return fmt.Errorf("not enough star")
@@ -3888,7 +3886,7 @@ func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) err
 	FriendTreasureMod.InitGame(req.List, req.List2)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTreasureStart{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3899,7 +3897,7 @@ func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureFilp{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			},
 		)
@@ -3921,7 +3919,7 @@ func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureFilp{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			},
 		)
@@ -3934,7 +3932,7 @@ func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTreasureFilp{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -3945,7 +3943,7 @@ func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error {
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureEnd{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			},
 		)
@@ -3970,7 +3968,7 @@ func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error {
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureEnd{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			},
 		)
@@ -3988,7 +3986,7 @@ func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error {
 	player.PlayMod.save()
 	player.PushClientRes(FriendTreasureMod.BackData())
 	player.PushClientRes(&msg.ResFriendTreasureEnd{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4006,7 +4004,7 @@ func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error
 	items, err := CardMod.GetHandbookReward(int(req.CardId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardHandbookReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4014,7 +4012,7 @@ func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CardHandbookReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardHandbookReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4025,7 +4023,7 @@ func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCardHandbookReward{
-		Code:   msg.RES_CODE_SUCCESS,
+		Code:   msg.RES_CODE_Success,
 		CardId: req.CardId,
 	})
 	return nil
@@ -4037,7 +4035,7 @@ func ReqSetEmoji(player *Player, req *msg.ReqSetEmoji) error {
 	err := EmojiMod.SetEmoji(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSetEmoji{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4050,7 +4048,7 @@ func ReqSetEmoji(player *Player, req *msg.ReqSetEmoji) error {
 	player.UpdateUserInfo()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetEmoji{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.BackUserInfo()
 	return nil
@@ -4083,7 +4081,7 @@ func ReqCollect(player *Player, req *msg.ReqCollect) error {
 	items, err := CollectMod.GetReward(int(req.Id), num, player.GetOrderFactor())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCollect{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4091,7 +4089,7 @@ func ReqCollect(player *Player, req *msg.ReqCollect) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_Collect.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCollect{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4099,7 +4097,7 @@ func ReqCollect(player *Player, req *msg.ReqCollect) error {
 	player.PlayMod.save()
 	player.PushClientRes(CollectMod.BackData(player.GetOrderFactor()))
 	player.PushClientRes(&msg.ResCollect{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.TeLog("playerdeco_warehouse_unlock", map[string]interface{}{
 		"area_type": areaType,
@@ -4129,7 +4127,7 @@ func ReqPlayroomDressSet(player *Player, req *msg.ReqPlayroomDressSet) error {
 	parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet))
 	if error != nil {
 		player.SendErrClienRes(&msg.ResPlayroomDressSet{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  error.Error(),
 		})
 		return error
@@ -4139,7 +4137,7 @@ func ReqPlayroomDressSet(player *Player, req *msg.ReqPlayroomDressSet) error {
 	//player.PetDecoSetLog(Diff)
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomDressSet{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4150,7 +4148,7 @@ func ReqPlayroomPetAirSet(player *Player, req *msg.ReqPlayroomPetAirSet) error {
 	error := PlayroomMod.PlayroomPetAirSet(int(req.PetAirSet))
 	if error != nil {
 		player.SendErrClienRes(&msg.ResPlayroomPetAirSet{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  error.Error(),
 		})
 		return error
@@ -4158,7 +4156,7 @@ func ReqPlayroomPetAirSet(player *Player, req *msg.ReqPlayroomPetAirSet) error {
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomPetAirSet{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4169,7 +4167,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	err := LimitedTimeEventMod.LuckyCat(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitEventLuckyCat{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4178,7 +4176,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	err = ChessMod.AddChess(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitEventLuckyCat{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 	}
@@ -4186,7 +4184,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitEventLuckyCat{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		player.TeLog("outsync_event", map[string]interface{}{
@@ -4201,7 +4199,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	player.PlayMod.save()
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(&msg.ResLimitEventLuckyCat{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4211,7 +4209,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	activityInfo := player.GetActivityInfo(activity.ACT_TYPE_ADD_GIFT)
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
@@ -4220,7 +4218,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	items, err := ActivityMod.GetAddGiftReward(activityInfo.Id)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddGiftReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4228,7 +4226,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_ActTypeAddGift.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddGiftReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4236,7 +4234,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	player.PlayMod.save()
 	player.BackDataActivity()
 	player.PushClientRes(&msg.ResAddGiftReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 
@@ -4247,7 +4245,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	activityInfo := player.GetActivityInfo(int(req.Id))
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
@@ -4256,7 +4254,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	items, err := ActivityMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4264,7 +4262,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_ActivityReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4277,7 +4275,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	player.InitActivity()
 	player.BackDataActivity()
 	player.PushClientRes(&msg.ResActivityReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4286,7 +4284,7 @@ func ReqLang(player *Player, req *msg.ReqLang) error {
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.SetLang(req.Lang)
 	player.PushClientRes(&msg.ResLang{
-		ResultCode: msg.RES_CODE_SUCCESS,
+		ResultCode: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4300,7 +4298,7 @@ func ReqAdWatch(player *Player, req *msg.ReqAdWatch) error {
 	player.PlayMod.save()
 	player.UpdateUserInfo()
 	player.PushClientRes(&msg.ResAdWatch{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4309,7 +4307,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
 	if !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK) {
 		player.SendErrClienRes(&msg.ResCatTrickReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "cat trick event not exist",
 		})
 		return fmt.Errorf("cat trick event not exist")
@@ -4317,7 +4315,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	items, err := LimitedTimeEventMod.GetCatTrickReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatTrickReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4325,7 +4323,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatTrickReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatTrickReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4336,7 +4334,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(&msg.ResCatTrickReward{
-		Code:    msg.RES_CODE_SUCCESS,
+		Code:    msg.RES_CODE_Success,
 		IsClose: !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK),
 	})
 	return nil
@@ -4351,7 +4349,7 @@ func ReqChargeReceive(player *Player, req *msg.ReqChargeReceive) error {
 		Extra: req.Content,
 	})
 	player.PushClientRes(&msg.ResChargeReceive{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4361,7 +4359,7 @@ func ReqAddWish(player *Player, req *msg.ReqAddWish) error {
 	items, err := ChargeMod.AddWish(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddWish{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4370,7 +4368,7 @@ func ReqAddWish(player *Player, req *msg.ReqAddWish) error {
 		err = player.HandleItem(items, msg.ITEM_POP_LABEL_AddWish.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResAddWish{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -4383,7 +4381,7 @@ func ReqAddWish(player *Player, req *msg.ReqAddWish) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResAddWish{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4393,7 +4391,7 @@ func ReqGetWish(player *Player, req *msg.ReqGetWish) error {
 	items, err := ChargeMod.GetWish()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetWish{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4402,7 +4400,7 @@ func ReqGetWish(player *Player, req *msg.ReqGetWish) error {
 		err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetWish.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResGetWish{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -4413,7 +4411,7 @@ func ReqGetWish(player *Player, req *msg.ReqGetWish) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGetWish{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4423,7 +4421,7 @@ func ReqSendWishBeg(player *Player, req *msg.ReqSendWishBeg) error {
 	err := ChargeMod.SendWishBeg(req.Uid)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSendWishBeg{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4441,7 +4439,7 @@ func ReqSendWishBeg(player *Player, req *msg.ReqSendWishBeg) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSendWishBeg{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4474,7 +4472,7 @@ func ReqWishApply(player *Player, req *msg.ReqWishApply) error {
 	err := FriendMod.ApplyWish(req.Uid)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResWishApply{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4490,7 +4488,7 @@ func ReqWishApply(player *Player, req *msg.ReqWishApply) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResWishApply{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4501,7 +4499,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 	isReward := GuideMod.GetPlayroomGuide()
 	if isReward {
 		player.SendErrClienRes(&msg.ResGuidePlayroom{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "已领取",
 		})
 		return fmt.Errorf("已领取")
@@ -4510,7 +4508,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResWishApply{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4518,7 +4516,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 	GuideMod.SetPlayroomGuide(true)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGuidePlayroom{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4526,7 +4524,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error {
 	if req.Id == "" || req.Name == "" {
 		player.SendErrClienRes(&msg.ResId2Verify{
-			ResultCode: msg.RES_CODE_FAIL,
+			ResultCode: msg.RES_CODE_Fail,
 			Msg:        "id is zero",
 		})
 		return fmt.Errorf("id is zero")
@@ -4534,7 +4532,7 @@ func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error {
 	err := GoUtil.IdVerify(req.Name, req.Id)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResId2Verify{
-			ResultCode: msg.RES_CODE_FAIL,
+			ResultCode: msg.RES_CODE_Fail,
 			Msg:        err.Error(),
 		})
 		return err
@@ -4547,7 +4545,7 @@ func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResId2Verify{
-		ResultCode: msg.RES_CODE_SUCCESS,
+		ResultCode: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4565,7 +4563,7 @@ func ReqPlayroomGuide(player *Player, req *msg.ReqPlayroomGuide) error {
 	err := PlayroomMod.Guide(int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomGuide{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4576,7 +4574,7 @@ func ReqPlayroomGuide(player *Player, req *msg.ReqPlayroomGuide) error {
 	player.PlayMod.save()
 	player.PushClientRes(PlayroomMod.NotifyMood())
 	player.PushClientRes(&msg.ResPlayroomGuide{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4591,7 +4589,7 @@ func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipInvite{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4601,7 +4599,7 @@ func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error {
 	err := CatnipMod.Invite(int(req.Uid), int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipInvite{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4622,7 +4620,7 @@ func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipInvite{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4634,7 +4632,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	activityInfo := player.GetActivityInfo(activityId)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipAgree{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4642,7 +4640,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	_, err := CatnipMod.Agree(int(req.Id), int(req.Uid))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipAgree{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4650,7 +4648,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	err = player.SetCatnipPartner(int(req.Id), int(req.Uid), activityInfo.EndT)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipAgree{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4671,7 +4669,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipAgree{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4683,7 +4681,7 @@ func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipMultiply{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4691,7 +4689,7 @@ func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error {
 	err := CatnipMod.Multiply(int(req.Multiply))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipMultiply{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4702,7 +4700,7 @@ func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipMultiply{
-		Code:     msg.RES_CODE_SUCCESS,
+		Code:     msg.RES_CODE_Success,
 		Multiply: req.Multiply,
 	})
 	return nil
@@ -4714,7 +4712,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4722,7 +4720,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	id, growth, partnerId, items, costItems, friendItems, err := CatnipMod.Play(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4730,7 +4728,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	err = player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_CatnipPlay.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4738,7 +4736,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipPlay.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4759,7 +4757,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipPlay{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   int32(id),
 	})
 	return nil
@@ -4771,7 +4769,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4779,7 +4777,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	items, gameInfo, err := CatnipMod.Reward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4787,7 +4785,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4801,7 +4799,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4812,7 +4810,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4820,7 +4818,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	items, err := CatnipMod.GrandReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipGrandReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4828,7 +4826,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipGrandReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipGrandReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4839,7 +4837,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipGrandReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -4849,7 +4847,7 @@ func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipRefuse{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4857,7 +4855,7 @@ func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error {
 	err := CatnipMod.Refuse(int(req.Id), int(req.Uid))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipRefuse{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4878,7 +4876,7 @@ func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipRefuse{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4895,7 +4893,7 @@ func ReqActPassReward(player *Player, req *msg.ReqActPassReward) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_ActPassReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResActPassReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4906,7 +4904,7 @@ func ReqActPassReward(player *Player, req *msg.ReqActPassReward) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResActPassReward{
-		Code:        msg.RES_CODE_SUCCESS,
+		Code:        msg.RES_CODE_Success,
 		RewardLevel: GoUtil.IntToInt32(newLevel),
 	})
 	return nil
@@ -4917,7 +4915,7 @@ func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) e
 	items, err := ChessMod.GetRetireReward(req.Id)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessRetireReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4925,7 +4923,7 @@ func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) e
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetChessRetireReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessRetireReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4937,7 +4935,7 @@ func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) e
 	player.PushClientRes(ChessMod.BackData())
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGetChessRetireReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -4948,7 +4946,7 @@ func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipEmoji{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4957,7 +4955,7 @@ func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error {
 	CatnipMod.SetSendEmoji(int(req.Id), int(req.EmojiId))
 	if gameInfo.Partner == 0 {
 		player.SendErrClienRes(&msg.ResCatnipEmoji{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "no partner",
 		})
 		return fmt.Errorf("no partner")
@@ -4969,7 +4967,7 @@ func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error {
 		Extra: int(req.EmojiId),
 	})
 	player.PushClientRes(&msg.ResCatnipEmoji{
-		Code:    msg.RES_CODE_SUCCESS,
+		Code:    msg.RES_CODE_Success,
 		EmojiId: req.EmojiId,
 		Id:      req.Id,
 	})
@@ -4989,7 +4987,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	activityInfo := player.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT)
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
@@ -4997,7 +4995,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	cfg := G_GameLogicPtr.ActivityMgr.GetCatReturnGiftCfg(activityInfo.Id)
 	if cfg == nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "config not exist",
 		})
 		return fmt.Errorf("config not exist")
@@ -5015,7 +5013,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	}
 	if len(items) == 0 {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "no reward",
 		})
 		return fmt.Errorf("no reward")
@@ -5023,7 +5021,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_CatReturnGiftReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5044,7 +5042,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	err := player.HandleLoseItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftRewardGift{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5054,7 +5052,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5062,7 +5060,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5076,7 +5074,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
 	player.PushClientRes(&msg.ResSelectLimitEvent{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	return nil
 }
@@ -5085,7 +5083,7 @@ func ReqCatReturnGiftScore(player *Player, req *msg.ReqCatReturnGiftScore) error
 	activityInfo := player.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT)
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftScore{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go
index a68b98d6..58d2824a 100644
--- a/src/server/game/req_func_friend.go
+++ b/src/server/game/req_func_friend.go
@@ -11,7 +11,7 @@ import (
 	"server/game/mod/item"
 	MsqMod "server/game/mod/msg"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"strconv"
 )
 
@@ -100,14 +100,14 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	FriendMod := player.PlayMod.getFriendMod()
 	if Uid == int(player.M_DwUin) {
 		player.SendErrClienRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "cannot apply yourself",
 		})
 		return fmt.Errorf("cannot apply yourself")
 	}
 	if FriendMod.CheckFriend(Uid) {
 		player.SendErrClienRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "already friend",
 		})
 		return fmt.Errorf("already friend")
@@ -115,7 +115,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	// 好友人数到达上限（2000人）时，玩家将无法再发送好友申请
 	if FriendMod.GetFriendLen() >= friendCfg.GetFriendLimitNum() {
 		player.SendErrClienRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "friend list full",
 		})
 		return fmt.Errorf("friend list full")
@@ -124,7 +124,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	sendApplyTime := FriendMod.GetSendApplyTime(Uid)
 	if sendApplyTime != 0 && GoUtil.Now()-sendApplyTime < oneday {
 		player.PushClientRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Uid:  req.Uid,
 			Msg:  "already applied",
 		})
@@ -136,7 +136,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 		Items, err := FriendMod.GetSponsorReward()
 		if err != nil {
 			player.SendErrClienRes(&msg.ResApplyFriend{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -146,7 +146,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 		err = player.HandleItem(Items, msg.ITEM_POP_LABEL_ApplyFriendSponsor.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResApplyFriend{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -176,7 +176,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	}
 	FriendMgrSend(m)
 	player.PushClientRes(&msg.ResApplyFriend{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -188,7 +188,7 @@ func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error {
 	FriendMod := player.PlayMod.getFriendMod()
 	if !FriendMod.CheckApply(Uid) {
 		player.SendErrClienRes(&msg.ResAgreeFriend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "apply uid not exist",
 		})
 		return fmt.Errorf("apply uid not exist")
@@ -196,7 +196,7 @@ func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error {
 	// 好友人数到达上限（2000人）时，玩家将无法再同意好友申请
 	if FriendMod.GetFriendLen() >= friendCfg.GetFriendLimitNum() {
 		player.SendErrClienRes(&msg.ResAgreeFriend{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "friend list full",
 		})
 		return fmt.Errorf("friend list full")
@@ -207,7 +207,7 @@ func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error {
 	}
 	FriendMod.AddFriend(Uid)
 	player.PushClientRes(&msg.ResAgreeFriend{
-		Code:   msg.RES_CODE_SUCCESS,
+		Code:   msg.RES_CODE_Success,
 		Uid:    req.Uid,
 		Player: G_GameLogicPtr.GetResSimplePlayerByUid(int(req.Uid)),
 	})
@@ -243,7 +243,7 @@ func ReqDelFriend(player *Player, req *msg.ReqDelFriend) error {
 	FriendMod.DelFriend(Uid)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResDelFriend{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	player.AddLog(Uid, friend.LOG_TYPE_FRIEND_DELETE, "", GoUtil.Now())
@@ -261,7 +261,7 @@ func ReqRefuseFriend(player *Player, req *msg.ReqRefuseFriend) error {
 	FriendMod.RefuseApply(Uid)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResRefuseFriend{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Uid:  req.Uid,
 	})
 	now := GoUtil.Now()
@@ -302,7 +302,7 @@ func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error {
 	Items, FUid, err := FriendMod.Upvote(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTLUpvote{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -310,7 +310,7 @@ func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error {
 	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_TLUpvote.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTLUpvote{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -329,7 +329,7 @@ func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error {
 	FriendMgrSend(m)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTLUpvote{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	player.TeLog("friend_upvote", map[string]interface{}{
@@ -343,7 +343,7 @@ func ReqFriendTReward(player *Player, req *msg.ReqFriendTReward) error {
 	Items, err := FriendMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -351,14 +351,14 @@ func ReqFriendTReward(player *Player, req *msg.ReqFriendTReward) error {
 	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendTReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTReward{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTReward{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 		Id:   req.Id,
 	})
 	return nil
@@ -369,12 +369,12 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 	ReplyInfo := FriendMod.ReplyFriend(int(req.LogId))
 	if ReplyInfo == nil {
 		player.SendErrClienRes(&msg.ResFriendReplyHandle{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "reply info not exist",
 		})
 		return fmt.Errorf("reply info not exist")
 	}
-	ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_NONE
+	ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_None
 	now := GoUtil.Now()
 	items := make([]*item.Item, 0)
 	if ReplyInfo.Type == friend.REPLY_TYPE_GREETING_Get {
@@ -439,7 +439,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 				}
 				player.CatnipBackData()
 			} else {
-				ErrType = msg.FRIEND_REPLY_HANDLE_ERR_TYPE_CATNIP
+				ErrType = msg.FRIEND_REPLY_HANDLE_ERR_TYPE_Catnip
 			}
 		}
 	}
@@ -447,7 +447,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 		err := player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResFriendReplyHandle{
-				Code: msg.RES_CODE_FAIL,
+				Code: msg.RES_CODE_Fail,
 				Msg:  err.Error(),
 			})
 			return err
@@ -455,7 +455,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 	}
 	player.FriendLogBackData()
 	player.PushClientRes(&msg.ResFriendReplyHandle{
-		Code:    msg.RES_CODE_SUCCESS,
+		Code:    msg.RES_CODE_Success,
 		LogId:   req.LogId,
 		Type:    req.Type,
 		ErrType: ErrType,
@@ -466,7 +466,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	if req.Code == "" {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "code is empty",
 		})
 		return fmt.Errorf("code is empty")
@@ -474,7 +474,7 @@ func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	CodeNum := GoUtil.ParseUniqueStringToInt(req.Code)
 	if CodeNum <= 0 {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "code is invalid",
 		})
 		return fmt.Errorf("code is invalid")
@@ -482,7 +482,7 @@ func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	Uid := int64(CodeNum) + int64(100000) + int64(conf.Server.AppID*100000000)
 	if Uid == player.M_DwUin {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "can not add yourself",
 		})
 		return fmt.Errorf("can not add yourself")
@@ -491,13 +491,13 @@ func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(int(Uid))
 	if PlayerSimpleData == nil {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  "player not exist",
 		})
 		return fmt.Errorf("player not exist")
 	}
 	player.PushClientRes(&msg.ResFriendByCode{
-		Code:   msg.RES_CODE_SUCCESS,
+		Code:   msg.RES_CODE_Success,
 		Player: PlayerSimpleData,
 	})
 	return nil
@@ -508,7 +508,7 @@ func ReqAddNpc(player *Player, req *msg.ReqAddNpc) error {
 	err := FriendMod.SetNpc(int(req.NpcId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddNpc{
-			Code: msg.RES_CODE_FAIL,
+			Code: msg.RES_CODE_Fail,
 			Msg:  err.Error(),
 		})
 		return err
@@ -526,7 +526,7 @@ func ReqAddNpc(player *Player, req *msg.ReqAddNpc) error {
 	FriendMod.AddReplyInfo(int(req.NpcId), friend.REPLY_TYPE_GREETING_Get, "", GoUtil.Now()+oneday, nil)
 	player.AddLog(int(req.NpcId), friend.LOG_TYPE_FRIEND_BECOME_NPC, GoUtil.String(req.NpcId), GoUtil.Now())
 	player.PushClientRes(&msg.ResAddNpc{
-		Code:  msg.RES_CODE_SUCCESS,
+		Code:  msg.RES_CODE_Success,
 		NpcId: req.NpcId,
 	})
 	return nil
diff --git a/src/server/game/req_func_fur.go b/src/server/game/req_func_fur.go
index a1a0087d..0b739c28 100644
--- a/src/server/game/req_func_fur.go
+++ b/src/server/game/req_func_fur.go
@@ -1,7 +1,7 @@
 package game
 
 import (
-	"server/msg"
+	msg "server/msg/meowmentnet"
 )
 
 func ReqPetFur(player *Player, req *msg.ReqPetFur) error {
diff --git a/src/server/game/trigger_func.go b/src/server/game/trigger_func.go
index d21cc15c..9ef53f96 100644
--- a/src/server/game/trigger_func.go
+++ b/src/server/game/trigger_func.go
@@ -17,7 +17,7 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
@@ -47,14 +47,14 @@ func (player *Player) MailTrigger(Tr *quest.Trigger) bool {
 	tr := false
 	for _, v := range t {
 		if player.checkTriggerCondition(v.Trigger) {
-			Title := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, v.Title)
-			Content := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, v.Content)
-			TitleEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Title)
-			ContentEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Content)
-			TitlePtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, v.Title)
-			ContentPtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, v.Content)
-			TitleEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, v.Title)
-			ContentEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, v.Content)
+			Title := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, v.Title)
+			Content := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, v.Content)
+			TitleEn := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, v.Title)
+			ContentEn := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, v.Content)
+			TitlePtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, v.Title)
+			ContentPtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, v.Content)
+			TitleEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, v.Title)
+			ContentEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, v.Content)
 			MailMod.SendMail(&mail.MailStruct{
 				Title:           Title,
 				SubTitle:        "",
@@ -102,7 +102,7 @@ func (player *Player) TriggerShippingOrderOrigin(req *msg.ReqShippingOrder) {
 	if Status == MergeConst.ORDER_STATUS_CANCEL { // 取消支付
 		player.CancelOrder(OrderSn)
 		player.PushClientRes(&msg.ResShippingOrder{
-			Code: msg.RES_CODE_SUCCESS,
+			Code: msg.RES_CODE_Success,
 			Msg:  "cancel success",
 		})
 		return
@@ -161,7 +161,7 @@ func (player *Player) TriggerShippingOrderOrigin(req *msg.ReqShippingOrder) {
 	}
 	player.TeLog("pay", orderDataMap)
 	player.PushClientRes(&msg.ResShippingOrder{
-		Code: msg.RES_CODE_SUCCESS,
+		Code: msg.RES_CODE_Success,
 	})
 	player.SendClientRes()
 }
diff --git a/src/server/game/unit_test.go b/src/server/game/unit_test.go
index 4dfaba5d..1d4dd0a1 100644
--- a/src/server/game/unit_test.go
+++ b/src/server/game/unit_test.go
@@ -11,7 +11,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/order"
 	"server/game/mod/quest"
-	"server/msg"
+	msg "server/msg/meowmentnet"
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
diff --git a/src/server/game_util/GoUtil.go b/src/server/game_util/GoUtil.go
index 845a4008..59789723 100644
--- a/src/server/game_util/GoUtil.go
+++ b/src/server/game_util/GoUtil.go
@@ -2,6 +2,7 @@ package GoUtil
 
 import (
 	"bytes"
+	"context"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/md5"
@@ -26,6 +27,7 @@ import (
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/oschwald/geoip2-golang"
 )
 
@@ -965,3 +967,23 @@ func FormatStarItemNum(num, factor int) int {
 	Num := math.Round(float64(num) * float64(factor) / 100)
 	return int(Num) / 5 * 5
 }
+
+func Marshal(m thrift.TStruct) []byte {
+	serializer := thrift.NewTSerializer()
+	data, err := serializer.Write(context.Background(), m)
+	if err != nil {
+		log.Debug("thrift Marshal error:", err)
+		return nil
+	}
+	return data
+}
+
+func Unmarshal(data []byte, m thrift.TStruct) error {
+	deserializer := thrift.NewTDeserializer()
+	err := deserializer.Read(context.Background(), m, data)
+	if err != nil {
+		log.Debug("thrift Unmarshal error:", err)
+		return err
+	}
+	return nil
+}
diff --git a/src/server/gate/router.go b/src/server/gate/router.go
index a37cf993..cbe5af77 100644
--- a/src/server/gate/router.go
+++ b/src/server/gate/router.go
@@ -2,13 +2,14 @@ package gate
 
 import (
 	"server/game"
-	"server/msg"
+	msg "server/msg"
+	"server/msg/meowmentnet"
 )
 
 func init() {
 	// 这里指定消息 Hello 路由到 game 模块
 	// 模块间使用 ChanRPC 通讯，消息路由也不例外
-	msg.Processor.SetRouter(&msg.ClientReq{}, game.ChanRPC)
-	msg.Processor.SetRouter(&msg.ClientRes{}, game.ChanRPC)
-	msg.Processor.SetRouter(&msg.AdminReq{}, game.ChanRPC)
+	msg.Processor.SetRouter(&meowmentnet.ClientReq{}, game.ChanRPC)
+	msg.Processor.SetRouter(&meowmentnet.ClientRes{}, game.ChanRPC)
+	msg.Processor.SetRouter(&meowmentnet.AdminReq{}, game.ChanRPC)
 }
diff --git a/src/server/go.mod b/src/server/go.mod
index 1ee08a40..7a7a0922 100644
--- a/src/server/go.mod
+++ b/src/server/go.mod
@@ -4,7 +4,7 @@ go 1.25.5
 
 require (
 	gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74
-	gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8
+	gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952
 	gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c
 	github.com/alibabacloud-go/cloudauth-20190307/v4 v4.9.2
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11
@@ -57,6 +57,7 @@ require (
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/apache/thrift v0.22.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/google/uuid v1.6.0 // indirect
diff --git a/src/server/go.sum b/src/server/go.sum
index 65640a7e..52c19dac 100644
--- a/src/server/go.sum
+++ b/src/server/go.sum
@@ -5,6 +5,8 @@ gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74 h1:Z2tn
 gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74/go.mod h1:Sj45tVreK2AFDH+k03Q0uy8paaF6TINOT6vqWIFG4sg=
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8 h1:qs0cKcOE/uI8ABumwubKR9TKMFa3u9jUR9hQ4SThq4Q=
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8/go.mod h1:9rWUv5SNj6indAuM2dAT76uO34a/C2FGptEDKkyg21U=
+gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952 h1:z3vtUEQTdzm5LqH9jwLaLUwU5WYwobwvSpboUu8kpSY=
+gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952/go.mod h1:v2aZGGOhLPUWCtgtwMztLucxBmk85qsnOuR8X+wDmdQ=
 gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c h1:FjL8acgHxp1CMi+JSMwD1GXWIe7WIo1h8LoFVaLI87A=
 gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c/go.mod h1:VNNASaG7YCk+7We0m+SQ6/fMacEjx+TTFvcS/1Rp+6Q=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -79,6 +81,8 @@ github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmP
 github.com/aliyun/credentials-go v1.4.5/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
 github.com/aliyun/credentials-go v1.4.6 h1:CG8rc/nxCNKfXbZWpWDzI9GjF4Tuu3Es14qT8Y0ClOk=
 github.com/aliyun/credentials-go v1.4.6/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
+github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
+github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
diff --git a/src/server/msg/msg.go b/src/server/msg/msg.go
index 8bbd8a56..38d5ef9a 100644
--- a/src/server/msg/msg.go
+++ b/src/server/msg/msg.go
@@ -1,14 +1,16 @@
 package msg
 
 import (
-	"gitea.bywaystudios.com/pet_home/leaf/network/protobuf"
+	"server/msg/meowmentnet"
+
+	"gitea.bywaystudios.com/pet_home/leaf/network/thrift"
 )
 
-var Processor = protobuf.NewProcessor()
+var Processor = thrift.NewProcessor()
 
 func init() {
-	Processor.Register(&ClientReq{})
-	Processor.Register(&ClientRes{})
-	Processor.Register(&AdminReq{})
-	Processor.Register(&AdminRes{})
+	Processor.Register(&meowmentnet.ClientReq{})
+	Processor.Register(&meowmentnet.ClientRes{})
+	Processor.Register(&meowmentnet.AdminReq{})
+	Processor.Register(&meowmentnet.AdminRes{})
 }

From 7ac99abedfb9371bdea185dad7c14f16a4a95975 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:30:33 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/proto_factory.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/server/game/proto_factory.go b/src/server/game/proto_factory.go
index a9afb006..ce815542 100644
--- a/src/server/game/proto_factory.go
+++ b/src/server/game/proto_factory.go
@@ -1,9 +1,9 @@
 package game
 
 import (
-	"context"
 	"fmt"
 	"reflect"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sync"
 
@@ -115,11 +115,6 @@ func UnmarshalThriftMessageByName(name string, data []byte) (thrift.TStruct, err
 	if err != nil {
 		return nil, err
 	}
-
-	deserializer := thrift.NewTDeserializer()
-	if err := deserializer.Read(context.Background(), message, data); err != nil {
-		return nil, err
-	}
-
+	GoUtil.Unmarshal(data, message)
 	return message, nil
 }

From ef129ee8e0d2724d87100c0bf3b0c34205842dff Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:51:43 +0800
Subject: [PATCH 03/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E6=96=B9=E5=BC=8F=E4=B8=BAcompact?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/proto_factory.go |  4 +++-
 src/server/game_util/GoUtil.go   | 16 ++++++++++++++--
 src/server/go.mod                |  2 +-
 src/server/go.sum                |  2 ++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/server/game/proto_factory.go b/src/server/game/proto_factory.go
index ce815542..262eed67 100644
--- a/src/server/game/proto_factory.go
+++ b/src/server/game/proto_factory.go
@@ -115,6 +115,8 @@ func UnmarshalThriftMessageByName(name string, data []byte) (thrift.TStruct, err
 	if err != nil {
 		return nil, err
 	}
-	GoUtil.Unmarshal(data, message)
+	if err := GoUtil.Unmarshal(data, message); err != nil {
+		return nil, err
+	}
 	return message, nil
 }
diff --git a/src/server/game_util/GoUtil.go b/src/server/game_util/GoUtil.go
index 59789723..b976485b 100644
--- a/src/server/game_util/GoUtil.go
+++ b/src/server/game_util/GoUtil.go
@@ -968,8 +968,20 @@ func FormatStarItemNum(num, factor int) int {
 	return int(Num) / 5 * 5
 }
 
+func newCompactSerializer() *thrift.TSerializer {
+	transport := thrift.NewTMemoryBufferLen(1024)
+	protocol := thrift.NewTCompactProtocolFactoryConf(nil).GetProtocol(transport)
+	return &thrift.TSerializer{Transport: transport, Protocol: protocol}
+}
+
+func newCompactDeserializer() *thrift.TDeserializer {
+	transport := thrift.NewTMemoryBufferLen(1024)
+	protocol := thrift.NewTCompactProtocolFactoryConf(nil).GetProtocol(transport)
+	return &thrift.TDeserializer{Transport: transport, Protocol: protocol}
+}
+
 func Marshal(m thrift.TStruct) []byte {
-	serializer := thrift.NewTSerializer()
+	serializer := newCompactSerializer()
 	data, err := serializer.Write(context.Background(), m)
 	if err != nil {
 		log.Debug("thrift Marshal error:", err)
@@ -979,7 +991,7 @@ func Marshal(m thrift.TStruct) []byte {
 }
 
 func Unmarshal(data []byte, m thrift.TStruct) error {
-	deserializer := thrift.NewTDeserializer()
+	deserializer := newCompactDeserializer()
 	err := deserializer.Read(context.Background(), m, data)
 	if err != nil {
 		log.Debug("thrift Unmarshal error:", err)
diff --git a/src/server/go.mod b/src/server/go.mod
index 7a7a0922..21cc8914 100644
--- a/src/server/go.mod
+++ b/src/server/go.mod
@@ -4,7 +4,7 @@ go 1.25.5
 
 require (
 	gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74
-	gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952
+	gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409104501-67c163ff07c2
 	gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c
 	github.com/alibabacloud-go/cloudauth-20190307/v4 v4.9.2
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11
diff --git a/src/server/go.sum b/src/server/go.sum
index 52c19dac..5c7ed699 100644
--- a/src/server/go.sum
+++ b/src/server/go.sum
@@ -7,6 +7,8 @@ gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8 h1:qs0cK
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8/go.mod h1:9rWUv5SNj6indAuM2dAT76uO34a/C2FGptEDKkyg21U=
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952 h1:z3vtUEQTdzm5LqH9jwLaLUwU5WYwobwvSpboUu8kpSY=
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952/go.mod h1:v2aZGGOhLPUWCtgtwMztLucxBmk85qsnOuR8X+wDmdQ=
+gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409104501-67c163ff07c2 h1:EnuWeend4oN/VAjzHcZYibQg5Ksuw9UTG0XJGEJzL6M=
+gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409104501-67c163ff07c2/go.mod h1:v2aZGGOhLPUWCtgtwMztLucxBmk85qsnOuR8X+wDmdQ=
 gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c h1:FjL8acgHxp1CMi+JSMwD1GXWIe7WIo1h8LoFVaLI87A=
 gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c/go.mod h1:VNNASaG7YCk+7We0m+SQ6/fMacEjx+TTFvcS/1Rp+6Q=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

From 3cc3af2aff1ee19d4d32d76d45eccc658940e1e0 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 13 Apr 2026 14:49:30 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/server.json           |  2 +-
 src/server/game/GameLogic.go          |  3 +++
 src/server/game/proto_factory.go      | 29 +++++++++++++++------------
 src/server/unit_test/playroom_test.go | 18 +++++++++++++++++
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/server/conf/server.json b/src/server/conf/server.json
index 25ea9004..38770d42 100644
--- a/src/server/conf/server.json
+++ b/src/server/conf/server.json
@@ -2,7 +2,7 @@
 	"AppID": 0,
 	"LogLevel": "debug", 
 	"LogPath": "./log",
-	"TCPAddr": ":3602",
+	"TCPAddr": ":3601",
 	"WSAddr": ":3567",
 	"RPCAddr": ":50051",
 	"MySqlAddr": "127.0.0.1",
diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index b9b1195b..77340de3 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -98,6 +98,9 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *thrift.TStruct
 		return nil, fmt.Errorf("second arg must be *thrift.TStruct or pointer type implementing thrift.TStruct")
 	}
 
+	// 注册具体的 thrift 消息类型到全局缓存
+	registerThriftType(msgArgType)
+
 	return func(player *Player, msg *thrift.TStruct) error {
 		if msg == nil || *msg == nil {
 			return fmt.Errorf("nil thrift message")
diff --git a/src/server/game/proto_factory.go b/src/server/game/proto_factory.go
index 262eed67..ee40908c 100644
--- a/src/server/game/proto_factory.go
+++ b/src/server/game/proto_factory.go
@@ -32,21 +32,24 @@ func buildProtoMessageTypeCache() {
 	})
 }
 
+func registerThriftType(msgType reflect.Type) {
+	if msgType == nil || msgType.Kind() != reflect.Ptr {
+		return
+	}
+	elemType := msgType.Elem()
+	if elemType.Name() != "" {
+		thriftMessageTypeByName.Store(elemType.Name(), msgType)
+	}
+	thriftMessageTypeByName.Store(msgType.String(), msgType)
+	thriftMessageTypeByName.Store(elemType.String(), msgType)
+	if elemType.PkgPath() != "" && elemType.Name() != "" {
+		thriftMessageTypeByName.Store(elemType.PkgPath()+"."+elemType.Name(), msgType)
+	}
+}
+
 func buildThriftMessageTypeCache() {
 	msg.Processor.Range(func(_ uint16, msgType reflect.Type) {
-		if msgType == nil || msgType.Kind() != reflect.Ptr {
-			return
-		}
-
-		elemType := msgType.Elem()
-		if elemType.Name() != "" {
-			thriftMessageTypeByName.Store(elemType.Name(), msgType)
-		}
-		thriftMessageTypeByName.Store(msgType.String(), msgType)
-		thriftMessageTypeByName.Store(elemType.String(), msgType)
-		if elemType.PkgPath() != "" && elemType.Name() != "" {
-			thriftMessageTypeByName.Store(elemType.PkgPath()+"."+elemType.Name(), msgType)
-		}
+		registerThriftType(msgType)
 	})
 }
 
diff --git a/src/server/unit_test/playroom_test.go b/src/server/unit_test/playroom_test.go
index 80c563d0..7d8a91b7 100644
--- a/src/server/unit_test/playroom_test.go
+++ b/src/server/unit_test/playroom_test.go
@@ -1,6 +1,8 @@
 package unit
 
 import (
+	"fmt"
+	"go/importer"
 	"server/game"
 	"testing"
 )
@@ -11,3 +13,19 @@ func TestPlayroomVisit(t *testing.T) {
 	player.InitPlayerOnly()
 	player.GetVisitorPlayer()
 }
+
+func TestFlect(t *testing.T) {
+	pkgPath := "server/msg/meowmentnet"
+	pkg, err := importer.Default().Import(pkgPath)
+	if err != nil {
+		fmt.Printf("failed to import package %s: %v\n", pkgPath, err)
+		return
+	}
+	for _, name := range pkg.Scope().Names() {
+		obj := pkg.Scope().Lookup(name)
+		if obj == nil {
+			continue
+		}
+		fmt.Printf("name %s, obj name %s\n", name, obj.Type())
+	}
+}

From d525a432480dd0034a18c55f17b49fea1f7b259d Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 14 Apr 2026 20:44:22 +0800
Subject: [PATCH 05/25] =?UTF-8?q?=E8=A2=AB=E8=B8=A2=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8D=E6=96=AD=E5=BC=80socket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/GameLogic.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index e07ef628..da556aaa 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -645,7 +645,6 @@ func (ad *GameLogic) ReplaceExistPlayerAndAgent(a gate.Agent, player *Player) er
 	if agent != nil && a != agent {
 		G_getGameLogic().PackResInfo(agent, "ForceKickOut", data)
 		internal.AsignPlayerToAgents(agent, ad.NotInitPlayer)
-		agent.Close()
 		log.Debug("player %d 被挤下线", player.M_DwUin)
 	}
 	internal.AsignPlayerToAgents(a, player)

From f238dd1e768d7512f92ade61386f90cfa2014a95 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 14 Apr 2026 22:17:12 +0800
Subject: [PATCH 06/25] =?UTF-8?q?=E5=BB=BA=E9=80=A0=E6=89=93=E6=8A=98?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A0=E7=89=A9=E5=B8=81=E5=90=91=E4=B8=8A=E5=8F=96?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/mod/decorate/Decorate.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go
index bf0e2de5..7fb9d4f0 100644
--- a/src/server/game/mod/decorate/Decorate.go
+++ b/src/server/game/mod/decorate/Decorate.go
@@ -98,7 +98,7 @@ func (d *Decorate) GetDecorateCostItem(areaId, decorateId int, decorateOffIsExis
 	id := decorateCfg.GetIdBySenceAndLv(areaId, decorateId)
 	if decorateOffIsExist {
 		offRate := limitedTimeEventCfg.GetDecorateOffDiscount(areaId, decorateId)
-		itemNum = int(math.Round(float64(itemNum) * float64(offRate) / 100))
+		itemNum = int(math.Ceil(float64(itemNum) * float64(offRate) / 100))
 	}
 	items := []*item.Item{item.NewItem(item.ITEM_STAR_ID, itemNum)}
 	partCostInfo := d.PartCost[id]
@@ -157,7 +157,7 @@ func (d *Decorate) DecorateAll(star int, decorateOffIsExist bool) ([]*item.Item,
 		needStar := decorateCfg.GetStarCost(d.AreaId, v)
 		if decorateOffIsExist {
 			offRate := limitedTimeEventCfg.GetDecorateOffDiscount(d.AreaId, v)
-			needStar = int(math.Round(float64(needStar) * float64(offRate) / 100))
+			needStar = int(math.Ceil(float64(needStar) * float64(offRate) / 100))
 		}
 		if star < needStar {
 			break

From fb2320c4dde171fcd7c860a31bde099bf56818be Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 15 Apr 2026 17:18:27 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E7=8C=AB=E7=8C=AB=E5=9B=9E=E7=A4=BC?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1=E8=81=9A=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go         | 4 ++--
 src/server/game/register_network_func.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 68ad6240..a29735d5 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -202,9 +202,9 @@ func (p *Player) CatReturnGiftZeroUpdate() {
 		if cfg != nil {
 			for _, v := range cfg.RewardList {
 				if oldScore >= int(v.Total) && oldReward < int(v.Id) {
-					items = append(items, item.MsgToItem(v.Reward)...)
+					items = item.Merge(items, item.MsgToItem(v.Reward))
 					if v.StarReward > 0 {
-						items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor())))
+						items = item.Merge(items, []*item.Item{item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor()))})
 					}
 				}
 			}
diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go
index 1bd83b6e..68c52351 100644
--- a/src/server/game/register_network_func.go
+++ b/src/server/game/register_network_func.go
@@ -5015,10 +5015,10 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	var maxRewardId int
 	for _, v := range cfg.RewardList {
 		if score >= int(v.Total) && reward < int(v.Id) {
-			items = append(items, item.MsgToItem(v.Reward)...)
+			items = item.Merge(items, item.MsgToItem(v.Reward))
 			maxRewardId = max(maxRewardId, int(v.Id))
 			if v.StarReward > 0 {
-				items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor())))
+				items = item.Merge(items, []*item.Item{item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor()))})
 			}
 		}
 	}

From d5faf42da07d506744c03a0f0b83e244bb0c46eb Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 15 Apr 2026 20:44:25 +0800
Subject: [PATCH 08/25] playroom interact bug fix

---
 src/server/game/player_data.go        | 9 +++++++++
 src/server/unit_test/playroom_test.go | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index b48129af..cb7e9b39 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -290,6 +290,7 @@ func (p *Player) InitPlayer(UserName string) error {
 	p.FixOrderBug()
 	p.FixDecorate()
 	p.FixPlayroomPyhical()
+	p.FixPlayroomInteract()
 	return nil
 }
 
@@ -1484,6 +1485,14 @@ func (p *Player) FixPlayroomPyhical() {
 	}
 }
 
+func (p *Player) FixPlayroomInteract() {
+	PlayroomMod := p.PlayMod.getPlayroomMod()
+	BaseMod := p.PlayMod.getBaseMod()
+	if BaseMod.GetLevel() < playroomCfg.GetInteractNum() {
+		PlayroomMod.InteractNum = 0
+	}
+}
+
 func (p *Player) GetOrderFactor() int {
 	return orderCfg.GetOrderFactor(p.GetDecorateMod().AreaId)
 }
diff --git a/src/server/unit_test/playroom_test.go b/src/server/unit_test/playroom_test.go
index 73ff4438..97a22f6e 100644
--- a/src/server/unit_test/playroom_test.go
+++ b/src/server/unit_test/playroom_test.go
@@ -11,3 +11,10 @@ func TestPlayroomVisit(t *testing.T) {
 	player.InitPlayerOnly()
 	player.GetVisitorPlayer()
 }
+
+func TestInteract(t *testing.T) {
+	player := getTestPlayer()
+	BaseMod := player.GetBaseMod()
+	PlayroomMod := player.GetPlayroomMod()
+	PlayroomMod.AddInteractNum(BaseMod.GetLevel())
+}

From 4253df8f13ff7e821107410c45f977d517e7b704 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 15 Apr 2026 20:59:36 +0800
Subject: [PATCH 09/25] playroom interact bug fix

---
 src/server/game/player_data.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index cb7e9b39..cb76ddb7 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -352,6 +352,8 @@ func (p *Player) InitPlayerByUid(Uid int) error {
 	ChargeMod.FixBug(ChessMod.GetEmitList())
 	p.FixOrderBug()
 	p.FixDecorate()
+	p.FixPlayroomPyhical()
+	p.FixPlayroomInteract()
 	return nil
 }
 
@@ -1488,7 +1490,7 @@ func (p *Player) FixPlayroomPyhical() {
 func (p *Player) FixPlayroomInteract() {
 	PlayroomMod := p.PlayMod.getPlayroomMod()
 	BaseMod := p.PlayMod.getBaseMod()
-	if BaseMod.GetLevel() < playroomCfg.GetInteractNum() {
+	if BaseMod.GetLevel() < playroomCfg.GetInteractUnlock() {
 		PlayroomMod.InteractNum = 0
 	}
 }

From 49a551dabad8545ae5202ebd17d97fde075d7b98 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:35:32 +0800
Subject: [PATCH 10/25] Revert "Merge branch 'thrift' into develop"

This reverts commit 00a30d9f13958178f9ae10c087ecfc11f3c8a9a3, reversing
changes made to 4253df8f13ff7e821107410c45f977d517e7b704.
---
 .gitignore                                    |   3 +-
 src/server/conf/item/Item_cfg.go              |   4 +-
 src/server/conf/language/language_cfg.go      |  18 +-
 src/server/conf/mail/mail_cfg.go              |  26 +-
 src/server/conf/server.json                   |   2 +-
 src/server/game/GameLogic.go                  |  38 +-
 src/server/game/activity_func.go              |  58 +-
 src/server/game/activity_mgr.go               |  11 +-
 src/server/game/admin.go                      |  29 +-
 src/server/game/charge_func.go                |   2 +-
 src/server/game/external.go                   |  50 +-
 src/server/game/gm_handler.go                 |   8 +-
 src/server/game/limited_time_trigger.go       |   2 +-
 src/server/game/message_handler.go            |  14 +-
 src/server/game/mod/avatar/Avatar.go          |   2 +-
 src/server/game/mod/base/Base.go              |   2 +-
 src/server/game/mod/card/Card.go              |   2 +-
 src/server/game/mod/champship/Champship.go    |   2 +-
 src/server/game/mod/charge/Charge.go          |   2 +-
 src/server/game/mod/chess/Chess.go            |   6 +-
 src/server/game/mod/collect/Collect.go        |   2 +-
 src/server/game/mod/daily_task/DailyTask.go   |   2 +-
 src/server/game/mod/decorate/Decorate.go      |   2 +-
 src/server/game/mod/emoji/emoji.go            |   2 +-
 src/server/game/mod/endless/Endless.go        |   2 +-
 src/server/game/mod/face/Face.go              |   2 +-
 src/server/game/mod/friend/Friend.go          |   2 +-
 .../mod/friend_treasure.go/friend_treasure.go |   2 +-
 src/server/game/mod/fur/fur.go                |   2 +-
 src/server/game/mod/guide/Guide.go            |   2 +-
 src/server/game/mod/guide_task/guide_task.go  |   2 +-
 src/server/game/mod/handbook/Handbook.go      |   2 +-
 src/server/game/mod/invite/invite.go          |   2 +-
 src/server/game/mod/item/Item.go              |   2 +-
 src/server/game/mod/kv/kv.go                  |   2 +-
 .../limited_time_event/limited_time_event.go  |  12 +-
 src/server/game/mod/mail/Mail.go              |   2 +-
 src/server/game/mod/order/Order.go            |  20 +-
 src/server/game/mod/piggy_bank/piggy_bank.go  |   2 +-
 src/server/game/mod/playroom/playroom.go      |   2 +-
 src/server/game/mod/quest/Quest.go            |   2 +-
 .../game/mod/seven_login/seven_login.go       |   2 +-
 src/server/game/notification.go               |   2 +-
 src/server/game/player_back.go                |  10 +-
 src/server/game/player_base_mod.go            |  37 +-
 src/server/game/player_chess_mod.go           |  44 +-
 src/server/game/player_data.go                |  23 +-
 src/server/game/proto_factory.go              |  66 +-
 src/server/game/register_network_func.go      | 740 +++++++++---------
 src/server/game/req_func_friend.go            |  62 +-
 src/server/game/req_func_fur.go               |   2 +-
 src/server/game/trigger_func.go               |  22 +-
 src/server/game/unit_test.go                  |   2 +-
 src/server/game_util/GoUtil.go                |  34 -
 src/server/gate/router.go                     |   9 +-
 src/server/go.mod                             |   3 +-
 src/server/go.sum                             |   6 -
 src/server/msg/msg.go                         |  14 +-
 58 files changed, 672 insertions(+), 757 deletions(-)

diff --git a/.gitignore b/.gitignore
index db214c9b..41bb583f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,4 @@ src/server/GeoLite2-Country
 src/server/test/GeoLite2-Country
 src/server/msg/Gameapi_grpc.pb.go
 src/server/unit_test/*.exe*
-src/server/unit_test/log*
-src/server/msg/meowmentnet
+src/server/unit_test/log*
\ No newline at end of file
diff --git a/src/server/conf/item/Item_cfg.go b/src/server/conf/item/Item_cfg.go
index 016619fc..c904b16f 100644
--- a/src/server/conf/item/Item_cfg.go
+++ b/src/server/conf/item/Item_cfg.go
@@ -3,7 +3,7 @@ package itemCfg
 import (
 	languageCfg "server/conf/language"
 	"server/gamedata"
-	"server/msg/meowmentnet"
+	"server/msg"
 	"strconv"
 	"strings"
 
@@ -61,5 +61,5 @@ func GetItemName(Id int) (string, string) {
 		return "", ""
 	}
 	name := gamedata.GetStringValue(data, "Name")
-	return languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, name), languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, name)
+	return languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, name), languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, name)
 }
diff --git a/src/server/conf/language/language_cfg.go b/src/server/conf/language/language_cfg.go
index ffcb9462..53bdce56 100644
--- a/src/server/conf/language/language_cfg.go
+++ b/src/server/conf/language/language_cfg.go
@@ -2,7 +2,7 @@ package languageCfg
 
 import (
 	"server/gamedata"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 const (
@@ -31,13 +31,13 @@ func _GetClientLanguage(lang msg.LANG_TYPE, key string) string {
 		return key
 	}
 	switch lang {
-	case msg.LANG_TYPE_LangEn:
+	case msg.LANG_TYPE_LANG_EN:
 		return gamedata.GetStringValue(data, "en_US")
-	case msg.LANG_TYPE_LangPtbr:
+	case msg.LANG_TYPE_LANG_PTBR:
 		return gamedata.GetStringValue(data, "pt_BR")
-	case msg.LANG_TYPE_LangCn:
+	case msg.LANG_TYPE_LANG_CN:
 		return gamedata.GetStringValue(data, "zh_CN")
-	case msg.LANG_TYPE_LangEsLatam:
+	case msg.LANG_TYPE_LANG_ES_LATAM:
 		return gamedata.GetStringValue(data, "es_LATAM")
 	default:
 		return key
@@ -50,13 +50,13 @@ func _GetBackendLanguage(lang msg.LANG_TYPE, key string) string {
 		return key
 	}
 	switch lang {
-	case msg.LANG_TYPE_LangEn:
+	case msg.LANG_TYPE_LANG_EN:
 		return gamedata.GetStringValue(data, "en_US")
-	case msg.LANG_TYPE_LangPtbr:
+	case msg.LANG_TYPE_LANG_PTBR:
 		return gamedata.GetStringValue(data, "pt_BR")
-	case msg.LANG_TYPE_LangCn:
+	case msg.LANG_TYPE_LANG_CN:
 		return gamedata.GetStringValue(data, "zh_CN")
-	case msg.LANG_TYPE_LangEsLatam:
+	case msg.LANG_TYPE_LANG_ES_LATAM:
 		return gamedata.GetStringValue(data, "es_LATAM")
 	default:
 		return key
diff --git a/src/server/conf/mail/mail_cfg.go b/src/server/conf/mail/mail_cfg.go
index 478897b3..c237068a 100644
--- a/src/server/conf/mail/mail_cfg.go
+++ b/src/server/conf/mail/mail_cfg.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	GoUtil "server/game_util"
 	"server/gamedata"
-	"server/msg/meowmentnet"
+	"server/msg"
 	"strings"
 )
 
@@ -80,10 +80,10 @@ func GetRecallMail(Title, ItemName, TitleEn, ItemNameEn string) (string, string,
 	if err != nil {
 		return "", "", "", ""
 	}
-	mt := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Title"))
-	mc := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Content"))
-	mt_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Title"))
-	mc_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Content"))
+	mt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title"))
+	mc := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Content"))
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title"))
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Content"))
 	return fmt.Sprintf(mt, Title), fmt.Sprintf(mc, Title, ItemName), fmt.Sprintf(mt_en, TitleEn), fmt.Sprintf(mc_en, Title, ItemNameEn)
 }
 
@@ -92,10 +92,10 @@ func GetChargeSendMail(PlayerName string) (string, string, string, string) {
 	if err != nil {
 		return "", "", "", ""
 	}
-	mt := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Title"))
-	mc := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Content"))
-	mt_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Title"))
-	mc_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Content"))
+	mt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title"))
+	mc := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Content"))
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title"))
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Content"))
 	return mt, fmt.Sprintf(mc, PlayerName), mt_en, fmt.Sprintf(mc_en, PlayerName)
 }
 
@@ -104,9 +104,9 @@ func GetChargeReceiveMail(PlayerName string, Content string) (string, string, st
 	if err != nil {
 		return "", "", "", ""
 	}
-	mt := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Title"))
-	mc := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangCn, gamedata.GetStringValue(data, "Content"))
-	mt_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Title"))
-	mc_en := languageCfg.GetLanguage(meowmentnet.LANG_TYPE_LangEn, gamedata.GetStringValue(data, "Content"))
+	mt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Title"))
+	mc := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, gamedata.GetStringValue(data, "Content"))
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Title"))
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, gamedata.GetStringValue(data, "Content"))
 	return fmt.Sprintf(mt, PlayerName), fmt.Sprintf(mc, Content), fmt.Sprintf(mt_en, PlayerName), fmt.Sprintf(mc_en, Content)
 }
diff --git a/src/server/conf/server.json b/src/server/conf/server.json
index 38770d42..25ea9004 100644
--- a/src/server/conf/server.json
+++ b/src/server/conf/server.json
@@ -2,7 +2,7 @@
 	"AppID": 0,
 	"LogLevel": "debug", 
 	"LogPath": "./log",
-	"TCPAddr": ":3601",
+	"TCPAddr": ":3602",
 	"WSAddr": ":3567",
 	"RPCAddr": ":50051",
 	"MySqlAddr": "127.0.0.1",
diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index b97ae4cd..da556aaa 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -19,12 +19,13 @@ import (
 	"server/game/internal"
 
 	MsgMod "server/game/mod/msg"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"time"
 
-	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/robfig/cron/v3"
 
+	"google.golang.org/protobuf/proto"
+
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
 	"gitea.bywaystudios.com/pet_home/leaf/timer"
 
@@ -37,7 +38,7 @@ var (
 
 var isInitGameLogic = false
 var RegisterNetWorkFunc = make(map[string]interface{})
-var NewRegisterNetWorkFunc = make(map[string]func(*Player, *thrift.TStruct) error)
+var NewRegisterNetWorkFunc = make(map[string]func(*Player, *proto.Message) error)
 
 const (
 	SERVER_STATUS_OPEN     = 1 // 服务器状态 开放
@@ -58,8 +59,8 @@ func RegisterNewMsgProcessFunc(key string, value interface{}) {
 	NewRegisterNetWorkFunc[key] = handler
 }
 
-func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *thrift.TStruct) error, error) {
-	if fn, ok := value.(func(*Player, *thrift.TStruct) error); ok {
+func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *proto.Message) error, error) {
+	if fn, ok := value.(func(*Player, *proto.Message) error); ok {
 		return fn, nil
 	}
 
@@ -83,10 +84,10 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *thrift.TStruct
 		return nil, fmt.Errorf("return type must be error")
 	}
 
-	msgIfaceType := reflect.TypeOf((*thrift.TStruct)(nil)).Elem()
+	msgIfaceType := reflect.TypeOf((*proto.Message)(nil)).Elem()
 	msgArgType := rt.In(1)
-	if msgArgType == reflect.TypeOf((*thrift.TStruct)(nil)) {
-		return func(player *Player, msg *thrift.TStruct) error {
+	if msgArgType == reflect.TypeOf((*proto.Message)(nil)) {
+		return func(player *Player, msg *proto.Message) error {
 			results := rv.Call([]reflect.Value{reflect.ValueOf(player), reflect.ValueOf(msg)})
 			if results[0].IsNil() {
 				return nil
@@ -95,15 +96,12 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *thrift.TStruct
 		}, nil
 	}
 	if msgArgType.Kind() != reflect.Ptr || !msgArgType.Implements(msgIfaceType) {
-		return nil, fmt.Errorf("second arg must be *thrift.TStruct or pointer type implementing thrift.TStruct")
+		return nil, fmt.Errorf("second arg must be *proto.Message or pointer type implementing proto.Message")
 	}
 
-	// 注册具体的 thrift 消息类型到全局缓存
-	registerThriftType(msgArgType)
-
-	return func(player *Player, msg *thrift.TStruct) error {
+	return func(player *Player, msg *proto.Message) error {
 		if msg == nil || *msg == nil {
-			return fmt.Errorf("nil thrift message")
+			return fmt.Errorf("nil proto message")
 		}
 
 		raw := *msg
@@ -120,7 +118,7 @@ func buildNewMsgHandlerAdapter(value interface{}) (func(*Player, *thrift.TStruct
 	}, nil
 }
 
-func RunNewNetProcessByKey(key string, player *Player, msg *thrift.TStruct) error {
+func RunNewNetProcessByKey(key string, player *Player, msg *proto.Message) error {
 	fun, ok := NewRegisterNetWorkFunc[key]
 	if ok {
 		err := fun(player, msg)
@@ -302,8 +300,8 @@ func (ad *GameLogic) NewAccountInsertDataToDB() bool {
 }
 
 func (ad *GameLogic) PackLoginResInfo(a gate.Agent, ResLogin *msg.ResLogin) {
-	data := GoUtil.Marshal(ResLogin)
-	ad.PackResInfo(a, "ResLogin", data)
+	resBuff, _ := proto.Marshal(ResLogin)
+	ad.PackResInfo(a, "ResLogin", resBuff)
 }
 
 func (ad *GameLogic) PackResInfo(a gate.Agent, Func string, data []byte) {
@@ -324,7 +322,7 @@ func (ad *GameLogic) CreateNewPlayer(a gate.Agent, UserName string) *Player {
 	player.agent = a
 	err := player.InitPlayer(UserName)
 	if err != nil {
-		data := GoUtil.Marshal(&msg.ResLogin{ResultCode: MergeConst.Protocol_Error_Account_Fail})
+		data, _ := proto.Marshal(&msg.ResLogin{ResultCode: MergeConst.Protocol_Error_Account_Fail})
 		G_GameLogicPtr.PackResInfo(a, "ResLogin", data)
 		panic(err)
 	}
@@ -596,7 +594,7 @@ func (ad *GameLogic) InitServerInfo() {
 func (ad *GameLogic) SendServerVersion(a gate.Agent) {
 	res := &msg.ResServerVersion{}
 	res.Version = G_GameLogicPtr.Version
-	data := GoUtil.Marshal(res)
+	data, _ := proto.Marshal(res)
 	G_getGameLogic().PackResInfo(a, "ResServerVersion", data)
 }
 
@@ -643,7 +641,7 @@ func (ad *GameLogic) ReplaceExistPlayerAndAgent(a gate.Agent, player *Player) er
 	}
 	agent := player.GetAgentByPlayer()
 	notify := &msg.ForceKickOut{}
-	data := GoUtil.Marshal(notify)
+	data, _ := proto.Marshal(notify)
 	if agent != nil && a != agent {
 		G_getGameLogic().PackResInfo(agent, "ForceKickOut", data)
 		internal.AsignPlayerToAgents(agent, ad.NotInitPlayer)
diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index e7261787..a29735d5 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -15,7 +15,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/mail"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
@@ -65,14 +65,14 @@ func (p *Player) ActivityLogin() {
 		// 清空猫草大作战数据无需发邮件
 		MailMod := p.PlayMod.getMailMod()
 		MailMod.SendMail(&mail.MailStruct{
-			Title:          languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, "backend_gardenend_mail_title"),
-			TitleEn:        languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, "backend_gardenend_mail_title"),
-			Content:        languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, "backend_gardenend_mail_content"),
-			ContentEn:      languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, "backend_gardenend_mail_content"),
-			TitlePtBr:      languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, "backend_gardenend_mail_title"),
-			ContentPtBr:    languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, "backend_gardenend_mail_content"),
-			TitleEsLatam:   languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, "backend_gardenend_mail_title"),
-			ContentEsLatam: languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, "backend_gardenend_mail_content"),
+			Title:          languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_title"),
+			TitleEn:        languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_title"),
+			Content:        languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_content"),
+			ContentEn:      languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_content"),
+			TitlePtBr:      languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, "backend_gardenend_mail_title"),
+			ContentPtBr:    languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, "backend_gardenend_mail_content"),
+			TitleEsLatam:   languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, "backend_gardenend_mail_title"),
+			ContentEsLatam: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, "backend_gardenend_mail_content"),
 			Items:          catnipUnReward,
 			Type:           mail.MAIL_TYPE_NORMAL,
 		})
@@ -108,18 +108,18 @@ func (p *Player) ActivityLogin() {
 func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems []*item.Item) {
 	MailMod := p.PlayMod.getMailMod()
 	activity_title_key, mail_title_key, mail_content_key := activityCfg.GetActivityRecycleMail(ActivityId)
-	activity_title_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, activity_title_key)
-	activity_title_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, activity_title_key)
-	activity_title_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, activity_title_key)
-	activity_title_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, activity_title_key)
-	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_title_key)
-	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_content_key)
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_title_key)
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_content_key)
-	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_title_key)
-	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_content_key)
-	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_title_key)
-	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_content_key)
+	activity_title_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, activity_title_key)
+	activity_title_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, activity_title_key)
+	activity_title_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, activity_title_key)
+	activity_title_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, activity_title_key)
+	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_title_key)
+	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_content_key)
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_title_key)
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_content_key)
+	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_title_key)
+	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_content_key)
+	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_title_key)
+	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_content_key)
 	Items := []*item.Item{item.NewItem(ItemId, ItemNum)}
 	Items = append(Items, RewardItems...)
 	MailMod.SendMail(&mail.MailStruct{
@@ -139,14 +139,14 @@ func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems [
 // 发送活动邮件
 func (p *Player) SendActivityMail2(items []*item.Item, mail_title, mail_content string) {
 	MailMod := p.PlayMod.getMailMod()
-	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_title)
-	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, mail_content)
-	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_title)
-	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, mail_content)
-	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_title)
-	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, mail_content)
-	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_title)
-	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, mail_content)
+	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_title)
+	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_content)
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_title)
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_content)
+	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_title)
+	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_content)
+	mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_title)
+	mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_content)
 	MailMod.SendMail(&mail.MailStruct{
 		Title:          mt_zh,
 		Content:        mc_zh,
diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go
index 80e25441..4e13ff45 100644
--- a/src/server/game/activity_mgr.go
+++ b/src/server/game/activity_mgr.go
@@ -1,17 +1,18 @@
 package game
 
 import (
-	"encoding/json"
 	"fmt"
 	"server/db"
 	"server/game/mod/activity"
 	"server/game/mod/msg"
 	Msg "server/game/mod/msg"
 	GoUtil "server/game_util"
-	protoMsg "server/msg/meowmentnet"
+	protoMsg "server/msg"
 	"sync"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
+
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 type ActivityMgr struct {
@@ -170,21 +171,21 @@ func unmarshalActivityCfg(atype int, buf []byte) (interface{}, error) {
 	switch atype {
 	case 1:
 		cfg := &protoMsg.MiningCfg{}
-		err := json.Unmarshal(buf, cfg)
+		err := protojson.Unmarshal(buf, cfg)
 		if err != nil {
 			return nil, err
 		}
 		return cfg, nil
 	case 9:
 		cfg := &protoMsg.ChampionshipCfg{}
-		err := json.Unmarshal(buf, cfg)
+		err := protojson.Unmarshal(buf, cfg)
 		if err != nil {
 			return nil, err
 		}
 		return cfg, nil
 	case 10:
 		cfg := &protoMsg.CatReturnGiftCfg{}
-		err := json.Unmarshal(buf, cfg)
+		err := protojson.Unmarshal(buf, cfg)
 		if err != nil {
 			return nil, err
 		}
diff --git a/src/server/game/admin.go b/src/server/game/admin.go
index 5674ba9b..5c00ded4 100644
--- a/src/server/game/admin.go
+++ b/src/server/game/admin.go
@@ -11,7 +11,6 @@ import (
 	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
-	"server/msg/meowmentnet"
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
@@ -50,18 +49,18 @@ func AdminProcess(funcName string, args []interface{}) {
 	log.Debug("AdminProcess error: %v", "Func not found")
 }
 
-func VerifyUser(accountInfo *db.Db_Account, detail *meowmentnet.ReqLogin) (ResLogin *meowmentnet.ResLogin, accountInfoOut *db.Db_Account) {
-	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_CodeLogin) {
+func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg.ResLogin, accountInfoOut *db.Db_Account) {
+	if detail.Type == msg.LOGIN_TYPE_CODE_LOGIN {
 		err := VerifyCode(detail.UserName, detail.Code)
 		if err != nil {
-			ResLogin = &meowmentnet.ResLogin{
+			ResLogin = &msg.ResLogin{
 				ResultCode: MergeConst.Protocol_Error_Account_Code_Error,
 				DwUin:      0,
 			}
 			return
 		}
 	}
-	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_SdkLogin) {
+	if detail.Type == msg.LOGIN_TYPE_SDK_LOGIN {
 		if accountInfo == nil {
 			accountInfo = db.GetAccountInfoFromDb(detail.Device)
 		}
@@ -72,22 +71,22 @@ func VerifyUser(accountInfo *db.Db_Account, detail *meowmentnet.ReqLogin) (ResLo
 		}
 	}
 	if accountInfo == nil {
-		ResLogin = &meowmentnet.ResLogin{
+		ResLogin = &msg.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_NoExsit,
 			DwUin:      0,
 		}
 		return
 	}
-	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_AccountLogin) && accountInfo.UserPassword != detail.UserPwd {
-		ResLogin = &meowmentnet.ResLogin{
+	if detail.Type == msg.LOGIN_TYPE_ACCOUNT_LOGIN && accountInfo.UserPassword != detail.UserPwd {
+		ResLogin = &msg.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_OR_PWD_ERROR,
 			DwUin:      0,
 		}
 		return
 	}
-	if detail.Type == meowmentnet.LOGIN_TYPE(meowmentnet.LOGIN_TYPE_DeviceLogin) {
+	if detail.Type == msg.LOGIN_TYPE_DEVICE_LOGIN {
 		if detail.Device != accountInfo.DeviceId {
-			ResLogin = &meowmentnet.ResLogin{
+			ResLogin = &msg.ResLogin{
 				ResultCode: MergeConst.Protocol_Error_Account_Device_Error,
 				DwUin:      0,
 			}
@@ -97,7 +96,7 @@ func VerifyUser(accountInfo *db.Db_Account, detail *meowmentnet.ReqLogin) (ResLo
 
 	playerbaseinfo := db.GetPlayerBaseInfoFromDbByName(detail.UserName)
 	if playerbaseinfo == nil {
-		ResLogin = &meowmentnet.ResLogin{
+		ResLogin = &msg.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_NoExsit,
 			DwUin:      0,
 		}
@@ -105,14 +104,14 @@ func VerifyUser(accountInfo *db.Db_Account, detail *meowmentnet.ReqLogin) (ResLo
 	}
 
 	if playerbaseinfo.Ban > GoUtil.Now() || playerbaseinfo.Ban == -1 {
-		ResLogin = &meowmentnet.ResLogin{
+		ResLogin = &msg.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_Ban,
 			DwUin:      0,
 		}
 		return
 	}
 	accountInfoOut = accountInfo
-	ResLogin = &meowmentnet.ResLogin{
+	ResLogin = &msg.ResLogin{
 		ResultCode: 0,
 		DwUin:      playerbaseinfo.DwUin,
 		FaceBookId: playerbaseinfo.FaceBookId,
@@ -138,7 +137,7 @@ func ReqAdminShipping(args []interface{}) error {
 	}
 	player := G_GameLogicPtr.GetPlayer(int64(orderInfo.Uid))
 	if player != nil {
-		go player.TriggerShippingOrderOrigin(&meowmentnet.ReqShippingOrder{
+		go player.TriggerShippingOrderOrigin(&msg.ReqShippingOrder{
 			OrderSn: req.OrderSn,
 		})
 		res["Msg"] = "player online,triggered sync"
@@ -344,7 +343,7 @@ func AdminShipping(req *msg.ReqOrderShipping) (*msg.ResOrderShipping, error) {
 	// 玩家在线，通知发货
 	player := G_GameLogicPtr.GetPlayer(int64(orderInfo.Uid))
 	if player != nil {
-		go player.TriggerShippingOrderOrigin(&meowmentnet.ReqShippingOrder{
+		go player.TriggerShippingOrderOrigin(&msg.ReqShippingOrder{
 			OrderSn: req.OrderSn,
 		})
 		res.Msg = "player online,triggered sync"
diff --git a/src/server/game/charge_func.go b/src/server/game/charge_func.go
index 427fec7c..8d945e98 100644
--- a/src/server/game/charge_func.go
+++ b/src/server/game/charge_func.go
@@ -16,7 +16,7 @@ import (
 	piggyBank "server/game/mod/piggy_bank"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	proto "server/msg/meowmentnet"
+	proto "server/msg"
 	"strings"
 	"time"
 
diff --git a/src/server/game/external.go b/src/server/game/external.go
index dcc9344a..babd9bd5 100644
--- a/src/server/game/external.go
+++ b/src/server/game/external.go
@@ -1,7 +1,6 @@
 package game
 
 import (
-	"encoding/json"
 	"fmt"
 	"reflect"
 	"server/MergeConst"
@@ -11,12 +10,15 @@ import (
 	"strings"
 	"time"
 
-	msg "server/msg/meowmentnet"
+	"server/msg"
 
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
+
 	"server/db"
 )
 
@@ -71,46 +73,46 @@ func HandleClientReq(args []interface{}) {
 	case "ClientTick":
 	case "ReqChangePassword":
 		detail := &msg.ReqChangePassword{}
-		GoUtil.Unmarshal(buf, detail)
+		proto.Unmarshal(buf, detail)
 		accountInfo := db.GetAccountInfoFromDb(detail.UserName)
 		if accountInfo == nil {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_NoExsit
-			data := GoUtil.Marshal(ResChangePassword)
+			data, _ := proto.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
 		if accountInfo.UserPassword != detail.OldPwd && detail.OldPwd != "-1" {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_OR_PWD_ERROR
-			data := GoUtil.Marshal(ResChangePassword)
+			data, _ := proto.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
-		if strings.Count(detail.NewPwd_, "")-1 < 6 {
+		if strings.Count(detail.NewPwd, "")-1 < 6 {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_OR_PWD_Short
-			data := GoUtil.Marshal(ResChangePassword)
+			data, _ := proto.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
-		accountInfo.UserPassword = detail.NewPwd_
+		accountInfo.UserPassword = detail.NewPwd
 		err := db.UpdateAccountInfoToDb(accountInfo)
 		if err != nil {
 			ResChangePassword := &msg.ResChangePassword{}
 			ResChangePassword.ResultCode = MergeConst.Protocol_Error_Account_Fail
-			data := GoUtil.Marshal(ResChangePassword)
+			data, _ := proto.Marshal(ResChangePassword)
 			G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 			return
 		}
 		ResChangePassword := &msg.ResChangePassword{}
 		ResChangePassword.ResultCode = 0
-		data := GoUtil.Marshal(ResChangePassword)
+		data, _ := proto.Marshal(ResChangePassword)
 		G_GameLogicPtr.PackResInfo(a, "ResChangePassword", data)
 	case "ReqAdminInfo": // 后台接口
 		AdminProcess(m.GetFunc(), []interface{}{a, buf})
 	case "ReqLoginCode":
-		detailMsg, err := UnmarshalThriftMessageByName(m.GetFunc(), buf)
+		detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf)
 		if err != nil {
 			log.Error("unmarshal %s failed: %v", m.GetFunc(), err)
 			return
@@ -123,13 +125,13 @@ func HandleClientReq(args []interface{}) {
 			ResLoginCode.Msg = err.Error()
 		}
 		ResLoginCode.Code = Code
-		data := GoUtil.Marshal(ResLoginCode)
+		data, _ := proto.Marshal(ResLoginCode)
 		G_GameLogicPtr.PackResInfo(a, "ResLoginCode", data)
 	case "ReqServerVersion":
 		G_GameLogicPtr.SendServerVersion(a)
 	case "ReqRegisterAccount":
 		detail := &msg.ReqRegisterAccount{}
-		GoUtil.Unmarshal(buf, detail)
+		proto.Unmarshal(buf, detail)
 		log.Debug("player %s start register", detail.UserName)
 		gl := G_getGameLogic()
 		defer func() {
@@ -141,7 +143,7 @@ func HandleClientReq(args []interface{}) {
 		if gl.IsExsitAccount(detail.UserName) {
 			ResRegisterAccount := &msg.ResRegisterAccount{}
 			ResRegisterAccount.ResultCode = MergeConst.Protocol_Error_Account_Exist
-			data := GoUtil.Marshal(ResRegisterAccount)
+			data, _ := proto.Marshal(ResRegisterAccount)
 			gl.PackResInfo(a, "ResRegisterAccount", data)
 			break
 		}
@@ -150,17 +152,17 @@ func HandleClientReq(args []interface{}) {
 		if !gl.NewAccountInsertDataToDB() {
 			ResRegisterAccount := &msg.ResRegisterAccount{}
 			ResRegisterAccount.ResultCode = MergeConst.Protocol_Error_Account_Fail
-			data := GoUtil.Marshal(ResRegisterAccount)
+			data, _ := proto.Marshal(ResRegisterAccount)
 			gl.PackResInfo(a, "ResRegisterAccount", data)
 			break
 		}
 		ResRegisterAccount := &msg.ResRegisterAccount{}
 		ResRegisterAccount.ResultCode = 0
-		data := GoUtil.Marshal(ResRegisterAccount)
+		data, _ := proto.Marshal(ResRegisterAccount)
 		gl.PackResInfo(a, "ResRegisterAccount", data)
 	case "ReqLogin": // 登录请求
 		detail := &msg.ReqLogin{}
-		GoUtil.Unmarshal(buf, detail)
+		proto.Unmarshal(buf, detail)
 		accountInfo := db.GetAccountInfoFromDb(detail.UserName)
 		log.Debug("player %s start login", detail.UserName)
 		defer func() {
@@ -204,10 +206,10 @@ func HandleClientReq(args []interface{}) {
 		log.Debug("uid : %d, init user process : %s, execTime : %v , isNew: %v", p.(*Player).M_DwUin, m.GetFunc(), time.Since(start), newPlayer)
 	case "ReqServerTime": // 获取服务器时间
 		detail := &msg.ReqServerTime{}
-		GoUtil.Unmarshal(buf, detail)
+		proto.Unmarshal(buf, detail)
 		res := &msg.ResServerTime{}
 		res.ServerTime = (int32)(time.Now().Unix())
-		data := GoUtil.Marshal(res)
+		data, _ := proto.Marshal(res)
 		G_getGameLogic().PackResInfo(a, "ResServerTime", data)
 	case "ReqOfflineReconnect": // 断线重连
 		ReqOfflineReconnectFunc(a, buf)
@@ -230,7 +232,7 @@ func HandleClientReq(args []interface{}) {
 			p.(*Player).args = make(map[string]interface{})
 			p.(*Player).args["func"] = m
 			p.(*Player).args["agent"] = a
-			detailMsg, err := UnmarshalThriftMessageByName(m.GetFunc(), buf)
+			detailMsg, err := UnmarshalProtoMessageByName(m.GetFunc(), buf)
 			if err != nil {
 				log.Error("uid : %d, func : %s, unmarshal error : %s", p.(*Player).M_DwUin, m.GetFunc(), err)
 				p.(*Player).TeLog("func_unmarshal_error", map[string]interface{}{
@@ -242,12 +244,8 @@ func HandleClientReq(args []interface{}) {
 			err = RunNewNetProcessByKey(m.GetFunc(), p.(*Player), &detailMsg)
 			str := ""
 			if conf.Server.GameName == "pet_home" || conf.Server.GameName == "merge_pet_sdk" {
-				jsonBuf, err := json.Marshal(detailMsg)
-				if err != nil {
-					log.Error("marshal %s to json failed: %v", m.GetFunc(), err)
-					return
-				}
-				str = string(jsonBuf)
+				strbuf, _ := protojson.Marshal(detailMsg)
+				str = string(strbuf)
 			}
 			if err != nil {
 				log.Error("uid : %d, func : %s, err : %s", p.(*Player).M_DwUin, m.GetFunc(), err)
diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go
index 611cf4d8..4dfbd304 100644
--- a/src/server/game/gm_handler.go
+++ b/src/server/game/gm_handler.go
@@ -30,7 +30,7 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/playroom"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"strconv"
 	"strings"
 	"time"
@@ -58,11 +58,11 @@ func ReqGmCommand_(player *Player, Command string) error {
 	case "additem":
 		id, _ := strconv.Atoi(arg[1])
 		num, _ := strconv.Atoi(arg[2])
-		player.HandleItem([]*item.Item{item.NewItem(id, num)}, msg.ITEM_POP_LABEL_Gm.String())
+		player.HandleItem([]*item.Item{item.NewItem(id, num)}, msg.ITEM_POP_LABEL_GM.String())
 	case "subitem":
 		id, _ := strconv.Atoi(arg[1])
 		num, _ := strconv.Atoi(arg[2])
-		player.HandleItem([]*item.Item{item.NewItem(id, -num)}, msg.ITEM_POP_LABEL_Gm.String())
+		player.HandleItem([]*item.Item{item.NewItem(id, -num)}, msg.ITEM_POP_LABEL_GM.String())
 	case "reset_order":
 		player.PlayMod.mod_list.Order.Step = 0
 		player.PlayMod.mod_list.Order.InitData()
@@ -566,7 +566,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 				})
 			}
 		}
-		player.HandleItem(items, msg.ITEM_POP_LABEL_Gm.String())
+		player.HandleItem(items, msg.ITEM_POP_LABEL_GM.String())
 	case "resetCompensation":
 		compensationMod := player.PlayMod.getCompensationMod()
 		compensationMod.C20250910 = false
diff --git a/src/server/game/limited_time_trigger.go b/src/server/game/limited_time_trigger.go
index 6be08480..2b9de489 100644
--- a/src/server/game/limited_time_trigger.go
+++ b/src/server/game/limited_time_trigger.go
@@ -11,7 +11,7 @@ import (
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/playroom"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"time"
 )
 
diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go
index 3f0a04e0..b02d26c8 100644
--- a/src/server/game/message_handler.go
+++ b/src/server/game/message_handler.go
@@ -24,7 +24,7 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/playroom"
 	GoUtil "server/game_util"
-	proto "server/msg/meowmentnet"
+	proto "server/msg"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
@@ -915,12 +915,12 @@ func (player *Player) AddOrder() {
 		preheatStep := OrderMod.PreheatStep[chessColor]
 		OrderMod.PreheatStep[chessColor]++
 		if preheatStep < 4 {
-			NewChessId_ := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+preheatStep+1, chessColor)
+			newChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+preheatStep+1, chessColor)
 			items, ok := order.PreheatItems[OrderMod.PreheatStep[chessColor]]
 			if !ok {
-				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId_}, ChessMod.GetStarEmitList()))}
+				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{newChessId}, ChessMod.GetStarEmitList()))}
 			}
-			OrderMod.AddPreheatOrder([]int{NewChessId_}, order.DIFF_LOW, order.Preheat_type, items)
+			OrderMod.AddPreheatOrder([]int{newChessId}, order.DIFF_LOW, order.Preheat_type, items)
 		}
 	}
 	for _, v := range OrderMod.OrderList {
@@ -956,13 +956,13 @@ func (player *Player) FixOrderBug() {
 		if exit {
 			continue
 		}
-		NewChessId_ := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+v+1, k)
+		newChessId := mergeDataCfg.GetChessIdByLvAndColor(BaseMod.GetEnergyMul()+v+1, k)
 		OrderMod.PreheatStep[k]++
 		items, ok := order.PreheatItems[OrderMod.PreheatStep[k]]
 		if !ok {
-			items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{NewChessId_}, ChessMod.GetStarEmitList()))}
+			items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, order.GetOrderStar([]int{newChessId}, ChessMod.GetStarEmitList()))}
 		}
-		OrderMod.AddPreheatOrder([]int{NewChessId_}, order.DIFF_LOW, order.Preheat_type, items)
+		OrderMod.AddPreheatOrder([]int{newChessId}, order.DIFF_LOW, order.Preheat_type, items)
 	}
 }
 
diff --git a/src/server/game/mod/avatar/Avatar.go b/src/server/game/mod/avatar/Avatar.go
index 9bd58150..da2f3ca4 100644
--- a/src/server/game/mod/avatar/Avatar.go
+++ b/src/server/game/mod/avatar/Avatar.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	avatarCfg "server/conf/avatar"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type AvatarMod struct {
diff --git a/src/server/game/mod/base/Base.go b/src/server/game/mod/base/Base.go
index fc06fc93..85fbf4b0 100644
--- a/src/server/game/mod/base/Base.go
+++ b/src/server/game/mod/base/Base.go
@@ -6,7 +6,7 @@ import (
 	baseCfg "server/conf/base"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 const (
diff --git a/src/server/game/mod/card/Card.go b/src/server/game/mod/card/Card.go
index 8c5f16da..cf856d48 100644
--- a/src/server/game/mod/card/Card.go
+++ b/src/server/game/mod/card/Card.go
@@ -5,7 +5,7 @@ import (
 	cardCfg "server/conf/card"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 )
diff --git a/src/server/game/mod/champship/Champship.go b/src/server/game/mod/champship/Champship.go
index 00cfde32..e997b827 100644
--- a/src/server/game/mod/champship/Champship.go
+++ b/src/server/game/mod/champship/Champship.go
@@ -6,7 +6,7 @@ import (
 	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type ChampshipMod struct {
diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go
index f48ee622..6103ace3 100644
--- a/src/server/game/mod/charge/Charge.go
+++ b/src/server/game/mod/charge/Charge.go
@@ -9,7 +9,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/order"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 )
diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go
index 7b498bc7..a89b1d57 100644
--- a/src/server/game/mod/chess/Chess.go
+++ b/src/server/game/mod/chess/Chess.go
@@ -8,7 +8,7 @@ import (
 	userCfg "server/conf/user"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 	"strings"
 )
@@ -401,7 +401,7 @@ func (cb *ChessBorad) FinishOrderChessByBag(chess int) error {
 }
 
 // 棋子转换
-func (cb *ChessBorad) ExChess(oldChessId, NewChessId_ int) error {
+func (cb *ChessBorad) ExChess(oldChessId, newChessId int) error {
 	if oldChessId > 0 {
 		newList, b := GoUtil.PopElemSlice(cb.ChessList, oldChessId)
 		if !b {
@@ -409,7 +409,7 @@ func (cb *ChessBorad) ExChess(oldChessId, NewChessId_ int) error {
 		}
 		cb.ChessList = newList
 	}
-	return cb.AddChess(NewChessId_)
+	return cb.AddChess(newChessId)
 }
 
 // 增加棋盘缓冲器
diff --git a/src/server/game/mod/collect/Collect.go b/src/server/game/mod/collect/Collect.go
index cc509c4c..d6eac176 100644
--- a/src/server/game/mod/collect/Collect.go
+++ b/src/server/game/mod/collect/Collect.go
@@ -5,7 +5,7 @@ import (
 	collectCfg "server/conf/collect"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type Collect struct {
diff --git a/src/server/game/mod/daily_task/DailyTask.go b/src/server/game/mod/daily_task/DailyTask.go
index b673f024..8a2ec057 100644
--- a/src/server/game/mod/daily_task/DailyTask.go
+++ b/src/server/game/mod/daily_task/DailyTask.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go
index dbcd6a68..7fb9d4f0 100644
--- a/src/server/game/mod/decorate/Decorate.go
+++ b/src/server/game/mod/decorate/Decorate.go
@@ -8,7 +8,7 @@ import (
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 )
 
diff --git a/src/server/game/mod/emoji/emoji.go b/src/server/game/mod/emoji/emoji.go
index fcaa48bc..f55a1669 100644
--- a/src/server/game/mod/emoji/emoji.go
+++ b/src/server/game/mod/emoji/emoji.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	emojiCfg "server/conf/emoji"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type EmojiMod struct {
diff --git a/src/server/game/mod/endless/Endless.go b/src/server/game/mod/endless/Endless.go
index f5e75b96..7fcbd28a 100644
--- a/src/server/game/mod/endless/Endless.go
+++ b/src/server/game/mod/endless/Endless.go
@@ -5,7 +5,7 @@ import (
 	"math"
 	endlessCfg "server/conf/endless"
 	"server/game/mod/item"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 )
 
diff --git a/src/server/game/mod/face/Face.go b/src/server/game/mod/face/Face.go
index a670541f..91c8050d 100644
--- a/src/server/game/mod/face/Face.go
+++ b/src/server/game/mod/face/Face.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	faceCfg "server/conf/face"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type FaceMod struct {
diff --git a/src/server/game/mod/friend/Friend.go b/src/server/game/mod/friend/Friend.go
index c5c741e5..bcf22fc2 100644
--- a/src/server/game/mod/friend/Friend.go
+++ b/src/server/game/mod/friend/Friend.go
@@ -7,7 +7,7 @@ import (
 	"server/game/mod/card"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 )
 
diff --git a/src/server/game/mod/friend_treasure.go/friend_treasure.go b/src/server/game/mod/friend_treasure.go/friend_treasure.go
index a9ca4cd2..6f7e086d 100644
--- a/src/server/game/mod/friend_treasure.go/friend_treasure.go
+++ b/src/server/game/mod/friend_treasure.go/friend_treasure.go
@@ -5,7 +5,7 @@ import (
 	friendTreasureCfg "server/conf/friend_treasure"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type FriendTreasureMod struct {
diff --git a/src/server/game/mod/fur/fur.go b/src/server/game/mod/fur/fur.go
index 6c783c2f..6a68f166 100644
--- a/src/server/game/mod/fur/fur.go
+++ b/src/server/game/mod/fur/fur.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	fur_cfg "server/conf/fur"
 	"server/game/mod/item"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type FurMod struct {
diff --git a/src/server/game/mod/guide/Guide.go b/src/server/game/mod/guide/Guide.go
index caba0c97..6a6c4785 100644
--- a/src/server/game/mod/guide/Guide.go
+++ b/src/server/game/mod/guide/Guide.go
@@ -5,7 +5,7 @@ import (
 	guidecfg "server/conf/guide"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type Guide struct {
diff --git a/src/server/game/mod/guide_task/guide_task.go b/src/server/game/mod/guide_task/guide_task.go
index f9d5d374..7df792f8 100644
--- a/src/server/game/mod/guide_task/guide_task.go
+++ b/src/server/game/mod/guide_task/guide_task.go
@@ -6,7 +6,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type GuideTaskMod struct {
diff --git a/src/server/game/mod/handbook/Handbook.go b/src/server/game/mod/handbook/Handbook.go
index ec2f1e1a..7bd3ee6c 100644
--- a/src/server/game/mod/handbook/Handbook.go
+++ b/src/server/game/mod/handbook/Handbook.go
@@ -6,7 +6,7 @@ import (
 	handbookCfg "server/conf/handbook"
 	startMergeCfg "server/conf/start_merge"
 	"server/game/mod/item"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type Handbook struct {
diff --git a/src/server/game/mod/invite/invite.go b/src/server/game/mod/invite/invite.go
index bc287571..b737b9dc 100644
--- a/src/server/game/mod/invite/invite.go
+++ b/src/server/game/mod/invite/invite.go
@@ -5,7 +5,7 @@ import (
 	inviteCfg "server/conf/invite"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type InviteMod struct {
diff --git a/src/server/game/mod/item/Item.go b/src/server/game/mod/item/Item.go
index c1690b80..a5b3f892 100644
--- a/src/server/game/mod/item/Item.go
+++ b/src/server/game/mod/item/Item.go
@@ -3,7 +3,7 @@ package item
 import (
 	"fmt"
 	"math"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type Item struct {
diff --git a/src/server/game/mod/kv/kv.go b/src/server/game/mod/kv/kv.go
index 640179ea..6700eac5 100644
--- a/src/server/game/mod/kv/kv.go
+++ b/src/server/game/mod/kv/kv.go
@@ -2,7 +2,7 @@ package kv
 
 import (
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type KvMod struct {
diff --git a/src/server/game/mod/limited_time_event/limited_time_event.go b/src/server/game/mod/limited_time_event/limited_time_event.go
index 20014970..2d8f7423 100644
--- a/src/server/game/mod/limited_time_event/limited_time_event.go
+++ b/src/server/game/mod/limited_time_event/limited_time_event.go
@@ -7,7 +7,7 @@ import (
 	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 const (
@@ -537,29 +537,29 @@ func getLimitEventMsg(eType int, event *LTEInfo) *msg.LimitEvent {
 		if !ok {
 			return nil
 		}
-		param[msg.LimitEventParam_LuckyCatEarnings.String()] = int32(d.MaxEarings)
+		param[msg.LimitEventParam_LUCKY_CAT_EARNINGS.String()] = int32(d.MaxEarings)
 	case EVENT_TYPE_CAT_TRICK:
 		d, ok := event.D.(*CatTrick)
 		if !ok {
 			return nil
 		}
 		energy := d.Energy
-		param[msg.LimitEventParam_CatTrickEnergy.String()] = int32(energy)
+		param[msg.LimitEventParam_CAT_TRICK_ENERGY.String()] = int32(energy)
 	case EVENT_TYPE_PAYBACK_DAY:
 		d, ok := event.D.(*PaybackDay)
 		if !ok {
 			return nil
 		}
-		param[msg.LimitEventParam_PaybackDayCount.String()] = int32(d.Count)
+		param[msg.LimitEventParam_PAYBACK_DAY_COUNT.String()] = int32(d.Count)
 	case EVENT_TYPE_SENCE_DASH:
 		times := GoUtil.Int(event.Info["Times"])
-		param[msg.LimitEventParam_SenceDashTimes.String()] = int32(times)
+		param[msg.LimitEventParam_SENCE_DASH_TIMES.String()] = int32(times)
 	}
 	return &msg.LimitEvent{
 		EndTime:   endTime,
 		ShowTime:  showTime,
 		Cd:        int32(cd),
-		Mul:       float64(mul),
+		Mul:       float32(mul),
 		StartTime: int32(event.StartT),
 		Param:     param,
 	}
diff --git a/src/server/game/mod/mail/Mail.go b/src/server/game/mod/mail/Mail.go
index fe5eeac9..7bd16127 100644
--- a/src/server/game/mod/mail/Mail.go
+++ b/src/server/game/mod/mail/Mail.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type MailMod struct {
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index fe8992d0..3be4d046 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -6,7 +6,7 @@ import (
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"strings"
 	"time"
 )
@@ -344,19 +344,19 @@ func (o *OrderMod) CreatePriorityOrder(lv int, emit []int) bool {
 					if B == 1 {
 						newColor := GoUtil.RandStringSlice(produce[1:])
 						diffLv := GoUtil.RandMap(map[int]int{DIFF_LOW: 70, DIFF_MID: 30})
-						NewChessId_ := 0
+						newChessId := 0
 						switch diffLv {
 						case DIFF_LOW:
 							newLv := GoUtil.RandNum(4, 3+durLv)
-							NewChessId_ = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
+							newChessId = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
 						case DIFF_MID:
 							newLv := GoUtil.RandNum(4+durLv, 3+durLv*2)
-							NewChessId_ = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
+							newChessId = mergeDataCfg.GetChessIdByLvAndColor(newLv, newColor)
 						}
-						if NewChessId_ == 0 {
+						if newChessId == 0 {
 							continue
 						}
-						o.addOrder([]int{NewChessId_}, diffLv, Common_type)
+						o.addOrder([]int{newChessId}, diffLv, Common_type)
 						return true
 					}
 				}
@@ -701,16 +701,16 @@ func (o *OrderMod) ChangeEnergyMul(lv int, emit []int, energyMul int, chessList
 			chessId := v.MergeId[0]
 			chessColor := mergeDataCfg.GetColorById(chessId)
 			preheatStep := o.PreheatStep[chessColor]
-			NewChessId_ := mergeDataCfg.GetChessIdByLvAndColor(energyMul+preheatStep, chessColor)
-			if NewChessId_ == 0 {
+			newChessId := mergeDataCfg.GetChessIdByLvAndColor(energyMul+preheatStep, chessColor)
+			if newChessId == 0 {
 				continue
 			}
 			delete(o.OrderList, k)
 			items, ok := PreheatItems[preheatStep]
 			if !ok {
-				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, GetOrderStar([]int{NewChessId_}, emit))}
+				items = []*item.Item{item.NewItem(item.ITEM_STAR_ID, GetOrderStar([]int{newChessId}, emit))}
 			}
-			o.addPreheatOrder([]int{NewChessId_}, DIFF_LOW, Preheat_type, items)
+			o.addPreheatOrder([]int{newChessId}, DIFF_LOW, Preheat_type, items)
 		}
 	}
 
diff --git a/src/server/game/mod/piggy_bank/piggy_bank.go b/src/server/game/mod/piggy_bank/piggy_bank.go
index 94be5d0c..32d40731 100644
--- a/src/server/game/mod/piggy_bank/piggy_bank.go
+++ b/src/server/game/mod/piggy_bank/piggy_bank.go
@@ -4,7 +4,7 @@ import (
 	chargeCfg "server/conf/charge"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type PiggyBankMod struct {
diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go
index 2eb7f62d..fefed16b 100644
--- a/src/server/game/mod/playroom/playroom.go
+++ b/src/server/game/mod/playroom/playroom.go
@@ -8,7 +8,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
diff --git a/src/server/game/mod/quest/Quest.go b/src/server/game/mod/quest/Quest.go
index 9f51fe4e..a3226e80 100644
--- a/src/server/game/mod/quest/Quest.go
+++ b/src/server/game/mod/quest/Quest.go
@@ -3,7 +3,7 @@ package quest
 import (
 	"fmt"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"strconv"
 	"strings"
 )
diff --git a/src/server/game/mod/seven_login/seven_login.go b/src/server/game/mod/seven_login/seven_login.go
index 7aa0dee9..e07bfb3d 100644
--- a/src/server/game/mod/seven_login/seven_login.go
+++ b/src/server/game/mod/seven_login/seven_login.go
@@ -5,7 +5,7 @@ import (
 	sevenLoginCfg "server/conf/seven_login"
 	"server/game/mod/item"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 type SevenLoginMod struct {
diff --git a/src/server/game/notification.go b/src/server/game/notification.go
index b14d66b3..00528b59 100644
--- a/src/server/game/notification.go
+++ b/src/server/game/notification.go
@@ -5,7 +5,7 @@ import (
 	languageCfg "server/conf/language"
 	notification_cfg "server/conf/notification"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 const (
diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go
index 3e77559a..7c8e8413 100644
--- a/src/server/game/player_back.go
+++ b/src/server/game/player_back.go
@@ -7,7 +7,7 @@ import (
 	"server/game/mod/item"
 	limitedTimeEvent "server/game/mod/limited_time_event"
 	GoUtil "server/game_util"
-	proto "server/msg/meowmentnet"
+	proto "server/msg"
 )
 
 func (p *Player) NotifyPlayroomTask() {
@@ -287,7 +287,7 @@ func (p *Player) ChargeBackData() {
 		specialChargeWeek = int32(GoUtil.FullWeeksSince(c.LastSpecialCharge))
 	}
 	p.PushClientRes(&proto.ResCharge{
-		Charge:            float64(c.Charge),
+		Charge:            float32(c.Charge),
 		Total:             int32(c.Total),
 		First:             GoUtil.MapIntToSlice(c.EnergyShop),
 		SpecialShop:       specialShop,
@@ -295,10 +295,10 @@ func (p *Player) ChargeBackData() {
 		ChessShop:         chessShop,
 		Gift:              GoUtil.MapIntToInt32(c.Gift),
 		Ad:                c.Ad,
-		SpecialCharge:     float64(c.SpecialCharge),
+		SpecialCharge:     float32(c.SpecialCharge),
 		SpecialChargeWeek: specialChargeWeek,
-		TodayCharge:       float64(c.TodayCharge),
-		MonthCharge:       float64(c.MonthCharge),
+		TodayCharge:       float32(c.TodayCharge),
+		MonthCharge:       float32(c.MonthCharge),
 		Wish:              resWish,
 		AdEndTime:         c.AdEndTime,
 		WeeklyDiscount:    weeklyDiscount,
diff --git a/src/server/game/player_base_mod.go b/src/server/game/player_base_mod.go
index 5145f32d..cedc8ad1 100644
--- a/src/server/game/player_base_mod.go
+++ b/src/server/game/player_base_mod.go
@@ -14,10 +14,12 @@ import (
 	Msg "server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/quest"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
+
+	"google.golang.org/protobuf/proto"
 )
 
 type PlayerBaseData struct {
@@ -201,7 +203,10 @@ func (p *PlayerBaseData) ReqRemoveAd(player *Player, req *msg.ReqRemoveAd) {
 	res := &msg.ResRemoveAd{}
 	p.Data.NoAd = 1
 	res.ResultCode = 0
-	player.PushClientRes(res)
+
+	agent := player.GetAgentByPlayer()
+	data, _ := proto.Marshal(res)
+	G_getGameLogic().PackResInfo(agent, "ResRemoveAd", data)
 }
 
 func (p *PlayerBaseData) ResPlayerBaseInfo(player *Player) {
@@ -250,8 +255,10 @@ func (p *PlayerBaseData) ReqBindFacebookAccount(player *Player, req *msg.ReqBind
 	}
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.FackBookId = req.BindAccountId
+	agent := player.GetAgentByPlayer()
+	data, _ := proto.Marshal(res)
 	p.SaveDataFromDB("")
-	player.PushAndSendClienRes(res)
+	G_getGameLogic().PackResInfo(agent, "ResBindFacebookAccount", data)
 }
 
 func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFacebook) {
@@ -261,8 +268,10 @@ func (p *PlayerBaseData) ReqUnBindFacebook(player *Player, req *msg.ReqUnBindFac
 	p.Data.FaceBookId = ""
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.FackBookId = ""
+	agent := player.GetAgentByPlayer()
+	data, _ := proto.Marshal(res)
+	G_getGameLogic().PackResInfo(agent, "ResUnBindFacebook", data)
 	p.SaveDataFromDB("")
-	player.PushAndSendClienRes(res)
 	player.TeLog("platform_disconnect", map[string]interface{}{
 		"platform_type": "Facebook",
 		"platform_id":   req.BindAccountId,
@@ -323,7 +332,9 @@ func (p *PlayerBaseData) ReqOnlyBindFacebook(player *Player, req *msg.ReqOnlyBin
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.FackBookId = req.BindAccountId
 	p.SaveDataFromDB("")
-	player.PushAndSendClienRes(res)
+	agent := player.GetAgentByPlayer()
+	data, _ := proto.Marshal(res)
+	G_getGameLogic().PackResInfo(agent, "ResOnlyBindFacebook", data)
 }
 
 func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData) {
@@ -331,7 +342,7 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 	sqlStr := "SELECT * FROM t_player_baseinfo WHERE FaceBookId = ?"
 	sqlStruck := db.ResPlayerBaseInfo{}
 	isHaveOther := false
-	if err := db.SqlDb.Get(&sqlStruck, sqlStr, req.NewFBId_); err != nil {
+	if err := db.SqlDb.Get(&sqlStruck, sqlStr, req.NewFBId); err != nil {
 		isHaveOther = false
 	} else {
 		isHaveOther = true
@@ -341,9 +352,13 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 	}
 	oldPlayer := G_GameLogicPtr.GetPlayer(sqlStruck.DwUin)
 	if oldPlayer != nil {
+		agent := oldPlayer.GetAgentByPlayer()
 		// notify := &msg.ForceKickOut{}
 		notify := &msg.ResSynGameData{}
-		oldPlayer.PushAndSendClienRes(notify)
+		data, _ := proto.Marshal(notify)
+		if agent != nil {
+			G_getGameLogic().PackResInfo(agent, "ResSynGameData", data)
+		}
 		oldPlayer.ClearData()
 		G_GameLogicPtr.M_Players.Delete(sqlStruck.DwUin)
 	}
@@ -377,9 +392,9 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 				return
 			}
 
-			sqlStruck.FaceBookId = req.NewFBId_
+			sqlStruck.FaceBookId = req.NewFBId
 			sqlStruck.UserName = userName
-			_, err = db.SqlDb.Exec("update t_player_baseinfo set user_name = ?, FaceBookId = ? where dwUin = ?", userName, req.NewFBId_, sqlStruck.DwUin)
+			_, err = db.SqlDb.Exec("update t_player_baseinfo set user_name = ?, FaceBookId = ? where dwUin = ?", userName, req.NewFBId, sqlStruck.DwUin)
 			if err != nil {
 				tx.Rollback()
 				return
@@ -406,7 +421,9 @@ func (p *PlayerBaseData) ReqSynGameData(player *Player, req *msg.ReqSynGameData)
 		"platform_type": "facebook",
 	})
 	p.SaveDataFromDB("")
-	player.PushAndSendClienRes(res)
+	agent := player.GetAgentByPlayer()
+	data, _ := proto.Marshal(res)
+	G_getGameLogic().PackResInfo(agent, "ResSynGameData", data)
 }
 
 func (p *PlayerBaseData) ClearData() bool {
diff --git a/src/server/game/player_chess_mod.go b/src/server/game/player_chess_mod.go
index 7c687eb3..efe766c1 100644
--- a/src/server/game/player_chess_mod.go
+++ b/src/server/game/player_chess_mod.go
@@ -11,10 +11,12 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
+
+	"google.golang.org/protobuf/proto"
 )
 
 type PlayerChessData struct {
@@ -33,15 +35,19 @@ func (p *PlayerChessData) SaveDataFromDB(key interface{}) bool {
 }
 
 func (p *PlayerChessData) ResPlayerChessData(player *Player) {
+	agent := player.GetAgentByPlayer()
 	res := &p.Data
 	ChessMod := player.PlayMod.getChessMod()
 	res.ChessList = ChessMod.BackData().ChessList
 	res.MChessData = ChessMod.ChessMap
-	player.PushClientRes(res)
+	data, _ := proto.Marshal(res)
+	G_getGameLogic().PackResInfo(agent, "ResPlayerChessData", data)
 }
 
 func (p *PlayerChessData) ResChessColorData(player *Player) {
-	player.PushClientRes(&p.ColorData)
+	agent := player.GetAgentByPlayer()
+	data, _ := proto.Marshal(&p.ColorData)
+	G_getGameLogic().PackResInfo(agent, "ResChessColorData", data)
 }
 
 // 同步棋盘数据
@@ -51,7 +57,7 @@ func (p *PlayerChessData) UpdatePlayerChessData(player *Player, req *msg.UpdateP
 	addChessList, addNewEmit, err := p.HandleChess(player, update.MChessHandle)
 	if err != nil {
 		res := &msg.ResUpdatePlayerChessData{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		}
 		handleStr := ""
@@ -66,12 +72,12 @@ func (p *PlayerChessData) UpdatePlayerChessData(player *Player, req *msg.UpdateP
 		return err
 	}
 	player.PushClientRes(&msg.ResUpdatePlayerChessData{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	p.Data.MChessData = update.MChessData
 	if !p.checkChessEqual(player) {
 		res := &msg.ResUpdatePlayerChessData{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "棋子数据不一致",
 		}
 		handleStr := ""
@@ -104,7 +110,7 @@ func (p *PlayerChessData) UpdateChessData(player *Player, mChessData map[string]
 	p.Data.MChessData = mChessData
 	if !p.checkChessEqual(player) {
 		res := &msg.ResUpdatePlayerChessData{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "棋子数据不一致",
 		}
 		log.Debug("棋子数据不一致地图, %v---%v---%v", player.PlayMod.getChessMod().ChessMap, p.Data.MChessData, player.PlayMod.getChessMod().GetChessList())
@@ -196,7 +202,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 		chessId := int(v.ChessId)
 		emitId := int(v.Emit)
 		switch v.Type {
-		case msg.HANDLE_TYPE_Add: //增加棋子
+		case msg.HANDLE_TYPE_ADD: //增加棋子
 			err := ChessMod.AddChess(chessId)
 			if err != nil {
 				return nil, nil, err
@@ -216,25 +222,25 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 				addNewEmit = append(addNewEmit, chessId)
 			}
 			player.PushClientRes(HandbookMod.BackData())
-		case msg.HANDLE_TYPE_Compose: //合成棋子
-			NewChessId_, err := ChessMod.ComposeChess(chessId)
+		case msg.HANDLE_TYPE_COMPOSE: //合成棋子
+			newChessId, err := ChessMod.ComposeChess(chessId)
 			if err != nil {
 				return nil, nil, err
 			}
-			b := HandbookMod.SetHandbook(NewChessId_) // 添加图鉴
+			b := HandbookMod.SetHandbook(newChessId) // 添加图鉴
 			if b {
-				addNewEmit = append(addNewEmit, NewChessId_)
+				addNewEmit = append(addNewEmit, newChessId)
 			}
-			addChessList = append(addChessList, NewChessId_)
-			NewChessId_Lv := mergeDataCfg.GetLvById(NewChessId_)
-			TriggerList = append(TriggerList, &quest.Trigger{Label: quest.TRIGGER_LABEL_MERGELVTIME, A: []interface{}{NewChessId_Lv}})
+			addChessList = append(addChessList, newChessId)
+			newChessIdLv := mergeDataCfg.GetLvById(newChessId)
+			TriggerList = append(TriggerList, &quest.Trigger{Label: quest.TRIGGER_LABEL_MERGELVTIME, A: []interface{}{newChessIdLv}})
 			TriggerList = append(TriggerList, &quest.Trigger{Label: quest.TRIGGER_LABEL_MERGETIME})
 			player.PushClientRes(HandbookMod.BackData())
-			triggerComposeChess(player, NewChessId_, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
+			triggerComposeChess(player, newChessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
 			// 获取活动道具
 			ActItem := player.GetActivityItem(GoUtil.Int32ToInt(v.ActType))
 			itemList = item.Merge(itemList, ActItem)
-		case msg.HANDLE_TYPE_Buy: //购买棋子
+		case msg.HANDLE_TYPE_BUY: //购买棋子
 			loseGold, err := ChessMod.BuyChess(chessId)
 			if err != nil {
 				return nil, nil, err
@@ -242,7 +248,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 			addChessList = append(addChessList, chessId)
 			buyChess += loseGold
 			itemList = append(itemList, &item.Item{Id: item.ITEM_STAR_ID, Num: int(-loseGold)})
-		case msg.HANDLE_TYPE_Sell: //出售棋子
+		case msg.HANDLE_TYPE_SELL: //出售棋子
 			items, err := ChessMod.SellChess(chessId)
 			if checkChess(chessId, BaseMod.GetEnergyMul(), ChessMod.GetEmitList()) { // 在订单中无法生成的棋子 出售获得原价宠物币
 				items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: mergeDataCfg.GetStarById(chessId)}}
@@ -272,7 +278,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa
 			// 获取活动道具
 			ActItem := player.GetActivityItem(GoUtil.Int32ToInt(v.ActType))
 			itemList = item.Merge(itemList, ActItem)
-		case msg.HANDLE_TYPE_Remove: //移除棋子
+		case msg.HANDLE_TYPE_REMOVE: //移除棋子
 			ChessMod.RemoveChess(chessId)
 		}
 
diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index cd81f607..cb76ddb7 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -28,7 +28,7 @@ import (
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"strconv"
 	"sync"
 	"time"
@@ -38,8 +38,9 @@ import (
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 
-	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/robfig/cron/v3"
+
+	"google.golang.org/protobuf/proto"
 )
 
 // import "reflect"
@@ -146,25 +147,25 @@ func (p *Player) SendClientRes() {
 	p.Msg = make([]PlayerMsg, 0)
 }
 
-func (p *Player) PushClientRes(m thrift.TStruct) {
+func (p *Player) PushClientRes(m proto.Message) {
 	key := GetStructName(m)
-	data := GoUtil.Marshal(m)
+	buff, _ := proto.Marshal(m)
 	p.Msg = append(p.Msg, PlayerMsg{
 		F: key,
-		B: data,
+		B: buff,
 	})
 }
 
-func (p *Player) PushAndSendClienRes(m thrift.TStruct) {
+func (p *Player) PushAndSendClienRes(m proto.Message) {
 	key := GetStructName(m)
-	data := GoUtil.Marshal(m)
-	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, data)
+	buff, _ := proto.Marshal(m)
+	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, buff)
 }
 
-func (p *Player) SendErrClienRes(m thrift.TStruct) {
+func (p *Player) SendErrClienRes(m proto.Message) {
 	key := GetStructName(m)
-	data := GoUtil.Marshal(m)
-	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, data)
+	buff, _ := proto.Marshal(m)
+	G_GameLogicPtr.PackResInfo(p.GetAgent(), key, buff)
 }
 
 func (p *Player) QuestTrigger(tr *quest.Trigger) {
diff --git a/src/server/game/proto_factory.go b/src/server/game/proto_factory.go
index ee40908c..30be0252 100644
--- a/src/server/game/proto_factory.go
+++ b/src/server/game/proto_factory.go
@@ -2,22 +2,16 @@ package game
 
 import (
 	"fmt"
-	"reflect"
-	GoUtil "server/game_util"
-	"server/msg"
 	"sync"
 
-	thrift "github.com/apache/thrift/lib/go/thrift"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
 
 var (
-	protoMessageTypeCacheOnce  sync.Once
-	protoMessageTypeByName     sync.Map
-	thriftMessageTypeCacheOnce sync.Once
-	thriftMessageTypeByName    sync.Map
+	protoMessageTypeCacheOnce sync.Once
+	protoMessageTypeByName    sync.Map
 )
 
 func buildProtoMessageTypeCache() {
@@ -32,27 +26,6 @@ func buildProtoMessageTypeCache() {
 	})
 }
 
-func registerThriftType(msgType reflect.Type) {
-	if msgType == nil || msgType.Kind() != reflect.Ptr {
-		return
-	}
-	elemType := msgType.Elem()
-	if elemType.Name() != "" {
-		thriftMessageTypeByName.Store(elemType.Name(), msgType)
-	}
-	thriftMessageTypeByName.Store(msgType.String(), msgType)
-	thriftMessageTypeByName.Store(elemType.String(), msgType)
-	if elemType.PkgPath() != "" && elemType.Name() != "" {
-		thriftMessageTypeByName.Store(elemType.PkgPath()+"."+elemType.Name(), msgType)
-	}
-}
-
-func buildThriftMessageTypeCache() {
-	msg.Processor.Range(func(_ uint16, msgType reflect.Type) {
-		registerThriftType(msgType)
-	})
-}
-
 func FindProtoMessageTypeByName(name string) (protoreflect.MessageType, error) {
 	messageType, err := protoregistry.GlobalTypes.FindMessageByName(protoreflect.FullName(name))
 	if err == nil {
@@ -67,15 +40,6 @@ func FindProtoMessageTypeByName(name string) (protoreflect.MessageType, error) {
 	return nil, fmt.Errorf("protobuf message type not found: %s", name)
 }
 
-func FindThriftMessageTypeByName(name string) (reflect.Type, error) {
-	thriftMessageTypeCacheOnce.Do(buildThriftMessageTypeCache)
-	if cachedType, ok := thriftMessageTypeByName.Load(name); ok {
-		return cachedType.(reflect.Type), nil
-	}
-
-	return nil, fmt.Errorf("thrift message type not found: %s", name)
-}
-
 func NewProtoMessageByName(name string) (proto.Message, error) {
 	messageType, err := FindProtoMessageTypeByName(name)
 	if err != nil {
@@ -85,21 +49,6 @@ func NewProtoMessageByName(name string) (proto.Message, error) {
 	return messageType.New().Interface(), nil
 }
 
-func NewThriftMessageByName(name string) (thrift.TStruct, error) {
-	messageType, err := FindThriftMessageTypeByName(name)
-	if err != nil {
-		return nil, err
-	}
-
-	message := reflect.New(messageType.Elem()).Interface()
-	thriftMessage, ok := message.(thrift.TStruct)
-	if !ok {
-		return nil, fmt.Errorf("thrift message type %s does not implement thrift.TStruct", messageType)
-	}
-
-	return thriftMessage, nil
-}
-
 func UnmarshalProtoMessageByName(name string, data []byte) (proto.Message, error) {
 	message, err := NewProtoMessageByName(name)
 	if err != nil {
@@ -112,14 +61,3 @@ func UnmarshalProtoMessageByName(name string, data []byte) (proto.Message, error
 
 	return message, nil
 }
-
-func UnmarshalThriftMessageByName(name string, data []byte) (thrift.TStruct, error) {
-	message, err := NewThriftMessageByName(name)
-	if err != nil {
-		return nil, err
-	}
-	if err := GoUtil.Unmarshal(data, message); err != nil {
-		return nil, err
-	}
-	return message, nil
-}
diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go
index b6b432ee..68c52351 100644
--- a/src/server/game/register_network_func.go
+++ b/src/server/game/register_network_func.go
@@ -30,13 +30,15 @@ import (
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"strconv"
 	"strings"
 
 	"gitea.bywaystudios.com/pet_home/leaf/gate"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
+
+	"google.golang.org/protobuf/proto"
 )
 
 func ReqPlayerAsset(player *Player, req *msg.ReqPlayerAsset) error {
@@ -127,7 +129,7 @@ func ReqSetEnergyMul(player *Player, req *msg.ReqSetEnergyMul) error {
 	energyMul := BaseMod.GetEnergyMul()
 	if int(req.EnergyMul) > energyMul && int(req.EnergyMul) > maxEnergyMul {
 		player.SendErrClienRes(&msg.ResSetEnergyMul{
-			ResultCode: msg.RES_CODE_Fail,
+			ResultCode: msg.RES_CODE_FAIL,
 			Msg:        "能量倍数超过最大值",
 		})
 		return errors.New("能量倍数超过最大值")
@@ -155,7 +157,7 @@ func ReqGetHandbookReward(player *Player, req *msg.ReqGetHandbookReward) error {
 	err := player.PlayMod.getHandbookMod().GetHandbookReward(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetHandbookReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -165,13 +167,13 @@ func ReqGetHandbookReward(player *Player, req *msg.ReqGetHandbookReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_HandbookReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetHandbookReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PushClientRes(&msg.ResGetHandbookReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.PushClientRes(player.PlayMod.getHandbookMod().BackData())
 	player.PlayMod.save()
@@ -187,7 +189,7 @@ func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error {
 	items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, allChess)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResHandbookAllReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -195,7 +197,7 @@ func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_HandbookAllReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResHandbookAllReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -204,7 +206,7 @@ func RegHandbookAllReward(player *Player, req *msg.RegHandbookAllReward) error {
 	FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_HANDBOOK_ACHIEVEMENT, req.Type)
 	player.UpdateUserInfo()
 	player.PushClientRes(&msg.ResHandbookAllReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	now := GoUtil.Now()
 	NotifyAllFriend(player, &MsqMod.Msg{
@@ -273,7 +275,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	}
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -282,7 +284,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	err = ChessMod.FinishOrder(mergeList)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -291,7 +293,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_OrderReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -303,7 +305,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 		err = player.HandleItem(chestRainItems, msg.ITEM_POP_LABEL_LimitEventChestRain.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResRewardOrder{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -324,7 +326,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRewardOrder{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -406,7 +408,7 @@ func ReqRewardOrder(player *Player, req *msg.ReqRewardOrder) error {
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
 	player.PushClientRes(&msg.ResRewardOrder{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -423,13 +425,13 @@ func ReqDelOrder(player *Player, req *msg.ReqDelOrder) error {
 	delOrder, err := OrderMod.DelOrder(int(req.OrderId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDelOrder{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PushAndSendClienRes(&msg.ResDelOrder{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("order_delete", map[string]interface{}{
 		"order_id": int(req.OrderId),
@@ -450,7 +452,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	err := player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -458,7 +460,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	addItem, err := DecorateMod.Decorate(areaId, decorateId) // 装饰
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -469,7 +471,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	err = player.HandleItem(addItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -477,7 +479,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	_, err = player.GetPlayerBaseMod().AddExp(player, 10, petExp)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorate{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -521,7 +523,7 @@ func ReqDecorate(player *Player, req *msg.ReqDecorate) error {
 	player.PlayMod.save()
 	player.PushClientRes(DecorateMod.BackData())
 	player.PushClientRes(&msg.ResDecorate{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.HandleInUserRank()
 	player.BackUserInfo()
@@ -536,7 +538,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	unLockLv := decorateCfg.GetOneKeyDecorateUnlockLv()
 	if player.GetPlayerBaseMod().GetLevel() < unLockLv {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  fmt.Sprintf("等级不足%d级", unLockLv),
 		})
 		return errors.New("等级不足")
@@ -548,7 +550,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	err := player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -559,7 +561,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	err = player.HandleItem(addItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -567,7 +569,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	_, err = player.GetPlayerBaseMod().AddExp(player, 10*decorateNum, PetExp)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDecorateAll{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -598,7 +600,7 @@ func ReqDecorateAll(player *Player, req *msg.ReqDecorateAll) error {
 	player.PlayMod.save()
 	player.PushClientRes(DecorateMod.BackData())
 	player.PushClientRes(&msg.ResDecorate{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.HandleInUserRank()
 	player.BackUserInfo()
@@ -611,7 +613,7 @@ func ReqAreaReward(player *Player, req *msg.ReqAreaReward) error {
 	rewardItem, err := DecorateMod.GetDecorateReward(int(req.AreaId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAreaReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -619,13 +621,13 @@ func ReqAreaReward(player *Player, req *msg.ReqAreaReward) error {
 	err = player.HandleItem(rewardItem, msg.ITEM_POP_LABEL_DecorateReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAreaReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PushClientRes(&msg.ResAreaReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.PushClientRes(DecorateMod.BackData())
 	player.PlayMod.save()
@@ -661,7 +663,7 @@ func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error {
 	}
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessFromBuff{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -670,7 +672,7 @@ func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessFromBuff{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -687,7 +689,7 @@ func ReqGetChessFromBuff(player *Player, req *msg.ReqGetChessFromBuff) error {
 	player.PushClientRes(OrderMod.BackData())
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResGetChessFromBuff{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -699,7 +701,7 @@ func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error {
 	err := ChessMod.PutPartInBag(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutPartInBag{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -708,7 +710,7 @@ func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutPartInBag{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -719,7 +721,7 @@ func ReqPutPartInBag(player *Player, req *msg.ReqPutPartInBag) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResPutPartInBag{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -731,7 +733,7 @@ func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error {
 	err := ChessMod.PutChessInBag(int(req.BagId), int(req.ChessId), int(req.EmitId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutChessInBag{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -740,7 +742,7 @@ func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPutChessInBag{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -753,7 +755,7 @@ func ReqPutChessInBag(player *Player, req *msg.ReqPutChessInBag) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResPutChessInBag{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -764,7 +766,7 @@ func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error {
 	chessId, err := ChessMod.TakeChessOutBag(int(req.BagId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResTakeChessOutBag{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -773,7 +775,7 @@ func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResTakeChessOutBag{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -792,7 +794,7 @@ func ReqTakeChessOutBag(player *Player, req *msg.ReqTakeChessOutBag) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResTakeChessOutBag{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -803,7 +805,7 @@ func ReqTakeChessOutBagToHonor(player *Player, req *msg.ReqTakeChessOutBagToHono
 	chessId, err := ChessMod.TakeChessOutBagToHonor(int(req.BagId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResTakeChessOutBagToHonor{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -817,7 +819,7 @@ func ReqTakeChessOutBagToHonor(player *Player, req *msg.ReqTakeChessOutBagToHono
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResTakeChessOutBagToHonor{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -829,7 +831,7 @@ func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error {
 	err := player.HandleItem(costItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessBagGrid{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -837,7 +839,7 @@ func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error {
 	err = ChessMod.BuyChessBagGrid()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessBagGrid{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -846,7 +848,7 @@ func ReqBuyChessBagGrid(player *Player, req *msg.ReqBuyChessBagGrid) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResBuyChessBagGrid{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	if len(costItem) > 0 {
 		player.TeLog("warehouse_unlock", map[string]interface{}{
@@ -862,7 +864,7 @@ func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error {
 	newChess, err := ChessMod.SeparateChess(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSeparateChess{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -871,7 +873,7 @@ func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSeparateChess{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -883,7 +885,7 @@ func ReqSeparateChess(player *Player, req *msg.ReqSeparateChess) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResSeparateChess{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
 	triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
@@ -899,7 +901,7 @@ func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error {
 	newChess, err := ChessMod.UpgradeChess(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResUpgradeChess{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -908,7 +910,7 @@ func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResUpgradeChess{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -923,7 +925,7 @@ func ReqUpgradeChess(player *Player, req *msg.ReqUpgradeChess) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResUpgradeChess{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.PushClientRes(Handbook.BackData())
 	player.UpdateUserInfo()
@@ -940,7 +942,7 @@ func ReqChessEx(player *Player, req *msg.ReqChessEx) error {
 		err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResChessEx{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -948,67 +950,67 @@ func ReqChessEx(player *Player, req *msg.ReqChessEx) error {
 		player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_BUBBLE, A: []interface{}{}})
 	}
 
-	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId_))
+	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChessEx{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	HandbookMod := player.PlayMod.getHandbookMod()
-	HandbookMod.SetHandbook(int(req.NewChessId_))
+	HandbookMod.SetHandbook(int(req.NewChessId))
 	data := &PlayerChessData{}
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChessEx{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	// 限时事件气泡 幸运猫
-	if req.Type == msg.CHESS_EX_TYPE_ChessExEvent {
+	if req.Type == msg.CHESS_EX_TYPE_CHESS_EX_EVENT {
 		LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
-		err := LimitedTimeEventMod.LuckyCat(int(req.NewChessId_))
+		err := LimitedTimeEventMod.LuckyCat(int(req.NewChessId))
 		if err != nil {
 			player.SendErrClienRes(&msg.ResChessEx{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
 		}
 		player.TeLog("LimitEventLuckyCat", map[string]interface{}{
-			"req": int(req.NewChessId_),
+			"req": int(req.NewChessId),
 		})
 	}
 
 	// 限时事件 小学徒
-	if req.Type == msg.CHESS_EX_TYPE_ChessExEventLittleApprentice {
+	if req.Type == msg.CHESS_EX_TYPE_CHESS_EX_EVENT_LITTLE_APPRENTICE {
 		LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
 		if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_LITTLE_APPRENTICE) {
 			player.SendErrClienRes(&msg.ResChessEx{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  "小学徒活动已结束",
 			})
 			return err
 		}
 
 		player.TeLog("LimitEventLittleApprentice", map[string]interface{}{
-			"req":  int(req.NewChessId_),
+			"req":  int(req.NewChessId),
 			"star": req.CostStar,
 		})
 	}
 	player.TeLog("ReqChessEx", map[string]interface{}{
 		"old_chess_id": int(req.OldChessId),
-		"new_chess_id": int(req.NewChessId_),
+		"new_chess_id": int(req.NewChessId),
 		"cost_dia":     req.CostDia,
 		"cost_star":    req.CostStar,
 	})
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResChessEx{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1020,7 +1022,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	items, err := ChessMod.SourceChest(chestId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSourceChest{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1028,7 +1030,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_SourceChest.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSourceChest{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1037,7 +1039,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSourceChest{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1049,7 +1051,7 @@ func ReqSourceChest(player *Player, req *msg.ReqSourceChest) error {
 	})
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResSourceChest{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.UpdateUserInfo()
 	return nil
@@ -1068,7 +1070,7 @@ func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward)
 	itemList, err := CardMod.SeasonFirstReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardSeasonFirstReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1076,7 +1078,7 @@ func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward)
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_CardSeasonFirstReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardSeasonFirstReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1087,7 +1089,7 @@ func ReqCardSeasonFirstReward(player *Player, req *msg.ReqCardSeasonFirstReward)
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCardSeasonFirstReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1098,7 +1100,7 @@ func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error {
 	itemList, chess, err := CardMod.GetCollectReward(int(req.Color))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardCollectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1107,7 +1109,7 @@ func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_CardCollectReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardCollectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1122,7 +1124,7 @@ func ReqCardCollectReward(player *Player, req *msg.ReqCardCollectReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(&msg.ResCardCollectReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("card_book", map[string]interface{}{
 		"season_id":    CardMod.EndTime,
@@ -1138,7 +1140,7 @@ func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error {
 	itemList, costStar, err := CardMod.ExStarReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResExStarReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1147,7 +1149,7 @@ func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_ExStarReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResExStarReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1159,7 +1161,7 @@ func ReqExStarReward(player *Player, req *msg.ReqExStarReward) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResExStarReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 
 	return nil
@@ -1171,7 +1173,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	itemList, itemList2, err := CardMod.AllCollectReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAllCollectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1180,7 +1182,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_AllCollectReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAllCollectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1188,7 +1190,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	err = player.HandleItem(itemList2, msg.ITEM_POP_LABEL_AllCollectRewardHB.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAllCollectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1203,7 +1205,7 @@ func ReqAllCollectReward(player *Player, req *msg.ReqAllCollectReward) error {
 	})
 	player.PushClientRes(CardMod.BackData())
 	player.PushClientRes(&msg.ResAllCollectReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1214,7 +1216,7 @@ func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error {
 	itemList, err := GuideMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuideReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1223,7 +1225,7 @@ func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuideReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1235,7 +1237,7 @@ func ReqGuideReward(player *Player, req *msg.ReqGuideReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(GuideMod.BackData())
 	player.PushClientRes(&msg.ResGuideReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1246,7 +1248,7 @@ func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error
 	itemList, err := DailyTaskMod.GetDailyReward(int(req.Id), player.GetDailyTaskActivityId())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyTaskReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1255,7 +1257,7 @@ func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_DailyTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyTaskReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1263,7 +1265,7 @@ func ReqGetDailyTaskReward(player *Player, req *msg.ReqGetDailyTaskReward) error
 	player.PlayMod.save()
 	player.PushClientRes(DailyTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetDailyTaskReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("daily_task", map[string]interface{}{
 		"task_id":           int(req.Id),
@@ -1279,7 +1281,7 @@ func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error
 	itemList, err := DailyTaskMod.GetWeekReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyWeekReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1288,7 +1290,7 @@ func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_DailyWeekReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetDailyWeekReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1302,7 +1304,7 @@ func ReqGetDailyWeekReward(player *Player, req *msg.ReqGetDailyWeekReward) error
 	player.PlayMod.save()
 	player.PushClientRes(DailyTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetDailyWeekReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1313,7 +1315,7 @@ func ReqDailyUnlock(player *Player, req *msg.ReqDailyUnlock) error {
 	player.PlayMod.save()
 	player.PushClientRes(DailyTaskMod.BackData())
 	player.PushClientRes(&msg.ResDailyUnlock{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1323,7 +1325,7 @@ func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error
 	itemList, err := GuideTaskMod.GetTaskReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideTaskReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1332,7 +1334,7 @@ func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideTaskReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1346,7 +1348,7 @@ func ReqGetGuideTaskReward(player *Player, req *msg.ReqGetGuideTaskReward) error
 	player.PlayMod.save()
 	player.PushClientRes(GuideTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetGuideTaskReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -1357,7 +1359,7 @@ func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) e
 	itemList, err := GuideTaskMod.GetActiveReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideActiveReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1366,7 +1368,7 @@ func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) e
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideActiveReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetGuideActiveReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1378,7 +1380,7 @@ func ReqGetGuideActiveReward(player *Player, req *msg.ReqGetGuideActiveReward) e
 	player.PlayMod.save()
 	player.PushClientRes(GuideTaskMod.BackData())
 	player.PushClientRes(&msg.ResGetGuideActiveReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -1390,14 +1392,14 @@ func ReqSetAvatar(player *Player, req *msg.ReqSetAvatar) error {
 	err := avatarMod.SetAvatar(int(req.Avatar))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSetAvatar{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetAvatar{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.BackUserInfo()
 	player.UpdateUserInfo()
@@ -1419,14 +1421,14 @@ func ReqSetFace(player *Player, req *msg.ReqSetFace) error {
 	err := FaceMod.SetFace(int(req.Face))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSetFace{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetFace{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	is_platform := false
 	if req.Face == 0 {
@@ -1450,7 +1452,7 @@ func ReqBuyEnergy(player *Player, req *msg.ReqBuyEnergy) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyEnergy{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1458,7 +1460,7 @@ func ReqBuyEnergy(player *Player, req *msg.ReqBuyEnergy) error {
 	player.PlayMod.save()
 	player.PushClientRes(BaseMod.BackData())
 	player.PushClientRes(&msg.ResBuyEnergy{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.ChargeBackData()
 	player.TeLog("buy_energy_diamond", map[string]interface{}{
@@ -1473,7 +1475,7 @@ func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error {
 	items, err := BaseMod.GetEnergyByAD()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetEnergyByAD{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1481,7 +1483,7 @@ func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetEnergyByAD.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetEnergyByAD{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1492,7 +1494,7 @@ func ReqGetEnergyByAD(player *Player, req *msg.ReqGetEnergyByAD) error {
 	player.PlayMod.save()
 	player.PushClientRes(BaseMod.BackData())
 	player.PushClientRes(&msg.ResGetEnergyByAD{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1503,7 +1505,7 @@ func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) err
 	itemList, err := SevenLoginMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetSevenLoginReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1512,7 +1514,7 @@ func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) err
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_SevenLoginRewardLabel.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetSevenLoginReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1520,7 +1522,7 @@ func ReqGetSevenLoginReward(player *Player, req *msg.ReqGetSevenLoginReward) err
 	player.PlayMod.save()
 	player.PushClientRes(SevenLoginMod.BackData())
 	player.PushClientRes(&msg.ResGetSevenLoginReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("weekly_gift", map[string]interface{}{
 		"reward_type": "week",
@@ -1536,7 +1538,7 @@ func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) err
 	itemList, err := SevenLoginMod.GetMonthReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMonthLoginReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1545,7 +1547,7 @@ func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) err
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MonthLoginReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMonthLoginReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1558,7 +1560,7 @@ func ReqGetMonthLoginReward(player *Player, req *msg.ReqGetMonthLoginReward) err
 	player.PlayMod.save()
 	player.PushClientRes(SevenLoginMod.BackData())
 	player.PushClientRes(&msg.ResGetMonthLoginReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1579,7 +1581,7 @@ func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error {
 	itemList, err := LimitedTimeEventMod.GetFastProduceReward(int(req.Energy))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFastProduceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1587,7 +1589,7 @@ func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_FastProduceReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFastProduceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1599,7 +1601,7 @@ func ReqFastProduceReward(player *Player, req *msg.ReqFastProduceReward) error {
 	})
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(&msg.ResFastProduceReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1608,7 +1610,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
 	if !limitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_SENCE_DASH) { // 场景冲刺奖励
 		player.SendErrClienRes(&msg.ResLimitSenceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "not exist",
 		})
 		return fmt.Errorf("not exist")
@@ -1617,7 +1619,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	id, items, err := limitedTimeEventMod.GetSceneDashReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitSenceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1626,7 +1628,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_LimitSenceReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitSenceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1637,7 +1639,7 @@ func ReqLimitSenceReward(player *Player, req *msg.ReqLimitSenceReward) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResLimitSenceReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -1666,7 +1668,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 	err := CardMod.RequestCard()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardGive{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1674,7 +1676,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 
 	if len(req.Uid) == 0 { // 请求的UID列表不为空
 		player.SendErrClienRes(&msg.ResCardGive{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "uid empty",
 		})
 		return fmt.Errorf("uid empty")
@@ -1682,7 +1684,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 	cardId := int(req.CardId)
 	if cardId == 0 { // 请求交换的卡牌ID不为空
 		player.SendErrClienRes(&msg.ResCardGive{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card id empty",
 		})
 		return fmt.Errorf("card id empty")
@@ -1692,7 +1694,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 		uid := int(v)
 		if !FriendMod.CheckFriend(uid) {
 			player.SendErrClienRes(&msg.ResCardGive{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  "not friend",
 			})
 			return fmt.Errorf("not friend")
@@ -1711,7 +1713,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 		err = CardMod.AddRequestCard(CardInfo) // 添加请求卡牌
 		if err != nil {
 			player.SendErrClienRes(&msg.ResCardGive{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -1727,7 +1729,7 @@ func ReqCardGive(player *Player, req *msg.ReqCardGive) error {
 		FriendMgrSend(m)
 	}
 	player.PushClientRes(&msg.ResCardGive{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(CardMod.NotifyTimes())
@@ -1745,7 +1747,7 @@ func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil {
 		player.SendErrClienRes(&msg.ResAgreeCardGive{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card apply not exist",
 		})
 		return fmt.Errorf("card apply not exist")
@@ -1754,7 +1756,7 @@ func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error {
 	err := player.SubCard(cardInfo.CardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAgreeCardGive{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card not exist",
 		})
 		return fmt.Errorf("card  not exist")
@@ -1773,7 +1775,7 @@ func ReqAgreeCardGive(player *Player, req *msg.ReqAgreeCardGive) error {
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(CardMod.NotifyTimes())
 	player.PushClientRes(&msg.ResAgreeCardGive{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	player.AddLog(cardInfo.AUid, friend.LOG_TYPE_CARD_GIVE_ACCEPT, strconv.Itoa(cardInfo.CardId), GoUtil.Now())
@@ -1791,7 +1793,7 @@ func ReqRefuseCardGive(player *Player, req *msg.ReqRefuseCardGive) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil {
 		player.SendErrClienRes(&msg.ResRefuseCardGive{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card apply not exist",
 		})
 		return fmt.Errorf("card apply not exist")
@@ -1799,7 +1801,7 @@ func ReqRefuseCardGive(player *Player, req *msg.ReqRefuseCardGive) error {
 	FriendMod.DelCardInfo(req.Id)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResRefuseCardGive{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	player.TeLog("ReqRefuseCardGive", map[string]interface{}{
@@ -1825,7 +1827,7 @@ func ReqCardSend(player *Player, req *msg.ReqCardSend) error {
 	cardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), cardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardSend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1841,7 +1843,7 @@ func ReqCardSend(player *Player, req *msg.ReqCardSend) error {
 	}
 	player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_SEND, strconv.Itoa(cardId), GoUtil.Now())
 	player.PushClientRes(&msg.ResCardSend{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("card_exchange", map[string]interface{}{
 		"card_id":          cardId,
@@ -1863,7 +1865,7 @@ func ReqCardExchange(player *Player, req *msg.ReqCardExchange) error {
 	cardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), cardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1879,7 +1881,7 @@ func ReqCardExchange(player *Player, req *msg.ReqCardExchange) error {
 	}
 	player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_EX_SEND, fmt.Sprintf("%d", cardId), GoUtil.Now())
 	player.PushClientRes(&msg.ResCardExchange{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PlayMod.save()
@@ -1901,14 +1903,14 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() {
 		player.SendErrClienRes(&msg.ResSelectCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
 	}
 	if cardInfo.ExId != 0 {
 		player.SendErrClienRes(&msg.ResSelectCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card already selected",
 		})
 		return fmt.Errorf("card already selected")
@@ -1919,7 +1921,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 		err := CardMod.SubGoldTimes()
 		if err != nil {
 			player.SendErrClienRes(&msg.ResSelectCardExchange{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -1930,7 +1932,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 	err := player.SubCard(cardId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -1938,7 +1940,7 @@ func ReqSelectCardExchange(player *Player, req *msg.ReqSelectCardExchange) error
 	player.PlayMod.save()
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(&msg.ResSelectCardExchange{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	player.PushClientRes(CardMod.NotifyCard())
@@ -1967,7 +1969,7 @@ func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error {
 
 	if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() {
 		player.SendErrClienRes(&msg.ResAgreeCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
@@ -1979,7 +1981,7 @@ func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error {
 		err := CardMod.SubGoldTimes()
 		if err != nil {
 			player.SendErrClienRes(&msg.ResAgreeCardExchange{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -1991,7 +1993,7 @@ func ReqAgreeCardExchange(player *Player, req *msg.ReqAgreeCardExchange) error {
 	player.PlayMod.save()
 	player.PushClientRes(CardMod.NotifyCard())
 	player.PushClientRes(&msg.ResAgreeCardExchange{
-		Code:  msg.RES_CODE_Success,
+		Code:  msg.RES_CODE_SUCCESS,
 		Id:    req.Id,
 		Emoji: int32(cardInfo.Emoji),
 	})
@@ -2026,14 +2028,14 @@ func ReqRefuseCardSelect(player *Player, req *msg.ReqRefuseCardSelect) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil {
 		player.SendErrClienRes(&msg.ResRefuseCardSelect{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
 	}
 	if cardInfo.Status != 1 {
 		player.SendErrClienRes(&msg.ResRefuseCardSelect{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card is not select status",
 		})
 		return fmt.Errorf("card is not select status")
@@ -2048,7 +2050,7 @@ func ReqRefuseCardSelect(player *Player, req *msg.ReqRefuseCardSelect) error {
 	}
 	FriendMgrSend(m)
 	player.PushClientRes(&msg.ResRefuseCardSelect{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	player.PlayMod.save()
@@ -2062,14 +2064,14 @@ func ReqRefuseCardExchange(player *Player, req *msg.ReqRefuseCardExchange) error
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() {
 		player.SendErrClienRes(&msg.ResRefuseCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
 	}
 	if cardInfo.Status != 2 {
 		player.SendErrClienRes(&msg.ResRefuseCardExchange{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "card is not status 2",
 		})
 		return fmt.Errorf("card is not status 2")
@@ -2080,7 +2082,7 @@ func ReqRefuseCardExchange(player *Player, req *msg.ReqRefuseCardExchange) error
 	CardMod.AddExTimes(cardInfo)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResRefuseCardExchange{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	m := &MsqMod.Msg{
@@ -2103,7 +2105,7 @@ func ReqGetFriendCard(player *Player, req *msg.ReqGetFriendCard) error {
 	cardInfo := FriendMod.GetCardInfo(req.Id)
 	if cardInfo == nil || cardInfo.EndTime != 0 {
 		player.SendErrClienRes(&msg.ResGetFriendCard{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "exchange time out",
 		})
 		return fmt.Errorf("exchange time out")
@@ -2119,7 +2121,7 @@ func ReqGetFriendCard(player *Player, req *msg.ReqGetFriendCard) error {
 	player.AddLog(uid, friend.LOG_TYPE_CARD_SEND_ACCEPT, fmt.Sprintf("%d", cardInfo.CardId), GoUtil.Now())
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGetFriendCard{
-		Code:   msg.RES_CODE_Success,
+		Code:   msg.RES_CODE_SUCCESS,
 		Id:     req.Id,
 		CardId: int32(cardInfo.CardId),
 		Emoji:  int32(cardInfo.Emoji),
@@ -2155,7 +2157,7 @@ func ReqRank(player *Player, req *msg.ReqRank) error {
 		Type:     req.Type,
 		RankList: res,
 		MyRank:   int32(rankInfo.MyRank),
-		MyScore:  float64(rankInfo.MyScore),
+		MyScore:  float32(rankInfo.MyScore),
 	})
 	return nil
 }
@@ -2213,7 +2215,7 @@ func ReqReadMail(player *Player, req *msg.ReqReadMail) error {
 	err := MailMod.Read(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResReadMail{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2221,7 +2223,7 @@ func ReqReadMail(player *Player, req *msg.ReqReadMail) error {
 	player.PlayMod.save()
 	player.PushClientRes(MailMod.NotifyMail(int(req.Id)))
 	player.PushClientRes(&msg.ResReadMail{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -2233,7 +2235,7 @@ func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error {
 	itemList, err := MailMod.Reward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMailReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2241,7 +2243,7 @@ func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MailReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetMailReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2254,7 +2256,7 @@ func ReqGetMailReward(player *Player, req *msg.ReqGetMailReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(MailMod.NotifyMail(int(req.Id)))
 	player.PushClientRes(&msg.ResGetMailReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -2266,7 +2268,7 @@ func ReqDeleteMail(player *Player, req *msg.ReqDeleteMail) error {
 	err := MailMod.Del(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResDeleteMail{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2274,7 +2276,7 @@ func ReqDeleteMail(player *Player, req *msg.ReqDeleteMail) error {
 	player.PlayMod.save()
 	player.PushClientRes(MailMod.NotifyMail(int(req.Id)))
 	player.PushClientRes(&msg.ResDeleteMail{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -2286,14 +2288,14 @@ func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error {
 	items, err := ChargeMod.FireFreeShop()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFreeShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	if len(items) == 0 {
 		player.SendErrClienRes(&msg.ResFreeShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "no reward",
 		})
 		return fmt.Errorf("no reward")
@@ -2301,7 +2303,7 @@ func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_FreeShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFreeShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2309,7 +2311,7 @@ func ReqFreeShop(player *Player, req *msg.ReqFreeShop) error {
 	player.PlayMod.save()
 	player.ChargeBackData()
 	player.PushClientRes(&msg.ResFreeShop{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("gift_free", map[string]interface{}{
 		"gift_type": "store",
@@ -2325,7 +2327,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	lostItems, items, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2337,7 +2339,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	err = player.HandleLoseItem(lostItems, "ChessShop")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2345,7 +2347,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_ChessShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2359,7 +2361,7 @@ func ReqBuyChessShop(player *Player, req *msg.ReqBuyChessShop) error {
 	player.PlayMod.save()
 	player.ChargeBackData()
 	player.PushClientRes(&msg.ResBuyChessShop{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("buy_product_diamond", map[string]interface{}{
 		"diamond_cost": -lostNum,
@@ -2375,7 +2377,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	lostItems, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2383,7 +2385,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	err = player.HandleLoseItem(lostItems, "ChessShop")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2392,7 +2394,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	err = ChessMod.AddChess(ChessId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2401,7 +2403,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResBuyChessShop2{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2419,7 +2421,7 @@ func ReqBuyChessShop2(player *Player, req *msg.ReqBuyChessShop2) error {
 	player.PlayMod.save()
 	player.ChargeBackData()
 	player.PushClientRes(&msg.ResBuyChessShop2{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("buy_product_diamond", map[string]interface{}{
 		"diamond_cost": lostNum,
@@ -2438,7 +2440,7 @@ func ReqRefreshChessShop(player *Player, req *msg.ReqRefreshChessShop) error {
 	err := player.HandleItem(costItems, msg.ITEM_POP_LABEL_RefreshChessShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRefreshChessShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2458,7 +2460,7 @@ func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error {
 	itemList, err := EndlessMod.GetReward(BaseMod.GetLevel())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResEndlessReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2466,7 +2468,7 @@ func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_EndlessReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResEndlessReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2474,7 +2476,7 @@ func ReqEndlessReward(player *Player, req *msg.ReqEndlessReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(EndlessMod.BackData())
 	player.PushClientRes(&msg.ResEndlessReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	ids := make([]int, 0)
 	nums := make([]int, 0)
@@ -2504,7 +2506,7 @@ func ReqPiggyBankReward(player *Player, req *msg.ReqPiggyBankReward) error {
 	err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_PiggyBankReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPiggyBankReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2512,7 +2514,7 @@ func ReqPiggyBankReward(player *Player, req *msg.ReqPiggyBankReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(PiggyBankMod.BackData())
 	player.PushClientRes(&msg.ResPiggyBankReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("piggy_bank_open", map[string]interface{}{
 		"piggy_bank_type": piggyBank.PIGGY_BANK_TYPE_AD,
@@ -2550,7 +2552,7 @@ func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error {
 	err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2559,7 +2561,7 @@ func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error {
 	player.BackChampship()
 	player.TriggerSeed()
 	player.PushClientRes(&msg.ResChampshipReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	maxId := champshipCfg.GetMaxRewardId()
 	if maxId == ChampshipMod.Reward {
@@ -2601,7 +2603,7 @@ func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) err
 	itemList, err := player.GetChampshipRankReward(myPreRank, yesterdayActivityId)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipRankReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2609,7 +2611,7 @@ func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) err
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipRankReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipRankReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2622,7 +2624,7 @@ func ReqChampshipRankReward(player *Player, req *msg.ReqChampshipRankReward) err
 	player.PlayMod.save()
 	player.BackChampship()
 	player.PushClientRes(&msg.ResChampshipRankReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("championship_reward", map[string]interface{}{
 		"season_id":         GoUtil.ZeroTimestamp() - 86400,
@@ -2638,7 +2640,7 @@ func ReqSetName(player *Player, req *msg.ReqSetName) error {
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.SetNickName(req.Name)
 	player.PushClientRes(&msg.ResSetName{
-		ResultCode: msg.RES_CODE_Success,
+		ResultCode: msg.RES_CODE_SUCCESS,
 	})
 	player.PlayMod.save()
 	player.BackUserInfo()
@@ -2653,7 +2655,7 @@ func ReqSetPetName(player *Player, req *msg.ReqSetPetName) error {
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.SetPetName(req.Name)
 	player.PushClientRes(&msg.ResSetPetName{
-		ResultCode: msg.RES_CODE_Success,
+		ResultCode: msg.RES_CODE_SUCCESS,
 	})
 	player.PlayMod.save()
 	player.BackUserInfo()
@@ -2675,14 +2677,14 @@ func ReqMasterCard(player *Player, req *msg.ReqMasterCard) error {
 	err := CardMod.MasterCardEx(int(req.Id), int(req.CardId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMasterCard{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResMasterCard{
-		Code:     msg.RES_CODE_Success,
+		Code:     msg.RES_CODE_SUCCESS,
 		MasterId: req.Id,
 		CardId:   req.CardId,
 	})
@@ -2699,7 +2701,7 @@ func ReqSetFacebookUrl(player *Player, req *msg.ReqSetFacebookUrl) error {
 	BaseMod.SetFacebookUrl(req.Url)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetFacebookUrl{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -2766,7 +2768,7 @@ func ReqAutoAddInviteFriend(player *Player, req *msg.ReqAutoAddInviteFriend) err
 	uid := int(req.Id)
 	if uid == 0 && uid == int(player.M_DwUin) {
 		player.PushClientRes(&msg.ResAutoAddInviteFriend{
-			ResultCode: int32(msg.RES_CODE_Fail),
+			ResultCode: int32(msg.RES_CODE_FAIL),
 		})
 		return fmt.Errorf("uid wrong %d", uid)
 	}
@@ -2829,7 +2831,7 @@ func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error {
 	items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2837,7 +2839,7 @@ func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2851,7 +2853,7 @@ func ReqSelectLimitEvent(player *Player, req *msg.ReqSelectLimitEvent) error {
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
 	player.PushClientRes(&msg.ResSelectLimitEvent{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -2869,7 +2871,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_MINING)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -2878,7 +2880,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	err := player.HandleLoseItem(loseItem, "MiningLose")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2887,7 +2889,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	itemList, err := MiningMod.Take(req.Map, int(req.Gem))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2895,7 +2897,7 @@ func ReqMiningTake(player *Player, req *msg.ReqMiningTake) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MiningTake.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningTake{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2913,7 +2915,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_MINING)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResMiningReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -2923,7 +2925,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 	itemList, mining, err := MiningMod.GetReward(orderFactor)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2931,7 +2933,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 	err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MiningReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResMiningReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -2947,7 +2949,7 @@ func ReqMiningReward(player *Player, req *msg.ReqMiningReward) error {
 		"event_id":         aId,
 	})
 	player.PushClientRes(&msg.ResMiningReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.PlayMod.save()
 	player.MiningBackData()
@@ -2972,7 +2974,7 @@ func ReqGuessColorTake(player *Player, req *msg.ReqGuessColorTake) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResGuessColorTake{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -2982,7 +2984,7 @@ func ReqGuessColorTake(player *Player, req *msg.ReqGuessColorTake) error {
 	err := player.HandleLoseItem(loseItems, "GuessColorLose")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuessColorTake{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3007,7 +3009,7 @@ func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error {
 	status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR)
 	if status != ACT_STATUS_START {
 		player.SendErrClienRes(&msg.ResGuessColorReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not start",
 		})
 		return fmt.Errorf("activity not start")
@@ -3016,7 +3018,7 @@ func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error {
 	items, err := GuessColorMod.GetReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuessColorReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3024,7 +3026,7 @@ func ReqGuessColorReward(player *Player, req *msg.ReqGuessColorReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_GuessColorReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGuessColorReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3049,14 +3051,14 @@ func ReqRaceStart(player *Player, req *msg.ReqRaceStart) error {
 	err := RaceMod.StartGame()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRaceStart{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.RaceBackData()
 	player.PushClientRes(&msg.ResRaceStart{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3067,7 +3069,7 @@ func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error {
 	items, err := RaceMod.GetReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRaceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3075,7 +3077,7 @@ func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_RaceReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResRaceReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3085,7 +3087,7 @@ func ReqRaceReward(player *Player, req *msg.ReqRaceReward) error {
 		"item_list": items,
 	})
 	player.PushClientRes(&msg.ResRaceReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3169,7 +3171,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 	items, pType, err := PlayroomMod.Interact(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3177,7 +3179,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 	err = player.HandleLoseItem(items, "PlayroomInteract")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3189,7 +3191,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 	_, err = player.GetPlayerBaseMod().AddExp(player, 0, pExp)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 	}
@@ -3204,7 +3206,7 @@ func ReqPlayroomInteract(player *Player, req *msg.ReqPlayroomInteract) error {
 		"interact_type": int(req.Type),
 	})
 	player.PushClientRes(&msg.ResPlayroomInteract{
-		Code:        msg.RES_CODE_Success,
+		Code:        msg.RES_CODE_SUCCESS,
 		InteractNum: int32(PlayroomMod.InteractNum),
 	})
 	return nil
@@ -3216,7 +3218,7 @@ func ReqPlayroomSetRoom(player *Player, req *msg.ReqPlayroomSetRoom) error {
 	_, err := PlayroomMod.SetRoom(GoUtil.MapInt32ToInt(req.Playroom))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomSetRoom{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3225,7 +3227,7 @@ func ReqPlayroomSetRoom(player *Player, req *msg.ReqPlayroomSetRoom) error {
 	player.PlayMod.save()
 	//player.RoomDecoSetLog(Diff)
 	player.PushClientRes(&msg.ResPlayroomSetRoom{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3236,7 +3238,7 @@ func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error {
 	target := PlayroomMod.GetTarget()
 	if target == 0 {
 		player.SendErrClienRes(&msg.ResPlayroomGame{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "no target",
 		})
 		return fmt.Errorf("no target")
@@ -3245,7 +3247,7 @@ func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomGame{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3278,7 +3280,7 @@ func ReqPlayroomGame(player *Player, req *msg.ReqPlayroomGame) error {
 	player.PlayroomBackData()
 	player.PlayerDecoSetLog("emoji", int(req.EmojiId), "playroom_game")
 	player.PushClientRes(&msg.ResPlayroomGame{
-		Code:  msg.RES_CODE_Success,
+		Code:  msg.RES_CODE_SUCCESS,
 		Type:  req.Type,
 		Items: itemsMsg,
 	})
@@ -3293,7 +3295,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomSelectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3302,7 +3304,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
 	target := PlayroomMod.GetTarget()
 	if gameId == 0 || target == 0 {
 		player.SendErrClienRes(&msg.ResPlayroomSelectReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "no game or target",
 		})
 		return fmt.Errorf("no game or target")
@@ -3340,7 +3342,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
 	go NotifyPetroomGame(target)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomSelectReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3359,7 +3361,7 @@ func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error {
 	items, err := PlayroomMod.Work()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomWork{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3372,7 +3374,7 @@ func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error {
 	err = player.HandleLoseItem(items, "playroomWork")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomWork{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3385,7 +3387,7 @@ func ReqPlayroomWork(player *Player, req *msg.ReqPlayroomWork) error {
 	player.PushClientRes(PlayroomMod.NotifyWork())
 	// player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomWork{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3407,7 +3409,7 @@ func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error {
 	id, items, err := PlayroomMod.Draw()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomDraw{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3416,7 +3418,7 @@ func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomDraw.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomDraw{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3429,7 +3431,7 @@ func ReqPlayroomDraw(player *Player, req *msg.ReqPlayroomDraw) error {
 		"item_list": items,
 	})
 	player.PushClientRes(&msg.ResPlayroomDraw{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   int32(id),
 	})
 	return nil
@@ -3441,7 +3443,7 @@ func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error {
 	items, chipNum, err := PlayroomMod.RemoveChip(req.Uid)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomChip{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3449,7 +3451,7 @@ func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error {
 	err = player.HandleLoseItem(items, msg.ITEM_POP_LABEL_PlayroomChip.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomChip{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3463,7 +3465,7 @@ func ReqPlayroomChip(player *Player, req *msg.ReqPlayroomChip) error {
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomChip{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3474,7 +3476,7 @@ func ReqPlayroomFlip(player *Player, req *msg.ReqPlayroomFlip) error {
 	cardId, err := PlayroomMod.FlipCard(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomFlip{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3486,7 +3488,7 @@ func ReqPlayroomFlip(player *Player, req *msg.ReqPlayroomFlip) error {
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomFlip{
-		Code:   msg.RES_CODE_Success,
+		Code:   msg.RES_CODE_SUCCESS,
 		Id:     req.Id,
 		CardId: int32(cardId),
 	})
@@ -3498,7 +3500,7 @@ func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error
 	items, target, result, err := PlayroomMod.GetFlipReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomFlipReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3520,7 +3522,7 @@ func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomFlip.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomFlip{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3553,7 +3555,7 @@ func ReqPlayroomFlipReward(player *Player, req *msg.ReqPlayroomFlipReward) error
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomFlipReward{
-		Code:   msg.RES_CODE_Success,
+		Code:   msg.RES_CODE_SUCCESS,
 		Broken: broken,
 	})
 	return nil
@@ -3565,7 +3567,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	if costItems == nil {
 		err := fmt.Errorf("can not buy item")
 		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3574,7 +3576,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	err := player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3582,7 +3584,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	err = player.HandleItem(addItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3592,7 +3594,7 @@ func ReqPlayroomBuyItem(player *Player, req *msg.ReqPlayroomBuyItem) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomBuyItem{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3602,7 +3604,7 @@ func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error {
 	items, err := PlayroomMod.GiveUpvote(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomUpvote{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3610,7 +3612,7 @@ func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomUpvote.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomUpvote{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 	}
@@ -3637,7 +3639,7 @@ func ReqPlayroomUpvote(player *Player, req *msg.ReqPlayroomUpvote) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomUpvote{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3647,7 +3649,7 @@ func ReqPlayroomUnlock(player *Player, req *msg.ReqPlayroomUnlock) error {
 	err := PlayroomMod.Unlock(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomUnlock{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3657,7 +3659,7 @@ func ReqPlayroomUnlock(player *Player, req *msg.ReqPlayroomUnlock) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomUnlock{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   int32(req.Id),
 	})
 	player.PlayroomBackData()
@@ -3669,7 +3671,7 @@ func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error {
 	items, err := PlayroomMod.GetDailyTaskReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTask{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3677,7 +3679,7 @@ func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomTask.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTask{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3689,7 +3691,7 @@ func ReqPlayroomTask(player *Player, req *msg.ReqPlayroomTask) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomTask{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   int32(req.Id),
 	})
 	player.PlayroomBackData()
@@ -3701,7 +3703,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 	id, items, err := PlayroomMod.GetTaskReward(int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTaskReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3710,7 +3712,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomTaskReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomTaskReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3722,7 +3724,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResPlayroomTaskReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   int32(id),
 		Type: req.Type,
 	})
@@ -3732,7 +3734,7 @@ func ReqPlayroomTaskReward(player *Player, req *msg.ReqPlayroomTaskReward) error
 
 func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error {
 	req := &msg.ReqOfflineReconnect{}
-	err := GoUtil.Unmarshal(buf, req)
+	err := proto.Unmarshal(buf, req)
 	if err != nil {
 		return err
 	}
@@ -3747,11 +3749,11 @@ func ReqOfflineReconnectFunc(a gate.Agent, buf []byte) error {
 			internal.Agents.Delete(agent)
 		}
 		player.TeLog("reconnect", map[string]interface{}{})
-		res.Result_ = 3
+		res.Result = 3
 	} else {
-		res.Result_ = 2
+		res.Result = 2
 	}
-	data := GoUtil.Marshal(res)
+	data, _ := proto.Marshal(res)
 	G_GameLogicPtr.PackResInfo(a, "ResOfflineReconnect", data)
 	return nil
 }
@@ -3766,28 +3768,28 @@ func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error {
 		err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResPlayroomOutline{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
 		}
 	}
 
-	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId_))
+	err := ChessMod.ExChess(int(req.OldChessId), int(req.NewChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomOutline{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	HandbookMod := player.PlayMod.getHandbookMod()
-	HandbookMod.SetHandbook(int(req.NewChessId_))
+	HandbookMod.SetHandbook(int(req.NewChessId))
 	data := &PlayerChessData{}
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomOutline{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3796,7 +3798,7 @@ func ReqPlayroomOutline(player *Player, req *msg.ReqPlayroomOutline) error {
 	player.PlayMod.save()
 	player.PushClientRes(ChessMod.BackData())
 	player.PushClientRes(&msg.ResPlayroomOutline{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3807,7 +3809,7 @@ func ReqPlayroomWorkOutline(player *Player, req *msg.ReqPlayroomWorkOutline) err
 	player.PlayMod.save()
 	player.PushClientRes(PlayroomMod.NotifyStatus())
 	player.PushClientRes(&msg.ResPlayroomWorkOutline{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3817,7 +3819,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	addItems, loseItems, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3827,7 +3829,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 		err := PlayroomMod.AdWatch(addItems[0].Id)
 		if err != nil {
 			player.SendErrClienRes(&msg.ResPlayroomBuyItem{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -3836,7 +3838,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	err = player.HandleLoseItem(loseItems, msg.ITEM_POP_LABEL_PlayroomShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3844,7 +3846,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	err = player.HandleItem(addItems, msg.ITEM_POP_LABEL_PlayroomShop.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomShop{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -3859,7 +3861,7 @@ func ReqPlayroomShop(player *Player, req *msg.ReqPlayroomShop) error {
 	player.PushClientRes(PlayroomMod.NotifyMood())
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomShop{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3874,7 +3876,7 @@ func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) err
 	FriendTreasureMod := player.PlayMod.getFriendTreasureMod()
 	if FriendTreasureMod.Status == 1 {
 		player.SendErrClienRes(&msg.ResFriendTreasureStart{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "game not over",
 		})
 		return fmt.Errorf("game not over")
@@ -3882,7 +3884,7 @@ func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) err
 
 	if FriendTreasureMod.Star < 100 {
 		player.SendErrClienRes(&msg.ResFriendTreasureStart{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "not enough star",
 		})
 		return fmt.Errorf("not enough star")
@@ -3892,7 +3894,7 @@ func ReqFriendTreasureStart(player *Player, req *msg.ReqFriendTreasureStart) err
 	FriendTreasureMod.InitGame(req.List, req.List2)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTreasureStart{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3903,7 +3905,7 @@ func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureFilp{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			},
 		)
@@ -3925,7 +3927,7 @@ func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureFilp{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			},
 		)
@@ -3938,7 +3940,7 @@ func ReqFriendTreasureFilp(player *Player, req *msg.ReqFriendTreasureFilp) error
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTreasureFilp{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -3949,7 +3951,7 @@ func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error {
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureEnd{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			},
 		)
@@ -3974,7 +3976,7 @@ func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error {
 	if err != nil {
 		player.SendErrClienRes(
 			&msg.ResFriendTreasureEnd{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			},
 		)
@@ -3992,7 +3994,7 @@ func ReqFriendTreasureEnd(player *Player, req *msg.ReqFriendTreasureEnd) error {
 	player.PlayMod.save()
 	player.PushClientRes(FriendTreasureMod.BackData())
 	player.PushClientRes(&msg.ResFriendTreasureEnd{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4010,7 +4012,7 @@ func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error
 	items, err := CardMod.GetHandbookReward(int(req.CardId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardHandbookReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4018,7 +4020,7 @@ func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CardHandbookReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCardHandbookReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4029,7 +4031,7 @@ func ReqCardHandbookReward(player *Player, req *msg.ReqCardHandbookReward) error
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCardHandbookReward{
-		Code:   msg.RES_CODE_Success,
+		Code:   msg.RES_CODE_SUCCESS,
 		CardId: req.CardId,
 	})
 	return nil
@@ -4041,7 +4043,7 @@ func ReqSetEmoji(player *Player, req *msg.ReqSetEmoji) error {
 	err := EmojiMod.SetEmoji(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSetEmoji{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4054,7 +4056,7 @@ func ReqSetEmoji(player *Player, req *msg.ReqSetEmoji) error {
 	player.UpdateUserInfo()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSetEmoji{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.BackUserInfo()
 	return nil
@@ -4087,7 +4089,7 @@ func ReqCollect(player *Player, req *msg.ReqCollect) error {
 	items, err := CollectMod.GetReward(int(req.Id), num, player.GetOrderFactor())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCollect{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4095,7 +4097,7 @@ func ReqCollect(player *Player, req *msg.ReqCollect) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_Collect.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCollect{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4103,7 +4105,7 @@ func ReqCollect(player *Player, req *msg.ReqCollect) error {
 	player.PlayMod.save()
 	player.PushClientRes(CollectMod.BackData(player.GetOrderFactor()))
 	player.PushClientRes(&msg.ResCollect{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.TeLog("playerdeco_warehouse_unlock", map[string]interface{}{
 		"area_type": areaType,
@@ -4133,7 +4135,7 @@ func ReqPlayroomDressSet(player *Player, req *msg.ReqPlayroomDressSet) error {
 	parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet))
 	if error != nil {
 		player.SendErrClienRes(&msg.ResPlayroomDressSet{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  error.Error(),
 		})
 		return error
@@ -4143,7 +4145,7 @@ func ReqPlayroomDressSet(player *Player, req *msg.ReqPlayroomDressSet) error {
 	//player.PetDecoSetLog(Diff)
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomDressSet{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4154,7 +4156,7 @@ func ReqPlayroomPetAirSet(player *Player, req *msg.ReqPlayroomPetAirSet) error {
 	error := PlayroomMod.PlayroomPetAirSet(int(req.PetAirSet))
 	if error != nil {
 		player.SendErrClienRes(&msg.ResPlayroomPetAirSet{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  error.Error(),
 		})
 		return error
@@ -4162,7 +4164,7 @@ func ReqPlayroomPetAirSet(player *Player, req *msg.ReqPlayroomPetAirSet) error {
 	player.PlayMod.save()
 	player.PlayroomBackData()
 	player.PushClientRes(&msg.ResPlayroomPetAirSet{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4173,7 +4175,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	err := LimitedTimeEventMod.LuckyCat(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitEventLuckyCat{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4182,7 +4184,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	err = ChessMod.AddChess(int(req.ChessId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitEventLuckyCat{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 	}
@@ -4190,7 +4192,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	err = data.UpdateChessData(player, req.MChessData)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResLimitEventLuckyCat{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		player.TeLog("outsync_event", map[string]interface{}{
@@ -4205,7 +4207,7 @@ func ReqLimitEventLuckyCat(player *Player, req *msg.ReqLimitEventLuckyCat) error
 	player.PlayMod.save()
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(&msg.ResLimitEventLuckyCat{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4215,7 +4217,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	activityInfo := player.GetActivityInfo(activity.ACT_TYPE_ADD_GIFT)
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
@@ -4224,7 +4226,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	items, err := ActivityMod.GetAddGiftReward(activityInfo.Id)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddGiftReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4232,7 +4234,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_ActTypeAddGift.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddGiftReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4240,7 +4242,7 @@ func ReqAddGiftReward(player *Player, req *msg.ReqAddGiftReward) error {
 	player.PlayMod.save()
 	player.BackDataActivity()
 	player.PushClientRes(&msg.ResAddGiftReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 
@@ -4251,7 +4253,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	activityInfo := player.GetActivityInfo(int(req.Id))
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
@@ -4260,7 +4262,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	items, err := ActivityMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4268,7 +4270,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_ActivityReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResActivityReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4281,7 +4283,7 @@ func ReqActivityReward(player *Player, req *msg.ReqActivityReward) error {
 	player.InitActivity()
 	player.BackDataActivity()
 	player.PushClientRes(&msg.ResActivityReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4290,7 +4292,7 @@ func ReqLang(player *Player, req *msg.ReqLang) error {
 	BaseMod := player.PlayMod.getBaseMod()
 	BaseMod.SetLang(req.Lang)
 	player.PushClientRes(&msg.ResLang{
-		ResultCode: msg.RES_CODE_Success,
+		ResultCode: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4304,7 +4306,7 @@ func ReqAdWatch(player *Player, req *msg.ReqAdWatch) error {
 	player.PlayMod.save()
 	player.UpdateUserInfo()
 	player.PushClientRes(&msg.ResAdWatch{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4313,7 +4315,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod()
 	if !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK) {
 		player.SendErrClienRes(&msg.ResCatTrickReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "cat trick event not exist",
 		})
 		return fmt.Errorf("cat trick event not exist")
@@ -4321,7 +4323,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	items, err := LimitedTimeEventMod.GetCatTrickReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatTrickReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4329,7 +4331,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatTrickReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatTrickReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4340,7 +4342,7 @@ func ReqCatTrickReward(player *Player, req *msg.ReqCatTrickReward) error {
 	player.PlayMod.save()
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(&msg.ResCatTrickReward{
-		Code:    msg.RES_CODE_Success,
+		Code:    msg.RES_CODE_SUCCESS,
 		IsClose: !LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK),
 	})
 	return nil
@@ -4355,7 +4357,7 @@ func ReqChargeReceive(player *Player, req *msg.ReqChargeReceive) error {
 		Extra: req.Content,
 	})
 	player.PushClientRes(&msg.ResChargeReceive{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4365,7 +4367,7 @@ func ReqAddWish(player *Player, req *msg.ReqAddWish) error {
 	items, err := ChargeMod.AddWish(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddWish{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4374,7 +4376,7 @@ func ReqAddWish(player *Player, req *msg.ReqAddWish) error {
 		err = player.HandleItem(items, msg.ITEM_POP_LABEL_AddWish.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResAddWish{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -4387,7 +4389,7 @@ func ReqAddWish(player *Player, req *msg.ReqAddWish) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResAddWish{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4397,7 +4399,7 @@ func ReqGetWish(player *Player, req *msg.ReqGetWish) error {
 	items, err := ChargeMod.GetWish()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetWish{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4406,7 +4408,7 @@ func ReqGetWish(player *Player, req *msg.ReqGetWish) error {
 		err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetWish.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResGetWish{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -4417,7 +4419,7 @@ func ReqGetWish(player *Player, req *msg.ReqGetWish) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGetWish{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4427,7 +4429,7 @@ func ReqSendWishBeg(player *Player, req *msg.ReqSendWishBeg) error {
 	err := ChargeMod.SendWishBeg(req.Uid)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSendWishBeg{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4445,7 +4447,7 @@ func ReqSendWishBeg(player *Player, req *msg.ReqSendWishBeg) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResSendWishBeg{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4478,7 +4480,7 @@ func ReqWishApply(player *Player, req *msg.ReqWishApply) error {
 	err := FriendMod.ApplyWish(req.Uid)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResWishApply{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4494,7 +4496,7 @@ func ReqWishApply(player *Player, req *msg.ReqWishApply) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResWishApply{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4505,7 +4507,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 	isReward := GuideMod.GetPlayroomGuide()
 	if isReward {
 		player.SendErrClienRes(&msg.ResGuidePlayroom{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "已领取",
 		})
 		return fmt.Errorf("已领取")
@@ -4514,7 +4516,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResWishApply{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4522,7 +4524,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 	GuideMod.SetPlayroomGuide(true)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGuidePlayroom{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4530,7 +4532,7 @@ func ReqGuidePlayroom(player *Player, req *msg.ReqGuidePlayroom) error {
 func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error {
 	if req.Id == "" || req.Name == "" {
 		player.SendErrClienRes(&msg.ResId2Verify{
-			ResultCode: msg.RES_CODE_Fail,
+			ResultCode: msg.RES_CODE_FAIL,
 			Msg:        "id is zero",
 		})
 		return fmt.Errorf("id is zero")
@@ -4538,7 +4540,7 @@ func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error {
 	err := GoUtil.IdVerify(req.Name, req.Id)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResId2Verify{
-			ResultCode: msg.RES_CODE_Fail,
+			ResultCode: msg.RES_CODE_FAIL,
 			Msg:        err.Error(),
 		})
 		return err
@@ -4551,7 +4553,7 @@ func ReqId2Verify(player *Player, req *msg.ReqId2Verify) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResId2Verify{
-		ResultCode: msg.RES_CODE_Success,
+		ResultCode: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4569,7 +4571,7 @@ func ReqPlayroomGuide(player *Player, req *msg.ReqPlayroomGuide) error {
 	err := PlayroomMod.Guide(int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomGuide{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4580,7 +4582,7 @@ func ReqPlayroomGuide(player *Player, req *msg.ReqPlayroomGuide) error {
 	player.PlayMod.save()
 	player.PushClientRes(PlayroomMod.NotifyMood())
 	player.PushClientRes(&msg.ResPlayroomGuide{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4595,7 +4597,7 @@ func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipInvite{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4605,7 +4607,7 @@ func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error {
 	err := CatnipMod.Invite(int(req.Uid), int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipInvite{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4626,7 +4628,7 @@ func ReqCatnipInvite(player *Player, req *msg.ReqCatnipInvite) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipInvite{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4638,7 +4640,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	activityInfo := player.GetActivityInfo(activityId)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipAgree{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4646,7 +4648,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	_, err := CatnipMod.Agree(int(req.Id), int(req.Uid))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipAgree{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4654,7 +4656,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	err = player.SetCatnipPartner(int(req.Id), int(req.Uid), activityInfo.EndT)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipAgree{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4675,7 +4677,7 @@ func ReqCatnipAgree(player *Player, req *msg.ReqCatnipAgree) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipAgree{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4687,7 +4689,7 @@ func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipMultiply{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4695,7 +4697,7 @@ func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error {
 	err := CatnipMod.Multiply(int(req.Multiply))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipMultiply{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4706,7 +4708,7 @@ func ReqCatnipMultiply(player *Player, req *msg.ReqCatnipMultiply) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipMultiply{
-		Code:     msg.RES_CODE_Success,
+		Code:     msg.RES_CODE_SUCCESS,
 		Multiply: req.Multiply,
 	})
 	return nil
@@ -4718,7 +4720,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4726,7 +4728,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	id, growth, partnerId, items, costItems, friendItems, err := CatnipMod.Play(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4734,7 +4736,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	err = player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_CatnipPlay.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4742,7 +4744,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipPlay.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4763,7 +4765,7 @@ func ReqCatnipPlay(player *Player, req *msg.ReqCatnipPlay) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipPlay{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   int32(id),
 	})
 	return nil
@@ -4775,7 +4777,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4783,7 +4785,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	items, gameInfo, err := CatnipMod.Reward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4791,7 +4793,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4805,7 +4807,7 @@ func ReqCatnipReward(player *Player, req *msg.ReqCatnipReward) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4816,7 +4818,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipPlay{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4824,7 +4826,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	items, err := CatnipMod.GrandReward()
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipGrandReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4832,7 +4834,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipGrandReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipGrandReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4843,7 +4845,7 @@ func ReqCatnipGrandReward(player *Player, req *msg.ReqCatnipGrandReward) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipGrandReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -4853,7 +4855,7 @@ func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipRefuse{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4861,7 +4863,7 @@ func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error {
 	err := CatnipMod.Refuse(int(req.Id), int(req.Uid))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatnipRefuse{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4882,7 +4884,7 @@ func ReqCatnipRefuse(player *Player, req *msg.ReqCatnipRefuse) error {
 	//player.CatnipBackData()
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResCatnipRefuse{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -4899,7 +4901,7 @@ func ReqActPassReward(player *Player, req *msg.ReqActPassReward) error {
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_ActPassReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResActPassReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4910,7 +4912,7 @@ func ReqActPassReward(player *Player, req *msg.ReqActPassReward) error {
 	})
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResActPassReward{
-		Code:        msg.RES_CODE_Success,
+		Code:        msg.RES_CODE_SUCCESS,
 		RewardLevel: GoUtil.IntToInt32(newLevel),
 	})
 	return nil
@@ -4921,7 +4923,7 @@ func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) e
 	items, err := ChessMod.GetRetireReward(req.Id)
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessRetireReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4929,7 +4931,7 @@ func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) e
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetChessRetireReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResGetChessRetireReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -4941,7 +4943,7 @@ func ReqGetChessRetireReward(player *Player, req *msg.ReqGetChessRetireReward) e
 	player.PushClientRes(ChessMod.BackData())
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResGetChessRetireReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -4952,7 +4954,7 @@ func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error {
 	activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP)
 	if activityId == 0 {
 		player.SendErrClienRes(&msg.ResCatnipEmoji{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not active",
 		})
 		return fmt.Errorf("activity not active")
@@ -4961,7 +4963,7 @@ func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error {
 	CatnipMod.SetSendEmoji(int(req.Id), int(req.EmojiId))
 	if gameInfo.Partner == 0 {
 		player.SendErrClienRes(&msg.ResCatnipEmoji{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "no partner",
 		})
 		return fmt.Errorf("no partner")
@@ -4973,7 +4975,7 @@ func ReqCatnipEmoji(player *Player, req *msg.ReqCatnipEmoji) error {
 		Extra: int(req.EmojiId),
 	})
 	player.PushClientRes(&msg.ResCatnipEmoji{
-		Code:    msg.RES_CODE_Success,
+		Code:    msg.RES_CODE_SUCCESS,
 		EmojiId: req.EmojiId,
 		Id:      req.Id,
 	})
@@ -4993,7 +4995,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	activityInfo := player.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT)
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
@@ -5001,7 +5003,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	cfg := G_GameLogicPtr.ActivityMgr.GetCatReturnGiftCfg(activityInfo.Id)
 	if cfg == nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "config not exist",
 		})
 		return fmt.Errorf("config not exist")
@@ -5022,7 +5024,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	}
 	if len(items) == 0 {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "no reward",
 		})
 		return fmt.Errorf("no reward")
@@ -5030,7 +5032,7 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
 	err := player.HandleItem(items, msg.ITEM_POP_LABEL_CatReturnGiftReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5062,7 +5064,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	err := player.HandleLoseItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftRewardGift{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5072,7 +5074,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5080,7 +5082,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	err = player.HandleItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResSelectLimitEvent{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -5094,7 +5096,7 @@ func ReqCatReturnGiftRewardGift(player *Player, req *msg.ReqCatReturnGiftRewardG
 	player.PushClientRes(LimitedTimeEventMod.BackData())
 	player.PushClientRes(LimitedTimeEventMod.ProgressBackData())
 	player.PushClientRes(&msg.ResSelectLimitEvent{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	return nil
 }
@@ -5103,7 +5105,7 @@ func ReqCatReturnGiftScore(player *Player, req *msg.ReqCatReturnGiftScore) error
 	activityInfo := player.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT)
 	if activityInfo == nil {
 		player.SendErrClienRes(&msg.ResCatReturnGiftScore{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "activity not exist",
 		})
 		return fmt.Errorf("activity not exist")
diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go
index 58d2824a..a68b98d6 100644
--- a/src/server/game/req_func_friend.go
+++ b/src/server/game/req_func_friend.go
@@ -11,7 +11,7 @@ import (
 	"server/game/mod/item"
 	MsqMod "server/game/mod/msg"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"strconv"
 )
 
@@ -100,14 +100,14 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	FriendMod := player.PlayMod.getFriendMod()
 	if Uid == int(player.M_DwUin) {
 		player.SendErrClienRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "cannot apply yourself",
 		})
 		return fmt.Errorf("cannot apply yourself")
 	}
 	if FriendMod.CheckFriend(Uid) {
 		player.SendErrClienRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "already friend",
 		})
 		return fmt.Errorf("already friend")
@@ -115,7 +115,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	// 好友人数到达上限（2000人）时，玩家将无法再发送好友申请
 	if FriendMod.GetFriendLen() >= friendCfg.GetFriendLimitNum() {
 		player.SendErrClienRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "friend list full",
 		})
 		return fmt.Errorf("friend list full")
@@ -124,7 +124,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	sendApplyTime := FriendMod.GetSendApplyTime(Uid)
 	if sendApplyTime != 0 && GoUtil.Now()-sendApplyTime < oneday {
 		player.PushClientRes(&msg.ResApplyFriend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Uid:  req.Uid,
 			Msg:  "already applied",
 		})
@@ -136,7 +136,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 		Items, err := FriendMod.GetSponsorReward()
 		if err != nil {
 			player.SendErrClienRes(&msg.ResApplyFriend{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -146,7 +146,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 		err = player.HandleItem(Items, msg.ITEM_POP_LABEL_ApplyFriendSponsor.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResApplyFriend{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -176,7 +176,7 @@ func ReqApplyFriend(player *Player, req *msg.ReqApplyFriend) error {
 	}
 	FriendMgrSend(m)
 	player.PushClientRes(&msg.ResApplyFriend{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	return nil
@@ -188,7 +188,7 @@ func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error {
 	FriendMod := player.PlayMod.getFriendMod()
 	if !FriendMod.CheckApply(Uid) {
 		player.SendErrClienRes(&msg.ResAgreeFriend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "apply uid not exist",
 		})
 		return fmt.Errorf("apply uid not exist")
@@ -196,7 +196,7 @@ func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error {
 	// 好友人数到达上限（2000人）时，玩家将无法再同意好友申请
 	if FriendMod.GetFriendLen() >= friendCfg.GetFriendLimitNum() {
 		player.SendErrClienRes(&msg.ResAgreeFriend{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "friend list full",
 		})
 		return fmt.Errorf("friend list full")
@@ -207,7 +207,7 @@ func ReqAgreeFriend(player *Player, req *msg.ReqAgreeFriend) error {
 	}
 	FriendMod.AddFriend(Uid)
 	player.PushClientRes(&msg.ResAgreeFriend{
-		Code:   msg.RES_CODE_Success,
+		Code:   msg.RES_CODE_SUCCESS,
 		Uid:    req.Uid,
 		Player: G_GameLogicPtr.GetResSimplePlayerByUid(int(req.Uid)),
 	})
@@ -243,7 +243,7 @@ func ReqDelFriend(player *Player, req *msg.ReqDelFriend) error {
 	FriendMod.DelFriend(Uid)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResDelFriend{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	player.AddLog(Uid, friend.LOG_TYPE_FRIEND_DELETE, "", GoUtil.Now())
@@ -261,7 +261,7 @@ func ReqRefuseFriend(player *Player, req *msg.ReqRefuseFriend) error {
 	FriendMod.RefuseApply(Uid)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResRefuseFriend{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Uid:  req.Uid,
 	})
 	now := GoUtil.Now()
@@ -302,7 +302,7 @@ func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error {
 	Items, FUid, err := FriendMod.Upvote(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTLUpvote{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -310,7 +310,7 @@ func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error {
 	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_TLUpvote.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTLUpvote{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -329,7 +329,7 @@ func ReqFriendTLUpvote(player *Player, req *msg.ReqFriendTLUpvote) error {
 	FriendMgrSend(m)
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTLUpvote{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	player.TeLog("friend_upvote", map[string]interface{}{
@@ -343,7 +343,7 @@ func ReqFriendTReward(player *Player, req *msg.ReqFriendTReward) error {
 	Items, err := FriendMod.GetReward(int(req.Id))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -351,14 +351,14 @@ func ReqFriendTReward(player *Player, req *msg.ReqFriendTReward) error {
 	err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendTReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResFriendTReward{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
 	}
 	player.PlayMod.save()
 	player.PushClientRes(&msg.ResFriendTReward{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 		Id:   req.Id,
 	})
 	return nil
@@ -369,12 +369,12 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 	ReplyInfo := FriendMod.ReplyFriend(int(req.LogId))
 	if ReplyInfo == nil {
 		player.SendErrClienRes(&msg.ResFriendReplyHandle{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "reply info not exist",
 		})
 		return fmt.Errorf("reply info not exist")
 	}
-	ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_None
+	ErrType := msg.FRIEND_REPLY_HANDLE_ERR_TYPE_NONE
 	now := GoUtil.Now()
 	items := make([]*item.Item, 0)
 	if ReplyInfo.Type == friend.REPLY_TYPE_GREETING_Get {
@@ -439,7 +439,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 				}
 				player.CatnipBackData()
 			} else {
-				ErrType = msg.FRIEND_REPLY_HANDLE_ERR_TYPE_Catnip
+				ErrType = msg.FRIEND_REPLY_HANDLE_ERR_TYPE_CATNIP
 			}
 		}
 	}
@@ -447,7 +447,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 		err := player.HandleItem(items, msg.ITEM_POP_LABEL_FriendReplyHandle.String())
 		if err != nil {
 			player.SendErrClienRes(&msg.ResFriendReplyHandle{
-				Code: msg.RES_CODE_Fail,
+				Code: msg.RES_CODE_FAIL,
 				Msg:  err.Error(),
 			})
 			return err
@@ -455,7 +455,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 	}
 	player.FriendLogBackData()
 	player.PushClientRes(&msg.ResFriendReplyHandle{
-		Code:    msg.RES_CODE_Success,
+		Code:    msg.RES_CODE_SUCCESS,
 		LogId:   req.LogId,
 		Type:    req.Type,
 		ErrType: ErrType,
@@ -466,7 +466,7 @@ func ReqFriendReplyHandle(player *Player, req *msg.ReqFriendReplyHandle) error {
 func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	if req.Code == "" {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "code is empty",
 		})
 		return fmt.Errorf("code is empty")
@@ -474,7 +474,7 @@ func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	CodeNum := GoUtil.ParseUniqueStringToInt(req.Code)
 	if CodeNum <= 0 {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "code is invalid",
 		})
 		return fmt.Errorf("code is invalid")
@@ -482,7 +482,7 @@ func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	Uid := int64(CodeNum) + int64(100000) + int64(conf.Server.AppID*100000000)
 	if Uid == player.M_DwUin {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "can not add yourself",
 		})
 		return fmt.Errorf("can not add yourself")
@@ -491,13 +491,13 @@ func ReqFriendByCode(player *Player, req *msg.ReqFriendByCode) error {
 	PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(int(Uid))
 	if PlayerSimpleData == nil {
 		player.SendErrClienRes(&msg.ResFriendByCode{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  "player not exist",
 		})
 		return fmt.Errorf("player not exist")
 	}
 	player.PushClientRes(&msg.ResFriendByCode{
-		Code:   msg.RES_CODE_Success,
+		Code:   msg.RES_CODE_SUCCESS,
 		Player: PlayerSimpleData,
 	})
 	return nil
@@ -508,7 +508,7 @@ func ReqAddNpc(player *Player, req *msg.ReqAddNpc) error {
 	err := FriendMod.SetNpc(int(req.NpcId))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResAddNpc{
-			Code: msg.RES_CODE_Fail,
+			Code: msg.RES_CODE_FAIL,
 			Msg:  err.Error(),
 		})
 		return err
@@ -526,7 +526,7 @@ func ReqAddNpc(player *Player, req *msg.ReqAddNpc) error {
 	FriendMod.AddReplyInfo(int(req.NpcId), friend.REPLY_TYPE_GREETING_Get, "", GoUtil.Now()+oneday, nil)
 	player.AddLog(int(req.NpcId), friend.LOG_TYPE_FRIEND_BECOME_NPC, GoUtil.String(req.NpcId), GoUtil.Now())
 	player.PushClientRes(&msg.ResAddNpc{
-		Code:  msg.RES_CODE_Success,
+		Code:  msg.RES_CODE_SUCCESS,
 		NpcId: req.NpcId,
 	})
 	return nil
diff --git a/src/server/game/req_func_fur.go b/src/server/game/req_func_fur.go
index 0b739c28..a1a0087d 100644
--- a/src/server/game/req_func_fur.go
+++ b/src/server/game/req_func_fur.go
@@ -1,7 +1,7 @@
 package game
 
 import (
-	msg "server/msg/meowmentnet"
+	"server/msg"
 )
 
 func ReqPetFur(player *Player, req *msg.ReqPetFur) error {
diff --git a/src/server/game/trigger_func.go b/src/server/game/trigger_func.go
index 9ef53f96..d21cc15c 100644
--- a/src/server/game/trigger_func.go
+++ b/src/server/game/trigger_func.go
@@ -17,7 +17,7 @@ import (
 	"server/game/mod/order"
 	"server/game/mod/quest"
 	GoUtil "server/game_util"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"sort"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
@@ -47,14 +47,14 @@ func (player *Player) MailTrigger(Tr *quest.Trigger) bool {
 	tr := false
 	for _, v := range t {
 		if player.checkTriggerCondition(v.Trigger) {
-			Title := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, v.Title)
-			Content := languageCfg.GetLanguage(msg.LANG_TYPE_LangCn, v.Content)
-			TitleEn := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, v.Title)
-			ContentEn := languageCfg.GetLanguage(msg.LANG_TYPE_LangEn, v.Content)
-			TitlePtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, v.Title)
-			ContentPtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LangPtbr, v.Content)
-			TitleEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, v.Title)
-			ContentEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LangEsLatam, v.Content)
+			Title := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, v.Title)
+			Content := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, v.Content)
+			TitleEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Title)
+			ContentEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Content)
+			TitlePtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, v.Title)
+			ContentPtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, v.Content)
+			TitleEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, v.Title)
+			ContentEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, v.Content)
 			MailMod.SendMail(&mail.MailStruct{
 				Title:           Title,
 				SubTitle:        "",
@@ -102,7 +102,7 @@ func (player *Player) TriggerShippingOrderOrigin(req *msg.ReqShippingOrder) {
 	if Status == MergeConst.ORDER_STATUS_CANCEL { // 取消支付
 		player.CancelOrder(OrderSn)
 		player.PushClientRes(&msg.ResShippingOrder{
-			Code: msg.RES_CODE_Success,
+			Code: msg.RES_CODE_SUCCESS,
 			Msg:  "cancel success",
 		})
 		return
@@ -161,7 +161,7 @@ func (player *Player) TriggerShippingOrderOrigin(req *msg.ReqShippingOrder) {
 	}
 	player.TeLog("pay", orderDataMap)
 	player.PushClientRes(&msg.ResShippingOrder{
-		Code: msg.RES_CODE_Success,
+		Code: msg.RES_CODE_SUCCESS,
 	})
 	player.SendClientRes()
 }
diff --git a/src/server/game/unit_test.go b/src/server/game/unit_test.go
index 1d4dd0a1..4dfaba5d 100644
--- a/src/server/game/unit_test.go
+++ b/src/server/game/unit_test.go
@@ -11,7 +11,7 @@ import (
 	"server/game/mod/item"
 	"server/game/mod/order"
 	"server/game/mod/quest"
-	msg "server/msg/meowmentnet"
+	"server/msg"
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
diff --git a/src/server/game_util/GoUtil.go b/src/server/game_util/GoUtil.go
index b976485b..845a4008 100644
--- a/src/server/game_util/GoUtil.go
+++ b/src/server/game_util/GoUtil.go
@@ -2,7 +2,6 @@ package GoUtil
 
 import (
 	"bytes"
-	"context"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/md5"
@@ -27,7 +26,6 @@ import (
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
 
-	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/oschwald/geoip2-golang"
 )
 
@@ -967,35 +965,3 @@ func FormatStarItemNum(num, factor int) int {
 	Num := math.Round(float64(num) * float64(factor) / 100)
 	return int(Num) / 5 * 5
 }
-
-func newCompactSerializer() *thrift.TSerializer {
-	transport := thrift.NewTMemoryBufferLen(1024)
-	protocol := thrift.NewTCompactProtocolFactoryConf(nil).GetProtocol(transport)
-	return &thrift.TSerializer{Transport: transport, Protocol: protocol}
-}
-
-func newCompactDeserializer() *thrift.TDeserializer {
-	transport := thrift.NewTMemoryBufferLen(1024)
-	protocol := thrift.NewTCompactProtocolFactoryConf(nil).GetProtocol(transport)
-	return &thrift.TDeserializer{Transport: transport, Protocol: protocol}
-}
-
-func Marshal(m thrift.TStruct) []byte {
-	serializer := newCompactSerializer()
-	data, err := serializer.Write(context.Background(), m)
-	if err != nil {
-		log.Debug("thrift Marshal error:", err)
-		return nil
-	}
-	return data
-}
-
-func Unmarshal(data []byte, m thrift.TStruct) error {
-	deserializer := newCompactDeserializer()
-	err := deserializer.Read(context.Background(), m, data)
-	if err != nil {
-		log.Debug("thrift Unmarshal error:", err)
-		return err
-	}
-	return nil
-}
diff --git a/src/server/gate/router.go b/src/server/gate/router.go
index cbe5af77..a37cf993 100644
--- a/src/server/gate/router.go
+++ b/src/server/gate/router.go
@@ -2,14 +2,13 @@ package gate
 
 import (
 	"server/game"
-	msg "server/msg"
-	"server/msg/meowmentnet"
+	"server/msg"
 )
 
 func init() {
 	// 这里指定消息 Hello 路由到 game 模块
 	// 模块间使用 ChanRPC 通讯，消息路由也不例外
-	msg.Processor.SetRouter(&meowmentnet.ClientReq{}, game.ChanRPC)
-	msg.Processor.SetRouter(&meowmentnet.ClientRes{}, game.ChanRPC)
-	msg.Processor.SetRouter(&meowmentnet.AdminReq{}, game.ChanRPC)
+	msg.Processor.SetRouter(&msg.ClientReq{}, game.ChanRPC)
+	msg.Processor.SetRouter(&msg.ClientRes{}, game.ChanRPC)
+	msg.Processor.SetRouter(&msg.AdminReq{}, game.ChanRPC)
 }
diff --git a/src/server/go.mod b/src/server/go.mod
index 21cc8914..1ee08a40 100644
--- a/src/server/go.mod
+++ b/src/server/go.mod
@@ -4,7 +4,7 @@ go 1.25.5
 
 require (
 	gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74
-	gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409104501-67c163ff07c2
+	gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8
 	gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c
 	github.com/alibabacloud-go/cloudauth-20190307/v4 v4.9.2
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.11
@@ -57,7 +57,6 @@ require (
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/apache/thrift v0.22.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/google/uuid v1.6.0 // indirect
diff --git a/src/server/go.sum b/src/server/go.sum
index 5c7ed699..65640a7e 100644
--- a/src/server/go.sum
+++ b/src/server/go.sum
@@ -5,10 +5,6 @@ gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74 h1:Z2tn
 gitea.bywaystudios.com/pet_home/galog v0.0.0-20260313081346-5689712d8f74/go.mod h1:Sj45tVreK2AFDH+k03Q0uy8paaF6TINOT6vqWIFG4sg=
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8 h1:qs0cKcOE/uI8ABumwubKR9TKMFa3u9jUR9hQ4SThq4Q=
 gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260313092348-57448df16cd8/go.mod h1:9rWUv5SNj6indAuM2dAT76uO34a/C2FGptEDKkyg21U=
-gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952 h1:z3vtUEQTdzm5LqH9jwLaLUwU5WYwobwvSpboUu8kpSY=
-gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409020159-53d700ade952/go.mod h1:v2aZGGOhLPUWCtgtwMztLucxBmk85qsnOuR8X+wDmdQ=
-gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409104501-67c163ff07c2 h1:EnuWeend4oN/VAjzHcZYibQg5Ksuw9UTG0XJGEJzL6M=
-gitea.bywaystudios.com/pet_home/leaf v0.0.0-20260409104501-67c163ff07c2/go.mod h1:v2aZGGOhLPUWCtgtwMztLucxBmk85qsnOuR8X+wDmdQ=
 gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c h1:FjL8acgHxp1CMi+JSMwD1GXWIe7WIo1h8LoFVaLI87A=
 gitea.bywaystudios.com/pet_home/thinkdata v0.0.0-20260401014936-68c5994be89c/go.mod h1:VNNASaG7YCk+7We0m+SQ6/fMacEjx+TTFvcS/1Rp+6Q=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -83,8 +79,6 @@ github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmP
 github.com/aliyun/credentials-go v1.4.5/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
 github.com/aliyun/credentials-go v1.4.6 h1:CG8rc/nxCNKfXbZWpWDzI9GjF4Tuu3Es14qT8Y0ClOk=
 github.com/aliyun/credentials-go v1.4.6/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
-github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
-github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
diff --git a/src/server/msg/msg.go b/src/server/msg/msg.go
index 38d5ef9a..8bbd8a56 100644
--- a/src/server/msg/msg.go
+++ b/src/server/msg/msg.go
@@ -1,16 +1,14 @@
 package msg
 
 import (
-	"server/msg/meowmentnet"
-
-	"gitea.bywaystudios.com/pet_home/leaf/network/thrift"
+	"gitea.bywaystudios.com/pet_home/leaf/network/protobuf"
 )
 
-var Processor = thrift.NewProcessor()
+var Processor = protobuf.NewProcessor()
 
 func init() {
-	Processor.Register(&meowmentnet.ClientReq{})
-	Processor.Register(&meowmentnet.ClientRes{})
-	Processor.Register(&meowmentnet.AdminReq{})
-	Processor.Register(&meowmentnet.AdminRes{})
+	Processor.Register(&ClientReq{})
+	Processor.Register(&ClientRes{})
+	Processor.Register(&AdminReq{})
+	Processor.Register(&AdminRes{})
 }

From a80dc792e4346d852eef01b3a39718e764dff64e Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:53:21 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go |  3 +++
 src/server/game/activity_mgr.go  | 35 ++++++++++++++++++++++++++++++++
 src/server/game/champship_mgr.go | 10 +++++++++
 3 files changed, 48 insertions(+)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index a29735d5..1c594833 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -594,6 +594,9 @@ func (p *Player) GetTodayAndYesterdayActivityId(atype int) (int, int) {
 func (p *Player) ChampionshipZeroUpdate() {
 	todayActivityId, _ := p.GetChampshipActivityId()
 	ChampionshipMod := p.PlayMod.getChampshipMod()
+	if todayActivityId == ChampionshipMod.AId {
+		return
+	}
 	aid := ChampionshipMod.AId
 	var items []*item.Item
 	items = p.GetChampshipReward(aid)
diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go
index 4e13ff45..9120aafb 100644
--- a/src/server/game/activity_mgr.go
+++ b/src/server/game/activity_mgr.go
@@ -107,6 +107,41 @@ func (r *ActivityMgr) GetActivityList() []ActivityCfg {
 	return list
 }
 
+func (r *ActivityMgr) GetActivityListByType(atype int) ActivityCfg {
+	// 获取活动列表
+	data := r.getData()
+	data.mu.Lock()
+	defer data.mu.Unlock()
+	list := make([]ActivityCfg, 0, len(data.List))
+	now := GoUtil.Now()
+	for _, v := range data.List {
+		if v.Type == atype {
+			info := v.Copy()
+			//循环活动，重新计算活动时间
+			if info.Interval > 0 {
+				info.AId = int(info.Startime)
+				list = append(list, info)
+				internal := (now - info.Startime) / info.Interval
+				for i := int64(0); i <= internal; i++ {
+					newInfo := info.Copy()
+					newInfo.Startime += info.Interval
+					newInfo.Endtime += info.Interval
+					newInfo.AId = int(newInfo.Startime) //活动id用开始时间表示，方便客户端排序
+					list = append(list, newInfo)
+				}
+			} else {
+				list = append(list, info)
+			}
+		}
+	}
+	for _, v := range list {
+		if v.Startime <= GoUtil.Now() && v.Endtime > GoUtil.Now() {
+			return v
+		}
+	}
+	return ActivityCfg{}
+}
+
 func (r *ActivityMgr) GetActivityCfg(Id int) ActivityCfg {
 	// 获取活动配置
 	data := r.getData()
diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 7d8acff2..50db70d0 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -10,6 +10,7 @@ import (
 	faceCfg "server/conf/face"
 	randnameCfg "server/conf/randname"
 	"server/db"
+	"server/game/mod/activity"
 	"server/game/mod/friend"
 	"server/game/mod/msg"
 	GoUtil "server/game_util"
@@ -42,6 +43,7 @@ type ChampshipData struct {
 	PreRobot     map[int]*ChampshipRobot  // 机器人 备份
 	ZeroTime     int64
 	Version      int
+	Aid          int // 当前活动ID
 }
 
 type ChampshipRank struct {
@@ -176,6 +178,14 @@ func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
 	log.Debug("ChampshipMgr ZeroUpdate")
 	data := c.getData()
 	data.mu.Lock()
+	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	// 如果活动ID没有变化，说明没有新的活动，不需要重置数据
+	if activityCfg.AId == data.Aid {
+		log.Debug("championship zero update not init by aid %d", data.Aid)
+		return nil, nil
+	}
+	log.Debug("championship zero update by aid %d", activityCfg.AId)
+	data.Aid = activityCfg.AId
 	data.ZeroTime = GoUtil.ZeroTimestamp()
 	// 深拷贝 map，避免多个协程持有同一个 map 引用导致并发读写
 	oldRank := make(map[int][]*ChampshipRank, len(data.Rank))

From dea42c45744ab0aa0263ee0adbd9573daf35f44c Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:05:09 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/GameLogic.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index da556aaa..552c45ad 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -561,12 +561,11 @@ func G_getGameLogic() *GameLogic {
 		G_GameLogicPtr.RegisterEvent()       // 注册事件
 		G_GameLogicPtr.RegisterNetWorkFunc() // 注册客户端接口
 		G_GameLogicPtr.InitActivity()        // 初始化活动
+		G_GameLogicPtr.CreateActivityMgr()   //创建活动管理器
 		if conf.Server.ServerType == "center" {
 			// G_GameLogicPtr.CreateFriendMgr()    //创建好友管理器
 			G_GameLogicPtr.CreateChampshipMgr() // 创建竞标赛管理器
 			G_GameLogicPtr.CreateVarMgr()       // 创建变量管理器
-		} else {
-			G_GameLogicPtr.CreateActivityMgr() //创建活动管理器
 		}
 		G_GameLogicPtr.CreateRankMgr() //创建排行榜管理器
 		G_GameLogicPtr.CreateMailMgr() //创建邮件管理器

From 4546bd66cf8ca1ef1b874a80cdd00907ec7b7648 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:25:40 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 14 ++++----------
 src/server/game/message_mgr.go   |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 50db70d0..591435b7 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -114,7 +114,7 @@ func (c *ChampshipMgr) Init() {
 	remain1 := 1800 - remain%1800
 
 	c.mDispatr.AfterFunc(time.Duration(remain1)*time.Second, func() { // 30分钟后重新分组
-		c.group(false)
+		c.group()
 	})
 
 	c.mDispatr.AfterFunc(time.Duration(60)*time.Second, func() {
@@ -174,7 +174,6 @@ func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) {
 }
 
 func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
-	c.group(true)
 	log.Debug("ChampshipMgr ZeroUpdate")
 	data := c.getData()
 	data.mu.Lock()
@@ -494,14 +493,9 @@ func (c *ChampshipMgr) GetRankMsg(uid int) *proto.ResChampshipRank {
 }
 
 // 分组
-func (c *ChampshipMgr) group(iszero bool) (interface{}, error) {
-	now := GoUtil.Now()
-	zero := GoUtil.ZeroTimestamp()
-	if now-zero < 1800 && !iszero { // 0点30分钟内不分组
-		return nil, nil
-	}
+func (c *ChampshipMgr) group() (interface{}, error) {
 	c.mDispatr.AfterFunc(time.Duration(1800)*time.Second, func() { // 30分钟后重新分组
-		c.group(false)
+		c.group()
 	})
 	ChampshipData := c.getData()
 	ChampshipData.mu.Lock()
@@ -1053,7 +1047,7 @@ func (c *ChampshipMgr) Debug() {
 			H:     GoUtil.RandNum(1, 99),
 		}
 	}
-	c.group(true)
+	c.group()
 	var i int
 	for _, v := range ChampshipData.Rank {
 		for _, v1 := range v {
diff --git a/src/server/game/message_mgr.go b/src/server/game/message_mgr.go
index 4e7a6323..62f0d61d 100644
--- a/src/server/game/message_mgr.go
+++ b/src/server/game/message_mgr.go
@@ -221,7 +221,7 @@ func NotifyAllPlayerMsg(m *msg.Msg) {
 }
 
 func ChampshipGroupHandler(data *msg.Msg) (interface{}, error) {
-	G_GameLogicPtr.ChampshipMgr.group(true)
+	G_GameLogicPtr.ChampshipMgr.group()
 	return nil, nil
 }
 

From 530b5c89881356db720dad82d3ddce24ed36ac3b Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:35:55 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go           |  6 +++---
 src/server/game/mod/champship/Champship.go | 14 +++++++++-----
 src/server/game/player_data.go             | 11 +++++++++++
 src/server/game/register_network_func.go   |  2 +-
 src/server/unit_test/championship_test.go  |  6 +++++-
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 1c594833..30ef9880 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -592,9 +592,9 @@ func (p *Player) GetTodayAndYesterdayActivityId(atype int) (int, int) {
 }
 
 func (p *Player) ChampionshipZeroUpdate() {
-	todayActivityId, _ := p.GetChampshipActivityId()
 	ChampionshipMod := p.PlayMod.getChampshipMod()
-	if todayActivityId == ChampionshipMod.AId {
+	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	if activityCfg.AId == ChampionshipMod.AId {
 		return
 	}
 	aid := ChampionshipMod.AId
@@ -604,7 +604,7 @@ func (p *Player) ChampionshipZeroUpdate() {
 		p.SendActivityMail2(items, "backend_championship_mail_title", "backend_championship_mail_content")
 		p.PushClientRes(p.GetMailMod().BackData())
 	}
-	p.PlayMod.getChampshipMod().ZeroUpdate(todayActivityId)
+	p.PlayMod.getChampshipMod().ZeroUpdate(activityCfg.Id, activityCfg.AId)
 }
 
 func (p *Player) GetChampshipReward(id int) []*item.Item {
diff --git a/src/server/game/mod/champship/Champship.go b/src/server/game/mod/champship/Champship.go
index e997b827..6be5f9ac 100644
--- a/src/server/game/mod/champship/Champship.go
+++ b/src/server/game/mod/champship/Champship.go
@@ -15,19 +15,23 @@ type ChampshipMod struct {
 	RankReward bool
 	PreMax     int // 昨日最高档
 	Max        int // 历史最高档
-	AId        int // 活动id
-	LastAId    int // 上次活动id
+	AId        int // 活动aid 当前活动开始时间戳
+	LastAId    int // 上次活动aid
+	Id         int // 活动配置id
+	LastId     int
 }
 
 func (c *ChampshipMod) InitData() {}
 
-func (c *ChampshipMod) ZeroUpdate(aid int) {
+func (c *ChampshipMod) ZeroUpdate(id, aid int) {
 	c.PreMax = c.Reward
 	c.Score = 0
 	c.Reward = 0
 	c.RankReward = false
 	c.LastAId = c.AId
 	c.AId = aid
+	c.LastId = c.Id
+	c.Id = id
 }
 
 func (c *ChampshipMod) GetScore() int {
@@ -100,6 +104,6 @@ func (c *ChampshipMod) GetN() int {
 	return c.Max
 }
 
-func (c *ChampshipMod) GetAId() int {
-	return c.AId
+func (c *ChampshipMod) GetId() int {
+	return c.Id
 }
diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index cb76ddb7..4b2a4074 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -291,6 +291,7 @@ func (p *Player) InitPlayer(UserName string) error {
 	p.FixDecorate()
 	p.FixPlayroomPyhical()
 	p.FixPlayroomInteract()
+	p.FixChampionshipActivity()
 	return nil
 }
 
@@ -354,6 +355,7 @@ func (p *Player) InitPlayerByUid(Uid int) error {
 	p.FixDecorate()
 	p.FixPlayroomPyhical()
 	p.FixPlayroomInteract()
+	p.FixChampionshipActivity()
 	return nil
 }
 
@@ -1495,6 +1497,15 @@ func (p *Player) FixPlayroomInteract() {
 	}
 }
 
+func (p *Player) FixChampionshipActivity() {
+	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	ChampshipMod := p.PlayMod.getChampshipMod()
+	if activityCfg.Id != 0 && ChampshipMod.Id == 0 {
+		ChampshipMod.Id = activityCfg.Id
+		ChampshipMod.AId = activityCfg.AId
+	}
+}
+
 func (p *Player) GetOrderFactor() int {
 	return orderCfg.GetOrderFactor(p.GetDecorateMod().AreaId)
 }
diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go
index 68c52351..c565909b 100644
--- a/src/server/game/register_network_func.go
+++ b/src/server/game/register_network_func.go
@@ -2548,7 +2548,7 @@ func ReqChampship(player *Player, req *msg.ReqChampship) error {
 func ReqChampshipReward(player *Player, req *msg.ReqChampshipReward) error {
 	ChampshipMod := player.PlayMod.getChampshipMod()
 	rewardId := ChampshipMod.Reward
-	itemList := player.GetChampshipReward(ChampshipMod.GetAId())
+	itemList := player.GetChampshipReward(ChampshipMod.GetId())
 	err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String())
 	if err != nil {
 		player.SendErrClienRes(&msg.ResChampshipReward{
diff --git a/src/server/unit_test/championship_test.go b/src/server/unit_test/championship_test.go
index 51d57256..4429a7b3 100644
--- a/src/server/unit_test/championship_test.go
+++ b/src/server/unit_test/championship_test.go
@@ -2,6 +2,8 @@ package unit
 
 import (
 	"fmt"
+	"server/game"
+	"server/game/mod/activity"
 	"testing"
 )
 
@@ -9,9 +11,11 @@ func TestChampionshipReward(t *testing.T) {
 	player := getTestPlayer()
 	player.GetChampshipMod().AddScore([]int{15, 15, 15})
 	todayAid, yestAid := player.GetChampshipActivityId()
+	activityCfg := game.G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	fmt.Printf("activity cfg : %v\n", activityCfg)
 	items := player.GetChampshipReward(todayAid)
 	fmt.Printf("today id %d items : %v\n", todayAid, items)
-	player.GetChampshipMod().ZeroUpdate(todayAid)
+	player.GetChampshipMod().ZeroUpdate(activityCfg.Id, activityCfg.AId)
 	player.GetChampshipMod().AddScore([]int{15, 15, 15})
 	yestAid = 0
 	items = player.GetChampshipReward(yestAid)

From 41f292b190351ed15eb5b0a6eb622c7b97e8765b Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:53:43 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 591435b7..2b74cec6 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -179,7 +179,7 @@ func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
 	data.mu.Lock()
 	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
 	// 如果活动ID没有变化，说明没有新的活动，不需要重置数据
-	if activityCfg.AId == data.Aid {
+	if activityCfg.AId != 0 && activityCfg.AId == data.Aid {
 		log.Debug("championship zero update not init by aid %d", data.Aid)
 		return nil, nil
 	}

From 513736de4ff56e9fd4e26fc28d39b45259f7e232 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:54:17 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/server.json      | 2 +-
 src/server/game/activity_func.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/conf/server.json b/src/server/conf/server.json
index 25ea9004..38770d42 100644
--- a/src/server/conf/server.json
+++ b/src/server/conf/server.json
@@ -2,7 +2,7 @@
 	"AppID": 0,
 	"LogLevel": "debug", 
 	"LogPath": "./log",
-	"TCPAddr": ":3602",
+	"TCPAddr": ":3601",
 	"WSAddr": ":3567",
 	"RPCAddr": ":50051",
 	"MySqlAddr": "127.0.0.1",
diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 30ef9880..4abfaca5 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -594,7 +594,7 @@ func (p *Player) GetTodayAndYesterdayActivityId(atype int) (int, int) {
 func (p *Player) ChampionshipZeroUpdate() {
 	ChampionshipMod := p.PlayMod.getChampshipMod()
 	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
-	if activityCfg.AId == ChampionshipMod.AId {
+	if activityCfg.AId != 0 && activityCfg.AId == ChampionshipMod.AId {
 		return
 	}
 	aid := ChampionshipMod.AId

From c133d91ca76bd94ae337fa3bbd2e043b02c16d11 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Sun, 19 Apr 2026 00:02:03 -0400
Subject: [PATCH 17/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 2b74cec6..6ca2623d 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -181,6 +181,7 @@ func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
 	// 如果活动ID没有变化，说明没有新的活动，不需要重置数据
 	if activityCfg.AId != 0 && activityCfg.AId == data.Aid {
 		log.Debug("championship zero update not init by aid %d", data.Aid)
+		data.mu.Unlock()
 		return nil, nil
 	}
 	log.Debug("championship zero update by aid %d", activityCfg.AId)

From acbfd823e0bdfbd9663689d8085f42d90332857a Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Sun, 19 Apr 2026 01:40:38 -0400
Subject: [PATCH 18/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go | 3 +--
 src/server/game/champship_mgr.go | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 4abfaca5..feffdf5a 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -597,9 +597,8 @@ func (p *Player) ChampionshipZeroUpdate() {
 	if activityCfg.AId != 0 && activityCfg.AId == ChampionshipMod.AId {
 		return
 	}
-	aid := ChampionshipMod.AId
 	var items []*item.Item
-	items = p.GetChampshipReward(aid)
+	items = p.GetChampshipReward(ChampionshipMod.Id)
 	if len(items) > 0 {
 		p.SendActivityMail2(items, "backend_championship_mail_title", "backend_championship_mail_content")
 		p.PushClientRes(p.GetMailMod().BackData())
diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 6ca2623d..380c11c0 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -142,6 +142,14 @@ func (c *ChampshipMgr) version() {
 			}
 		}
 	}
+	if c.data.(*ChampshipData).Version == 1 {
+		c.data.(*ChampshipData).Version = 2
+		activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+		// 如果活动ID没有变化，说明没有新的活动，不需要重置数据
+		if activityCfg.AId != 0 && c.data.(*ChampshipData).Aid == 0 {
+			c.data.(*ChampshipData).Aid = activityCfg.AId
+		}
+	}
 }
 
 func sortChampionshipRank(rankList []*ChampshipRank) {

From 4370238f94d334e85701270df6ee2adcd75558aa Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:25:51 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go |  7 ++++++
 src/server/game/activity_mgr.go  |  3 +++
 src/server/game/champship_mgr.go | 42 ++++++++++++++++++++++----------
 src/server/game/player_data.go   |  2 --
 4 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index feffdf5a..9c4e2bef 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -102,6 +102,8 @@ func (p *Player) ActivityLogin() {
 
 	// 猫猫回礼登录
 	p.CatReturnGiftLogin()
+	// 赛季活动登录
+	p.ChampionshipLogin()
 }
 
 // 发送活动邮件
@@ -185,6 +187,11 @@ func (p *Player) CatReturnGiftLogin() {
 	p.CatReturnGiftZeroUpdate()
 }
 
+func (p *Player) ChampionshipLogin() {
+	p.ChampionshipZeroUpdate()
+	p.BackChampship()
+}
+
 // 猫猫回礼0点更新
 func (p *Player) CatReturnGiftZeroUpdate() {
 	activityInfo := p.GetActivityInfo(activity.ACT_TYPE_CAT_RETURN_GIFT)
diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go
index 9120aafb..5971b01a 100644
--- a/src/server/game/activity_mgr.go
+++ b/src/server/game/activity_mgr.go
@@ -196,6 +196,9 @@ func (r *ActivityMgr) Reload() error {
 		}
 	}()
 	G_GameLogicPtr.NotifyAll(&Msg.Msg{Type: Msg.HANDLE_TYPE_ACTIVITY_RELOAD})
+	if G_GameLogicPtr.ChampshipMgr != nil {
+		G_GameLogicPtr.ChampshipMgr.ReloadActivity()
+	}
 	return nil
 }
 
diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 380c11c0..72a3336a 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"gitea.bywaystudios.com/pet_home/leaf/log"
+	"gitea.bywaystudios.com/pet_home/leaf/timer"
 )
 
 const (
@@ -30,6 +31,8 @@ type ChampshipMgr struct {
 	*ServerMod
 }
 
+var dispterTimer map[string]*timer.Timer
+
 type ChampshipData struct {
 	mu           sync.RWMutex
 	AutoId       int
@@ -103,20 +106,18 @@ func (c *ChampshipMgr) Init() {
 	c.version()
 	now := GoUtil.Now()
 	zeroTime := GoUtil.ZeroTimestamp()
-	if c.getData().ZeroTime != zeroTime {
+	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	t := c.mDispatr.AfterFunc(time.Duration(activityCfg.Endtime-now)*time.Second, func() {
 		c.ZeroUpdate()
-	} else {
-		c.mDispatr.AfterFunc(time.Duration(GoUtil.NextZeroTimestampDuration())*time.Second, func() {
-			c.ZeroUpdate()
-		})
-	}
+	})
+	dispterTimer["zero"] = t
+
 	remain := now - zeroTime
 	remain1 := 1800 - remain%1800
 
 	c.mDispatr.AfterFunc(time.Duration(remain1)*time.Second, func() { // 30分钟后重新分组
 		c.group()
 	})
-
 	c.mDispatr.AfterFunc(time.Duration(60)*time.Second, func() {
 		c.ai()
 	})
@@ -181,6 +182,24 @@ func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) {
 	return nil, nil
 }
 
+func (c *ChampshipMgr) ReloadActivity() {
+	log.Debug("ChampshipMgr ReloadActivity")
+	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	if activityCfg.AId == 0 {
+		log.Debug("championship reload activity failed, no active, aid:%d", activityCfg.AId)
+		return
+	}
+	t := dispterTimer["zero"]
+	if t != nil {
+		t.Stop()
+	}
+	timeDuration := activityCfg.Endtime - GoUtil.Now()
+	t = c.mDispatr.AfterFunc(time.Duration(timeDuration)*time.Second, func() {
+		c.ZeroUpdate()
+	})
+	dispterTimer["zero"] = t
+}
+
 func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
 	log.Debug("ChampshipMgr ZeroUpdate")
 	data := c.getData()
@@ -221,14 +240,11 @@ func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
 		c.SetRankCache(k)
 	}
 	data.mu.Unlock()
-	timeDuration := GoUtil.NextZeroTimestampDuration()
-	if timeDuration <= 0 {
-		log.Error("championship zero update error")
-		timeDuration = 24 * 3600
-	}
-	c.mDispatr.AfterFunc(time.Duration(timeDuration)*time.Second, func() {
+	timeDuration := activityCfg.Endtime - GoUtil.Now()
+	t := c.mDispatr.AfterFunc(time.Duration(timeDuration)*time.Second, func() {
 		c.ZeroUpdate()
 	})
+	dispterTimer["zero"] = t
 	c.mDispatr.AfterFunc(time.Duration(timeDuration+1800)*time.Second, func() {
 		c.ZeroNotifyAll()
 	})
diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go
index 4b2a4074..5c14de8d 100644
--- a/src/server/game/player_data.go
+++ b/src/server/game/player_data.go
@@ -420,8 +420,6 @@ func (p *Player) ZeroUpdate(a []interface{}) {
 			PlayroomMod.ResetWeeklyDiscount()
 		}
 		p.PlayroomBackData()
-		p.ChampionshipZeroUpdate()
-		p.BackChampship()
 		// p.InitActivity()
 		// p.ActivityZeroUpdate()
 

From f9ef8275590afdcc27e77dba0122b1446961c8ad Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:33:25 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 72a3336a..62594a88 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -111,7 +111,7 @@ func (c *ChampshipMgr) Init() {
 		c.ZeroUpdate()
 	})
 	dispterTimer["zero"] = t
-
+	log.Debug("ChampshipMgr init success, activity endtime:%d, now:%d, remain:%d, next zero update time:%s", activityCfg.Endtime, now, activityCfg.Endtime-now, GoUtil.FormatTime(activityCfg.Endtime))
 	remain := now - zeroTime
 	remain1 := 1800 - remain%1800
 
@@ -245,6 +245,8 @@ func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {
 		c.ZeroUpdate()
 	})
 	dispterTimer["zero"] = t
+	now := GoUtil.Now()
+	log.Debug("ChampshipMgr init success, activity endtime:%d, now:%d, remain:%d, next zero update time:%s", activityCfg.Endtime, now, activityCfg.Endtime-now, GoUtil.FormatTime(activityCfg.Endtime))
 	c.mDispatr.AfterFunc(time.Duration(timeDuration+1800)*time.Second, func() {
 		c.ZeroNotifyAll()
 	})

From fc73d862dd4b24596fd0776b95937197a7dfdbc9 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:36:13 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 62594a88..b5295ba0 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -91,6 +91,7 @@ type CRank struct {
 }
 
 func (c *ChampshipMgr) Init() {
+	dispterTimer = make(map[string]*timer.Timer, 0)
 	c.key = CHAMPSHIP_MGR_KEY
 	c.data = &ChampshipData{
 		Rank:         make(map[int][]*ChampshipRank, 0),

From 00a8efc21d98144dc5914deb6a7871234f631bea Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:37:16 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index b5295ba0..de8d0498 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -199,6 +199,7 @@ func (c *ChampshipMgr) ReloadActivity() {
 		c.ZeroUpdate()
 	})
 	dispterTimer["zero"] = t
+	log.Debug("ChampshipMgr reload activity success, activity endtime:%d, now:%d, remain:%d, next zero update time:%s", activityCfg.Endtime, GoUtil.Now(), activityCfg.Endtime-GoUtil.Now(), GoUtil.FormatTime(activityCfg.Endtime))
 }
 
 func (c *ChampshipMgr) ZeroUpdate() (interface{}, error) {

From 05a5b5237b0774484ae48f75cbdcbfe0bf7356fa Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:52:14 +0800
Subject: [PATCH 23/25] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index de8d0498..66b86e33 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -190,14 +190,19 @@ func (c *ChampshipMgr) ReloadActivity() {
 		log.Debug("championship reload activity failed, no active, aid:%d", activityCfg.AId)
 		return
 	}
+	log.Debug("step1")
 	t := dispterTimer["zero"]
 	if t != nil {
 		t.Stop()
 	}
+	log.Debug("step2")
+
 	timeDuration := activityCfg.Endtime - GoUtil.Now()
 	t = c.mDispatr.AfterFunc(time.Duration(timeDuration)*time.Second, func() {
 		c.ZeroUpdate()
 	})
+	log.Debug("step3")
+
 	dispterTimer["zero"] = t
 	log.Debug("ChampshipMgr reload activity success, activity endtime:%d, now:%d, remain:%d, next zero update time:%s", activityCfg.Endtime, GoUtil.Now(), activityCfg.Endtime-GoUtil.Now(), GoUtil.FormatTime(activityCfg.Endtime))
 }

From 784e524c1a0f36b270bd969707547f418c142154 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 15:52:47 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/champship_mgr.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 66b86e33..495c6fc6 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -186,6 +186,7 @@ func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) {
 func (c *ChampshipMgr) ReloadActivity() {
 	log.Debug("ChampshipMgr ReloadActivity")
 	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
+	log.Debug("championship reload activity %v", activityCfg)
 	if activityCfg.AId == 0 {
 		log.Debug("championship reload activity failed, no active, aid:%d", activityCfg.AId)
 		return

From d36d09587383db355a7df45e233cc3cd64b9878d Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 16 Apr 2026 16:05:28 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_mgr.go  | 3 ---
 src/server/game/admin.go         | 7 ++++++-
 src/server/game/champship_mgr.go | 6 ------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go
index 5971b01a..9120aafb 100644
--- a/src/server/game/activity_mgr.go
+++ b/src/server/game/activity_mgr.go
@@ -196,9 +196,6 @@ func (r *ActivityMgr) Reload() error {
 		}
 	}()
 	G_GameLogicPtr.NotifyAll(&Msg.Msg{Type: Msg.HANDLE_TYPE_ACTIVITY_RELOAD})
-	if G_GameLogicPtr.ChampshipMgr != nil {
-		G_GameLogicPtr.ChampshipMgr.ReloadActivity()
-	}
 	return nil
 }
 
diff --git a/src/server/game/admin.go b/src/server/game/admin.go
index 5c00ded4..8ce8590b 100644
--- a/src/server/game/admin.go
+++ b/src/server/game/admin.go
@@ -326,7 +326,12 @@ func ReqAdminBan(args []interface{}) error {
 }
 
 func AcitivityCfgReload() {
-	G_GameLogicPtr.ActivityMgr.Reload()
+	if G_GameLogicPtr.ActivityMgr != nil {
+		G_GameLogicPtr.ActivityMgr.Reload()
+	}
+	if G_GameLogicPtr.ChampshipMgr != nil {
+		go G_GameLogicPtr.ChampshipMgr.ReloadActivity()
+	}
 }
 
 func AdminShipping(req *msg.ReqOrderShipping) (*msg.ResOrderShipping, error) {
diff --git a/src/server/game/champship_mgr.go b/src/server/game/champship_mgr.go
index 495c6fc6..ca08d603 100644
--- a/src/server/game/champship_mgr.go
+++ b/src/server/game/champship_mgr.go
@@ -184,26 +184,20 @@ func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) {
 }
 
 func (c *ChampshipMgr) ReloadActivity() {
-	log.Debug("ChampshipMgr ReloadActivity")
 	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
 	log.Debug("championship reload activity %v", activityCfg)
 	if activityCfg.AId == 0 {
 		log.Debug("championship reload activity failed, no active, aid:%d", activityCfg.AId)
 		return
 	}
-	log.Debug("step1")
 	t := dispterTimer["zero"]
 	if t != nil {
 		t.Stop()
 	}
-	log.Debug("step2")
-
 	timeDuration := activityCfg.Endtime - GoUtil.Now()
 	t = c.mDispatr.AfterFunc(time.Duration(timeDuration)*time.Second, func() {
 		c.ZeroUpdate()
 	})
-	log.Debug("step3")
-
 	dispterTimer["zero"] = t
 	log.Debug("ChampshipMgr reload activity success, activity endtime:%d, now:%d, remain:%d, next zero update time:%s", activityCfg.Endtime, GoUtil.Now(), activityCfg.Endtime-GoUtil.Now(), GoUtil.FormatTime(activityCfg.Endtime))
 }