refactor: 重构奖励发放逻辑并支持签到默认奖励

logic/controller/item_use.go

@@ -43,12 +43,20 @@ func (h Controller) UsePetItemOutOfFight(data *C2S_USE_PET_ITEM_OUT_OF_FIGHT, c
 		return nil, errorcode.ErrorCodes.ErrInsufficientItems
 	}
 
+	oldHP := currentPet.Hp
 	itemCfg, ok := xmlres.ItemsMAP[int(itemID)]
 	if !ok {
-		return nil, errorcode.ErrorCodes.ErrSystemError
+		errcode := h.handleRegularPetItem(itemID, currentPet)
+		if errcode != 0 {
+			return nil, errcode
+		}
+		refreshPetPaneKeepHP(currentPet, oldHP)
+		c.Service.Item.UPDATE(itemID, -1)
+		result = &item.S2C_USE_PET_ITEM_OUT_OF_FIGHT{}
+		copier.Copy(&result, currentPet)
+		return result, 0
 	}
 
-	oldHP := currentPet.Hp
 	var errcode errorcode.ErrorCode
 	switch {
 	case itemID == 300036:

logic/controller/user_cdk.go

@@ -2,20 +2,18 @@ package controller
 
 import (
 	"blazing/common/socket/errorcode"
-	"blazing/logic/service/player"
+	logicplayer "blazing/logic/service/player"
 	"blazing/logic/service/user"
-	"blazing/modules/config/service"
-	"blazing/modules/player/model"
+	configservice "blazing/modules/config/service"
+	playerservice "blazing/modules/player/service"
 	"time"
 )
 
 // CDK 处理控制器请求。
-func (h Controller) CDK(data *C2S_GET_GIFT_COMPLETE, player *player.Player) (result *user.S2C_GET_GIFT_COMPLETE, err errorcode.ErrorCode) {
+func (h Controller) CDK(data *C2S_GET_GIFT_COMPLETE, player *logicplayer.Player) (result *user.S2C_GET_GIFT_COMPLETE, err errorcode.ErrorCode) {
 	result = &user.S2C_GET_GIFT_COMPLETE{}
 
-	cdkService := service.NewCdkService()
-	rewardPetService := service.NewPetRewardService()
-	itemRewardService := service.NewItemService()
+	cdkService := configservice.NewCdkService()
 	now := time.Now()
 
 	r := cdkService.Get(data.PassText)
@@ -25,7 +23,6 @@ func (h Controller) CDK(data *C2S_GET_GIFT_COMPLETE, player *player.Player) (res
 	if r.BindUserId != 0 && r.BindUserId != data.Head.UserID {
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeFrozen
 	}
-
 	if r.ValidEndTime.Compare(now) == -1 {
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeExpired
 	}
@@ -36,28 +33,33 @@ func (h Controller) CDK(data *C2S_GET_GIFT_COMPLETE, player *player.Player) (res
 		return nil, errorcode.ErrorCodes.ErrMolecularCodeGiftsGone
 	}
 
+	reward, grantErr := playerservice.NewCdkService(data.Head.UserID).GrantConfigReward(uint32(r.ID))
+	if grantErr != nil {
+		return nil, errorcode.ErrorCodes.ErrSystemError
+	}
+
 	result.Flag = 1
-	for _, rewardID := range r.ElfRewardIds {
-		pet := rewardPetService.Get(rewardID)
-		if pet == nil {
-			continue
+	appendGift := func(giftID, count int64) {
+		if giftID == 0 || count <= 0 {
+			return
 		}
-
-		petInfo := model.GenPetInfo(int(pet.MonID), int(pet.DV), int(pet.Nature), int(pet.Effect), int(pet.Lv), nil, 0)
-		player.Service.Pet.PetAdd(petInfo, 0)
-		result.PetGift = append(result.PetGift, user.PetGiftInfo{PetID: petInfo.ID, CacthTime: petInfo.CatchTime})
+		result.GiftList = append(result.GiftList, user.GiftInfo{GiftID: giftID, Count: count})
 	}
 
-	for _, rewardID := range r.ItemRewardIds {
-		itemInfo := itemRewardService.GetItemCount(rewardID)
-		player.ItemAdd(itemInfo.ItemId, itemInfo.ItemCnt)
-		result.GiftList = append(result.GiftList, user.GiftInfo{GiftID: itemInfo.ItemId, Count: itemInfo.ItemCnt})
+	appendGift(1, reward.Coins)
+	appendGift(3, reward.ExpPool)
+	appendGift(5, reward.Gold)
+	appendGift(9, reward.EVPool)
+	for _, item := range reward.Items {
+		appendGift(item.ItemId, item.ItemCnt)
 	}
-	if r.TitleRewardIds != 0 {
-		player.Service.Title.Give(r.TitleRewardIds)
-		result.Tile = r.TitleRewardIds
+	for _, pet := range reward.Pets {
+		result.PetGift = append(result.PetGift, user.PetGiftInfo{PetID: pet.PetID, CacthTime: pet.CatchTime})
 	}
+	if len(reward.TitleIDs) > 0 {
+		result.Tile = reward.TitleIDs[0]
+	}
+
 	player.Service.Cdk.Log(uint32(r.ID))
-
 	return
 }

logic/service/item/petuse.go

@@ -27,6 +27,11 @@ type SetHandler struct {
 	Handler PetItemHandler
 }
 
+var fallbackPetItemNewSeIdx = map[uint32]int{
+	300741: 1103, // 瞬杀能量珠
+	300854: 1103, // 瞬杀能量珠Ω
+}
+
 // PetItemHandlerRegistry 道具处理器注册器
 type PetItemHandlerRegistry struct {
 	exactHandlers map[uint32]PetItemHandler // 精确ID映射
@@ -112,12 +117,29 @@ func nvfunc(itemid uint32, onpet *model.PetInfo) bool {
 	return true
 }
 
-func handleNewSeIdxPetItem(itemid uint32, onpet *model.PetInfo) errorcode.ErrorCode {
-	itemCfg, ok := xmlres.ItemsMAP[int(itemid)]
-	if !ok {
-		return errorcode.ErrorCodes.ErrItemUnusable
+func resolvePetItemNewSeIdx(itemid uint32) (itemCfg xmlres.Item, newSeIdx int, ok bool) {
+	itemCfg, ok = xmlres.ItemsMAP[int(itemid)]
+	if ok && itemCfg.NewSeIdx != 0 {
+		return itemCfg, itemCfg.NewSeIdx, true
 	}
-	if itemCfg.NewSeIdx == 0 {
+
+	if newSeIdx, ok = fallbackPetItemNewSeIdx[itemid]; ok {
+		return itemCfg, newSeIdx, true
+	}
+
+	for idx, effectCfg := range xmlres.EffectMAP {
+		if effectCfg.ItemId == nil || gconv.Uint32(*effectCfg.ItemId) != itemid {
+			continue
+		}
+		return itemCfg, idx, true
+	}
+
+	return itemCfg, 0, false
+}
+
+func handleNewSeIdxPetItem(itemid uint32, onpet *model.PetInfo) errorcode.ErrorCode {
+	itemCfg, newSeIdx, ok := resolvePetItemNewSeIdx(itemid)
+	if ok && newSeIdx == 0 {
 		if itemCfg.MaxHPUp > 0 {
 			if !onpet.AddMaxHPUpEffect(itemid, itemCfg.MaxHPUp) {
 				return errorcode.ErrorCodes.ErrCannotInjectPillAgain
@@ -126,14 +148,17 @@ func handleNewSeIdxPetItem(itemid uint32, onpet *model.PetInfo) errorcode.ErrorC
 		}
 		return errorcode.ErrorCodes.ErrItemUnusable
 	}
+	if !ok {
+		return errorcode.ErrorCodes.ErrItemUnusable
+	}
 
-	effectCfg, ok := xmlres.EffectMAP[itemCfg.NewSeIdx]
+	effectCfg, ok := xmlres.EffectMAP[newSeIdx]
 	if !ok {
 		return errorcode.ErrorCodes.ErrSystemError
 	}
 
 	effectStatus := byte(gconv.Int(effectCfg.Stat))
-	effectIdx := uint16(itemCfg.NewSeIdx)
+	effectIdx := uint16(newSeIdx)
 	leftCount := 1
 	if effectCfg.Times != nil && *effectCfg.Times != "" {
 		leftCount = gconv.Int(*effectCfg.Times)