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/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 da556aaa..b97ae4cd 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,15 @@ 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 { + // 注册具体的 thrift 消息类型到全局缓存 + registerThriftType(msgArgType) + + 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 +120,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 +302,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 +324,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 +596,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 +643,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 a29735d5..e7261787 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" "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_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, }) @@ -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_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{ @@ -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_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 4e13ff45..80e25441 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/encoding/protojson" ) type ActivityMgr struct { @@ -171,21 +170,21 @@ func unmarshalActivityCfg(atype int, buf []byte) (interface{}, error) { switch atype { case 1: cfg := &protoMsg.MiningCfg{} - err := protojson.Unmarshal(buf, cfg) + err := json.Unmarshal(buf, cfg) if err != nil { return nil, err } return cfg, nil case 9: cfg := &protoMsg.ChampionshipCfg{} - err := protojson.Unmarshal(buf, cfg) + err := json.Unmarshal(buf, cfg) if err != nil { return nil, err } return cfg, nil case 10: cfg := &protoMsg.CatReturnGiftCfg{} - err := protojson.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 babd9bd5..dcc9344a 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{}{ @@ -244,8 +242,12 @@ func HandleClientReq(args []interface{}) { err = RunNewNetProcessByKey(m.GetFunc(), p.(*Player), &detailMsg) 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) } 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 4dfbd304..611cf4d8 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() @@ -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 2b9de489..6be08480 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 b02d26c8..3f0a04e0 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" @@ -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 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 cf856d48..8c5f16da 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 e997b827..00cfde32 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 7fb9d4f0..dbcd6a68 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 bcf22fc2..c5c741e5 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 fefed16b..2eb7f62d 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" "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 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 7c8e8413..3e77559a 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" + proto "server/msg/meowmentnet" ) func (p *Player) NotifyPlayroomTask() { @@ -287,7 +287,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, @@ -295,10 +295,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 efe766c1..7c687eb3 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 cb76ddb7..cd81f607 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..ee40908c 100644 --- a/src/server/game/proto_factory.go +++ b/src/server/game/proto_factory.go @@ -2,16 +2,22 @@ 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 + protoMessageTypeCacheOnce sync.Once + protoMessageTypeByName sync.Map + thriftMessageTypeCacheOnce sync.Once + thriftMessageTypeByName sync.Map ) func buildProtoMessageTypeCache() { @@ -26,6 +32,27 @@ 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 { @@ -40,6 +67,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 +85,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 +112,14 @@ 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 68c52351..b6b432ee 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 @@ -408,7 +406,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 } @@ -425,13 +423,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), @@ -452,7 +450,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 @@ -460,7 +458,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 @@ -471,7 +469,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 @@ -479,7 +477,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 @@ -523,7 +521,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() @@ -538,7 +536,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("等级不足") @@ -550,7 +548,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 @@ -561,7 +559,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 @@ -569,7 +567,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 @@ -600,7 +598,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() @@ -613,7 +611,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 @@ -621,13 +619,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() @@ -663,7 +661,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 @@ -672,7 +670,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 @@ -689,7 +687,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 @@ -701,7 +699,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 @@ -710,7 +708,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 @@ -721,7 +719,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 @@ -733,7 +731,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 @@ -742,7 +740,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 @@ -755,7 +753,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 @@ -766,7 +764,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 @@ -775,7 +773,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 @@ -794,7 +792,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 @@ -805,7 +803,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 @@ -819,7 +817,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 @@ -831,7 +829,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 @@ -839,7 +837,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 @@ -848,7 +846,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{}{ @@ -864,7 +862,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 @@ -873,7 +871,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 @@ -885,7 +883,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()) @@ -901,7 +899,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 @@ -910,7 +908,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 @@ -925,7 +923,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() @@ -942,7 +940,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 @@ -950,67 +948,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 } @@ -1022,7 +1020,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 @@ -1030,7 +1028,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 @@ -1039,7 +1037,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 @@ -1051,7 +1049,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 @@ -1070,7 +1068,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 @@ -1078,7 +1076,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 @@ -1089,7 +1087,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 } @@ -1100,7 +1098,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 @@ -1109,7 +1107,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 @@ -1124,7 +1122,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, @@ -1140,7 +1138,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 @@ -1149,7 +1147,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 @@ -1161,7 +1159,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 @@ -1173,7 +1171,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 @@ -1182,7 +1180,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 @@ -1190,7 +1188,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 @@ -1205,7 +1203,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 } @@ -1216,7 +1214,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 @@ -1225,7 +1223,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 @@ -1237,7 +1235,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 } @@ -1248,7 +1246,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 @@ -1257,7 +1255,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 @@ -1265,7 +1263,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), @@ -1281,7 +1279,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 @@ -1290,7 +1288,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 @@ -1304,7 +1302,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 } @@ -1315,7 +1313,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 } @@ -1325,7 +1323,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 @@ -1334,7 +1332,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 @@ -1348,7 +1346,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 @@ -1359,7 +1357,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 @@ -1368,7 +1366,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 @@ -1380,7 +1378,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 @@ -1392,14 +1390,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() @@ -1421,14 +1419,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 { @@ -1452,7 +1450,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 @@ -1460,7 +1458,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{}{ @@ -1475,7 +1473,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 @@ -1483,7 +1481,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 @@ -1494,7 +1492,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 } @@ -1505,7 +1503,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 @@ -1514,7 +1512,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 @@ -1522,7 +1520,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", @@ -1538,7 +1536,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 @@ -1547,7 +1545,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 @@ -1560,7 +1558,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 } @@ -1581,7 +1579,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 @@ -1589,7 +1587,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 @@ -1601,7 +1599,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 } @@ -1610,7 +1608,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") @@ -1619,7 +1617,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 @@ -1628,7 +1626,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 @@ -1639,7 +1637,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 } @@ -1668,7 +1666,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 @@ -1676,7 +1674,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") @@ -1684,7 +1682,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") @@ -1694,7 +1692,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") @@ -1713,7 +1711,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 @@ -1729,7 +1727,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()) @@ -1747,7 +1745,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") @@ -1756,7 +1754,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") @@ -1775,7 +1773,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()) @@ -1793,7 +1791,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") @@ -1801,7 +1799,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{}{ @@ -1827,7 +1825,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 @@ -1843,7 +1841,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, @@ -1865,7 +1863,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 @@ -1881,7 +1879,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() @@ -1903,14 +1901,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") @@ -1921,7 +1919,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 @@ -1932,7 +1930,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 @@ -1940,7 +1938,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()) @@ -1969,7 +1967,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") @@ -1981,7 +1979,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 @@ -1993,7 +1991,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), }) @@ -2028,14 +2026,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") @@ -2050,7 +2048,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() @@ -2064,14 +2062,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") @@ -2082,7 +2080,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{ @@ -2105,7 +2103,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") @@ -2121,7 +2119,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), @@ -2157,7 +2155,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 } @@ -2215,7 +2213,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 @@ -2223,7 +2221,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 @@ -2235,7 +2233,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 @@ -2243,7 +2241,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 @@ -2256,7 +2254,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 @@ -2268,7 +2266,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 @@ -2276,7 +2274,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 @@ -2288,14 +2286,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") @@ -2303,7 +2301,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 @@ -2311,7 +2309,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", @@ -2327,7 +2325,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 @@ -2339,7 +2337,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 @@ -2347,7 +2345,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 @@ -2361,7 +2359,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, @@ -2377,7 +2375,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 @@ -2385,7 +2383,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 @@ -2394,7 +2392,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 @@ -2403,7 +2401,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 @@ -2421,7 +2419,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, @@ -2440,7 +2438,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 @@ -2460,7 +2458,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 @@ -2468,7 +2466,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 @@ -2476,7 +2474,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) @@ -2506,7 +2504,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 @@ -2514,7 +2512,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, @@ -2552,7 +2550,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 @@ -2561,7 +2559,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 { @@ -2603,7 +2601,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 @@ -2611,7 +2609,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 @@ -2624,7 +2622,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, @@ -2640,7 +2638,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() @@ -2655,7 +2653,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() @@ -2677,14 +2675,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, }) @@ -2701,7 +2699,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 } @@ -2768,7 +2766,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) } @@ -2831,7 +2829,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 @@ -2839,7 +2837,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 @@ -2853,7 +2851,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 } @@ -2871,7 +2869,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") @@ -2880,7 +2878,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 @@ -2889,7 +2887,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 @@ -2897,7 +2895,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 @@ -2915,7 +2913,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") @@ -2925,7 +2923,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 @@ -2933,7 +2931,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 @@ -2949,7 +2947,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() @@ -2974,7 +2972,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") @@ -2984,7 +2982,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 @@ -3009,7 +3007,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") @@ -3018,7 +3016,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 @@ -3026,7 +3024,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 @@ -3051,14 +3049,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 } @@ -3069,7 +3067,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 @@ -3077,7 +3075,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 @@ -3087,7 +3085,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 } @@ -3171,7 +3169,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 @@ -3179,7 +3177,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 @@ -3191,7 +3189,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(), }) } @@ -3206,7 +3204,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 @@ -3218,7 +3216,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 @@ -3227,7 +3225,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 } @@ -3238,7 +3236,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") @@ -3247,7 +3245,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 @@ -3280,7 +3278,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, }) @@ -3295,7 +3293,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 @@ -3304,7 +3302,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") @@ -3342,7 +3340,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 } @@ -3361,7 +3359,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 @@ -3374,7 +3372,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 @@ -3387,7 +3385,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 } @@ -3409,7 +3407,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 @@ -3418,7 +3416,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 @@ -3431,7 +3429,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 @@ -3443,7 +3441,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 @@ -3451,7 +3449,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 @@ -3465,7 +3463,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 } @@ -3476,7 +3474,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 @@ -3488,7 +3486,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), }) @@ -3500,7 +3498,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 @@ -3522,7 +3520,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 @@ -3555,7 +3553,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 @@ -3567,7 +3565,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 @@ -3576,7 +3574,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 @@ -3584,7 +3582,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 @@ -3594,7 +3592,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 } @@ -3604,7 +3602,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 @@ -3612,7 +3610,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(), }) } @@ -3639,7 +3637,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 } @@ -3649,7 +3647,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 @@ -3659,7 +3657,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() @@ -3671,7 +3669,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 @@ -3679,7 +3677,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 @@ -3691,7 +3689,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() @@ -3703,7 +3701,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 @@ -3712,7 +3710,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 @@ -3724,7 +3722,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, }) @@ -3734,7 +3732,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 } @@ -3749,11 +3747,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 } @@ -3768,28 +3766,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 @@ -3798,7 +3796,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 } @@ -3809,7 +3807,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 } @@ -3819,7 +3817,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 @@ -3829,7 +3827,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 @@ -3838,7 +3836,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 @@ -3846,7 +3844,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 @@ -3861,7 +3859,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 } @@ -3876,7 +3874,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") @@ -3884,7 +3882,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") @@ -3894,7 +3892,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 } @@ -3905,7 +3903,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(), }, ) @@ -3927,7 +3925,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(), }, ) @@ -3940,7 +3938,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 } @@ -3951,7 +3949,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(), }, ) @@ -3976,7 +3974,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(), }, ) @@ -3994,7 +3992,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 } @@ -4012,7 +4010,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 @@ -4020,7 +4018,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 @@ -4031,7 +4029,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 @@ -4043,7 +4041,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 @@ -4056,7 +4054,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 @@ -4089,7 +4087,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 @@ -4097,7 +4095,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 @@ -4105,7 +4103,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, @@ -4135,7 +4133,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 @@ -4145,7 +4143,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 } @@ -4156,7 +4154,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 @@ -4164,7 +4162,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 } @@ -4175,7 +4173,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 @@ -4184,7 +4182,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(), }) } @@ -4192,7 +4190,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{}{ @@ -4207,7 +4205,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 } @@ -4217,7 +4215,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") @@ -4226,7 +4224,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 @@ -4234,7 +4232,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 @@ -4242,7 +4240,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 @@ -4253,7 +4251,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") @@ -4262,7 +4260,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 @@ -4270,7 +4268,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 @@ -4283,7 +4281,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 } @@ -4292,7 +4290,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 } @@ -4306,7 +4304,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 } @@ -4315,7 +4313,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") @@ -4323,7 +4321,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 @@ -4331,7 +4329,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 @@ -4342,7 +4340,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 @@ -4357,7 +4355,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 } @@ -4367,7 +4365,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 @@ -4376,7 +4374,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 @@ -4389,7 +4387,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 } @@ -4399,7 +4397,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 @@ -4408,7 +4406,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 @@ -4419,7 +4417,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 } @@ -4429,7 +4427,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 @@ -4447,7 +4445,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 } @@ -4480,7 +4478,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 @@ -4496,7 +4494,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 @@ -4507,7 +4505,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("已领取") @@ -4516,7 +4514,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 @@ -4524,7 +4522,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 } @@ -4532,7 +4530,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") @@ -4540,7 +4538,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 @@ -4553,7 +4551,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 } @@ -4571,7 +4569,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 @@ -4582,7 +4580,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 } @@ -4597,7 +4595,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") @@ -4607,7 +4605,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 @@ -4628,7 +4626,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 @@ -4640,7 +4638,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") @@ -4648,7 +4646,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 @@ -4656,7 +4654,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 @@ -4677,7 +4675,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 @@ -4689,7 +4687,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") @@ -4697,7 +4695,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 @@ -4708,7 +4706,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 @@ -4720,7 +4718,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") @@ -4728,7 +4726,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 @@ -4736,7 +4734,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 @@ -4744,7 +4742,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 @@ -4765,7 +4763,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 @@ -4777,7 +4775,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") @@ -4785,7 +4783,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 @@ -4793,7 +4791,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 @@ -4807,7 +4805,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 } @@ -4818,7 +4816,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") @@ -4826,7 +4824,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 @@ -4834,7 +4832,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 @@ -4845,7 +4843,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 } @@ -4855,7 +4853,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") @@ -4863,7 +4861,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 @@ -4884,7 +4882,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 @@ -4901,7 +4899,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 @@ -4912,7 +4910,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 @@ -4923,7 +4921,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 @@ -4931,7 +4929,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 @@ -4943,7 +4941,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 @@ -4954,7 +4952,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") @@ -4963,7 +4961,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") @@ -4975,7 +4973,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, }) @@ -4995,7 +4993,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") @@ -5003,7 +5001,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") @@ -5024,7 +5022,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") @@ -5032,7 +5030,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 @@ -5064,7 +5062,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 @@ -5074,7 +5072,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 @@ -5082,7 +5080,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 @@ -5096,7 +5094,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 } @@ -5105,7 +5103,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..b976485b 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,35 @@ 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 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..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-20260313092348-57448df16cd8 + 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 @@ -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..5c7ed699 100644 --- a/src/server/go.sum +++ b/src/server/go.sum @@ -5,6 +5,10 @@ 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= @@ -79,6 +83,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{}) }