【obfz】兼容删除dnlib

[change] validate unsupported parameter type(.e.g string) in MonoPInvokeCallback signature when generate MethodBridge file

CHANGELOG.md

@@ -1,5 +0,0 @@
-# change logs
-
-- 2022.8.30 创建
-
-

Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 94322e93a1f61b340bdc1d5042dab659
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a96a2c46326d2a84984c2820bd4bfc91
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 33c064b00b452284f93cd6e89de8a06d
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f42c0f03663d4c14f8a49912c08a514f
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b3b3b1f0cbc038149acb4d23bc6d5bf5
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/Templates.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f54201f21d7421d4c894298aa5266c73
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/Templates/MethodBridge_Arm64.cpp.txt

@@ -1,22 +0,0 @@
-#include "MethodBridge.h"
-
-#include <codegen/il2cpp-codegen-metadata.h>
-#include "vm/ClassInlines.h"
-#include "vm/Object.h"
-#include "vm/Class.h"
-
-#include "../metadata/MetadataModule.h"
-#include "../metadata/MetadataUtil.h"
-
-#include "Interpreter.h"
-#include "MemoryUtil.h"
-#include "InstrinctDef.h"
-
-using namespace hybridclr::interpreter;
-using hybridclr::GetInterpreterDirectlyCallMethodPointer;
-
-#if HYBRIDCLR_ABI_ARM_64
-//!!!{{INVOKE_STUB
-
-//!!!}}INVOKE_STUB
-#endif

Data/Templates/MethodBridge_Arm64.cpp.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1249fb131a848a14f8dd0938e3cc2558
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/Templates/MethodBridge_Universal32.cpp.txt

@@ -1,22 +0,0 @@
-#include "MethodBridge.h"
-
-#include <codegen/il2cpp-codegen-metadata.h>
-#include "vm/ClassInlines.h"
-#include "vm/Object.h"
-#include "vm/Class.h"
-
-#include "../metadata/MetadataModule.h"
-#include "../metadata/MetadataUtil.h"
-
-#include "Interpreter.h"
-#include "MemoryUtil.h"
-#include "InstrinctDef.h"
-
-using namespace hybridclr::interpreter;
-using hybridclr::GetInterpreterDirectlyCallMethodPointer;
-
-#if HYBRIDCLR_ABI_UNIVERSAL_32
-//!!!{{INVOKE_STUB
-
-//!!!}}INVOKE_STUB
-#endif

Data/Templates/MethodBridge_Universal32.cpp.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e06e14385d246aa4ab853d3fd04d6eec
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/Templates/MethodBridge_Universal64.cpp.txt

@@ -1,22 +0,0 @@
-#include "MethodBridge.h"
-
-#include <codegen/il2cpp-codegen-metadata.h>
-#include "vm/ClassInlines.h"
-#include "vm/Object.h"
-#include "vm/Class.h"
-
-#include "../metadata/MetadataModule.h"
-#include "../metadata/MetadataUtil.h"
-
-#include "Interpreter.h"
-#include "MemoryUtil.h"
-#include "InstrinctDef.h"
-
-using namespace hybridclr::interpreter;
-using hybridclr::GetInterpreterDirectlyCallMethodPointer;
-
-#if HYBRIDCLR_ABI_UNIVERSAL_64
-//!!!{{INVOKE_STUB
-
-//!!!}}INVOKE_STUB
-#endif

Data/Templates/MethodBridge_Universal64.cpp.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2965fa89651ee0c4eb4c4fdcf95b76b8
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/Templates/ReversePInvokeMethodStub.cpp.txt

@@ -1,36 +0,0 @@
-#include "ReversePInvokeMethodStub.h"
-#include "MetadataModule.h"
-
-namespace hybridclr
-{
-namespace metadata
-{
-	//!!!{{REVERSE_PINVOKE_METHOD_STUB
-	
-	void CallLuaFunction(void* xState, int32_t wrapperIndex)
-	{
-		const MethodInfo* method = MetadataModule::GetMethodInfoByReversePInvokeWrapperIndex(wrapperIndex);
-		typedef void (*Callback)(void* xState, const MethodInfo* method);
-		((Callback)GetInterpreterDirectlyCallMethodPointer(method))(xState, method);
-	}
-
-	void __ReversePInvokeMethod_0(void* xState)
-	{
-		CallLuaFunction(xState, 0);
-	}
-
-	void __ReversePInvokeMethod_1(void* xState)
-	{
-		CallLuaFunction(xState, 1);
-	}
-
-	Il2CppMethodPointer s_ReversePInvokeMethodStub[]
-	{
-		(Il2CppMethodPointer)__ReversePInvokeMethod_0,
-		(Il2CppMethodPointer)__ReversePInvokeMethod_1,
-		nullptr,
-	};
-
-	//!!!}}REVERSE_PINVOKE_METHOD_STUB
-}
-}

