Fix repeated weapon story unlock notifications by sending only changed stories in diffs

server/internal/service/cageornament.go

@@ -49,10 +49,11 @@ func (s *CageOrnamentServiceServer) ReceiveReward(ctx context.Context, req *pb.R
 			"IUserMaterial", "IUserConsumableItem", "IUserGem",
 			"IUserCostume", "IUserCostumeActiveSkill", "IUserCharacter",
 			"IUserWeapon", "IUserWeaponSkill", "IUserWeaponAbility",
-			"IUserWeaponNote", "IUserWeaponStory",
+			"IUserWeaponNote",
 			"IUserCageOrnamentReward",
 		},
 	))
+	userdata.AddWeaponStoryDiff(diff, user, s.granter.DrainChangedStoryWeaponIds())
 
 	return &pb.ReceiveRewardResponse{
 		CageOrnamentReward: []*pb.CageOrnamentReward{

server/internal/service/gacha.go

@@ -26,7 +26,6 @@ var gachaDiffTables = []string{
 	"IUserWeaponNote",
 	"IUserWeaponSkill",
 	"IUserWeaponAbility",
-	"IUserWeaponStory",
 	"IUserCharacter",
 	"IUserMaterial",
 }
@@ -296,6 +295,7 @@ func (s *GachaServiceServer) Draw(ctx context.Context, req *pb.DrawRequest) (*pb
 		userdata.FullClientTableMap(updatedUser),
 		gachaDiffTables,
 	))
+	userdata.AddWeaponStoryDiff(diff, updatedUser, s.handler.Granter.DrainChangedStoryWeaponIds())
 
 	return &pb.DrawResponse{
 		NextGacha:          nextGacha,

server/internal/service/quest_event.go

@@ -8,6 +8,7 @@ import (
 	"lunar-tear/server/internal/gametime"
 	"lunar-tear/server/internal/questflow"
 	"lunar-tear/server/internal/store"
+	"lunar-tear/server/internal/userdata"
 
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
@@ -52,6 +53,28 @@ func (s *QuestServiceServer) FinishEventQuest(ctx context.Context, req *pb.Finis
 		outcome = s.engine.HandleEventQuestFinish(user, req.EventQuestChapterId, req.QuestId, req.IsRetired, req.IsAnnihilated, nowMillis)
 	})
 
+	diff := buildSelectedQuestDiff(user, []string{
+		"IUserQuest",
+		"IUserQuestMission",
+		"IUserEventQuestProgressStatus",
+		"IUserStatus",
+		"IUserGem",
+		"IUserCharacter",
+		"IUserCostume",
+		"IUserCostumeActiveSkill",
+		"IUserWeapon",
+		"IUserWeaponSkill",
+		"IUserWeaponAbility",
+		"IUserWeaponNote",
+		"IUserCompanion",
+		"IUserConsumableItem",
+		"IUserMaterial",
+		"IUserImportantItem",
+		"IUserParts",
+		"IUserPartsGroupNote",
+	})
+	userdata.AddWeaponStoryDiff(diff, user, outcome.ChangedWeaponStoryIds)
+
 	return &pb.FinishEventQuestResponse{
 		DropReward:                      toProtoRewards(outcome.DropRewards),
 		FirstClearReward:                toProtoRewards(outcome.FirstClearRewards),
@@ -61,27 +84,7 @@ func (s *QuestServiceServer) FinishEventQuest(ctx context.Context, req *pb.Finis
 		IsBigWin:                        outcome.IsBigWin,
 		BigWinClearedQuestMissionIdList: outcome.BigWinClearedQuestMissionIds,
 		UserStatusCampaignReward:        []*pb.QuestReward{},
-		DiffUserData: buildSelectedQuestDiff(user, []string{
-			"IUserQuest",
-			"IUserQuestMission",
-			"IUserEventQuestProgressStatus",
-			"IUserStatus",
-			"IUserGem",
-			"IUserCharacter",
-			"IUserCostume",
-			"IUserCostumeActiveSkill",
-			"IUserWeapon",
-			"IUserWeaponSkill",
-			"IUserWeaponAbility",
-			"IUserWeaponNote",
-			"IUserWeaponStory",
-			"IUserCompanion",
-			"IUserConsumableItem",
-			"IUserMaterial",
-			"IUserImportantItem",
-			"IUserParts",
-			"IUserPartsGroupNote",
-		}),
+		DiffUserData:                    diff,
 	}, nil
 }
 
@@ -111,21 +114,24 @@ func (s *QuestServiceServer) UpdateEventQuestSceneProgress(ctx context.Context,
 		s.engine.HandleEventQuestSceneProgress(user, req.QuestSceneId, gametime.NowMillis())
 	})
 
+	diff := buildSelectedQuestDiff(user, []string{
+		"IUserEventQuestProgressStatus",
+		"IUserCharacter",
+		"IUserCostume",
+		"IUserWeapon",
+		"IUserWeaponSkill",
+		"IUserWeaponAbility",
+		"IUserCompanion",
+		"IUserConsumableItem",
+		"IUserMaterial",
+		"IUserImportantItem",
+		"IUserParts",
+		"IUserPartsGroupNote",
+	})
+	userdata.AddWeaponStoryDiff(diff, user, s.engine.Granter.DrainChangedStoryWeaponIds())
+
 	return &pb.UpdateEventQuestSceneProgressResponse{
-		DiffUserData: buildSelectedQuestDiff(user, []string{
-			"IUserEventQuestProgressStatus",
-			"IUserCharacter",
-			"IUserCostume",
-			"IUserWeapon",
-			"IUserWeaponSkill",
-			"IUserWeaponAbility",
-			"IUserCompanion",
-			"IUserConsumableItem",
-			"IUserMaterial",
-			"IUserImportantItem",
-			"IUserParts",
-			"IUserPartsGroupNote",
-		}),
+		DiffUserData: diff,
 	}, nil
 }
 

