1

logic/controller/fight_塔.go

@@ -13,7 +13,6 @@ import (
 
 	"sync/atomic"
 
-	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/jinzhu/copier"
 )
 
@@ -207,32 +206,8 @@ func buildTowerMonsterInfo(towerBoss configmodel.BaseTowerConfig) (*model.Player
 	monsterInfo := &model.PlayerInfo{Nick: towerBoss.Name}
 	for i, boss := range bosses {
 		monster := model.GenPetInfo(int(boss.MonID), 24, int(boss.Nature), 0, int(boss.Lv), nil, 0)
-		if boss.Hp != 0 {
-			monster.Hp = uint32(boss.Hp)
-			monster.MaxHp = uint32(boss.Hp)
-		}
-
-		for statIdx, prop := range boss.Prop {
-			if prop != 0 {
-				monster.Prop[statIdx] = prop
-			}
-		}
-
-		for skillIdx := 0; skillIdx < len(monster.SkillList) && skillIdx < len(boss.SKill); skillIdx++ {
-			if boss.SKill[skillIdx] != 0 {
-				monster.SkillList[skillIdx].ID = boss.SKill[skillIdx]
-			}
-		}
-
-		effects := service.NewEffectService().Args(boss.Effect)
-		for _, effect := range effects {
-			monster.EffectInfo = append(monster.EffectInfo, model.PetEffectInfo{
-				Idx:  uint16(effect.ID),
-				EID:  gconv.Uint16(effect.Eid),
-				Args: gconv.Ints(effect.Args),
-			})
-		}
-
+		monster.ConfigBoss(boss.PetBaseConfig)
+		appendPetEffects(monster, boss.Effect)
 		monster.CatchTime = uint32(i)
 		monsterInfo.PetList = append(monsterInfo.PetList, *monster)
 	}