diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 131a4000..e693c21d 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -246,6 +246,10 @@ func ReqRewardOrder(args []interface{}) error { if CardLv > 0 { CardId := CardMod.RandCard(CardLv) ItemId := cardCfg.GetItemIdByCardId(CardId) + if ItemId == 0 { + log.Error("GetItemIdByCardId error cardId:%d", CardId) + return errors.New("GetItemIdByCardId error") + } ChestRainItems = []*item.Item{{Id: ItemId, Num: 1}} } if ProductLv > 0 { diff --git a/src/server/game/UnitTest.go b/src/server/game/UnitTest.go index 2245c5b0..d1d7274a 100644 --- a/src/server/game/UnitTest.go +++ b/src/server/game/UnitTest.go @@ -1,6 +1,7 @@ package game import ( + "errors" "fmt" "server/GoUtil" cardCfg "server/conf/card" @@ -10,6 +11,7 @@ import ( "server/game/mod/order" "server/game/mod/sevenLogin" "server/msg" + "server/pkg/github.com/name5566/leaf/log" ) func UnitEndlessReward(p *Player) error { @@ -110,9 +112,9 @@ func UnitLimitedTimeEvent(p *Player) error { LimitedTimeEventMod := p.PlayMod.getLimitedTimeEventMod() CardMod := p.PlayMod.getCardMod() ChessMod := p.PlayMod.getChessMod() - mergeList := []int{1, 2, 30} - ChestRainItems := make([]*item.Item, 0) + mergeList := []int{246, 5} AddItem, CardLv, ProductLv, Jackpot := LimitedTimeEventMod.GetChestReward(mergeList) + ChestRainItems := make([]*item.Item, 0) if len(AddItem) > 0 { ChestRainItems = AddItem } @@ -123,8 +125,12 @@ func UnitLimitedTimeEvent(p *Player) error { ChestRainItems = []*item.Item{{Id: ItemId, Num: 1}} } if ProductLv > 0 { - Color := order.RandChessColor(ChessMod.GetOrderEmit()) + Color := order.RandChessColor(ChessMod.GetEmitList()) ChessId := mergeDataCfg.GetChessIdByLvAndColor(ProductLv, Color) + if ChessId == 0 { + log.Error("GetChessIdByLvAndColor error color:%d, lv:%d", Color, ProductLv) + return errors.New("GetChessIdByLvAndColor error") + } ChestRainItems = append(ChestRainItems, &item.Item{Id: ChessId, Num: 1}) } if Jackpot > 0 { @@ -132,6 +138,11 @@ func UnitLimitedTimeEvent(p *Player) error { JackpotId = GoUtil.RandMap(ProbList) ChestRainItems = limitedTimeEventCfg.GetSenceJackpotReward(JackpotId) } - fmt.Print(ChestRainItems, JackpotId) + for _, v := range ChestRainItems { + if v.Id == 0 { + fmt.Print("item id is 0") + } + fmt.Println(v.Id) + } return nil }