diff --git a/src/server/db/Mysql.go b/src/server/db/Mysql.go index 5845af96..91249688 100644 --- a/src/server/db/Mysql.go +++ b/src/server/db/Mysql.go @@ -417,7 +417,7 @@ func GetServerMailData(data *[]*SqlServerMailStruct) error { } func GetActivityData(data *[]*SqlActivityCfgStruct) error { - sql := "select `id`, `type`, `title`, `mail_title`, `mail_content`, `level_limit`, `start_time`, `end_time`, `cfg_buf`, `extra`, `interval` from t_activity_mod" + sql := "select `id`, `type`, `title`, `mail_title`, `mail_content`, `level_limit`, `start_time`, `end_time`, `cfg`, `extra`, `interval` from t_activity_mod" err := SqlDb.Select(data, sql) return err } diff --git a/src/server/db/SqlStruct.go b/src/server/db/SqlStruct.go index c7135689..b9e2d473 100644 --- a/src/server/db/SqlStruct.go +++ b/src/server/db/SqlStruct.go @@ -506,7 +506,7 @@ type SqlActivityCfgStruct struct { Level int `db:"level_limit"` Start_time int64 `db:"start_time"` End_time int64 `db:"end_time"` - Cfg []byte `db:"cfg_buf"` + Cfg string `db:"cfg"` Interval int64 `db:"interval"` Extra string `db:"extra"` } diff --git a/src/server/game/activity_mgr.go b/src/server/game/activity_mgr.go index 4b26b1de..ff8ab603 100644 --- a/src/server/game/activity_mgr.go +++ b/src/server/game/activity_mgr.go @@ -12,7 +12,7 @@ import ( "gitea.bywaystudios.com/pet_home/leaf/log" - "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/encoding/protojson" ) type ActivityMgr struct { @@ -155,21 +155,21 @@ func unmarshalActivityCfg(atype int, buf []byte) (interface{}, error) { switch atype { case 1: cfg := &protoMsg.MiningCfg{} - err := proto.Unmarshal(buf, cfg) + err := protojson.Unmarshal(buf, cfg) if err != nil { return nil, err } return cfg, nil case 9: cfg := &protoMsg.ChampionshipCfg{} - err := proto.Unmarshal(buf, cfg) + err := protojson.Unmarshal(buf, cfg) if err != nil { return nil, err } return cfg, nil case 10: cfg := &protoMsg.CatReturnGiftCfg{} - err := proto.Unmarshal(buf, cfg) + err := protojson.Unmarshal(buf, cfg) if err != nil { return nil, err }