diff --git a/Assets/Resources/HotfixMainResDomain.asset b/Assets/Resources/HotfixMainResDomain.asset index ade98a9..45c9b6c 100644 --- a/Assets/Resources/HotfixMainResDomain.asset +++ b/Assets/Resources/HotfixMainResDomain.asset @@ -13,13 +13,15 @@ MonoBehaviour: m_Name: HotfixMainResDomain m_EditorClassIdentifier: com.stary.evo.runtime:Stary.Evo:HotfixMainResDomain hotfixMainResDomainEntity: - ipconfig: http://192.168.31.100:9527 + ipconfig: http://106.52.62.106:9527 mainDomainVersion: - username: admin2023 - password: admin@2023 + username: unity + password: unity@2026 projectInfo: projectName: projectCode: projectPackageName: com.xosmo. loadingScene: {fileID: 0} loadingScenePath: + buildConfig: + packages: [] diff --git a/EditorPrefs.ini b/EditorPrefs.ini new file mode 100644 index 0000000..d3c27b2 --- /dev/null +++ b/EditorPrefs.ini @@ -0,0 +1,8 @@ +# Custom Editor Prefs Data +# Last Modified: 2026/4/21 11:21:53 + +StartUp=1 +CreatDomainDirectory=1 +ChangePlayerSchema=HOST_PLAYMODE +ip=http://106.52.62.106:9527 +Authorization=Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjE0NGIyN2NkLWU5NDEtNDk5Zi04MGViLWY5MmYxYTBmNDgzMSIsInVuaXF1ZV9uYW1lIjoidW5pdHkiLCJlbWFpbCI6InphemU5N0BxcS5jb20iLCJuYW1laWQiOiIxNDRiMjdjZC1lOTQxLTQ5OWYtODBlYi1mOTJmMWEwZjQ4MzEiLCJyb2xlIjoiY2xpZW50IiwibmJmIjoxNzc2NzQxNzEzLCJleHAiOjE3NzkzMzM3MTMsImlhdCI6MTc3Njc0MTcxMywiaXNzIjoieW91ci1pc3N1ZXIiLCJhdWQiOiJ5b3VyLWF1ZGllbmNlIn0.WwsnRtW7iv0ydRRdq0EReKX8xLz71TeCEMr4Kpb7nJs diff --git a/Packages/manifest.json b/Packages/manifest.json index b922eab..779d0de 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { - "com.code-philosophy.hybridclr": "8.2.0", + "com.code-philosophy.hybridclr": "8.11.0", "com.rokid.xr.extension": "3.0.3", "com.rokid.xr.unity": "3.0.3", - "com.staryevo.audiocore": "1.0.19", - "com.staryevo.buildoriginality": "1.0.10", - "com.staryevo.main": "2.0.18", - "com.staryevo.rktools": "1.1.5", - "com.staryevo.tools": "1.2.2", + "com.staryevo.audiocore": "1.1.3", + "com.staryevo.buildoriginality": "1.1.4", + "com.staryevo.main": "2.1.14", + "com.staryevo.rktools": "1.1.7", + "com.staryevo.tools": "1.4.27", "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", "com.unity.collab-proxy": "2.6.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index bc8ff43..6526b9c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.code-philosophy.hybridclr": { - "version": "8.2.0", + "version": "8.11.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -54,19 +54,21 @@ "url": "https://npm.rokid.com" }, "com.staryevo.audiocore": { - "version": "1.0.19", + "version": "1.1.3", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.cysharp.unitask": "2.5.10" + }, "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, "com.staryevo.buildoriginality": { - "version": "1.0.10", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { "com.cysharp.unitask": "2.5.10", - "com.tuyoogame.yooasset": "2.3.16" + "com.tuyoogame.yooasset": "2.3.18" }, "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, @@ -78,17 +80,17 @@ "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, "com.staryevo.main": { - "version": "2.0.18", + "version": "2.1.14", "depth": 0, "source": "registry", "dependencies": { "com.cysharp.unitask": "2.5.10", - "com.tuyoogame.yooasset": "2.3.16" + "com.tuyoogame.yooasset": "2.3.18" }, "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, "com.staryevo.rktools": { - "version": "1.1.5", + "version": "1.1.7", "depth": 0, "source": "registry", "dependencies": { @@ -97,18 +99,18 @@ "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, "com.staryevo.tools": { - "version": "1.2.2", + "version": "1.4.27", "depth": 0, "source": "registry", "dependencies": { "com.cysharp.unitask": "2.5.10", "com.staryevo.informationsave": "2.0.1", - "com.tuyoogame.yooasset": "2.3.16" + "com.tuyoogame.yooasset": "2.3.18" }, "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, "com.tuyoogame.yooasset": { - "version": "2.3.16", + "version": "2.3.18", "depth": 1, "source": "registry", "dependencies": { @@ -132,38 +134,38 @@ "dependencies": { "com.unity.modules.ai": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.21", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { "version": "2.6.0", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 3, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ide.rider": { "version": "3.0.34", @@ -172,37 +174,37 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.11.2", + "version": "1.14.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.mobile.android-logcat": { "version": "1.4.3", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { "version": "14.0.10", @@ -222,8 +224,8 @@ "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "14.0.11", - "com.unity.shadergraph": "14.0.11", + "com.unity.render-pipelines.core": "14.0.12", + "com.unity.shadergraph": "14.0.12", "com.unity.render-pipelines.universal-config": "14.0.9" } }, @@ -240,21 +242,21 @@ "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.searcher": { "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.11", + "version": "14.0.12", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.11", + "com.unity.render-pipelines.core": "14.0.12", "com.unity.searcher": "4.9.2" } }, @@ -267,19 +269,19 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.timeline": { "version": "1.8.7", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.ugui": { "version": "1.0.0", @@ -291,82 +293,82 @@ } }, "com.unity.xr.arfoundation": { - "version": "5.1.5", + "version": "5.2.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.editorcoroutines": "1.0.0", + "com.unity.ugui": "1.0.0", + "com.unity.modules.ui": "1.0.0", "com.unity.inputsystem": "1.3.0", + "com.unity.mathematics": "1.2.5", "com.unity.xr.core-utils": "2.2.1", "com.unity.xr.management": "4.0.1", - "com.unity.ugui": "1.0.0", - "com.unity.mathematics": "1.2.5", + "com.unity.editorcoroutines": "1.0.0", "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.ui": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.5.1", + "version": "2.5.2", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.xr": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.xr.hands": { "version": "1.5.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.inputsystem": "1.3.0", "com.unity.modules.xr": "1.0.0", + "com.unity.inputsystem": "1.3.0", + "com.unity.mathematics": "1.2.6", "com.unity.xr.core-utils": "2.2.0", - "com.unity.xr.management": "4.0.1", - "com.unity.mathematics": "1.2.6" + "com.unity.xr.management": "4.0.1" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { "version": "3.0.5", "depth": 2, "source": "registry", "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.xr": "1.0.0", "com.unity.inputsystem": "1.8.1", "com.unity.mathematics": "1.2.6", - "com.unity.ugui": "1.0.0", - "com.unity.xr.core-utils": "2.2.3", "com.unity.modules.audio": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.xr.core-utils": "2.2.3", + "com.unity.modules.physics": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.11", + "version": "2.1.12", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.xr.management": { "version": "4.4.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", + "com.unity.modules.subsystems": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.7" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { "version": "1.13.2", @@ -378,7 +380,7 @@ "com.unity.xr.management": "4.4.0", "com.unity.xr.legacyinputhelpers": "2.1.2" }, - "url": "https://packages.unity.cn" + "url": "https://packages.unity.com" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/ProjectSettings/HybridCLRSettings.asset b/ProjectSettings/HybridCLRSettings.asset index 58ceba1..02b084e 100644 --- a/ProjectSettings/HybridCLRSettings.asset +++ b/ProjectSettings/HybridCLRSettings.asset @@ -18,6 +18,8 @@ MonoBehaviour: il2cppPlusRepoURL: https://gitee.com/focus-creative-games/il2cpp_plus hotUpdateAssemblyDefinitions: - {fileID: 5897886265953266890, guid: 0215eccc3fbaadc478df17450740779c, type: 3} + - {fileID: 5897886265953266890, guid: 35d5759cc8213ea4ba18c3d65342dbeb, type: 3} + - {fileID: 5897886265953266890, guid: a0b5615c852936343bad64f8521c039f, type: 3} hotUpdateAssemblies: [] preserveHotUpdateAssemblies: [] hotUpdateDllCompileOutputRootDir: HybridCLRData/HotUpdateDlls diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index ffa4645..a30c13a 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.cn + m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -50,6 +50,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -838 - m_OriginalInstanceId: -842 + m_UserModificationsInstanceId: -836 + m_OriginalInstanceId: -840 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 68bcc29..5b6fd0f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -77,6 +77,7 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -143,9 +144,6 @@ PlayerSettings: bundleVersion: 0.1 preloadedAssets: - {fileID: 0} - - {fileID: 6378784773771806207, guid: 585a4ad961dd5614e8745d46db7d679c, type: 2} - - {fileID: 11400000, guid: 24733d23f452fcb46892d5b07f3ac2a0, type: 2} - - {fileID: 5065509221171662625, guid: 4f326748f4e6ea3468481ebd6d8ad2a2, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -770,7 +768,7 @@ PlayerSettings: PS5: DOTWEEN QNX: DOTWEEN Stadia: DOTWEEN - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;USE_ROKID_OPENXR;USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;DOTWEEN;HotUpdate;HOST_PLAYMODE + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;USE_ROKID_OPENXR;USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;DOTWEEN;HotUpdate;EDITOR_SIMULATEMODE VisionOS: DOTWEEN WebGL: DOTWEEN Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;DOTWEEN @@ -885,9 +883,8 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiCpuConfiguration: hmiLogStartupTiming: 0 - qnxGraphicConfPath: + hmiCpuConfiguration: apiCompatibilityLevel: 3 activeInputHandler: 2 windowsGamepadBackendHint: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3d55efb..587f809 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.56f1c1 -m_EditorVersionWithRevision: 2022.3.56f1c1 (bb6410cfcc53) +m_EditorVersion: 2022.3.62f3 +m_EditorVersionWithRevision: 2022.3.62f3 (96770f904ca7)