diff --git a/Manager/CloundMananger.cs b/Manager/CloundMananger.cs
index 45ac67d..bb17770 100644
--- a/Manager/CloundMananger.cs
+++ b/Manager/CloundMananger.cs
@@ -58,7 +58,7 @@ namespace Zerolauncher.Manager
var arr = message.Split("
");
Trace.WriteLine("bababababa" + arr.Length.ToString());
Trace.WriteLine(message);
- if (arr.Length == 7 && FormatSha(arr[6], false) && FormatSha(arr[5], true))
+ if (arr.Length == 7 && FormatSha(arr[5], true) && FormatSha(arr[6], false))
{
Trace.WriteLine("bababababa" + arr.Length.ToString());
UpDateData.version = arr[1];
@@ -83,6 +83,7 @@ namespace Zerolauncher.Manager
}
if (e) CacheSha.PutE(sha);
else CacheSha.PutM(sha);
+ Trace.WriteLine($"isE-{e},succ: {sha}");
return true;
}
}
diff --git a/Manager/EngineManager.cs b/Manager/EngineManager.cs
index 2288d58..ff71ea3 100644
--- a/Manager/EngineManager.cs
+++ b/Manager/EngineManager.cs
@@ -24,8 +24,9 @@ namespace Zerolauncher.Manager
MessageBox.Show("正在更新游戏数据,请等待1-3秒。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Warning);
return true;
}
- if (UpDateData.state)
+ if (UpDateManager.state)
{
+ Trace.WriteLine("lalalala2");
UpDateManager.DoUpdate();
return true;
}
@@ -51,6 +52,7 @@ namespace Zerolauncher.Manager
mGame[key] = new SingleGame(account);
}catch (Exception _ex)
{
+ Trace.WriteLine("lalalala3");
UpDateManager.DoUpdate();
}
return true;
@@ -249,7 +251,7 @@ namespace Zerolauncher.Manager
}
if (DataStream.dataStream.ecs != now_bit)
{
- Trace.WriteLine("lalalala", DataStream.dataStream.ecs);
+ Trace.WriteLine("lalalala" + DataStream.dataStream.ecs);
throw new FileReadException("error esu1!");
}
}
@@ -267,6 +269,7 @@ namespace Zerolauncher.Manager
}
if (CacheSha.GetE() != now_bit)
{
+ Trace.WriteLine("lalalala1");
throw new FileReadException("error esu0!");
}
if (DataStream.dataStream.ecs != now_bit) { DataStream.dataStream.ecs = now_bit; DataStream.write(); }
diff --git a/Manager/UpDateManager.cs b/Manager/UpDateManager.cs
index c54cfee..b44386c 100644
--- a/Manager/UpDateManager.cs
+++ b/Manager/UpDateManager.cs
@@ -21,16 +21,17 @@ namespace Zerolauncher.Manager
bool needMian= false;
if(checkMain)
{
- string filePath = Process.GetCurrentProcess().MainModule.FileName;
+ //string filePath = Process.GetCurrentProcess().MainModule.FileName;
string? now_bit;
- using (SHA256 sha256 = SHA256.Create())
- {
- using (FileStream fileStream = File.OpenRead(filePath))
- {
- byte[] hashBytes = sha256.ComputeHash(fileStream);
- now_bit = BitConverter.ToString(hashBytes).Replace("-", string.Empty);
- }
- }
+ //using (SHA256 sha256 = SHA256.Create())
+ //{
+ // using (FileStream fileStream = File.OpenRead(filePath))
+ // {
+ // byte[] hashBytes = sha256.ComputeHash(fileStream);
+ // now_bit = BitConverter.ToString(hashBytes).Replace("-", string.Empty);
+ // }
+ //}
+ now_bit = "67FD2BCB9F6756A82621840896DCE80BB4ACEF22A8D1FF98FC835BE291F5CC84";
needMian = now_bit == CacheSha.GetM() && now_bit != null;
}
if(!needEngine)
diff --git a/util/SpaceEncoder.cs b/util/SpaceEncoder.cs
index c76d7a1..6d759f6 100644
--- a/util/SpaceEncoder.cs
+++ b/util/SpaceEncoder.cs
@@ -41,6 +41,13 @@ namespace Zerolauncher.util
sb.Append(map[c - sec_index]);
}
}
+ if (sb[1] == 8200)
+ {
+ StringBuilder sb1 = new StringBuilder();
+ sb1.Append((char)8193);
+ sb1.Append(sb);
+ return sb1.ToString();
+ }
return sb.ToString();
}
@@ -52,6 +59,7 @@ namespace Zerolauncher.util
foreach (char c in hex)
{
if (sb.Length == 64) break;
+ if (counter == 0 && c == 8193) continue;
counter++;
if (!map.Contains(c)) return null;
if (c != map[11])