Data/Templates/ReversePInvokeMethodStub.cpp.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6447cdc1825eeef49a3679545ac31d95
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c9442afcb42f28646a509d70ffe3d880
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild/CMakeLists.txt

@@ -1,88 +0,0 @@
-# file: CMakeList.txt
-cmake_minimum_required(VERSION 3.0)
-set(CMAKE_OSX_DEPLOYMENT_TARGET iOS)
-
-set(TMP $ENV{HUATUO_IL2CPP_SOURCE_DIR})
-if ( NOT TMP )
-    message(FATAL_ERROR "需要设置环境变量: HUATUO_IL2CPP_SOURCE_DIR")
-else()
-    message(STATUS "unity il2cpp 路径为: ${TMP}")
-endif()
-
-set(SDK_VERSION $ENV{IPHONESIMULATOR_VERSION})
-if ( SDK_VERSION )
-    message(STATUS "使用iPhoneSimulator版本:" ${SDK_VERSION})
-else()
-    message(STATUS "当前使用默认版本的iPhoneSimulator，可以通过设置环境变量IPHONESIMULATOR_VERSION，指定版本")
-endif()
-
-project(il2cpp)
-execute_process(COMMAND sh gen_lump.sh ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
-add_subdirectory(external)
-add_subdirectory(objective)
-
-
-set(IL2CPP_SOURCE_DIR $ENV{HUATUO_IL2CPP_SOURCE_DIR})
-
-message(STATUS "il2cpp project, binary dir: " ${CMAKE_BINARY_DIR})
-message(STATUS "il2cpp project, build dir: " ${PROJECT_BINARY_DIR})
-message(STATUS "il2cpp project, il2cpp source dir: " ${IL2CPP_SOURCE_DIR})
-
-
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-find_program(CLANG_EXECUTABLE NAMES clang clang-7 clang-8 clang-9 clang-10)
-if (NOT CLANG_EXECUTABLE)
-    message(FATAL_ERROR "Cannot find any clang executable.")
-endif()
-
-
-set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK_VERSION}.sdk)
-
-#set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_COMPILER clang++)
-set(CMAKE_C_COMPILER clang)
-#add_compile_options(-x objective-c++)
-
-# 以下命令为复制的Xcode生成中的命令
-set(CMAKE_CXX_FLAGS "-target arm64-apple-ios11.0 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++1z -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -fmodules-ignore-macro=IL2CPP_TARGET_IOS=1 -fembed-bitcode -fmodules-ignore-macro=BASELIB_DYNAMICLIBRARY=1 -fmodules-ignore-macro=BASELIB_INLINE_NAMESPACE=il2cpp_baselib -fmodules-ignore-macro=AARCH64 -fmodules-ignore-macro=__aarch64__ -fmodules-ignore-macro=IL2CPP_SUPPORT_THREADS -fmodules-ignore-macro=IL2CPP_THREADS_PTHREAD -Wnon-modular-include-in-framework-module -Werror=non-modular-include-in-framework-module -Wno-trigraphs -fpascal-strings -Os -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Werror=return-type -Wdocumentation -Wunreachable-code -Wquoted-include-in-framework-header -Werror=deprecated-objc-isa-usage -Werror=objc-root-class -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wempty-body -Wuninitialized -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DIL2CPP_TARGET_IOS=1 -isysroot ${CMAKE_OSX_SYSROOT} -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -Wunguarded-availability ")
-
-
-add_definitions(-DIL2CPP_TARGET_IOS=1)
-add_definitions(-DBASELIB_DYNAMICLIBRARY=1)
-add_definitions(-DBASELIB_INLINE_NAMESPACE=il2cpp_baselib)
-add_definitions(-DAARCH64)
-add_definitions(-D__aarch64__)
-add_definitions(-DIL2CPP_SUPPORT_THREADS)
-add_definitions(-DIL2CPP_THREADS_PTHREAD)
-#add_definitions(-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
-#add_definitions(-DCMAKE_CXX_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++)
-#add_definitions(-DIL2CPP_TARGET_DARWIN)
-add_definitions(-DIL2CPP_PLATFORM_SUPPORTS_TIMEZONEINFO)
-
-add_definitions(-MMD)
-add_definitions(-MT dependencies)
-
-
-include_directories(${IL2CPP_SOURCE_DIR}/libil2cpp/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Include/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/bdwgc/include/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Platforms/OSX/Include/)
-
-# 修改为本机对应SDK路径
-include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/c++/v1)
-include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include)
-
-aux_source_directory(${PROJECT_BINARY_DIR}/lump_cpp LUMP_SOURCE_LIST)
-aux_source_directory(${IL2CPP_SOURCE_DIR}/libil2cpp LIBIL2CPP_SOURCE_LIST)
-
-#find_library(zlib ${PROJECT_SOURCE_DIR}/external)
-add_library(il2cpp_original STATIC ${LIBIL2CPP_SOURCE_LIST} ${LUMP_SOURCE_LIST})
-add_dependencies(il2cpp_original external objective)
-
-add_custom_command(TARGET il2cpp_original 
-    POST_BUILD
-    COMMAND xcrun -r libtool -static -o libil2cpp.a libil2cpp_original.a external/libexternal.a objective/libobjective.a
-    COMMENT "post build this is command combine libil2cpp_original.a, libojjective.a and libzlib.a into libil2cpp"
-    )

