pengtaihao
/
YooAsset
mirror of https://github.com/tuyoogame/YooAsset
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

根据NETAnalyzers调整代码 

https://learn.microsoft.com/zh-cn/dotnet/fundamentals/code-analysis/quality-rules/ca1819
https://learn.microsoft.com/zh-cn/dotnet/fundamentals/code-analysis/quality-rules/ca1825
https://learn.microsoft.com/zh-cn/dotnet/fundamentals/code-analysis/quality-rules/ca1841
https://learn.microsoft.com/zh-cn/dotnet/fundamentals/code-analysis/quality-rules/ca1854
https://learn.microsoft.com/zh-cn/dotnet/fundamentals/code-analysis/quality-rules/ca1864
https://learn.microsoft.com/zh-cn/dotnet/fundamentals/code-analysis/quality-rules/ca1865-ca1867
pull/317/head
JellyHoney 2024-06-24 20:09:56 +08:00
parent 2987d356b6
commit 3d3fbedea2
11 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs
View File

@ -180,9 +180,9 @@ namespace YooAsset.Editor
for (int index = 0; index < manifest.BundleList.Count; index++)
{
var packageBundle = manifest.BundleList[index];
if (_cacheBundleTags.ContainsKey(index))
if (_cacheBundleTags.TryGetValue(index, out var value))
{
packageBundle.Tags = _cacheBundleTags[index].ToArray();
packageBundle.Tags = value.ToArray();
}
else
{

4
Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs
View File

@ -56,9 +56,9 @@ namespace YooAsset.Editor
string bundleName = collectAssetInfo.BundleName;
foreach (var dependAsset in collectAssetInfo.DependAssets)
{
if (allBuildAssetInfos.ContainsKey(dependAsset.AssetPath))
if (allBuildAssetInfos.TryGetValue(dependAsset.AssetPath, out var value))
{
allBuildAssetInfos[dependAsset.AssetPath].AddReferenceBundleName(bundleName);
value.AddReferenceBundleName(bundleName);
}
else
{

2
Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs
View File

@ -14,7 +14,7 @@ namespace YooAsset.Editor
protected override string[] GetBundleDepends(BuildContext context, string bundleName)
{
return new string[] { };
return Array.Empty<string>();
}
}
}

10
Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs
View File

@ -275,23 +275,23 @@ namespace YooAsset.Editor
public static bool HasActiveRuleName(string ruleName)
{
return _cacheActiveRuleTypes.Keys.Contains(ruleName);
return _cacheActiveRuleTypes.ContainsKey(ruleName);
}
public static bool HasAddressRuleName(string ruleName)
{
return _cacheAddressRuleTypes.Keys.Contains(ruleName);
return _cacheAddressRuleTypes.ContainsKey(ruleName);
}
public static bool HasPackRuleName(string ruleName)
{
return _cachePackRuleTypes.Keys.Contains(ruleName);
return _cachePackRuleTypes.ContainsKey(ruleName);
}
public static bool HasFilterRuleName(string ruleName)
{
return _cacheFilterRuleTypes.Keys.Contains(ruleName);
return _cacheFilterRuleTypes.ContainsKey(ruleName);
}
public static bool HasIgnoreRuleName(string ruleName)
{
return _cacheIgnoreRuleTypes.Keys.Contains(ruleName);
return _cacheIgnoreRuleTypes.ContainsKey(ruleName);
}
public static IActiveRule GetActiveRuleInstance(string ruleName)

5
Assets/YooAsset/Runtime/CacheSystem/CacheManager.cs
View File

@ -94,10 +94,7 @@ namespace YooAsset
}
}
if (_wrappers.ContainsKey(cacheGUID))
{
_wrappers.Remove(cacheGUID);
}
_wrappers.Remove(cacheGUID);
}
/// <summary>

2
Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs
View File