server/internal/service/quest_extra.go

@@ -8,6 +8,7 @@ import (
 	"lunar-tear/server/internal/gametime"
 	"lunar-tear/server/internal/questflow"
 	"lunar-tear/server/internal/store"
+	"lunar-tear/server/internal/userdata"
 )
 
 func (s *QuestServiceServer) StartExtraQuest(ctx context.Context, req *pb.StartExtraQuestRequest) (*pb.StartExtraQuestResponse, error) {
@@ -50,6 +51,28 @@ func (s *QuestServiceServer) FinishExtraQuest(ctx context.Context, req *pb.Finis
 		outcome = s.engine.HandleExtraQuestFinish(user, req.QuestId, req.IsRetired, req.IsAnnihilated, nowMillis)
 	})
 
+	diff := buildSelectedQuestDiff(user, []string{
+		"IUserQuest",
+		"IUserQuestMission",
+		"IUserExtraQuestProgressStatus",
+		"IUserStatus",
+		"IUserGem",
+		"IUserCharacter",
+		"IUserCostume",
+		"IUserCostumeActiveSkill",
+		"IUserWeapon",
+		"IUserWeaponSkill",
+		"IUserWeaponAbility",
+		"IUserWeaponNote",
+		"IUserCompanion",
+		"IUserConsumableItem",
+		"IUserMaterial",
+		"IUserImportantItem",
+		"IUserParts",
+		"IUserPartsGroupNote",
+	})
+	userdata.AddWeaponStoryDiff(diff, user, outcome.ChangedWeaponStoryIds)
+
 	return &pb.FinishExtraQuestResponse{
 		DropReward:                      toProtoRewards(outcome.DropRewards),
 		FirstClearReward:                toProtoRewards(outcome.FirstClearRewards),
@@ -58,27 +81,7 @@ func (s *QuestServiceServer) FinishExtraQuest(ctx context.Context, req *pb.Finis
 		IsBigWin:                        outcome.IsBigWin,
 		BigWinClearedQuestMissionIdList: outcome.BigWinClearedQuestMissionIds,
 		UserStatusCampaignReward:        []*pb.QuestReward{},
-		DiffUserData: buildSelectedQuestDiff(user, []string{
-			"IUserQuest",
-			"IUserQuestMission",
-			"IUserExtraQuestProgressStatus",
-			"IUserStatus",
-			"IUserGem",
-			"IUserCharacter",
-			"IUserCostume",
-			"IUserCostumeActiveSkill",
-			"IUserWeapon",
-			"IUserWeaponSkill",
-			"IUserWeaponAbility",
-			"IUserWeaponNote",
-			"IUserWeaponStory",
-			"IUserCompanion",
-			"IUserConsumableItem",
-			"IUserMaterial",
-			"IUserImportantItem",
-			"IUserParts",
-			"IUserPartsGroupNote",
-		}),
+		DiffUserData:                    diff,
 	}, nil
 }
 
