Merge branch 'main' of https://cnb.cool/blzing/blazing

logic/service/player/ai.go

@@ -1,8 +1,16 @@
 package player
 
+import "blazing/modules/player/model"
+
 type AI_player struct {
 	baseplayer
 
 	CanCapture int
 	BossScript string
 }
+
+func (p *AI_player) GetPetInfo(_ uint32) []model.PetInfo {
+	ret := make([]model.PetInfo, 0, len(p.Info.PetList))
+	ret = append(ret, p.Info.PetList...)
+	return ret
+}

logic/service/player/pet.go

@@ -35,15 +35,21 @@ func (p *Player) AddPetExp(petInfo *model.PetInfo, addExp int64) {
 		petInfo.Hp = utils.Min(currentHP, petInfo.MaxHp)
 	}
 	addExp = utils.Min(addExp, p.Info.ExpPool)
+	if addExp <= 0 {
+		return
+	}
 	originalLevel := petInfo.Level
-	exp := int64(petInfo.Exp) + addExp
+	allocatedExp := addExp
 	p.Info.ExpPool -= addExp //减去已使用的经验
-	gainedExp := exp         //已获得的经验
-	for exp >= int64(petInfo.NextLvExp) {
+
+	currentExp := petInfo.Exp + addExp
+	for currentExp >= petInfo.NextLvExp && petInfo.NextLvExp > 0 {
 		petInfo.Level++
 		petInfo.Update(true)
+		currentExp -= petInfo.LvExp
 	}
-	petInfo.Exp = (exp)
+	petInfo.Exp = currentExp
+
 	//  重新计算面板
 	if originalLevel != petInfo.Level {
 		petInfo.CalculatePetPane(panelLimit)
@@ -78,7 +84,7 @@ func (p *Player) AddPetExp(petInfo *model.PetInfo, addExp int64) {
 	var petUpdateInfo info.UpdatePropInfo
 
 	copier.Copy(&petUpdateInfo, petInfo)
-	petUpdateInfo.Exp = uint32(gainedExp)
+	petUpdateInfo.Exp = uint32(allocatedExp)
 	updateOutbound.Data = append(updateOutbound.Data, petUpdateInfo)
 	p.SendPack(header.Pack(updateOutbound)) //准备包由各自发,因为协议不一样
 

logic/service/player/pet_test.go

@@ -87,3 +87,71 @@ func TestAddPetExpRecalculatesPanelForLevelAbove100(t *testing.T) {
 		t.Fatalf("expected exp pool to be consumed normally, got %d", player.Info.ExpPool)
 	}
 }
+
+func TestAddPetExpSmallRewardDoesNotJumpToMaxLevel(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")
+	}
+
+	player := &Player{
+		baseplayer: baseplayer{
+			Info: &playermodel.PlayerInfo{
+				ExpPool: 1_000_000,
+			},
+		},
+	}
+
+	addExp := int64(100)
+	originalLevel := petInfo.Level
+	nextLevelNeed := petInfo.NextLvExp - petInfo.Exp
+	if addExp >= nextLevelNeed {
+		t.Fatalf("test setup invalid: addExp=%d should be smaller than next level need=%d", addExp, nextLevelNeed)
+	}
+
+	player.AddPetExp(petInfo, addExp)
+
+	if petInfo.Level != originalLevel {
+		t.Fatalf("expected level to stay at %d, got %d", originalLevel, petInfo.Level)
+	}
+	if petInfo.Exp != addExp {
+		t.Fatalf("expected current exp to increase by %d, got %d", addExp, petInfo.Exp)
+	}
+	if player.Info.ExpPool != 1_000_000-addExp {
+		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)
+	}
+}