Update AA synchronization, CW progression and diagnostics

internal/gameserver/currency_wars_settlement.go

@@ -95,12 +95,14 @@ func finishCurrencyWarsBattle(s *Session, req *pb.PVEBattleResultCsReq, current
 	// base display rule. Validate against the battle we actually issued before
 	// using that rule for HP/rewards or selecting the next transition.
 	penaltyID := node.IFIIOIIKJHO
+	var selectedBranch *pb.KKBGIPCAGGH
 	if layer := stage.GetIMPNAHBCADN().GetMPOBBIPMNNJ(); layer != nil && len(layer.BPDABHGFBFO) > 0 {
 		selected, e := cwSelectedEnemyBranch(layer)
 		if e != nil {
 			return e
 		}
 		penaltyID = selected.IFIIOIIKJHO
+		selectedBranch = selected
 		if current.GetEIGMKOJOEEI().GetIFIIOIIKJHO() != penaltyID {
 			return fmt.Errorf("CW selected Encounter penalty differs from issued battle")
 		}
@@ -277,6 +279,13 @@ func finishCurrencyWarsBattle(s *Session, req *pb.PVEBattleResultCsReq, current
 	if err = cwApplyBaseExperience(catalog, player, shop, uint32(gain)); err != nil {
 		return err
 	}
+	var encounterUpdates []*pb.KFNCAIHIHCM
+	if kind == "EliteBranch" {
+		encounterUpdates, err = cwEncounterRewards(catalog, run, selectedBranch, progress, penalty.ThresholdPosition)
+		if err != nil {
+			return err
+		}
+	}
 	damage := &pb.BHBAILHMCOI{}
 	frontMax, err := catalog.IntegerRule("GridFight_Front_AvatarMaxNum")
 	if err != nil {
@@ -338,6 +347,7 @@ func finishCurrencyWarsBattle(s *Session, req *pb.PVEBattleResultCsReq, current
 	}
 	CURRENT_BATTLE.Delete(s.Token) // Duplicate uploads cannot award again.
 	update := cwNotify(cwUnlock(), cwGoldSync(player.Gold), cwCapacitySync(player), &pb.KFNCAIHIHCM{MNLCHEJKDHO: &pb.KFNCAIHIHCM_GridFightLineupHp{GridFightLineupHp: &pb.FMJDDIHBELC{PPKKHHNEOHB: player.PPKKHHNEOHB, GridFightLineupHp: player.GridFightLineupHp}}}, &pb.KFNCAIHIHCM{MNLCHEJKDHO: &pb.KFNCAIHIHCM_PLPHEIBLPDL{PLPHEIBLPDL: &pb.PIHKLPJGEPM{Level: plan.Level, Exp: plan.Exp, HFMKLAPEKFA: player.NDAINFLOLPJ}}})
+	update.GCPNIHHBGGD[0].JKPJFKCBIEM = append(update.GCPNIHHBGGD[0].JKPJFKCBIEM, encounterUpdates...)
 	if err = s.Send(update); err != nil {
 		return err
 	}