Skip to content

Commit 8643293

Browse files
committed
Merge branch 'dev'
2 parents bc41408 + e697cc4 commit 8643293

5 files changed

Lines changed: 53 additions & 15 deletions

File tree

src/StatisticsAnalysisTool/Localization/localization.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23242,7 +23242,7 @@
2324223242
},
2324323243
{
2324423244
"lang": "ko-KR",
23245-
"seg": "추적이 부분적으로 활성화되었습니다(영역을 변경하세요!)."
23245+
"seg": "추적이 부분적으로 활성화되었습니다(지역을 변경하세요!)."
2324623246
},
2324723247
{
2324823248
"lang": "pl-PL",
@@ -23330,6 +23330,10 @@
2333023330
"lang": "fr-FR",
2333123331
"seg": "Redémarrage requis"
2333223332
},
23333+
{
23334+
"lang": "ko-KR",
23335+
"seg": "재시작이 필요합니다."
23336+
},
2333323337
{
2333423338
"lang": "pl-PL",
2333523339
"seg": "Wymagane ponowne uruchomienie"
@@ -37586,6 +37590,10 @@
3758637590
{
3758737591
"lang": "en-US",
3758837592
"seg": "Proxy"
37593+
},
37594+
{
37595+
"lang": "ko-KR",
37596+
"seg": "프록시"
3758937597
}
3759037598
]
3759137599
},

src/StatisticsAnalysisTool/Network/EventCodes.cs

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public enum EventCodes
397397
NewShrine, // map[0:19 1:[-89 90] 2:180 3:GENERAL_SHRINE_COMBAT_BUFF 4:SHRINE_NON_COMBAT_BUFF 5:1 6:637734312344532502 252:371]
398398
UpdateShrine, // map[0:19 1:2 2:637734313445294913 252:372]
399399
UpdateRoom,
400-
NewMistDungeonRoomMobSoul,
400+
NewMobSoul,
401401
NewHellgateShrine,
402402
UpdateHellgateShrine,
403403
ActivateHellgateExit,
@@ -530,9 +530,9 @@ public enum EventCodes
530530
MistsEntranceDataChanged,
531531
NewCagedObject,
532532
CagedObjectStateUpdated,
533-
MistsEntrancePartyBindingCreated,
534-
MistsEntrancePartyBindingCleared,
535-
MistsEntrancePartyBindingInfos,
533+
EntrancePartyBindingCreated,
534+
EntrancePartyBindingCleared,
535+
EntrancePartyBindingInfos,
536536
NewMistsBorderExit,
537537
NewMistsDungeonExit,
538538
LocalQuestInfos,
@@ -616,6 +616,28 @@ public enum EventCodes
616616
PickupFromPiledObjectFinished,
617617
ArmoryActivityChange,
618618
NewKillTrophyFurnitureBuilding,
619+
HellDungeonsPlayerJoinedInfo,
620+
NewTileSwitchTrigger,
621+
NewMultiRewardObject,
622+
NewHellDungeonSoulShrineObject,
623+
HellDungeonSoulShrineStateUpdate,
624+
NewResurrectionShrine,
625+
UpdateResurrectionShrine,
619626
StandTimeFinished,
620-
EpicAchievementAndStatsUpdate
627+
EpicAchievementAndStatsUpdate,
628+
SpectateTargetAfterDeathUpdate,
629+
SpectateTargetAfterDeathEnded,
630+
NewHellDungeonUpwardExit,
631+
NewHellDungeonSoulExit,
632+
NewHellDungeonDownwardExit,
633+
NewHellDungeonChestExit,
634+
NewCorruptedStaticEntrance,
635+
NewHellDungeonStaticEntrance,
636+
UpdateHellDungeonStaticEntranceState,
637+
DebugTriggerHellDungeonShutdownStart,
638+
FullJournalQuestInfo,
639+
JournalQuestProgressInfo,
640+
NewHellDungeonRoomShrineObject,
641+
HellDungeonRoomShrineStateUpdate,
642+
SimpleBehaviourBuildingStateUpdate
621643
}

src/StatisticsAnalysisTool/Network/OperationCodes.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ public enum OperationCodes
142142
GetCharacterSteamAchievements,
143143
GetCharacterStats,
144144
GetKillHistoryDetails,
145-
LearnMasteryLevel,
146145
ReSpecAchievement,
147146
ChangeAvatar,
148147
GetRankings,
@@ -341,6 +340,8 @@ public enum OperationCodes
341340
LinkAccountToSteamId,
342341
EpicIdHasActiveAccount,
343342
LinkAccountToEpicId,
343+
XboxIdHasActiveAccount,
344+
LinkAccountToXboxToken,
344345
InAppConfirmPaymentGooglePlay,
345346
InAppConfirmPaymentAppleAppStore,
346347
InAppPurchaseRequest,
@@ -507,6 +508,7 @@ public enum OperationCodes
507508
PartyReadyCheckUpdate,
508509
ClaimAlbionJournalReward,
509510
TrackAlbionJournalAchievements,
511+
TrackAlbionJournalAchievementSubCategory,
510512
RequestOutlandsTeleportationUsage,
511513
PickupFromPiledObjectStart,
512514
PickupFromPiledObjectCancel,
@@ -518,5 +520,11 @@ public enum OperationCodes
518520
AssetOverviewSearchTabs,
519521
AssetOverviewSearchTabContent,
520522
AssetOverviewRecoverPlayerVault,
521-
ImmortalizeKillTrophy
523+
ImmortalizeKillTrophy,
524+
ArmorySearch,
525+
ArmoryItemUsageStatistics,
526+
ArmoryActivityUsageStatistics,
527+
HellDungeonUseStaticEntrance,
528+
TravelIslandShowroom,
529+
GetXuids
522530
}

src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("Aaron Schultz")]
1414
[assembly: AssemblyProduct("StatisticsAnalysisTool")]
15-
[assembly: AssemblyCopyright("Copyright © 2023")]
15+
[assembly: AssemblyCopyright("Copyright © 2025")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818
[assembly: SupportedOSPlatform("windows")]
@@ -53,5 +53,5 @@
5353
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
5454
// indem Sie "*" wie unten gezeigt eingeben:
5555
// [assembly: AssemblyVersion("1.0.*")]
56-
[assembly: AssemblyVersion("8.4.0.*")]
57-
[assembly: AssemblyFileVersion("8.4.0.0")]
56+
[assembly: AssemblyVersion("8.5.0.*")]
57+
[assembly: AssemblyFileVersion("8.5.0.0")]

src/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
<PackageReference Include="BinaryFormat.Udp" Version="0.1.5" />
624624
<PackageReference Include="Libpcap" Version="0.1.5" />
625625
<PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-rc5.4" />
626-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3065.39" />
626+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3296.44" />
627627
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
628628
<PackageReference Include="FontAwesome5" Version="2.1.11" />
629629
<PackageReference Include="Notification.Wpf" Version="8.0.0" />
@@ -632,9 +632,9 @@
632632
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
633633
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
634634
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
635-
<PackageReference Include="SkiaSharp" Version="3.116.1" />
636-
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
637-
<PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
635+
<PackageReference Include="SkiaSharp" Version="3.119.0" />
636+
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
637+
<PackageReference Include="VirtualizingWrapPanel" Version="2.2.1" />
638638
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
639639
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.2" />
640640
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />

0 commit comments

Comments
 (0)