fix: 修复宠物升级经验显示与动态结算

logic/service/player/pet.go

@@ -39,27 +39,16 @@ func (p *Player) AddPetExp(petInfo *model.PetInfo, addExp int64) {
 		return
 	}
 	originalLevel := petInfo.Level
+	allocatedExp := addExp
 	p.Info.ExpPool -= addExp //减去已使用的经验
 
-	remainingExp := addExp
-	for remainingExp > 0 {
-		needExp := petInfo.NextLvExp - petInfo.Exp
-		if needExp <= 0 {
-			petInfo.Exp = petInfo.NextLvExp
-			petInfo.Level++
-			petInfo.Update(true)
-			continue
-		}
-		if remainingExp < needExp {
-			petInfo.Exp += remainingExp
-			break
-		}
-
-		petInfo.Exp += needExp
-		remainingExp -= needExp
+	currentExp := petInfo.Exp + addExp
+	for currentExp >= petInfo.NextLvExp && petInfo.NextLvExp > 0 {
 		petInfo.Level++
 		petInfo.Update(true)
+		currentExp -= petInfo.LvExp
 	}
+	petInfo.Exp = currentExp
 
 	//  重新计算面板
 	if originalLevel != petInfo.Level {
@@ -95,6 +84,7 @@ func (p *Player) AddPetExp(petInfo *model.PetInfo, addExp int64) {
 	var petUpdateInfo info.UpdatePropInfo
 
 	copier.Copy(&petUpdateInfo, petInfo)
+	petUpdateInfo.Exp = uint32(allocatedExp)
 	updateOutbound.Data = append(updateOutbound.Data, petUpdateInfo)
 	p.SendPack(header.Pack(updateOutbound)) //准备包由各自发,因为协议不一样
 

logic/service/player/pet_test.go

@@ -122,3 +122,36 @@ func TestAddPetExpSmallRewardDoesNotJumpToMaxLevel(t *testing.T) {
 		t.Fatalf("expected exp pool to decrease by %d, got %d", addExp, player.Info.ExpPool)
 	}
 }
+
+func TestAddPetExpUsesDynamicPerLevelRequirement(t *testing.T) {
+	petID := firstPetIDForTest(t)
+	petInfo := playermodel.GenPetInfo(petID, 31, 0, 0, 20, nil, 0)
+	if petInfo == nil {
+		t.Fatalf("failed to generate test pet")
+	}
+
+	initialNeed := petInfo.NextLvExp
+	if initialNeed <= 0 {
+		t.Fatalf("expected positive exp requirement, got %d", initialNeed)
+	}
+
+	player := &Player{
+		baseplayer: baseplayer{
+			Info: &playermodel.PlayerInfo{
+				ExpPool: 1_000_000,
+			},
+		},
+	}
+
+	player.AddPetExp(petInfo, initialNeed)
+
+	if petInfo.Level != 21 {
+		t.Fatalf("expected pet level to become 21, got %d", petInfo.Level)
+	}
+	if petInfo.Exp != 0 {
+		t.Fatalf("expected level-up to reset current level exp, got %d", petInfo.Exp)
+	}
+	if petInfo.NextLvExp == initialNeed {
+		t.Fatalf("expected next level exp to change after leveling, still %d", petInfo.NextLvExp)
+	}
+}