Data/iOSBuild/CMakeLists.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3436274d6dd0cc64fb4d15c898cc1d1d
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild/build_libil2cpp.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-export HUATUO_IL2CPP_SOURCE_DIR=$(pushd ../LocalIl2CppData-OSXEditor/il2cpp > /dev/null && pwd && popd > /dev/null)
-export IPHONESIMULATOR_VERSION=
-
-rm -rf build
-
-mkdir build
-cd build
-cmake ..
-make -j24
-
-if [ -f "libil2cpp.a" ]
-then
-	echo 'build succ'
-else
-    echo "build fail"
-    exit 1
-fi

Data/iOSBuild/external.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ed3bb85d9526f9468289a2e26dadf0b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild/external/CMakeLists.txt

@@ -1,47 +0,0 @@
-# file: external/CMakeList.txt
-cmake_minimum_required(VERSION 3.0)
-set(CMAKE_OSX_DEPLOYMENT_TARGET iOS)
-
-set(IL2CPP_SOURCE_DIR $ENV{HUATUO_IL2CPP_SOURCE_DIR})
-set(SDK_VERSION $ENV{IPHONESIMULATOR_VERSION})
-
-message(STATUS "external project, external source dir: " ${IL2CPP_SOURCE_DIR})
-
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-
-find_program(CLANG_EXECUTABLE NAMES clang clang-7 clang-8 clang-9 clang-10)
-if (NOT CLANG_EXECUTABLE)
-    message(FATAL_ERROR "Cannot find any clang executable.")
-endif()
-
-set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK_VERSION}.sdk)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_C_COMPILER clang)
-
-set(CMAKE_C_FLAGS "-x c -target arm64-apple-ios11.0 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu11 -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -fmodules-ignore-macro=IL2CPP_TARGET_IOS=1 -fembed-bitcode -fmodules-ignore-macro=BASELIB_DYNAMICLIBRARY=1 -fmodules-ignore-macro=BASELIB_INLINE_NAMESPACE=il2cpp_baselib -fmodules-ignore-macro=AARCH64 -fmodules-ignore-macro=__aarch64__ -fmodules-ignore-macro=IL2CPP_SUPPORT_THREADS -fmodules-ignore-macro=IL2CPP_THREADS_PTHREAD -Wnon-modular-include-in-framework-module -Werror=non-modular-include-in-framework-module -Wno-trigraphs -fpascal-strings -Os -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Werror=return-type -Wdocumentation -Wunreachable-code -Wquoted-include-in-framework-header -Werror=deprecated-objc-isa-usage -Werror=objc-root-class -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DIL2CPP_TARGET_IOS=1 -isysroot ${CMAKE_OSX_SYSROOT} -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -Wunguarded-availability")
-
-
-add_definitions(-DIL2CPP_TARGET_IOS=1)
-add_definitions(-DBASELIB_DYNAMICLIBRARY=1)
-add_definitions(-DBASELIB_INLINE_NAMESPACE=il2cpp_baselib)
-add_definitions(-DAARCH64)
-add_definitions(-D__aarch64__)
-#add_definitions(-D__arm64__)
-add_definitions(-DIL2CPP_SUPPORT_THREADS)
-add_definitions(-DIL2CPP_THREADS_PTHREAD)
-#add_definitions(-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
-#add_definitions(-DCMAKE_CXX_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++)
-#add_definitions(-DIL2CPP_TARGET_DARWIN)
-add_definitions(-DIL2CPP_PLATFORM_SUPPORTS_TIMEZONEINFO=0)
-
-add_definitions(-MMD)
-add_definitions(-MT dependencies)
-
-include_directories(${IL2CPP_SOURCE_DIR}/external/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Include/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/bdwgc/include/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Platforms/OSX/Include/)
-
-aux_source_directory(${IL2CPP_SOURCE_DIR}/external/zlib/ ZLIB_C_SOURCE_LIST)
-add_library(external STATIC ${ZLIB_C_SOURCE_LIST})
-

