From eb2522049a71438a5df1ec89bd2e15b118ddd78d Mon Sep 17 00:00:00 2001 From: hansheng <1091225802@qq.com> Date: Mon, 26 Sep 2022 11:54:14 +0800 Subject: [PATCH] fix: ignores Data Data to Data~ --- Data.meta | 8 -------- Data/ModifiedUnityAssemblies.meta | 8 -------- Data/Templates.meta | 8 -------- Data/iOSBuild.meta | 8 -------- Data/iOSBuild/CMakeLists.txt.meta | 7 ------- Data/iOSBuild/build_libil2cpp.sh.meta | 7 ------- Data/iOSBuild/external.meta | 8 -------- Data/iOSBuild/external/CMakeLists.txt.meta | 7 ------- Data/iOSBuild/gen_lump.sh.meta | 7 ------- Data/iOSBuild/objective.meta | 8 -------- Data/iOSBuild/objective/CMakeLists.txt.meta | 7 ------- .../ModifiedUnityAssemblies/2019.4.40.meta | 0 .../2019.4.40/Unity.IL2CPP-Mac.dll.bytes | Bin .../2019.4.40/Unity.IL2CPP-Mac.dll.bytes.meta | 0 .../2019.4.40/Unity.IL2CPP-Win.dll.bytes | Bin .../2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta | 0 .../ModifiedUnityAssemblies/2021.3.1.meta | 0 .../2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes | Bin .../UnityEditor.CoreModule-Mac.dll.bytes.meta | 0 .../2021.3.1/UnityEditor.CoreModule-Win.dll.bytes | Bin .../UnityEditor.CoreModule-Win.dll.bytes.meta | 0 .../ModifiedUnityAssemblies/2021.3.6.meta | 0 .../2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes | Bin .../UnityEditor.CoreModule-Mac.dll.bytes.meta | 0 .../2021.3.6/UnityEditor.CoreModule-Win.dll.bytes | Bin .../UnityEditor.CoreModule-Win.dll.bytes.meta | 0 .../Templates/MethodBridge_Arm64.cpp.txt | 0 .../Templates/MethodBridge_Arm64.cpp.txt.meta | 0 .../Templates/MethodBridge_Universal32.cpp.txt | 0 .../Templates/MethodBridge_Universal32.cpp.txt.meta | 0 .../Templates/MethodBridge_Universal64.cpp.txt | 0 .../Templates/MethodBridge_Universal64.cpp.txt.meta | 0 .../Templates/ReversePInvokeMethodStub.cpp.txt | 0 .../Templates/ReversePInvokeMethodStub.cpp.txt.meta | 0 {Data => Data~}/iOSBuild/CMakeLists.txt | 0 {Data => Data~}/iOSBuild/build_libil2cpp.sh | 0 {Data => Data~}/iOSBuild/external/CMakeLists.txt | 0 {Data => Data~}/iOSBuild/gen_lump.sh | 0 {Data => Data~}/iOSBuild/objective/CMakeLists.txt | 0 Editor/SettingsUtil.cs | 2 +- 40 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 Data.meta delete mode 100644 Data/ModifiedUnityAssemblies.meta delete mode 100644 Data/Templates.meta delete mode 100644 Data/iOSBuild.meta delete mode 100644 Data/iOSBuild/CMakeLists.txt.meta delete mode 100644 Data/iOSBuild/build_libil2cpp.sh.meta delete mode 100644 Data/iOSBuild/external.meta delete mode 100644 Data/iOSBuild/external/CMakeLists.txt.meta delete mode 100644 Data/iOSBuild/gen_lump.sh.meta delete mode 100644 Data/iOSBuild/objective.meta delete mode 100644 Data/iOSBuild/objective/CMakeLists.txt.meta rename {Data => Data~}/ModifiedUnityAssemblies/2019.4.40.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.1.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.6.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes.meta (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes (100%) rename {Data => Data~}/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes.meta (100%) rename {Data => Data~}/Templates/MethodBridge_Arm64.cpp.txt (100%) rename {Data => Data~}/Templates/MethodBridge_Arm64.cpp.txt.meta (100%) rename {Data => Data~}/Templates/MethodBridge_Universal32.cpp.txt (100%) rename {Data => Data~}/Templates/MethodBridge_Universal32.cpp.txt.meta (100%) rename {Data => Data~}/Templates/MethodBridge_Universal64.cpp.txt (100%) rename {Data => Data~}/Templates/MethodBridge_Universal64.cpp.txt.meta (100%) rename {Data => Data~}/Templates/ReversePInvokeMethodStub.cpp.txt (100%) rename {Data => Data~}/Templates/ReversePInvokeMethodStub.cpp.txt.meta (100%) rename {Data => Data~}/iOSBuild/CMakeLists.txt (100%) rename {Data => Data~}/iOSBuild/build_libil2cpp.sh (100%) rename {Data => Data~}/iOSBuild/external/CMakeLists.txt (100%) rename {Data => Data~}/iOSBuild/gen_lump.sh (100%) rename {Data => Data~}/iOSBuild/objective/CMakeLists.txt (100%) diff --git a/Data.meta b/Data.meta deleted file mode 100644 index 146542d..0000000 --- a/Data.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c3bdcb0d35a8834aadbee0e5e02a093 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/ModifiedUnityAssemblies.meta b/Data/ModifiedUnityAssemblies.meta deleted file mode 100644 index f79b8c5..0000000 --- a/Data/ModifiedUnityAssemblies.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68f56e29afb52164b85f220d1033b461 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/Templates.meta b/Data/Templates.meta deleted file mode 100644 index 2de038c..0000000 --- a/Data/Templates.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f54201f21d7421d4c894298aa5266c73 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild.meta b/Data/iOSBuild.meta deleted file mode 100644 index ae67437..0000000 --- a/Data/iOSBuild.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9442afcb42f28646a509d70ffe3d880 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/CMakeLists.txt.meta b/Data/iOSBuild/CMakeLists.txt.meta deleted file mode 100644 index 323b20a..0000000 --- a/Data/iOSBuild/CMakeLists.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3436274d6dd0cc64fb4d15c898cc1d1d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/build_libil2cpp.sh.meta b/Data/iOSBuild/build_libil2cpp.sh.meta deleted file mode 100644 index 25b4e4d..0000000 --- a/Data/iOSBuild/build_libil2cpp.sh.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cbb71cfc70bb1304f9527eb7ca5d38ee -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/external.meta b/Data/iOSBuild/external.meta deleted file mode 100644 index d3b9e7c..0000000 --- a/Data/iOSBuild/external.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8ed3bb85d9526f9468289a2e26dadf0b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/external/CMakeLists.txt.meta b/Data/iOSBuild/external/CMakeLists.txt.meta deleted file mode 100644 index ee9bbad..0000000 --- a/Data/iOSBuild/external/CMakeLists.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 03b1d6a5f25828042a1d215904917995 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/gen_lump.sh.meta b/Data/iOSBuild/gen_lump.sh.meta deleted file mode 100644 index 74be733..0000000 --- a/Data/iOSBuild/gen_lump.sh.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 641944d55f4cbc4449c3f8b3fcd4d7e5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/objective.meta b/Data/iOSBuild/objective.meta deleted file mode 100644 index 6be020b..0000000 --- a/Data/iOSBuild/objective.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 01ed218875eaf574694fbe3a8e0c4a64 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/iOSBuild/objective/CMakeLists.txt.meta b/Data/iOSBuild/objective/CMakeLists.txt.meta deleted file mode 100644 index 85b8741..0000000 --- a/Data/iOSBuild/objective/CMakeLists.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 76642fe740b6fd74b9a4491ce83b897e -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/ModifiedUnityAssemblies/2019.4.40.meta b/Data~/ModifiedUnityAssemblies/2019.4.40.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2019.4.40.meta rename to Data~/ModifiedUnityAssemblies/2019.4.40.meta diff --git a/Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes b/Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes similarity index 100% rename from Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes rename to Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes diff --git a/Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes.meta b/Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes.meta rename to Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Mac.dll.bytes.meta diff --git a/Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes b/Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes similarity index 100% rename from Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes rename to Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes diff --git a/Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta b/Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta rename to Data~/ModifiedUnityAssemblies/2019.4.40/Unity.IL2CPP-Win.dll.bytes.meta diff --git a/Data/ModifiedUnityAssemblies/2021.3.1.meta b/Data~/ModifiedUnityAssemblies/2021.3.1.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.1.meta rename to Data~/ModifiedUnityAssemblies/2021.3.1.meta diff --git a/Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes b/Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes rename to Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes diff --git a/Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes.meta b/Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes.meta rename to Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Mac.dll.bytes.meta diff --git a/Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes b/Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes rename to Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes diff --git a/Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes.meta b/Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes.meta rename to Data~/ModifiedUnityAssemblies/2021.3.1/UnityEditor.CoreModule-Win.dll.bytes.meta diff --git a/Data/ModifiedUnityAssemblies/2021.3.6.meta b/Data~/ModifiedUnityAssemblies/2021.3.6.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.6.meta rename to Data~/ModifiedUnityAssemblies/2021.3.6.meta diff --git a/Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes b/Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes rename to Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes diff --git a/Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes.meta b/Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes.meta rename to Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Mac.dll.bytes.meta diff --git a/Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes b/Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes rename to Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes diff --git a/Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes.meta b/Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes.meta similarity index 100% rename from Data/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes.meta rename to Data~/ModifiedUnityAssemblies/2021.3.6/UnityEditor.CoreModule-Win.dll.bytes.meta diff --git a/Data/Templates/MethodBridge_Arm64.cpp.txt b/Data~/Templates/MethodBridge_Arm64.cpp.txt similarity index 100% rename from Data/Templates/MethodBridge_Arm64.cpp.txt rename to Data~/Templates/MethodBridge_Arm64.cpp.txt diff --git a/Data/Templates/MethodBridge_Arm64.cpp.txt.meta b/Data~/Templates/MethodBridge_Arm64.cpp.txt.meta similarity index 100% rename from Data/Templates/MethodBridge_Arm64.cpp.txt.meta rename to Data~/Templates/MethodBridge_Arm64.cpp.txt.meta diff --git a/Data/Templates/MethodBridge_Universal32.cpp.txt b/Data~/Templates/MethodBridge_Universal32.cpp.txt similarity index 100% rename from Data/Templates/MethodBridge_Universal32.cpp.txt rename to Data~/Templates/MethodBridge_Universal32.cpp.txt diff --git a/Data/Templates/MethodBridge_Universal32.cpp.txt.meta b/Data~/Templates/MethodBridge_Universal32.cpp.txt.meta similarity index 100% rename from Data/Templates/MethodBridge_Universal32.cpp.txt.meta rename to Data~/Templates/MethodBridge_Universal32.cpp.txt.meta diff --git a/Data/Templates/MethodBridge_Universal64.cpp.txt b/Data~/Templates/MethodBridge_Universal64.cpp.txt similarity index 100% rename from Data/Templates/MethodBridge_Universal64.cpp.txt rename to Data~/Templates/MethodBridge_Universal64.cpp.txt diff --git a/Data/Templates/MethodBridge_Universal64.cpp.txt.meta b/Data~/Templates/MethodBridge_Universal64.cpp.txt.meta similarity index 100% rename from Data/Templates/MethodBridge_Universal64.cpp.txt.meta rename to Data~/Templates/MethodBridge_Universal64.cpp.txt.meta diff --git a/Data/Templates/ReversePInvokeMethodStub.cpp.txt b/Data~/Templates/ReversePInvokeMethodStub.cpp.txt similarity index 100% rename from Data/Templates/ReversePInvokeMethodStub.cpp.txt rename to Data~/Templates/ReversePInvokeMethodStub.cpp.txt diff --git a/Data/Templates/ReversePInvokeMethodStub.cpp.txt.meta b/Data~/Templates/ReversePInvokeMethodStub.cpp.txt.meta similarity index 100% rename from Data/Templates/ReversePInvokeMethodStub.cpp.txt.meta rename to Data~/Templates/ReversePInvokeMethodStub.cpp.txt.meta diff --git a/Data/iOSBuild/CMakeLists.txt b/Data~/iOSBuild/CMakeLists.txt similarity index 100% rename from Data/iOSBuild/CMakeLists.txt rename to Data~/iOSBuild/CMakeLists.txt diff --git a/Data/iOSBuild/build_libil2cpp.sh b/Data~/iOSBuild/build_libil2cpp.sh similarity index 100% rename from Data/iOSBuild/build_libil2cpp.sh rename to Data~/iOSBuild/build_libil2cpp.sh diff --git a/Data/iOSBuild/external/CMakeLists.txt b/Data~/iOSBuild/external/CMakeLists.txt similarity index 100% rename from Data/iOSBuild/external/CMakeLists.txt rename to Data~/iOSBuild/external/CMakeLists.txt diff --git a/Data/iOSBuild/gen_lump.sh b/Data~/iOSBuild/gen_lump.sh similarity index 100% rename from Data/iOSBuild/gen_lump.sh rename to Data~/iOSBuild/gen_lump.sh diff --git a/Data/iOSBuild/objective/CMakeLists.txt b/Data~/iOSBuild/objective/CMakeLists.txt similarity index 100% rename from Data/iOSBuild/objective/CMakeLists.txt rename to Data~/iOSBuild/objective/CMakeLists.txt diff --git a/Editor/SettingsUtil.cs b/Editor/SettingsUtil.cs index 9dd47a5..1a526cf 100644 --- a/Editor/SettingsUtil.cs +++ b/Editor/SettingsUtil.cs @@ -16,7 +16,7 @@ namespace HybridCLR.Editor public static string PackageName { get; } = "com.focus-creative-games.hybridclr_unity"; - public static string HybridCLRDataPathInPackage => $"Packages/{PackageName}/Data"; + public static string HybridCLRDataPathInPackage => $"Packages/{PackageName}/Data~"; public static string TemplatePathInPackage => $"{HybridCLRDataPathInPackage}/Templates";