@@ -119,20 +122,23 @@ func (s *QuestServiceServer) UpdateExtraQuestSceneProgress(ctx context.Context,
 		s.engine.HandleExtraQuestSceneProgress(user, req.QuestSceneId, gametime.NowMillis())
 	})
 
+	diff := buildSelectedQuestDiff(user, []string{
+		"IUserExtraQuestProgressStatus",
+		"IUserCharacter",
+		"IUserCostume",
+		"IUserWeapon",
+		"IUserWeaponSkill",
+		"IUserWeaponAbility",
+		"IUserCompanion",
+		"IUserConsumableItem",
+		"IUserMaterial",
+		"IUserImportantItem",
+		"IUserParts",
+		"IUserPartsGroupNote",
+	})
+	userdata.AddWeaponStoryDiff(diff, user, s.engine.Granter.DrainChangedStoryWeaponIds())
+
 	return &pb.UpdateExtraQuestSceneProgressResponse{
-		DiffUserData: buildSelectedQuestDiff(user, []string{
-			"IUserExtraQuestProgressStatus",
-			"IUserCharacter",
-			"IUserCostume",
-			"IUserWeapon",
-			"IUserWeaponSkill",
-			"IUserWeaponAbility",
-			"IUserCompanion",
-			"IUserConsumableItem",
-			"IUserMaterial",
-			"IUserImportantItem",
-			"IUserParts",
-			"IUserPartsGroupNote",
-		}),
+		DiffUserData: diff,
 	}, nil
 }

server/internal/service/quest_main.go

@@ -41,30 +41,32 @@ func (s *QuestServiceServer) UpdateMainFlowSceneProgress(ctx context.Context, re
 		s.engine.HandleMainFlowSceneProgress(user, req.QuestSceneId, gametime.NowMillis())
 	})
 
+	diff := buildSelectedQuestDiff(user, []string{
+		"IUserMainQuestFlowStatus",
+		"IUserMainQuestMainFlowStatus",
+		"IUserMainQuestProgressStatus",
+		"IUserMainQuestSeasonRoute",
+		"IUserPortalCageStatus",
+		"IUserSideStoryQuestSceneProgressStatus",
+		"IUserQuest",
+		"IUserCharacter",
+		"IUserCostume",
+		"IUserCostumeActiveSkill",
+		"IUserWeapon",
+		"IUserWeaponSkill",
+		"IUserWeaponAbility",
+		"IUserWeaponNote",
+		"IUserCompanion",
+		"IUserConsumableItem",
+		"IUserMaterial",
+		"IUserImportantItem",
+		"IUserParts",
+		"IUserPartsGroupNote",
+	})
+	userdata.AddWeaponStoryDiff(diff, user, s.engine.Granter.DrainChangedStoryWeaponIds())
+
 	return &pb.UpdateMainFlowSceneProgressResponse{
-		DiffUserData: buildSelectedQuestDiff(user, []string{
-			"IUserMainQuestFlowStatus",
-			"IUserMainQuestMainFlowStatus",
-			"IUserMainQuestProgressStatus",
-			"IUserMainQuestSeasonRoute",
-			"IUserPortalCageStatus",
-			"IUserSideStoryQuestSceneProgressStatus",
-			"IUserQuest",
-			"IUserCharacter",
-			"IUserCostume",
-			"IUserCostumeActiveSkill",
-			"IUserWeapon",
-			"IUserWeaponSkill",
-			"IUserWeaponAbility",
-			"IUserWeaponNote",
-			"IUserWeaponStory",
-			"IUserCompanion",
-			"IUserConsumableItem",
-			"IUserMaterial",
-			"IUserImportantItem",
-			"IUserParts",
-			"IUserPartsGroupNote",
-		}),
+		DiffUserData: diff,
 	}, nil
 }
 
