From 5ae2e1c333d158f4f963bcbba9c12600e146c129 Mon Sep 17 00:00:00 2001 From: VDH Date: Fri, 26 Dec 2025 10:15:12 +0700 Subject: [PATCH] fix not addresable --- .../AssetGroups/Default Local Group.asset | 15 ---------- .../AssetGroups/configuration.asset | 15 ++++++++++ .../Scripts/Task/CECTaskInterface.cs | 30 ------------------- Assets/Resources/PerformanceTestRunInfo.json | 1 - .../PerformanceTestRunInfo.json.meta | 7 ----- .../Resources/PerformanceTestRunSettings.json | 1 - .../PerformanceTestRunSettings.json.meta | 7 ----- 7 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 Assets/Resources/PerformanceTestRunInfo.json delete mode 100644 Assets/Resources/PerformanceTestRunInfo.json.meta delete mode 100644 Assets/Resources/PerformanceTestRunSettings.json delete mode 100644 Assets/Resources/PerformanceTestRunSettings.json.meta diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index edc24bb49c..15846187e2 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -15,11 +15,6 @@ MonoBehaviour: m_GroupName: Default Local Group m_GUID: 712e3991f28e549e7a56ee582a977810 m_SerializeEntries: - - m_GUID: 0359747f0eacde04db291d59f55155f3 - m_Address: Assets/PerfectWorld/Data/tasks.txt - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 1b653230886be4009808803501ad7d7f m_Address: Assets/PerfectWorld/SO/TaskTemplContainerSO.asset m_ReadOnly: 0 @@ -45,11 +40,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 68c2ec3141053fe4eb413d0698ae9a97 - m_Address: Assets/PerfectWorld/Data/task_npc.txt - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 88e840e5dac12ed4383d994c7fadfef1 m_Address: "\u7A0B\u5E8F\u8054\u5165/\u51FB\u4E2D/\u62F3\u5957\u51FB\u4E2D" m_ReadOnly: 0 @@ -65,11 +55,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: b4e097d2e97859c4fbe066b158b5fe4d - m_Address: Assets/PerfectWorld/Data/dyn_tasks.txt - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 070edb522e6e54c14a99055900003890, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/configuration.asset b/Assets/AddressableAssetsData/AssetGroups/configuration.asset index 21b2b75d11..4db0977141 100644 --- a/Assets/AddressableAssetsData/AssetGroups/configuration.asset +++ b/Assets/AddressableAssetsData/AssetGroups/configuration.asset @@ -15,11 +15,21 @@ MonoBehaviour: m_GroupName: configuration m_GUID: 402389c9c8797a8489a1d8188e497c23 m_SerializeEntries: + - m_GUID: 0359747f0eacde04db291d59f55155f3 + m_Address: Assets/PerfectWorld/Data/tasks.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 4e7b437eecb43c64b87ab9700f5850c9 m_Address: Assets/Addressable/elements.txt m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 68c2ec3141053fe4eb413d0698ae9a97 + m_Address: Assets/PerfectWorld/Data/task_npc.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 6e02334765e10654e874714298f4eef1 m_Address: Assets/Addressable/gshop.txt m_ReadOnly: 0 @@ -30,6 +40,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: b4e097d2e97859c4fbe066b158b5fe4d + m_Address: Assets/PerfectWorld/Data/dyn_tasks.txt + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 070edb522e6e54c14a99055900003890, type: 2} m_SchemaSet: diff --git a/Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs b/Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs index a2dfa03cab..f58e3eb5a7 100644 --- a/Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs +++ b/Assets/PerfectWorld/Scripts/Task/CECTaskInterface.cs @@ -433,18 +433,8 @@ namespace BrewMonster.Scripts.Task LoadingSceneController.Instance.UpdateUI(0f); LoadingSceneController.Instance.SetLoadingText("Loading Tasks From Pack"); -#if UNITY_ANDROID && !UNITY_EDITOR - bool result = await MoveShopDataToPersistentPath("data/tasks.data"); - if (!result) - { - BMLogger.LogError($"CECTaskInterface: Failed to move tasks data to persistent path"); - return false; - } - string task_data_path = Path.Combine(Application.persistentDataPath, "data/tasks.data"); -#else //string task_data_path = Path.Combine(Application.streamingAssetsPath, "data/tasks.data"); string task_data_path = "Assets/PerfectWorld/Data/tasks.txt"; -#endif await pTaskMan.LoadTasksFromPack(task_data_path, true, (x) => { @@ -452,32 +442,12 @@ namespace BrewMonster.Scripts.Task }, _cts.Token); -#if UNITY_ANDROID && !UNITY_EDITOR - result = await MoveShopDataToPersistentPath("data/task_npc.data"); - if (!result) - { - BMLogger.LogError($"CECTaskInterface: Failed to move tasks data to persistent path"); - return false; - } - var task_npc_path = Path.Combine(Application.persistentDataPath, "data/task_npc.data"); -#else //var task_npc_path = Path.Combine(Application.streamingAssetsPath, "data/task_npc.data"); var task_npc_path = "Assets/PerfectWorld/Data/task_npc.txt"; -#endif await pTaskMan.LoadNPCInfoFromPack(task_npc_path); -#if UNITY_ANDROID && !UNITY_EDITOR - result = await MoveShopDataToPersistentPath("data/dyn_tasks.data"); - if (!result) - { - BMLogger.LogError($"CECTaskInterface: Failed to move tasks data to persistent path"); - return false; - } - var dyn_tasks_path = Path.Combine(Application.persistentDataPath, "data/dyn_tasks.data"); -#else //var dyn_tasks_path = Path.Combine(Application.streamingAssetsPath, "data/dyn_tasks.data"); var dyn_tasks_path = "Assets/PerfectWorld/Data/dyn_tasks.txt"; -#endif await pTaskMan.VerifyDynTasksPack(dyn_tasks_path); InitActiveTaskList(); diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index 5489ec085d..0000000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.58f2","Branch":"6000.0/respin/6000.0.58f2-44b8bf3a32","Changeset":"92dee566b325","Date":1757670950},"Dependencies":["com.boxqkrtm.ide.cursor@2.0.25","com.cysharp.unitask@2.5.10","com.github-glitchenzo.nugetforunity@4.5.0","com.unity.2d.sprite@1.0.0","com.unity.addressables@2.7.4","com.unity.ai.navigation@2.0.9","com.unity.cinemachine@3.1.4","com.unity.collab-proxy@2.9.3","com.unity.ide.rider@3.0.38","com.unity.ide.visualstudio@2.0.23","com.unity.inputsystem@1.14.2","com.unity.multiplayer.center@1.0.0","com.unity.multiplayer.playmode@1.6.1","com.unity.render-pipelines.universal@17.0.4","com.unity.sharp-zip-lib@1.4.1","com.unity.test-framework@1.5.1","com.unity.timeline@1.8.9","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.8","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.0.4","com.unity.shadergraph@17.0.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.splines@2.8.1","com.unity.profiling.core@1.0.2","com.unity.scriptablebuildpipeline@2.4.3","com.unity.searcher@4.9.3","com.unity.burst@1.8.24","com.unity.mathematics@1.3.2","com.unity.collections@2.5.1","com.unity.rendering.light-transport@1.0.1","com.unity.settings-manager@2.1.0","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.1.0"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta deleted file mode 100644 index 44d954b374..0000000000 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 169cd37d7cd311d4da6109b592df188a -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae14b..0000000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta deleted file mode 100644 index 91bd34b215..0000000000 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 535f3a400e45f0b49ac48e4601cb7143 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: