圣遗物追加词条初步

gs/game/player_reliquary.go

@@ -18,8 +18,8 @@ func (g *GameManager) GetAllReliquaryDataConfig() map[int32]*gdconf.ItemData {
 		if (itemId >= 20002 && itemId <= 20004) ||
 			itemId == 23334 ||
 			(itemId >= 23300 && itemId <= 23340) {
-			continue
 			// 跳过无效圣遗物
+			continue
 		}
 		allReliquaryDataConfig[itemId] = itemData
 	}
@@ -43,17 +43,80 @@ func (g *GameManager) AddUserReliquary(userId uint32, itemId uint32) uint64 {
 		return 0
 	}
 	reliquaryId := uint64(g.snowflake.GenId())
-	// 根据圣遗物类型给予主属性Id
-	player.AddReliquary(itemId, reliquaryId, uint32(reliquaryMainConfig.MainPropId))
+	// 圣遗物主属性
+	mainPropId := uint32(reliquaryMainConfig.MainPropId)
+	// 玩家添加圣遗物
+	player.AddReliquary(itemId, reliquaryId, mainPropId)
 	reliquary := player.GetReliquary(reliquaryId)
 	if reliquary == nil {
 		logger.Error("reliquary is nil, itemId: %v, reliquaryId: %v", itemId, reliquaryId)
 		return 0
 	}
+	// 设置圣遗物初始词条
+	g.AppendReliquaryProp(reliquary, reliquaryConfig.AppendPropCount)
 	g.SendMsg(cmd.StoreItemChangeNotify, userId, player.ClientSeq, g.PacketStoreItemChangeNotifyByReliquary(reliquary))
 	return reliquaryId
 }
 
+// AppendReliquaryProp 圣遗物追加属性
+func (g *GameManager) AppendReliquaryProp(reliquary *model.Reliquary, count int32) {
+	// 获取圣遗物配置表
+	reliquaryConfig := gdconf.GetItemDataById(int32(reliquary.ItemId))
+	if reliquaryConfig == nil {
+		logger.Error("reliquary config error, itemId: %v", reliquary.ItemId)
+		return
+	}
+	// 主属性配置表
+	reliquaryMainConfig := gdconf.GetReliquaryMainDataByDepotIdAndPropId(reliquaryConfig.MainPropDepotId, int32(reliquary.MainPropId))
+	if reliquaryMainConfig == nil {
+		logger.Error("reliquary main config error, mainPropDepotId: %v, propId: %v", reliquaryConfig.MainPropDepotId, reliquary.MainPropId)
+		return
+	}
+	// 圣遗物追加属性的次数
+	for i := 0; i < int(count); i++ {
+		// 将要添加的属性
+		appendAffixConfig := gdconf.GetReliquaryAffixDataRandomByDepotId(reliquaryConfig.AppendPropDepotId)
+		if appendAffixConfig == nil {
+			logger.Error("append affix config error, appendPropDepotId: %v", reliquaryConfig.AppendPropDepotId)
+			return
+		}
+
+		isNotBoth := false
+		// 如果圣遗物词条为0就直接加不用校验是否相同
+		for len(reliquary.AppendPropIdList) > 0 {
+			if isNotBoth {
+				break
+			}
+			// 追加的属性类型不能相同
+			for i, propId := range reliquary.AppendPropIdList {
+				targetAffixConfig := gdconf.GetReliquaryAffixDataByDepotIdAndPropId(reliquaryConfig.AppendPropDepotId, int32(propId))
+				if targetAffixConfig == nil {
+					logger.Error("target affix config error, propId: %v", propId)
+					return
+				}
+				// 如果类型相同则重新随机获取一个属性
+				// 追加的属性还不能和主属性相同
+				if appendAffixConfig.PropType == targetAffixConfig.PropType || appendAffixConfig.PropType == reliquaryMainConfig.PropType {
+					reliquaryAffixConfig := gdconf.GetReliquaryAffixDataRandomByDepotId(reliquaryConfig.AppendPropDepotId)
+					if reliquaryAffixConfig == nil {
+						logger.Error("reliquary affix config error, appendPropDepotId: %v", reliquaryConfig.AppendPropDepotId)
+						return
+					}
+					// 将属性赋值并重新查找
+					appendAffixConfig = reliquaryAffixConfig
+					break
+				}
+				// 如果循环到最后一个还不匹配那就是没有相同的了
+				if i == len(reliquary.AppendPropIdList)-1 {
+					isNotBoth = true
+				}
+			}
+		}
+		// 圣遗物添加词条
+		reliquary.AppendPropIdList = append(reliquary.AppendPropIdList, uint32(appendAffixConfig.AppendPropId))
+	}
+}
+
 func (g *GameManager) CostUserReliquary(userId uint32, reliquaryIdList []uint64) {
 	player := USER_MANAGER.GetOnlineUser(userId)
 	if player == nil {

gs/model/reliquary.go

@@ -76,7 +76,6 @@ func (p *Player) AddReliquary(itemId uint32, reliquaryId uint64, mainPropId uint
 		AvatarId:         0,
 		Guid:             0,
 	}
-	_ = itemDataConfig
 	p.InitReliquary(reliquary)
 	p.ReliquaryMap[reliquaryId] = reliquary
 }