foldcc/YooAsset
1
0
Fork 0
mirror of https://github.com/tuyoogame/YooAsset.git synced 2026-06-12 06:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #660

Browse Source 
修复 IL2CPP 逆变委托崩溃
This commit is contained in:
何冠峰
2026-06-02 17:24:59 +08:00
parent cb96767f2d
commit 51c8c00604
1 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs vendored
View File

@@ -1,8 +1,4 @@
#if YOOASSET_UNITASK_SUPPORT #if YOOASSET_UNITASK_SUPPORT
#if UNITY_2020_1_OR_NEWER && ! UNITY_2021
#define UNITY_2020_BUG
#endif
using System; using System;
using System.Threading; using System.Threading;
using YooAsset; using YooAsset;
@@ -40,7 +36,6 @@ namespace Cysharp.Threading.Tasks
TaskPool.RegisterSizeGetter(typeof(HandleBaseConfiguredSource), () => pool.Size); TaskPool.RegisterSizeGetter(typeof(HandleBaseConfiguredSource), () => pool.Size);
} }
readonly Action<HandleBase> completedCallback;
HandleBase handle; HandleBase handle;
CancellationToken cancellationToken; CancellationToken cancellationToken;
CancellationTokenRegistration cancellationTokenRegistration; CancellationTokenRegistration cancellationTokenRegistration;
@@ -52,7 +47,6 @@ namespace Cysharp.Threading.Tasks
HandleBaseConfiguredSource() HandleBaseConfiguredSource()
{ {
completedCallback = HandleCompleted;
} }
public static IUniTaskSource Create(HandleBase handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, out short token) public static IUniTaskSource Create(HandleBase handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, out short token)
@@ -85,11 +79,7 @@ namespace Cysharp.Threading.Tasks
TaskTracker.TrackActiveTask(result, 3); TaskTracker.TrackActiveTask(result, 3);
PlayerLoopHelper.AddAction(timing, result); PlayerLoopHelper.AddAction(timing, result);
// BUG 在 Unity 2020.3.36 版本测试中, IL2Cpp 会报 如下错误 // 注意：统一用强类型回调订阅 Handle.Completed，修复 IL2CPP 逆变委托崩溃
// BUG ArgumentException: Incompatible Delegate Types. First is System.Action`1[[YooAsset.AssetHandle, YooAsset, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]] second is System.Action`1[[YooAsset.HandleBase, YooAsset, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]
// BUG 也可能报的是 Action '1' Action '1' 的 InvalidCastException
// BUG 此处不得不这么修改, 如果后续 Unity 修复了这个问题, 可以恢复之前的写法
#if UNITY_2020_BUG
switch (handle) switch (handle)
{ {
case AssetHandle asset_handle: case AssetHandle asset_handle:
@@ -108,38 +98,16 @@ namespace Cysharp.Threading.Tasks
all_assets_handle.Completed += result.AllAssetsContinuation; all_assets_handle.Completed += result.AllAssetsContinuation;
break; break;
} }
#else
switch (handle)
{
case AssetHandle asset_handle:
asset_handle.Completed += result.completedCallback;
break;
case SceneHandle scene_handle:
scene_handle.Completed += result.completedCallback;
break;
case SubAssetsHandle sub_asset_handle:
sub_asset_handle.Completed += result.completedCallback;
break;
case BundleFileHandle bundle_file_handle:
bundle_file_handle.Completed += result.completedCallback;
break;
case AllAssetsHandle all_assets_handle:
all_assets_handle.Completed += result.completedCallback;
break;
}
#endif
token = result.core.Version; token = result.core.Version;
return result; return result;
} }
#if UNITY_2020_BUG
void AssetContinuation(AssetHandle _) => HandleCompleted(null); void AssetContinuation(AssetHandle _) => HandleCompleted(null);
void SceneContinuation(SceneHandle _) => HandleCompleted(null); void SceneContinuation(SceneHandle _) => HandleCompleted(null);
void SubContinuation(SubAssetsHandle _) => HandleCompleted(null); void SubContinuation(SubAssetsHandle _) => HandleCompleted(null);
void BundleFileContinuation(BundleFileHandle _) => HandleCompleted(null); void BundleFileContinuation(BundleFileHandle _) => HandleCompleted(null);
void AllAssetsContinuation(AllAssetsHandle _) => HandleCompleted(null); void AllAssetsContinuation(AllAssetsHandle _) => HandleCompleted(null);
#endif
void HandleCompleted(HandleBase _) void HandleCompleted(HandleBase _)
{ {
@@ -162,7 +130,6 @@ namespace Cysharp.Threading.Tasks
{ {
if (handle == null || !handle.IsValid) return; if (handle == null || !handle.IsValid) return;
#if UNITY_2020_BUG
switch (handle) switch (handle)
{ {
case AssetHandle asset_handle: case AssetHandle asset_handle:
@@ -181,26 +148,6 @@ namespace Cysharp.Threading.Tasks
all_assets_handle.Completed -= AllAssetsContinuation; all_assets_handle.Completed -= AllAssetsContinuation;
break; break;
} }
#else
switch (handle)
{
case AssetHandle asset_handle:
asset_handle.Completed -= completedCallback;
break;
case SceneHandle scene_handle:
scene_handle.Completed -= completedCallback;
break;
case SubAssetsHandle sub_asset_handle:
sub_asset_handle.Completed -= completedCallback;
break;
case BundleFileHandle bundle_file_handle:
bundle_file_handle.Completed -= completedCallback;
break;
case AllAssetsHandle all_assets_handle:
all_assets_handle.Completed -= completedCallback;
break;
}
#endif
} }
public void GetResult(short token) public void GetResult(short token)