diff --git a/src/server/conf/catnip/CatnipCfg.go b/src/server/conf/catnip/CatnipCfg.go index 769f0460..bfb12708 100644 --- a/src/server/conf/catnip/CatnipCfg.go +++ b/src/server/conf/catnip/CatnipCfg.go @@ -80,7 +80,7 @@ func GetTemplateId(Id int) int { func GetProgressReward(Id int, Rewards []int, Progress int) ([]*item.Item, []int) { TemplateId := GetTemplateId(Id) - data, err := gamedata.GetDataByIntKey(CATNIP_GAME_CFG_NAME, Id) + data, err := gamedata.GetData(CATNIP_GAME_CFG_NAME) if err != nil { return nil, nil } diff --git a/src/server/test/catnip_test.go b/src/server/test/catnip_test.go index 93b5ee4d..32e844fb 100644 --- a/src/server/test/catnip_test.go +++ b/src/server/test/catnip_test.go @@ -34,3 +34,19 @@ func TestReqCatnipEmoji(t *testing.T) { t.Fatalf("ReqCatnipEmoji returned error: %v", err) } } + +func TestReqCatnipReward(t *testing.T) { + p1 := new(game.Player) + p1.InitPlayer("aaa001") + game.G_GameLogicPtr.SetPlayer(p1) + req := &msg.ReqCatnipReward{ + Id: 2, + } + data, err := proto.Marshal(req) + if err != nil { + t.Fatalf("proto.Marshal error: %v", err) + } + if err := game.ReqCatnipReward(p1, data); err != nil { + t.Fatalf("ReqCatnipReward returned error: %v", err) + } +}