diff --git a/Packages/manifest.json b/Packages/manifest.json index 83b01f177..6f2882449 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git", "com.unity.addressables": "1.22.3", "com.unity.burst": "1.8.27", "com.unity.collab-proxy": "2.10.2", @@ -9,6 +10,7 @@ "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.14.2", + "com.unity.memoryprofiler": "1.1.12", "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.recorder": "4.0.3", "com.unity.render-pipelines.universal": "14.0.12", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0f5278651..60f1708e3 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,12 @@ { "dependencies": { + "com.code-philosophy.hybridclr": { + "version": "https://gitee.com/focus-creative-games/hybridclr_unity.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "6cadd24d101f4cbd00cd80190106f6621132d24d" + }, "com.coffee.ui-particle": { "version": "file:src", "depth": 0, @@ -156,7 +163,7 @@ }, "com.unity.collections": { "version": "1.2.4", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.6.6", @@ -171,6 +178,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.editorcoroutines": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -234,6 +248,19 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.memoryprofiler": { + "version": "1.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.0", + "com.unity.collections": "1.2.3", + "com.unity.mathematics": "1.2.1", + "com.unity.profiling.core": "1.0.0", + "com.unity.editorcoroutines": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.2", "depth": 0, @@ -362,6 +389,12 @@ }, "url": "https://packages.unity.com" }, + "com.utj.profilerreader": { + "version": "file:jp.unity3d.profilerreader", + "depth": 0, + "source": "embedded", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index ca2fdba27..f49b08296 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,20 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/MyGame/Scenes/UIScene.unity - guid: ddf39675e15720c4f9713919c1b67d04 - - enabled: 1 - path: Assets/MyGame/Scenes/XJMH.unity - guid: 02c4548d2ee59d046afa19dee20d4153 - - enabled: 1 - path: Assets/MyGame/Scenes/FLZY.unity - guid: 873adaea65e45f1459ca61ad4c465029 - - enabled: 1 - path: Assets/MyGame/Scenes/HHWK.unity - guid: 11e4a8c71622d8c439add11c080ae733 - - enabled: 1 - path: Assets/MyGame/Scenes/YYSC.unity - guid: c7df62a546c0efb43a2604b2917da8a6 + path: Assets/MyGame/Scenes/BootScene.unity + guid: 3712bcf2c8e1be048bc5044b53e8b455 m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: a151e3b94e13b374c958c3263e0b8e56, type: 2} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 3a0132831..5594bfef3 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -9,7 +9,7 @@ EditorSettings: m_DefaultBehaviorMode: 0 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} - m_SpritePackerMode: 0 + m_SpritePackerMode: 5 m_SpritePackerCacheSize: 10 m_SpritePackerPaddingPower: 1 m_Bc7TextureCompressor: 0 diff --git a/ProjectSettings/HybridCLRSettings.asset b/ProjectSettings/HybridCLRSettings.asset new file mode 100644 index 000000000..3e88e0055 --- /dev/null +++ b/ProjectSettings/HybridCLRSettings.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e189374413a3f00468e49d51d8b27a09, type: 3} + m_Name: + m_EditorClassIdentifier: + enable: 1 + useGlobalIl2cpp: 0 + hybridclrRepoURL: https://gitee.com/focus-creative-games/hybridclr + il2cppPlusRepoURL: https://gitee.com/focus-creative-games/il2cpp_plus + hotUpdateAssemblyDefinitions: [] + hotUpdateAssemblies: + - Game.Hotfix + - Game.LegacyScripts + preserveHotUpdateAssemblies: [] + externalHotUpdateAssembliyDirs: [] + linkPreserveLevel: 0 + outputLinkFile: HybridCLR/Generate/link.xml + outputAOTGenericReferenceFile: HybridCLR/Generate/AOTGenericReferences.cs + maxGenericReferenceIteration: 10 + maxMethodBridgeGenericIteration: 10 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index affbf6aa9..cd7f1a68e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -9,7 +9,7 @@ PlayerSettings: AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 defaultScreenOrientation: 3 - targetDevice: 2 + targetDevice: 0 useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany @@ -149,7 +149,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.1 + bundleVersion: 0.1.2 preloadedAssets: - {fileID: 11400000, guid: f4b06bf2e92843d4cbd5cc8d600deed0, type: 2} metroInputSource: 0 @@ -269,7 +269,7 @@ PlayerSettings: useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 - useCustomLauncherGradleManifest: 0 + useCustomLauncherGradleManifest: 1 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 @@ -847,7 +847,7 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: DOTWEEN + Android: DOTWEEN;NewIP EmbeddedLinux: DOTWEEN GameCoreScarlett: DOTWEEN GameCoreXboxOne: DOTWEEN @@ -859,7 +859,7 @@ PlayerSettings: PS5: DOTWEEN QNX: DOTWEEN Stadia: DOTWEEN - Standalone: TMP_PRESENT;DOTWEEN;ENABLE_LOG_FILE;ENABLE_VERBOSE_LOG + Standalone: TMP_PRESENT;DOTWEEN;ENABLE_LOG_FILE;ENABLE_VERBOSE_LOG;AA_MONITOR VisionOS: DOTWEEN WebGL: DOTWEEN;ENABLE_LOG_FILE Windows Store Apps: DOTWEEN @@ -870,6 +870,7 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: Android: 1 + Standalone: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: Android: 0 @@ -882,7 +883,7 @@ PlayerSettings: PS5: 1 QNX: 1 Stadia: 1 - Standalone: 0 + Standalone: 4 VisionOS: 1 WebGL: 1 Windows Store Apps: 1