@@ -169,6 +171,32 @@ func (s *QuestServiceServer) FinishMainQuest(ctx context.Context, req *pb.Finish
 		outcome = s.engine.HandleQuestFinish(user, req.QuestId, req.IsRetired, req.IsAnnihilated, nowMillis)
 	})
 
+	diff := buildSelectedQuestDiff(user, []string{
+		"IUserQuest",
+		"IUserQuestMission",
+		"IUserMainQuestFlowStatus",
+		"IUserMainQuestMainFlowStatus",
+		"IUserMainQuestProgressStatus",
+		"IUserMainQuestSeasonRoute",
+		"IUserMainQuestReplayFlowStatus",
+		"IUserStatus",
+		"IUserGem",
+		"IUserCharacter",
+		"IUserCostume",
+		"IUserCostumeActiveSkill",
+		"IUserWeapon",
+		"IUserWeaponSkill",
+		"IUserWeaponAbility",
+		"IUserWeaponNote",
+		"IUserCompanion",
+		"IUserConsumableItem",
+		"IUserMaterial",
+		"IUserImportantItem",
+		"IUserParts",
+		"IUserPartsGroupNote",
+	})
+	userdata.AddWeaponStoryDiff(diff, user, outcome.ChangedWeaponStoryIds)
+
 	return &pb.FinishMainQuestResponse{
 		DropReward:                      toProtoRewards(outcome.DropRewards),
 		FirstClearReward:                toProtoRewards(outcome.FirstClearRewards),
@@ -179,31 +207,7 @@ func (s *QuestServiceServer) FinishMainQuest(ctx context.Context, req *pb.Finish
 		BigWinClearedQuestMissionIdList: outcome.BigWinClearedQuestMissionIds,
 		ReplayFlowFirstClearReward:      toProtoRewards(outcome.ReplayFlowFirstClearRewards),
 		UserStatusCampaignReward:        []*pb.QuestReward{},
-		DiffUserData: buildSelectedQuestDiff(user, []string{
-			"IUserQuest",
-			"IUserQuestMission",
-			"IUserMainQuestFlowStatus",
-			"IUserMainQuestMainFlowStatus",
-			"IUserMainQuestProgressStatus",
-			"IUserMainQuestSeasonRoute",
-			"IUserMainQuestReplayFlowStatus",
-			"IUserStatus",
-			"IUserGem",
-			"IUserCharacter",
-			"IUserCostume",
-			"IUserCostumeActiveSkill",
-			"IUserWeapon",
-			"IUserWeaponSkill",
-			"IUserWeaponAbility",
-			"IUserWeaponNote",
-			"IUserWeaponStory",
-			"IUserCompanion",
-			"IUserConsumableItem",
-			"IUserMaterial",
-			"IUserImportantItem",
-			"IUserParts",
-			"IUserPartsGroupNote",
-		}),
+		DiffUserData:                    diff,
 	}, nil
 }
 

server/internal/service/shop.go

