1 Commits
2.3.4 ... 2.3.5

Author SHA1 Message Date
5f1708129a UPDATE: Fix bug 2026-01-15 13:22:19 +07:00
4 changed files with 13 additions and 7 deletions

Binary file not shown.

View File

@@ -19,24 +19,25 @@ export function useGlobalEvents() {
const onProxyExit = () => setProxyRunning(false); const onProxyExit = () => setProxyRunning(false);
const onDownload = (event: any) => { const onDownload = (event: any) => {
const { percent, speed } = event.data[0]; const { percent, speed } = event.data;
setProgressDownload(Number(percent)); setProgressDownload(Number(percent));
setDownloadSpeed(speed); setDownloadSpeed(speed);
}; };
const onUpdateProgress = (event: any) => { const onUpdateProgress = (event: any) => {
const { progress, maxProgress } = event.data[0]; console.log(event)
const { progress, maxProgress } = event.data;
setProgressUpdate(Number(progress)); setProgressUpdate(Number(progress));
setMaxProgressUpdate(Number(maxProgress)); setMaxProgressUpdate(Number(maxProgress));
}; };
const onMessageUpdate = (event: any) => { const onMessageUpdate = (event: any) => {
const { message } = event.data[0]; const { message } = event.data;
setMessageUpdate(message); setMessageUpdate(message);
}; };
const onStageUpdate = (event: any) => { const onStageUpdate = (event: any) => {
const { stage } = event.data[0]; const { stage } = event.data;
setStageType(stage); setStageType(stage);
}; };
@@ -49,7 +50,7 @@ export function useGlobalEvents() {
Events.On("diff:message", onMessageUpdate); Events.On("diff:message", onMessageUpdate);
Events.On("diff:stage", onStageUpdate); Events.On("diff:stage", onStageUpdate);
Events.On("diff:error", (event: any) => { Events.On("diff:error", (event: any) => {
const { message } = event.data[0]; const { message } = event.data;
toast.error(message); toast.error(message);
}); });
Events.On("window:close", async () => { Events.On("window:close", async () => {

View File

@@ -68,9 +68,11 @@ func (h *DiffService) VersionValidate(gamePath, patchPath string) (bool, string)
if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes.hdiff", constant.TempUrl); err != nil { if err := sevenzip.ExtractAFileFromZip(patchPath, "StarRail_Data\\StreamingAssets\\BinaryVersion.bytes.hdiff", constant.TempUrl); err != nil {
return false, err.Error() return false, err.Error()
} }
patchBinFile := filepath.Join(constant.TempUrl, "BinaryVersion.bytes.hdiff") patchBinFile := filepath.Join(constant.TempUrl, "BinaryVersion.bytes.hdiff")
sourceBinFile := oldBinPath sourceBinFile := oldBinPath
tempBinFile = filepath.Join(constant.TempUrl, "BinaryVersion.bytes") tempBinFile = filepath.Join(constant.TempUrl, "BinaryVersion.bytes")
if err := hpatchz.ApplyPatch(sourceBinFile, patchBinFile, tempBinFile); err != nil { if err := hpatchz.ApplyPatch(sourceBinFile, patchBinFile, tempBinFile); err != nil {
os.Remove(patchBinFile) os.Remove(patchBinFile)
return false, err.Error() return false, err.Error()
@@ -172,9 +174,11 @@ func (h *DiffService) HDiffPatchData(gamePath string) (bool, string) {
if err != nil { if err != nil {
return false, err.Error() return false, err.Error()
} }
if err := json.Unmarshal(data, &jsonData); err != nil { var hdiffJson []*models.HDiffData
if err := json.Unmarshal(data, &hdiffJson); err != nil {
return false, err.Error() return false, err.Error()
} }
jsonData.DiffMap = append(jsonData.DiffMap, hdiffJson...)
} else if _, err := os.Stat(hdiffFilesPath); err == nil { } else if _, err := os.Stat(hdiffFilesPath); err == nil {
files, err := models.LoadHDiffFiles(hdiffFilesPath) files, err := models.LoadHDiffFiles(hdiffFilesPath)
if err != nil { if err != nil {
@@ -188,6 +192,7 @@ func (h *DiffService) HDiffPatchData(gamePath string) (bool, string) {
} }
application.Get().Event.Emit("diff:stage", map[string]string{"stage": "Patching HDiff"}) application.Get().Event.Emit("diff:stage", map[string]string{"stage": "Patching HDiff"})
for i, entry := range jsonData.DiffMap { for i, entry := range jsonData.DiffMap {
application.Get().Event.Emit( application.Get().Event.Emit(
"diff:progress", map[string]int{ "diff:progress", map[string]int{

View File

@@ -10,7 +10,7 @@ const ProxyFile = "firefly-go-proxy.exe"
const LauncherFile = "firefly-launcher.exe" const LauncherFile = "firefly-launcher.exe"
const TempUrl = "./temp" const TempUrl = "./temp"
const CurrentLauncherVersion = "2.3.4" const CurrentLauncherVersion = "2.3.5"
type ToolFile string type ToolFile string