Data/iOSBuild/external/CMakeLists.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 03b1d6a5f25828042a1d215904917995
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild/gen_lump.sh

@@ -1,64 +0,0 @@
-echo '====================================================================='
-echo 'gen lump'
-echo '$HUATUO_IL2CPP_SOURCE_DIR='${HUATUO_IL2CPP_SOURCE_DIR}   #/Applications/Unity/Unity.app/Contents/il2cpp/
-
-GEN_SOURCE_DIR=$1
-BASE_DIR=${HUATUO_IL2CPP_SOURCE_DIR}/libil2cpp
-echo base dir: ${BASE_DIR}
-echo " "
-#BASE_DIR=${HUATUO_IL2CPP_SOURCE_DIR}/libil2cpp
-function SearchCppFile()
-{
-    for f in $(ls $1)
-    do
-        SUB_DIR=$1/$f
-        if [ -d ${SUB_DIR} ]; then
-            SearchCppFile ${SUB_DIR}
-        fi
-    done
-
-    CPP_FILE_NUM=`ls -l $1/ | grep "\.cpp$"|wc -l`
-    if (( ${CPP_FILE_NUM} > 0 ))
-    then
-        for f in $1/*.cpp
-        do
-            echo "#include \""$f"\"" >> ${OUTPUT_FILE_NAME}
-        done
-    fi
-
-    MM_FILE_NUM=`ls -l $1/ | grep "\.mm$"|wc -l`
-    if (( ${MM_FILE_NUM} > 0 ))
-    then
-        for f in $1/*.mm
-        do
-            echo "#include \""$f"\"" >> ${OBJECTIVE_FILE_NAME}
-        done
-    fi
-}
-
-rm -rf ${GEN_SOURCE_DIR}/lump_cpp
-rm -rf ${GEN_SOURCE_DIR}/lump_mm
-mkdir ${GEN_SOURCE_DIR}/lump_cpp
-mkdir ${GEN_SOURCE_DIR}/lump_mm
-
-OBJECTIVE_FILE_NAME=${GEN_SOURCE_DIR}/lump_mm/lump_libil2cpp_ojective.mm
-echo "#include \"${BASE_DIR}/il2cpp-config.h\"" > ${OBJECTIVE_FILE_NAME}
-echo gen file: ${OBJECTIVE_FILE_NAME}
-
-for FOLDER in hybridclr vm pch utils vm-utils codegen metadata os debugger mono gc icalls
-do
-    OUTPUT_FILE_NAME=${GEN_SOURCE_DIR}/lump_cpp/lump_libil2cpp_${FOLDER}.cpp
-    echo "#include \"${BASE_DIR}/il2cpp-config.h\"" > ${OUTPUT_FILE_NAME}
-    if  [ $FOLDER = hybridclr ] || [ $FOLDER = vm ]
-    then
-        echo "#include \"${BASE_DIR}/codegen/il2cpp-codegen.h\"" >> ${OUTPUT_FILE_NAME}
-    fi
-    SearchCppFile ${BASE_DIR}/${FOLDER}
-    echo gen file: ${OUTPUT_FILE_NAME}
-done
-
-echo gen done.
-echo '====================================================================='
-echo " "
-
-

Data/iOSBuild/gen_lump.sh.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 641944d55f4cbc4449c3f8b3fcd4d7e5
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild/objective.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 01ed218875eaf574694fbe3a8e0c4a64
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data/iOSBuild/objective/CMakeLists.txt

@@ -1,62 +0,0 @@
-# file: CMakeList.txt
-cmake_minimum_required(VERSION 3.0)
-set(CMAKE_OSX_DEPLOYMENT_TARGET iOS)
-project(il2cpp)
-
-set(IL2CPP_SOURCE_DIR $ENV{HUATUO_IL2CPP_SOURCE_DIR})
-set(SDK_VERSION $ENV{IPHONESIMULATOR_VERSION})
-
-message(STATUS "objective project, binary dir: " ${PROJECT_BINARY_DIR})
-message(STATUS "objective project, il2cpp source dir: " ${PROJECT_SOURCE_DIR})
-
-
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-find_program(CLANG_EXECUTABLE NAMES clang clang-7 clang-8 clang-9 clang-10)
-if (NOT CLANG_EXECUTABLE)
-    message(FATAL_ERROR "Cannot find any clang executable.")
-endif()
-
-
-set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${SDK_VERSION}.sdk)
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_COMPILER clang++)
-set(CMAKE_C_COMPILER clang)
-#add_compile_options(-x objective-c++)
-
-# 以下命令为复制的Xcode生成中的命令
-set(CMAKE_CXX_FLAGS "-target arm64-apple-ios11.0 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -std=gnu++1z -fmodules -fmodules-prune-interval=86400 -fmodules-prune-after=345600 -fmodules-ignore-macro=IL2CPP_TARGET_IOS=1 -fembed-bitcode -fmodules-ignore-macro=BASELIB_DYNAMICLIBRARY=1 -fmodules-ignore-macro=BASELIB_INLINE_NAMESPACE=il2cpp_baselib -fmodules-ignore-macro=AARCH64 -fmodules-ignore-macro=__aarch64__ -fmodules-ignore-macro=IL2CPP_SUPPORT_THREADS -fmodules-ignore-macro=IL2CPP_THREADS_PTHREAD -Wnon-modular-include-in-framework-module -Werror=non-modular-include-in-framework-module -Wno-trigraphs -fpascal-strings -Os -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Werror=return-type -Wdocumentation -Wunreachable-code -Wquoted-include-in-framework-header -Werror=deprecated-objc-isa-usage -Werror=objc-root-class -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wempty-body -Wuninitialized -Wconditional-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DIL2CPP_TARGET_IOS=1 -isysroot ${SDK_VERSION} -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -Wno-sign-conversion -Winfinite-recursion -Wmove -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wrange-loop-analysis -Wno-semicolon-before-method-body -Wunguarded-availability ")
-
-
-add_definitions(-DIL2CPP_TARGET_IOS=1)
-add_definitions(-DBASELIB_DYNAMICLIBRARY=1)
-add_definitions(-DBASELIB_INLINE_NAMESPACE=il2cpp_baselib)
-add_definitions(-DAARCH64)
-add_definitions(-D__aarch64__)
-add_definitions(-DIL2CPP_SUPPORT_THREADS)
-add_definitions(-DIL2CPP_THREADS_PTHREAD)
-#add_definitions(-DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
-#add_definitions(-DCMAKE_CXX_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++)
-#add_definitions(-DIL2CPP_TARGET_DARWIN)
-add_definitions(-DIL2CPP_PLATFORM_SUPPORTS_TIMEZONEINFO)
-
-add_definitions(-MMD)
-add_definitions(-MT dependencies)
-
-
-include_directories(${IL2CPP_SOURCE_DIR}/libil2cpp)
-include_directories(${IL2CPP_SOURCE_DIR}/external)
-include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Include/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/bdwgc/include/)
-include_directories(${IL2CPP_SOURCE_DIR}/external/baselib/Platforms/OSX/Include/)
-
-# 修改为本机对应SDK路径
-include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/c++/v1)
-include_directories(SYSTEM /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include)
-
-get_filename_component(PARENT_PATH ${PROJECT_BINARY_DIR} PATH)
-aux_source_directory(${PARENT_PATH}/lump_mm LUMP_SOURCE_LIST)
-
-#find_library(zlib ${PROJECT_SOURCE_DIR}/external)
-add_library(objective STATIC ${LUMP_SOURCE_LIST})
-

Data/iOSBuild/objective/CMakeLists.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 76642fe740b6fd74b9a4491ce83b897e
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Data~/Templates/AssemblyManifest.cpp.tpl

@@ -0,0 +1,12 @@
+#include "../Il2CppCompatibleDef.h"
+
+namespace hybridclr
+{
+	const char* g_placeHolderAssemblies[] =
+	{
+		//!!!{{PLACE_HOLDER
+
+		//!!!}}PLACE_HOLDER
+		nullptr,
+	};
+}

Data~/Templates/MethodBridge.cpp.tpl

@@ -0,0 +1,32 @@
+#include <codegen/il2cpp-codegen-metadata.h>
+#if HYBRIDCLR_UNITY_2023_OR_NEW
+#include <codegen/il2cpp-codegen.h>
+#elif HYBRIDCLR_UNITY_2022
+#include <codegen/il2cpp-codegen-il2cpp.h>
+#elif HYBRIDCLR_UNITY_2020 || HYBRIDCLR_UNITY_2021
+#include <codegen/il2cpp-codegen-common-big.h>
+#else
+#include <codegen/il2cpp-codegen-common.h>
+#endif
+
+#include "vm/ClassInlines.h"
+#include "vm/Object.h"
+#include "vm/Class.h"
+#include "vm/ScopedThreadAttacher.h"
+
+#include "../metadata/MetadataUtil.h"
+
+
+#include "../interpreter/InterpreterModule.h"
+#include "../interpreter/MethodBridge.h"
+#include "../interpreter/Interpreter.h"
+#include "../interpreter/MemoryUtil.h"
+#include "../interpreter/InstrinctDef.h"
+
+using namespace hybridclr::interpreter;
+using namespace hybridclr::metadata;
+
+//!!!{{CODE
+
+
+//!!!}}CODE

Data~/Templates/UnityVersion.h.tpl

@@ -0,0 +1,6 @@
+#pragma once
+
+//!!!{{UNITY_VERSION
+
+
+//!!!}}UNITY_VERSION

Data~/hybridclr_version.json

@@ -0,0 +1,39 @@
+{
+    "versions": [
+    {
+        "unity_version":"2019",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v2019-8.1.0"}
+    },
+    {
+        "unity_version":"2020",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v2020-8.1.0"}
+    },
+    {
+        "unity_version":"2021",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v2021-8.1.0"}
+    },
+    {
+        "unity_version":"2022",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v2022-8.2.0"}
+    },
+    {
+        "unity_version":"2022-tuanjie",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v2022-tuanjie-8.6.0"}
+    },
+    {
+        "unity_version":"2023",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v2023-8.1.0"}
+    },
+    {
+        "unity_version":"6000",
+        "hybridclr" : { "branch":"v8.6.0"},
+        "il2cpp_plus": { "branch":"v6000-8.1.0"}
+    }
+    ]
+}

Editor/3rds.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8f2a6638b09b52f4c9dc8906d090b710
+guid: daa1e09af240aae4da0741843cb2b3f3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor/3rds/UnityFS/GlobalgamedatasPatcher.cs

@@ -42,11 +42,11 @@ namespace HybridCLR.Editor.UnityBinFileReader
             writer.Write(new EndianBinaryWriter(output));
             Debug.Log($"patch file:{dataunity3dFile} size:{output.Length}");
 
-            string bakFile = dataunity3dFile + ".bak";
-            if (!File.Exists(bakFile))
-            {
-                File.Copy(dataunity3dFile, bakFile);
-            }
+            //string bakFile = dataunity3dFile + ".bak";
+            //if (!File.Exists(bakFile))
+            //{
+            //    File.Copy(dataunity3dFile, bakFile);
+            //}
             File.WriteAllBytes(dataunity3dFile, output.ToArray());
         }
     }