@@ -32,7 +32,6 @@ var shopDiffTables = []string{
 	"IUserWeaponSkill",
 	"IUserWeaponAbility",
 	"IUserWeaponNote",
-	"IUserWeaponStory",
 }
 
 type ShopServiceServer struct {
@@ -92,6 +91,7 @@ func (s *ShopServiceServer) Buy(ctx context.Context, req *pb.BuyRequest) (*pb.Bu
 
 	tables := userdata.FullClientTableMap(snapshot)
 	diff := userdata.BuildDiffFromTables(userdata.SelectTables(tables, shopDiffTables))
+	userdata.AddWeaponStoryDiff(diff, snapshot, s.granter.DrainChangedStoryWeaponIds())
 
 	return &pb.BuyResponse{
 		OverflowPossession: []*pb.Possession{},

server/internal/service/state.go

@@ -28,7 +28,6 @@ var startedGameStartTables = []string{
 	"IUserQuestMission",
 	"IUserTutorialProgress",
 	"IUserWeaponNote",
-	"IUserWeaponStory",
 	"IUserCostumeActiveSkill",
 	"IUserDeckTypeNote",
 	"IUserDeckSubWeaponGroup",

server/internal/service/weapon.go

@@ -20,7 +20,6 @@ var weaponDiffTables = []string{
 	"IUserWeaponAbility",
 	"IUserMaterial",
 	"IUserConsumableItem",
-	"IUserWeaponStory",
 }
 
 var limitBreakDiffTables = []string{
@@ -98,6 +97,7 @@ func (s *WeaponServiceServer) EnhanceByMaterial(ctx context.Context, req *pb.Enh
 	userId := currentUserId(ctx, s.users, s.sessions)
 	nowMillis := gametime.NowMillis()
 
+	var changedStoryIds []int32
 	snapshot, err := s.users.UpdateUser(userId, func(user *store.UserState) {
 		weapon, ok := user.Weapons[req.UserWeaponUuid]
 		if !ok {
@@ -149,6 +149,8 @@ func (s *WeaponServiceServer) EnhanceByMaterial(ctx context.Context, req *pb.Enh
 		weapon.LatestVersion = nowMillis
 		user.Weapons[req.UserWeaponUuid] = weapon
 		log.Printf("[WeaponService] EnhanceByMaterial: weaponId=%d +%d exp -> total=%d level=%d", weapon.WeaponId, totalExp, weapon.Exp, weapon.Level)
+
+		changedStoryIds = s.checkWeaponStoryUnlocks(user, weapon.WeaponId, weapon.Level, nowMillis)
 	})
 	if err != nil {
 		return nil, fmt.Errorf("weapon enhance by material: %w", err)
@@ -156,6 +158,7 @@ func (s *WeaponServiceServer) EnhanceByMaterial(ctx context.Context, req *pb.Enh
 
 	tables := userdata.FullClientTableMap(snapshot)
 	diff := userdata.BuildDiffFromTables(userdata.SelectTables(tables, weaponDiffTables))
+	userdata.AddWeaponStoryDiff(diff, snapshot, changedStoryIds)
 
 	return &pb.EnhanceByMaterialResponse{
 		IsGreatSuccess:         false,
@@ -227,6 +230,7 @@ func (s *WeaponServiceServer) Evolve(ctx context.Context, req *pb.EvolveRequest)
 	userId := currentUserId(ctx, s.users, s.sessions)
 	nowMillis := gametime.NowMillis()
 
+	var changedStoryIds []int32
 	snapshot, err := s.users.UpdateUser(userId, func(user *store.UserState) {
 		weapon, ok := user.Weapons[req.UserWeaponUuid]
 		if !ok {
@@ -286,7 +290,7 @@ func (s *WeaponServiceServer) Evolve(ctx context.Context, req *pb.EvolveRequest)
 
 		log.Printf("[WeaponService] Evolve: weaponId %d -> %d", wm.WeaponId, evolvedId)
 
-		s.checkEvolutionStoryUnlocks(user, evolvedId, nowMillis)
+		changedStoryIds = s.checkWeaponStoryUnlocks(user, evolvedId, weapon.Level, nowMillis)
 	})
 	if err != nil {
 		return nil, fmt.Errorf("weapon evolve: %w", err)
@@ -294,6 +298,7 @@ func (s *WeaponServiceServer) Evolve(ctx context.Context, req *pb.EvolveRequest)
 
 	tables := userdata.FullClientTableMap(snapshot)
 	diff := userdata.BuildDiffFromTables(userdata.SelectTables(tables, weaponDiffTables))
+	userdata.AddWeaponStoryDiff(diff, snapshot, changedStoryIds)
 
 	return &pb.EvolveResponse{DiffUserData: diff}, nil
 }
@@ -665,6 +670,7 @@ func (s *WeaponServiceServer) EnhanceByWeapon(ctx context.Context, req *pb.Enhan
 		Track("IUserWeaponSkill", oldUser, userdata.SortedWeaponSkillRecords, []string{"userId", "userWeaponUuid", "slotNumber"}).
 		Track("IUserWeaponAbility", oldUser, userdata.SortedWeaponAbilityRecords, []string{"userId", "userWeaponUuid", "slotNumber"})
 
+	var changedStoryIds []int32
 	snapshot, err := s.users.UpdateUser(userId, func(user *store.UserState) {
 		weapon, ok := user.Weapons[req.UserWeaponUuid]
 		if !ok {
@@ -725,6 +731,8 @@ func (s *WeaponServiceServer) EnhanceByWeapon(ctx context.Context, req *pb.Enhan
 		weapon.LatestVersion = nowMillis
 		user.Weapons[req.UserWeaponUuid] = weapon
 		log.Printf("[WeaponService] EnhanceByWeapon: weaponId=%d +%d exp -> total=%d level=%d", weapon.WeaponId, totalExp, weapon.Exp, weapon.Level)
+
+		changedStoryIds = s.checkWeaponStoryUnlocks(user, weapon.WeaponId, weapon.Level, nowMillis)
 	})
 	if err != nil {
 		return nil, fmt.Errorf("weapon enhance by weapon: %w", err)
@@ -732,6 +740,7 @@ func (s *WeaponServiceServer) EnhanceByWeapon(ctx context.Context, req *pb.Enhan
 
 	tables := userdata.SelectTables(userdata.FullClientTableMap(snapshot), weaponDiffTables)
 	diff := tracker.Apply(snapshot, tables)
+	userdata.AddWeaponStoryDiff(diff, snapshot, changedStoryIds)
 
 	return &pb.EnhanceByWeaponResponse{
 		IsGreatSuccess:       false,
@@ -740,21 +749,49 @@ func (s *WeaponServiceServer) EnhanceByWeapon(ctx context.Context, req *pb.Enhan
 	}, nil
 }
 
-func (s *WeaponServiceServer) checkEvolutionStoryUnlocks(user *store.UserState, weaponId int32, nowMillis int64) {
+func (s *WeaponServiceServer) checkWeaponStoryUnlocks(user *store.UserState, weaponId, level int32, nowMillis int64) []int32 {
 	wm, ok := s.catalog.Weapons[weaponId]
 	if !ok || wm.WeaponStoryReleaseConditionGroupId == 0 {
-		return
+		return nil
 	}
 	evoOrder, hasEvo := s.catalog.EvolutionOrder[weaponId]
 	conditions := s.catalog.ReleaseConditionsByGroupId[wm.WeaponStoryReleaseConditionGroupId]
+
+	changed := false
 	for _, cond := range conditions {
+		granted := false
 		switch cond.WeaponStoryReleaseConditionType {
+		case model.WeaponStoryReleaseConditionTypeAcquisition:
+			granted = store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
+		case model.WeaponStoryReleaseConditionTypeReachSpecifiedLevel:
+			if level >= cond.ConditionValue {
+				granted = store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
+			}
+		case model.WeaponStoryReleaseConditionTypeReachInitialMaxLevel:
+			if maxFunc, ok := s.catalog.MaxLevelByEnhanceId[wm.WeaponSpecificEnhanceId]; ok {
+				if level >= maxFunc.Evaluate(0) {
+					granted = store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
+				}
+			}
+		case model.WeaponStoryReleaseConditionTypeReachOnceEvolvedMaxLevel:
+			if hasEvo && evoOrder >= 1 {
+				if maxFunc, ok := s.catalog.MaxLevelByEnhanceId[wm.WeaponSpecificEnhanceId]; ok {
+					if level >= maxFunc.Evaluate(0) {
+						granted = store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
+					}
+				}
+			}
 		case model.WeaponStoryReleaseConditionTypeReachSpecifiedEvolutionCount:
 			if hasEvo && evoOrder >= cond.ConditionValue {
-				store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
+				granted = store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
 			}
-		case model.WeaponStoryReleaseConditionTypeAcquisition:
-			store.GrantWeaponStoryUnlock(user, weaponId, cond.StoryIndex, nowMillis)
+		}
+		if granted {
+			changed = true
 		}
 	}
+	if changed {
+		return []int32{weaponId}
+	}
+	return nil
 }