@ -67,7 +67,7 @@ namespace YooAsset
/// <summary>
/// 子资源对象集合
/// </summary>
public UnityEngine.Object[] AllAssetObjects
public IReadOnlyList<UnityEngine.Object> AllAssetObjects
{
get
{

2
Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs
View File

@ -67,7 +67,7 @@ namespace YooAsset
/// <summary>
/// 子资源对象集合
/// </summary>
public UnityEngine.Object[] AllAssetObjects
public IReadOnlyList<Object> AllAssetObjects
{
get
{

4
Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
View File

@ -166,10 +166,8 @@ namespace YooAsset
{
// 注意：我们不允许原始路径存在重名
string assetPath = packageAsset.AssetPath;
if (manifest.AssetDic.ContainsKey(assetPath))
if (!manifest.AssetDic.TryAdd(assetPath, packageAsset))
throw new Exception($"AssetPath have existed : {assetPath}");
else
manifest.AssetDic.Add(assetPath, packageAsset);
}
return manifest;

20
Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
View File

@ -124,10 +124,8 @@ namespace YooAsset
// 注意：我们不允许原始路径存在重名
string assetPath = packageAsset.AssetPath;
if (Manifest.AssetDic.ContainsKey(assetPath))
if (!Manifest.AssetDic.TryAdd(assetPath, packageAsset))
throw new System.Exception($"AssetPath have existed : {assetPath}");
else
Manifest.AssetDic.Add(assetPath, packageAsset);
// 填充AssetPathMapping1
{
@ -136,19 +134,15 @@ namespace YooAsset
location = location.ToLower();
// 添加原生路径的映射
if (Manifest.AssetPathMapping1.ContainsKey(location))
if (!Manifest.AssetPathMapping1.TryAdd(location, packageAsset.AssetPath))
throw new System.Exception($"Location have existed : {location}");
else
Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
// 添加无后缀名路径的映射
string locationWithoutExtension = Path.ChangeExtension(location, null);
if (ReferenceEquals(location, locationWithoutExtension) == false)
{
if (Manifest.AssetPathMapping1.ContainsKey(locationWithoutExtension))
if (!Manifest.AssetPathMapping1.TryAdd(locationWithoutExtension, packageAsset.AssetPath))
YooLogger.Warning($"Location have existed : {locationWithoutExtension}");
else
Manifest.AssetPathMapping1.Add(locationWithoutExtension, packageAsset.AssetPath);
}
}
if (Manifest.EnableAddressable)
@ -156,20 +150,16 @@ namespace YooAsset
string location = packageAsset.Address;
if (string.IsNullOrEmpty(location) == false)
{
if (Manifest.AssetPathMapping1.ContainsKey(location))
if (!Manifest.AssetPathMapping1.TryAdd(location, packageAsset.AssetPath))
throw new System.Exception($"Location have existed : {location}");
else
Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
}
}
// 填充AssetPathMapping2
if (Manifest.IncludeAssetGUID)
{
if (Manifest.AssetPathMapping2.ContainsKey(packageAsset.AssetGUID))
if (!Manifest.AssetPathMapping2.TryAdd(packageAsset.AssetGUID, packageAsset.AssetPath))
throw new System.Exception($"AssetGUID have existed : {packageAsset.AssetGUID}");
else
Manifest.AssetPathMapping2.Add(packageAsset.AssetGUID, packageAsset.AssetPath);
}
_packageAssetCount--;

2
Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs
View File

@ -344,7 +344,7 @@ namespace YooAsset
if (string.IsNullOrEmpty(location) == false)
{
// 检查路径末尾是否有空格
int index = location.LastIndexOf(" ");
int index = location.LastIndexOf(' ');
if (index != -1)
{
if (location.Length == index + 1)

6
Assets/YooAsset/Runtime/Utility/YooUtility.cs
View File

@ -1,9 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.IO;
using System.Security.Cryptography;
using System.Text;
namespace YooAsset
{
@ -29,7 +27,7 @@ namespace YooAsset
if (string.IsNullOrEmpty(str))
return str;
int index = str.LastIndexOf(".");
int index = str.LastIndexOf('.');
if (index == -1)
return str;
else