4.8

.github/workflows/dotnet.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
     - name: Restore dependencies
@@ -24,7 +24,7 @@ jobs:
     - name: Publish
       run: dotnet publish --property:OutputPath=.\publish\
     - name: Upload artifact
-      uses: actions/upload-artifact@v3.1.0
+      uses: actions/upload-artifact@v4
       with:
         name: Artifacts
         path: publish

README.md

@@ -36,7 +36,7 @@
 
 ## 常见问题
 0. Q: 打不开   
-   A: 安装 [.NET Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-7.0.3-windows-x64-installer)
+   A: 安装 [.NET Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.4-windows-x64-installer)
 
 1. Q: 原神启动时报错: 数据异常(31-4302)   
    A: 不要把软件和原神主程序放一起   

README_EN.md

@@ -6,9 +6,6 @@
 
 [简体中文](README.md) | English
    
-**I18n support currently in [snapshot version](https://github.com/HolographicHat/YaeAchievement/actions/)**   
-**Next release: 2022/09/28 (Genshin 3.1)**
-   
 </div>
 
 - Support for exporting all categories of achievements
@@ -39,7 +36,7 @@
 
 ## Frequently asked questions
 0. Q: Unable to start   
-   A: Download and install [.NET Runtime 7](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-7.0.7-windows-x64-installer) or ` winget install Microsoft.DotNet.Runtime.7`
+   A: Download and install [.NET Runtime 7](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.4-windows-x64-installer) or ` winget install Microsoft.DotNet.Runtime.8`
  
 
 1. Q: Error while Genshin started: Data Exception (31-4302)   

Tutorial.md

@@ -10,7 +10,7 @@
 
 2.安装启动软件所需文件（若已安装该运行时可忽略此步骤）
 
-点击该网址：https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-7.0.3-windows-x64-installer 。
+点击该网址：https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.4-windows-x64-installer 。
 
 进入网页后浏览器会自动弹出下载，同样地，将文件保存在桌面或者其它易于寻找的文件夹内。
 

Tutorial_EN.md

@@ -11,7 +11,7 @@ Click on the file named "YaeAchievement.exe" in the red box to automatically pop
 
 2.Install .NET Runtime 7 (this step can be ignored if the runtime is already installed)
 
-Click Here：https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-7.0.7-windows-x64-installer .
+Click Here：https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.4-windows-x64-installer .
 
 Or `winget install Microsoft.DotNet.Runtime.7` if you use Windows 11 or have Winget installed.
 

lib/YaeAchievementLib.vcxproj

@@ -112,7 +112,6 @@
     <ClInclude Include="src\HookManager.h" />
     <ClInclude Include="src\il2cpp-appdata.h" />
     <ClInclude Include="src\il2cpp-functions.h" />
-    <ClInclude Include="src\il2cpp-types-ptr.h" />
     <ClInclude Include="src\il2cpp-types.h" />
     <ClInclude Include="src\il2cpp-init.h" />
     <ClInclude Include="src\pch.h" />

lib/src/dllmain.cpp

@@ -15,24 +15,24 @@ using Genshin::ByteArray;
 HWND unityWnd = nullptr;
 HANDLE hPipe  = nullptr;
 
+void* baClass;
 std::string checksum;
 
 namespace Hook {
 
 	ByteArray* UnityEngine_RecordUserData(const INT type) {
 		if (type == 0) {
-			const auto arr = new ByteArray {};
 			const auto len = checksum.length();
-			arr->max_length = len;
+			const auto arr = Genshin::il2cpp_array_new_specific(baClass, len);
 			memcpy(&arr->vector[0], checksum.data(), len);
 			return arr;
 		}
-		return new ByteArray {};
+		return Genshin::il2cpp_array_new_specific(baClass, 0);
 	}
 	
 	uint16_t BitConverter_ToUInt16(ByteArray* val, const int startIndex) {
 		const auto ret = CALL_ORIGIN(BitConverter_ToUInt16, val, startIndex);
-		if (ret == 0xAB89 && ReadMapped<UINT16>(val->vector, 2) == 1655) {
+		if (ret == 0xAB89 && ReadMapped<UINT16>(val->vector, 2) == 3199) {
 			const auto headLength = ReadMapped<UINT16>(val->vector, 4);
 			const auto dataLength = ReadMapped<UINT32>(val->vector, 6);
 			const auto cStr = base64_encode(val->vector + 10 + headLength, dataLength) + "\n";
@@ -56,9 +56,10 @@ void Run(HMODULE* phModule) {
 	for (int i = 0; i < 3; i++) {
 		const auto result = Genshin::RecordUserData(i);
 		checksum += string(reinterpret_cast<char*>(&result->vector[0]), result->max_length);
+		baClass = result->klass;
 	}
+	HookManager::install(Genshin::RecordUserData, Hook::UnityEngine_RecordUserData);
 	HookManager::install(Genshin::BitConverter_ToUInt16, Hook::BitConverter_ToUInt16);
-	HookManager::install(Genshin::UnityEngine_RecordUserData, Hook::UnityEngine_RecordUserData);
 	hPipe = CreateFile(R"(\\.\pipe\YaeAchievementPipe)", GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
 	if (hPipe == INVALID_HANDLE_VALUE) {
 		Win32ErrorDialog(1001);

lib/src/il2cpp-appdata.h

@@ -5,15 +5,7 @@
 
 // Application-specific functions
 #define DO_APP_FUNC(ca, oa, r, n, p) extern r (*n) p
-#define DO_UNI_FUNC(ca, oa, r, n, p) extern r (*n) p
 namespace Genshin {
 #include "il2cpp-functions.h"
 }
-#undef DO_UNI_FUNC
 #undef DO_APP_FUNC
-
-#define DO_TYPEDEF(ca, oa, n) extern n##__Class **n##__TypeInfo
-namespace Genshin {
-#include "il2cpp-types-ptr.h"
-}
-#undef DO_TYPEDEF

lib/src/il2cpp-functions.h

@@ -2,10 +2,8 @@ using namespace Genshin;
 
 // DO_APP_FUNC(CN_OFFSET, OS_OFFSET, RETURN, FUNC_NAME, (ARGS...));
 
-DO_APP_FUNC(0x57A390, 0x579D00, LPVOID, il2cpp_object_new, (LPVOID t));
+DO_APP_FUNC(0x0052A510, 0x0052ED10, ByteArray*, il2cpp_array_new_specific, (void* arrayTypeInfo, uint64_t length));
 
-DO_APP_FUNC(0x07315A30, 0x0710F580, ByteArray*, RecordUserData, (int32_t nType));
+DO_APP_FUNC(0x01688250, 0x0168CB50, ByteArray*, RecordUserData, (int32_t nType));
 
-DO_APP_FUNC(0x0D257150, 0x0D244830, uint16_t, BitConverter_ToUInt16, (ByteArray* val, int startIndex));
+DO_APP_FUNC(0x0FC7D610, 0x0FCA7240, uint16_t, BitConverter_ToUInt16, (ByteArray* val, int startIndex));
-
-DO_UNI_FUNC(0x10CF80, 0x10CF80, ByteArray*, UnityEngine_RecordUserData, (int32_t nType));

lib/src/il2cpp-init.cpp

@@ -1,38 +1,26 @@
+// ReSharper disable CppCStyleCast
+// ReSharper disable CppInconsistentNaming
 // ReSharper disable CppClangTidyBugproneMacroParentheses
+// ReSharper disable CppClangTidyClangDiagnosticCastAlign
 
 #include "pch.h"
 
 #include "il2cpp-init.h"
 
 #define DO_APP_FUNC(ca, oa, r, n, p) r (*n) p
-#define DO_UNI_FUNC(ca, oa, r, n, p) r (*n) p
 namespace Genshin {
 #include "il2cpp-functions.h"
 }
-#undef DO_UNI_FUNC
 #undef DO_APP_FUNC
 
-#define DO_TYPEDEF(ca, oa, n) n##__Class **n##__TypeInfo
-namespace Genshin {
-#include "il2cpp-types-ptr.h"
-}
-#undef DO_TYPEDEF
-
 using std::string;
 
 void InitIL2CPP() {
 	TCHAR szFileName[MAX_PATH];
-	GetModuleFileName(NULL, szFileName, MAX_PATH);
+	GetModuleFileName(nullptr, szFileName, MAX_PATH);
-	auto isCN = strstr(szFileName, "YuanShen.exe");//string(szFileName).contains();
+	const auto isCN = strstr(szFileName, "YuanShen.exe");
-	auto hBase = GetModuleHandle("UserAssembly.dll");
+	const auto uBase = reinterpret_cast<uint64_t>(GetModuleHandle(isCN ? "YuanShen.exe" : "GenshinImpact.exe"));
-	auto bAddr = (UINT64)hBase;
+	#define DO_APP_FUNC(ca, oa, r, n, p) n = (r (*) p)(uBase + (isCN ? ca : oa))
-	auto cAddr = (UINT64)GetModuleHandle("UnityPlayer.dll");
-	#define DO_APP_FUNC(ca, oa, r, n, p) n = (r (*) p)(bAddr + (isCN ? ca : oa))
-	#define DO_UNI_FUNC(ca, oa, r, n, p) n = (r (*) p)(cAddr + (isCN ? ca : oa))
 	#include "il2cpp-functions.h"
-	#undef DO_UNI_FUNC
 	#undef DO_APP_FUNC
-	#define DO_TYPEDEF(ca, oa, n) n##__TypeInfo = (n##__Class **)(bAddr + (isCN ? ca : oa))
-	#include "il2cpp-types-ptr.h"
-	#undef DO_TYPEDEF
 }

lib/src/il2cpp-types.h

@@ -3,43 +3,13 @@
 
 #pragma once
 
-#pragma region IL2CPPInternalTypes
-
-typedef uint16_t Il2CppChar;
-typedef uintptr_t il2cpp_array_size_t;
-typedef int32_t il2cpp_array_lower_bound_t;
-
-typedef struct Il2CppObject {
-    union {
-        void* klass;
-        void* vtable;
-    } Il2CppClass;
-    void* monitor;
-} Il2CppObject;
-
-typedef struct Il2CppString {
-    Il2CppObject object;
-    int32_t length;
-    Il2CppChar chars[32];
-} Il2CppString;
-
-typedef struct Il2CppArrayBounds {
-    il2cpp_array_size_t length;
-    il2cpp_array_lower_bound_t lower_bound;
-} Il2CppArrayBounds;
-
-#pragma endregion
-
 namespace Genshin {
 
     struct ByteArray {
         void* klass;
         void* monitor;
-        Il2CppArrayBounds* bounds;
+        void* bounds;
-        il2cpp_array_size_t max_length;
+        uint64_t max_length;
         uint8_t vector[32];
     };
-    
-    struct CodedOutputStream__Class {
-    };
 }

lib/src/pch.h

@@ -14,12 +14,8 @@
 // 添加要在此处预编译的标头
 
 #include <map>
-#include <set>
 #include <string>
-#include <vector>
-#include <codecvt>
 #include <cstdint>
-#include <iostream>
 #include <detours.h>
 #include "HookManager.h"
 #include "il2cpp-appdata.h"

lib/src/util.cpp

@@ -12,24 +12,12 @@ VOID DisableVMProtect() {
     VirtualProtect(pNtProtectVirtualMemory, 1, old, &old);
 }
 
-#pragma region StringConvert
-
-string ToString(Il2CppString* str, UINT codePage) {
-    auto chars = reinterpret_cast<const wchar_t*>(str->chars);
-    auto len = WideCharToMultiByte(codePage, 0, chars, -1, nullptr, 0, nullptr, nullptr);
-    auto buffer = new char[len];
-    WideCharToMultiByte(codePage, 0, chars, -1, buffer, len, nullptr, nullptr);
-    return string(buffer);
-}
-
-#pragma endregion
-
 #pragma region ByteUtils
 
 bool IsLittleEndian() {
     UINT i = 1;
     char* c = (char*)&i;
-    return (*c);
+    return *c;
 }
 
 #pragma endregion

lib/src/util.h

@@ -5,10 +5,9 @@ using std::string;
 VOID DisableVMProtect();
 bool IsLittleEndian();
 HWND FindMainWindowByPID(DWORD pid);
-string ToString(Il2CppString* str, UINT codePage = CP_ACP);
 std::string base64_encode(BYTE const* buf, unsigned int bufLen);
 
-#define ErrorDialogT(title, msg) MessageBox(unityWnd, msg, title, MB_OK | MB_ICONERROR | MB_SYSTEMMODAL);
+#define ErrorDialogT(title, msg) MessageBox(unityWnd, msg, title, MB_OK | MB_ICONERROR | MB_SYSTEMMODAL)
 #define ErrorDialog(msg) ErrorDialogT("YaeAchievement", msg)
 #define Win32ErrorDialog(code) ErrorDialogT("YaeAchievement", ("CRITICAL ERROR!\nError code: " + std::to_string(GetLastError()) + "-"#code"\n\nPlease take the screenshot and contact developer by GitHub Issue to solve this problem\nNOT MIHOYO/COGNOSPHERE CUSTOMER SERVICE!").c_str())
 

res/proto/AchievementAllDataNotify.proto

@@ -9,11 +9,11 @@ message Achievement {
     FINISHED = 2;
     REWARD_TAKEN = 3;
   }
-  uint32 timestamp = 13;
+  uint32 timestamp = 7;
-  uint32 current = 6;
+  uint32 current = 12;
-  uint32 total = 9;
+  uint32 total = 5;
-  uint32 id = 1;
+  uint32 id = 15;
-  Status status = 2;
+  Status status = 8;
 }
 
 message AchievementAllDataNotify {

src/GlobalVars.cs

@@ -20,8 +20,8 @@ public static class GlobalVars {
     public static readonly string CachePath = Path.Combine(DataPath, "cache");
     public static readonly string LibFilePath = Path.Combine(DataPath, "YaeAchievement.dll");
     
-    public const uint   AppVersionCode = 46;
+    public const uint   AppVersionCode = 48;
-    public const string AppVersionName = "3.6";
+    public const string AppVersionName = "3.8";
     
     public const string PipeName = "YaeAchievementPipe";
     public const string BucketHost = "https://cn-cd-1259389942.file.myqcloud.com";

src/Program.cs

@@ -1,8 +1,12 @@
-using Proto;
+using System.Text;
+using Proto;
 using YaeAchievement;
 using YaeAchievement.res;
 using static YaeAchievement.Utils;
 
+Console.InputEncoding = Encoding.UTF8;
+Console.OutputEncoding = Encoding.UTF8;
+
 TryDisableQuickEdit();
 InstallExitHook();
 InstallExceptionHook();