diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/AlipayFileSystem.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/AlipayFileSystem.cs
index bf49db77..dcb47c6a 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/AlipayFileSystem.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/AlipayFileSystem.cs
@@ -182,10 +182,10 @@ internal class AlipayFileSystem : IFileSystem
if (string.IsNullOrEmpty(_aliCacheRoot))
{
- throw new System.Exception("请配置支付宝小游戏的缓存根目录!");
+ throw new System.Exception("请配置小游戏的缓存根目录!");
}
- // 注意:CDN服务未启用的情况下,使用支付宝WEB服务器
+ // 注意:CDN服务未启用的情况下,使用WEB服务器
if (RemoteServices == null)
{
string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSLoadPackageManifestOperation.cs
index 4b0b3783..cdb630fb 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSLoadPackageManifestOperation.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSLoadPackageManifestOperation.cs
@@ -14,8 +14,8 @@ internal class APFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
private readonly AlipayFileSystem _fileSystem;
private readonly string _packageVersion;
private readonly int _timeout;
- private RequestAlipayPackageHashOperation _requestPackageHashOp;
- private LoadAlipayPackageManifestOperation _loadPackageManifestOp;
+ private RequestWebPackageHashOperation _requestPackageHashOp;
+ private LoadWebPackageManifestOperation _loadPackageManifestOp;
private ESteps _steps = ESteps.None;
@@ -38,7 +38,7 @@ internal class APFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
{
if (_requestPackageHashOp == null)
{
- _requestPackageHashOp = new RequestAlipayPackageHashOperation(_fileSystem, _packageVersion, _timeout);
+ _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
_requestPackageHashOp.StartOperation();
AddChildOperation(_requestPackageHashOp);
}
@@ -64,7 +64,10 @@ internal class APFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
if (_loadPackageManifestOp == null)
{
string packageHash = _requestPackageHashOp.PackageHash;
- _loadPackageManifestOp = new LoadAlipayPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+ string packageName = _fileSystem.PackageName;
+ var manifestServices = _fileSystem.ManifestServices;
+ var remoteServices = _fileSystem.RemoteServices;
+ _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
_loadPackageManifestOp.StartOperation();
AddChildOperation(_loadPackageManifestOp);
}
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSRequestPackageVersionOperation.cs
index ba5b117f..cedb7e4c 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSRequestPackageVersionOperation.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/APFSRequestPackageVersionOperation.cs
@@ -13,7 +13,7 @@ internal class APFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
private readonly AlipayFileSystem _fileSystem;
private readonly bool _appendTimeTicks;
private readonly int _timeout;
- private RequestAlipayPackageVersionOperation _requestWebPackageVersionOp;
+ private RequestWebPackageVersionOperation _requestWebPackageVersionOp;
private ESteps _steps = ESteps.None;
@@ -36,7 +36,7 @@ internal class APFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
{
if (_requestWebPackageVersionOp == null)
{
- _requestWebPackageVersionOp = new RequestAlipayPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+ _requestWebPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
_requestWebPackageVersionOp.StartOperation();
AddChildOperation(_requestWebPackageVersionOp);
}
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs
deleted file mode 100644
index de343777..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-#if UNITY_WEBGL && UNITY_ALIMINIGAME
-using YooAsset;
-
-internal class LoadAlipayPackageManifestOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestFileData,
- VerifyFileData,
- LoadManifest,
- Done,
- }
-
- private readonly AlipayFileSystem _fileSystem;
- private readonly string _packageVersion;
- private readonly string _packageHash;
- private readonly int _timeout;
- private UnityWebDataRequestOperation _webDataRequestOp;
- private DeserializeManifestOperation _deserializer;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹清单
- ///
- public PackageManifest Manifest { private set; get; }
-
-
- internal LoadAlipayPackageManifestOperation(AlipayFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
- {
- _fileSystem = fileSystem;
- _packageVersion = packageVersion;
- _packageHash = packageHash;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadAlipayPackageManifestOperation));
- _steps = ESteps.RequestFileData;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestFileData)
- {
- if (_webDataRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
- string url = GetRequestURL(fileName);
- _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
- _webDataRequestOp.StartOperation();
- AddChildOperation(_webDataRequestOp);
- }
-
- _webDataRequestOp.UpdateOperation();
- Progress = _webDataRequestOp.Progress;
- if (_webDataRequestOp.IsDone == false)
- return;
-
- if (_webDataRequestOp.Status == EOperationStatus.Succeed)
- {
- _steps = ESteps.VerifyFileData;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webDataRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadAlipayPackageManifestOperation));
- }
- }
-
- if (_steps == ESteps.VerifyFileData)
- {
- string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
- if (fileHash == _packageHash)
- {
- _steps = ESteps.LoadManifest;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = "Failed to verify package manifest file!";
- }
- }
-
- if (_steps == ESteps.LoadManifest)
- {
- if (_deserializer == null)
- {
- _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
- _deserializer.StartOperation();
- AddChildOperation(_deserializer);
- }
-
- _deserializer.UpdateOperation();
- Progress = _deserializer.Progress;
- if (_deserializer.IsDone == false)
- return;
-
- if (_deserializer.Status == EOperationStatus.Succeed)
- {
- _steps = ESteps.Done;
- Manifest = _deserializer.Manifest;
- Status = EOperationStatus.Succeed;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _deserializer.Error;
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs.meta
deleted file mode 100644
index 77d0ee62..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/LoadAlipayPackageManifestOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c802e6ad51754e144bb4e08942da9592
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs
deleted file mode 100644
index 617e627a..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-#if UNITY_WEBGL && UNITY_ALIMINIGAME
-using YooAsset;
-
-internal class RequestAlipayPackageHashOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestPackageHash,
- Done,
- }
-
- private readonly AlipayFileSystem _fileSystem;
- private readonly string _packageVersion;
- private readonly int _timeout;
- private UnityWebTextRequestOperation _webTextRequestOp;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹哈希值
- ///
- public string PackageHash { private set; get; }
-
-
- public RequestAlipayPackageHashOperation(AlipayFileSystem fileSystem, string packageVersion, int timeout)
- {
- _fileSystem = fileSystem;
- _packageVersion = packageVersion;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestAlipayPackageHashOperation));
- _steps = ESteps.RequestPackageHash;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestPackageHash)
- {
- if (_webTextRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
- string url = GetRequestURL(fileName);
- _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
- _webTextRequestOp.StartOperation();
- AddChildOperation(_webTextRequestOp);
- }
-
- _webTextRequestOp.UpdateOperation();
- Progress = _webTextRequestOp.Progress;
- if (_webTextRequestOp.IsDone == false)
- return;
-
- if (_webTextRequestOp.Status == EOperationStatus.Succeed)
- {
- PackageHash = _webTextRequestOp.Result;
- if (string.IsNullOrEmpty(PackageHash))
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = $"Web package hash file content is empty !";
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Succeed;
- }
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webTextRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestAlipayPackageHashOperation));
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs.meta
deleted file mode 100644
index 9559c2a2..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageHashOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3b4f8cf6fe34a7e419f8e3a0063f591b
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs
deleted file mode 100644
index 69874c5b..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-#if UNITY_WEBGL && UNITY_ALIMINIGAME
-using YooAsset;
-
-internal class RequestAlipayPackageVersionOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestPackageVersion,
- Done,
- }
-
- private readonly AlipayFileSystem _fileSystem;
- private readonly bool _appendTimeTicks;
- private readonly int _timeout;
- private UnityWebTextRequestOperation _webTextRequestOp;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹版本
- ///
- public string PackageVersion { private set; get; }
-
-
- public RequestAlipayPackageVersionOperation(AlipayFileSystem fileSystem, bool appendTimeTicks, int timeout)
- {
- _fileSystem = fileSystem;
- _appendTimeTicks = appendTimeTicks;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestAlipayPackageVersionOperation));
- _steps = ESteps.RequestPackageVersion;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestPackageVersion)
- {
- if (_webTextRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
- string url = GetRequestURL(fileName);
- _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
- _webTextRequestOp.StartOperation();
- AddChildOperation(_webTextRequestOp);
- }
-
- _webTextRequestOp.UpdateOperation();
- Progress = _webTextRequestOp.Progress;
- if (_webTextRequestOp.IsDone == false)
- return;
-
- if (_webTextRequestOp.Status == EOperationStatus.Succeed)
- {
- PackageVersion = _webTextRequestOp.Result;
- if (string.IsNullOrEmpty(PackageVersion))
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = $"Web package version file content is empty !";
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Succeed;
- }
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webTextRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestAlipayPackageVersionOperation));
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- string url;
-
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-
- // 在URL末尾添加时间戳
- if (_appendTimeTicks)
- return $"{url}?{System.DateTime.UtcNow.Ticks}";
- else
- return url;
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs.meta
deleted file mode 100644
index 08ed6918..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/AlipayFileSystem/Operation/internal/RequestAlipayPackageVersionOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0ef3d88ce51a6fa47be1b157316a740c
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs
index d5d448c0..54541763 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs
@@ -14,11 +14,11 @@ internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
private readonly TiktokFileSystem _fileSystem;
private readonly string _packageVersion;
private readonly int _timeout;
- private RequestTiktokPackageHashOperation _requestPackageHashOp;
- private LoadTiktokPackageManifestOperation _loadPackageManifestOp;
+ private RequestWebPackageHashOperation _requestPackageHashOp;
+ private LoadWebPackageManifestOperation _loadPackageManifestOp;
private ESteps _steps = ESteps.None;
-
+
public TTFSLoadPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout)
{
_fileSystem = fileSystem;
@@ -38,7 +38,7 @@ internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
{
if (_requestPackageHashOp == null)
{
- _requestPackageHashOp = new RequestTiktokPackageHashOperation(_fileSystem, _packageVersion, _timeout);
+ _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
_requestPackageHashOp.StartOperation();
AddChildOperation(_requestPackageHashOp);
}
@@ -64,7 +64,10 @@ internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
if (_loadPackageManifestOp == null)
{
string packageHash = _requestPackageHashOp.PackageHash;
- _loadPackageManifestOp = new LoadTiktokPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+ string packageName = _fileSystem.PackageName;
+ var manifestServices = _fileSystem.ManifestServices;
+ var remoteServices = _fileSystem.RemoteServices;
+ _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
_loadPackageManifestOp.StartOperation();
AddChildOperation(_loadPackageManifestOp);
}
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs
index 76643577..feea29ef 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs
@@ -13,7 +13,7 @@ internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
private readonly TiktokFileSystem _fileSystem;
private readonly bool _appendTimeTicks;
private readonly int _timeout;
- private RequestTiktokPackageVersionOperation _requestPackageVersionOp;
+ private RequestWebPackageVersionOperation _requestPackageVersionOp;
private ESteps _steps = ESteps.None;
@@ -36,7 +36,7 @@ internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
{
if (_requestPackageVersionOp == null)
{
- _requestPackageVersionOp = new RequestTiktokPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+ _requestPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
_requestPackageVersionOp.StartOperation();
AddChildOperation(_requestPackageVersionOp);
}
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs
deleted file mode 100644
index 1c5a14a3..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
-using YooAsset;
-
-internal class LoadTiktokPackageManifestOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestFileData,
- VerifyFileData,
- LoadManifest,
- Done,
- }
-
- private readonly TiktokFileSystem _fileSystem;
- private readonly string _packageVersion;
- private readonly string _packageHash;
- private readonly int _timeout;
- private UnityWebDataRequestOperation _webDataRequestOp;
- private DeserializeManifestOperation _deserializer;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹清单
- ///
- public PackageManifest Manifest { private set; get; }
-
-
- internal LoadTiktokPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
- {
- _fileSystem = fileSystem;
- _packageVersion = packageVersion;
- _packageHash = packageHash;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation));
- _steps = ESteps.RequestFileData;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestFileData)
- {
- if (_webDataRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
- string url = GetRequestURL(fileName);
- _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
- _webDataRequestOp.StartOperation();
- AddChildOperation(_webDataRequestOp);
- }
-
- _webDataRequestOp.UpdateOperation();
- Progress = _webDataRequestOp.Progress;
- if (_webDataRequestOp.IsDone == false)
- return;
-
- if (_webDataRequestOp.Status == EOperationStatus.Succeed)
- {
- _steps = ESteps.VerifyFileData;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webDataRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation));
- }
- }
-
- if (_steps == ESteps.VerifyFileData)
- {
- string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
- if (fileHash == _packageHash)
- {
- _steps = ESteps.LoadManifest;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = "Failed to verify package manifest file!";
- }
- }
-
- if (_steps == ESteps.LoadManifest)
- {
- if (_deserializer == null)
- {
- _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
- _deserializer.StartOperation();
- AddChildOperation(_deserializer);
- }
-
- _deserializer.UpdateOperation();
- Progress = _deserializer.Progress;
- if (_deserializer.IsDone == false)
- return;
-
- if (_deserializer.Status == EOperationStatus.Succeed)
- {
- _steps = ESteps.Done;
- Manifest = _deserializer.Manifest;
- Status = EOperationStatus.Succeed;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _deserializer.Error;
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta
deleted file mode 100644
index 6bb1e19a..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b648d648fa0c4e44d811b42b80891543
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs
deleted file mode 100644
index c0791573..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
-using YooAsset;
-
-internal class RequestTiktokPackageHashOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestPackageHash,
- Done,
- }
-
- private readonly TiktokFileSystem _fileSystem;
- private readonly string _packageVersion;
- private readonly int _timeout;
- private UnityWebTextRequestOperation _webTextRequestOp;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹哈希值
- ///
- public string PackageHash { private set; get; }
-
-
- public RequestTiktokPackageHashOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout)
- {
- _fileSystem = fileSystem;
- _packageVersion = packageVersion;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation));
- _steps = ESteps.RequestPackageHash;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestPackageHash)
- {
- if (_webTextRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
- string url = GetRequestURL(fileName);
- _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
- _webTextRequestOp.StartOperation();
- AddChildOperation(_webTextRequestOp);
- }
-
- _webTextRequestOp.UpdateOperation();
- Progress = _webTextRequestOp.Progress;
- if (_webTextRequestOp.IsDone == false)
- return;
-
- if (_webTextRequestOp.Status == EOperationStatus.Succeed)
- {
- PackageHash = _webTextRequestOp.Result;
- if (string.IsNullOrEmpty(PackageHash))
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = $"Web package hash file content is empty !";
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Succeed;
- }
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webTextRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation));
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta
deleted file mode 100644
index 7a997454..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 51a0e40e248b49a4783b3dca33a23cf1
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs
deleted file mode 100644
index d795734b..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-#if UNITY_WEBGL && DOUYINMINIGAME
-using YooAsset;
-
-internal class RequestTiktokPackageVersionOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestPackageVersion,
- Done,
- }
-
- private readonly TiktokFileSystem _fileSystem;
- private readonly bool _appendTimeTicks;
- private readonly int _timeout;
- private UnityWebTextRequestOperation _webTextRequestOp;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹版本
- ///
- public string PackageVersion { private set; get; }
-
-
- public RequestTiktokPackageVersionOperation(TiktokFileSystem fileSystem, bool appendTimeTicks, int timeout)
- {
- _fileSystem = fileSystem;
- _appendTimeTicks = appendTimeTicks;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation));
- _steps = ESteps.RequestPackageVersion;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestPackageVersion)
- {
- if (_webTextRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
- string url = GetRequestURL(fileName);
- _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
- _webTextRequestOp.StartOperation();
- AddChildOperation(_webTextRequestOp);
- }
-
- _webTextRequestOp.UpdateOperation();
- Progress = _webTextRequestOp.Progress;
- if (_webTextRequestOp.IsDone == false)
- return;
-
- if (_webTextRequestOp.Status == EOperationStatus.Succeed)
- {
- PackageVersion = _webTextRequestOp.Result;
- if (string.IsNullOrEmpty(PackageVersion))
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = $"Web package version file content is empty !";
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Succeed;
- }
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webTextRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation));
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- string url;
-
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-
- // 在URL末尾添加时间戳
- if (_appendTimeTicks)
- return $"{url}?{System.DateTime.UtcNow.Ticks}";
- else
- return url;
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta
deleted file mode 100644
index be04d192..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a04c463fb00f60f499541fbb98e4fdc4
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/TiktokFileSystem.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/TiktokFileSystem.cs
index f98c576b..d91b8feb 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/TiktokFileSystem.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/TiktokFileSystem/TiktokFileSystem.cs
@@ -182,10 +182,10 @@ internal class TiktokFileSystem : IFileSystem
if (string.IsNullOrEmpty(_ttCacheRoot))
{
- throw new System.Exception("请配置抖音小游戏的缓存根目录!");
+ throw new System.Exception("请配置小游戏的缓存根目录!");
}
- // 注意:CDN服务未启用的情况下,使用抖音WEB服务器
+ // 注意:CDN服务未启用的情况下,使用WEB服务器
if (RemoteServices == null)
{
string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs
index 712959a4..4759c72f 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs
@@ -14,11 +14,11 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
private readonly WechatFileSystem _fileSystem;
private readonly string _packageVersion;
private readonly int _timeout;
- private RequestWechatPackageHashOperation _requestPackageHashOp;
- private LoadWechatPackageManifestOperation _loadPackageManifestOp;
+ private RequestWebPackageHashOperation _requestPackageHashOp;
+ private LoadWebPackageManifestOperation _loadPackageManifestOp;
private ESteps _steps = ESteps.None;
-
+
public WXFSLoadPackageManifestOperation(WechatFileSystem fileSystem, string packageVersion, int timeout)
{
_fileSystem = fileSystem;
@@ -38,7 +38,7 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
{
if (_requestPackageHashOp == null)
{
- _requestPackageHashOp = new RequestWechatPackageHashOperation(_fileSystem, _packageVersion, _timeout);
+ _requestPackageHashOp = new RequestWebPackageHashOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _packageVersion, _timeout);
_requestPackageHashOp.StartOperation();
AddChildOperation(_requestPackageHashOp);
}
@@ -64,7 +64,10 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
if (_loadPackageManifestOp == null)
{
string packageHash = _requestPackageHashOp.PackageHash;
- _loadPackageManifestOp = new LoadWechatPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
+ string packageName = _fileSystem.PackageName;
+ var manifestServices = _fileSystem.ManifestServices;
+ var remoteServices = _fileSystem.RemoteServices;
+ _loadPackageManifestOp = new LoadWebPackageManifestOperation(manifestServices, remoteServices, packageName, _packageVersion, packageHash, _timeout);
_loadPackageManifestOp.StartOperation();
AddChildOperation(_loadPackageManifestOp);
}
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs
index 293c7484..66a82a68 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/WXFSRequestPackageVersionOperation.cs
@@ -13,7 +13,7 @@ internal class WXFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
private readonly WechatFileSystem _fileSystem;
private readonly bool _appendTimeTicks;
private readonly int _timeout;
- private RequestWechatPackageVersionOperation _requestWebPackageVersionOp;
+ private RequestWebPackageVersionOperation _requestWebPackageVersionOp;
private ESteps _steps = ESteps.None;
@@ -36,7 +36,7 @@ internal class WXFSRequestPackageVersionOperation : FSRequestPackageVersionOpera
{
if (_requestWebPackageVersionOp == null)
{
- _requestWebPackageVersionOp = new RequestWechatPackageVersionOperation(_fileSystem, _appendTimeTicks, _timeout);
+ _requestWebPackageVersionOp = new RequestWebPackageVersionOperation(_fileSystem.RemoteServices, _fileSystem.PackageName, _appendTimeTicks, _timeout);
_requestWebPackageVersionOp.StartOperation();
AddChildOperation(_requestWebPackageVersionOp);
}
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs
deleted file mode 100644
index c18e1b4c..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-
-internal class LoadWechatPackageManifestOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestFileData,
- VerifyFileData,
- LoadManifest,
- Done,
- }
-
- private readonly WechatFileSystem _fileSystem;
- private readonly string _packageVersion;
- private readonly string _packageHash;
- private readonly int _timeout;
- private UnityWebDataRequestOperation _webDataRequestOp;
- private DeserializeManifestOperation _deserializer;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹清单
- ///
- public PackageManifest Manifest { private set; get; }
-
-
- internal LoadWechatPackageManifestOperation(WechatFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
- {
- _fileSystem = fileSystem;
- _packageVersion = packageVersion;
- _packageHash = packageHash;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadWechatPackageManifestOperation));
- _steps = ESteps.RequestFileData;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestFileData)
- {
- if (_webDataRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
- string url = GetRequestURL(fileName);
- _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
- _webDataRequestOp.StartOperation();
- AddChildOperation(_webDataRequestOp);
- }
-
- _webDataRequestOp.UpdateOperation();
- Progress = _webDataRequestOp.Progress;
- if (_webDataRequestOp.IsDone == false)
- return;
-
- if (_webDataRequestOp.Status == EOperationStatus.Succeed)
- {
- _steps = ESteps.VerifyFileData;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webDataRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadWechatPackageManifestOperation));
- }
- }
-
- if (_steps == ESteps.VerifyFileData)
- {
- string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
- if (fileHash == _packageHash)
- {
- _steps = ESteps.LoadManifest;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = "Failed to verify package manifest file!";
- }
- }
-
- if (_steps == ESteps.LoadManifest)
- {
- if (_deserializer == null)
- {
- _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
- _deserializer.StartOperation();
- AddChildOperation(_deserializer);
- }
-
- _deserializer.UpdateOperation();
- Progress = _deserializer.Progress;
- if (_deserializer.IsDone == false)
- return;
-
- if (_deserializer.Status == EOperationStatus.Succeed)
- {
- _steps = ESteps.Done;
- Manifest = _deserializer.Manifest;
- Status = EOperationStatus.Succeed;
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _deserializer.Error;
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta
deleted file mode 100644
index 183900fb..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/LoadWechatPackageManifestOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2c2153284d246964fb2146f9fdda311c
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs
deleted file mode 100644
index 70c43d76..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-
-internal class RequestWechatPackageHashOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestPackageHash,
- Done,
- }
-
- private readonly WechatFileSystem _fileSystem;
- private readonly string _packageVersion;
- private readonly int _timeout;
- private UnityWebTextRequestOperation _webTextRequestOp;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹哈希值
- ///
- public string PackageHash { private set; get; }
-
-
- public RequestWechatPackageHashOperation(WechatFileSystem fileSystem, string packageVersion, int timeout)
- {
- _fileSystem = fileSystem;
- _packageVersion = packageVersion;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWechatPackageHashOperation));
- _steps = ESteps.RequestPackageHash;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestPackageHash)
- {
- if (_webTextRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, _packageVersion);
- string url = GetRequestURL(fileName);
- _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
- _webTextRequestOp.StartOperation();
- AddChildOperation(_webTextRequestOp);
- }
-
- _webTextRequestOp.UpdateOperation();
- Progress = _webTextRequestOp.Progress;
- if (_webTextRequestOp.IsDone == false)
- return;
-
- if (_webTextRequestOp.Status == EOperationStatus.Succeed)
- {
- PackageHash = _webTextRequestOp.Result;
- if (string.IsNullOrEmpty(PackageHash))
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = $"Web package hash file content is empty !";
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Succeed;
- }
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webTextRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWechatPackageHashOperation));
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- return _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- return _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta
deleted file mode 100644
index c2f4ed99..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageHashOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3f8269507a575884f935f9fbc71396ea
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs
deleted file mode 100644
index 575bfbd6..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-#if UNITY_WEBGL && WEIXINMINIGAME
-using YooAsset;
-
-internal class RequestWechatPackageVersionOperation : AsyncOperationBase
-{
- private enum ESteps
- {
- None,
- RequestPackageVersion,
- Done,
- }
-
- private readonly WechatFileSystem _fileSystem;
- private readonly bool _appendTimeTicks;
- private readonly int _timeout;
- private UnityWebTextRequestOperation _webTextRequestOp;
- private int _requestCount = 0;
- private ESteps _steps = ESteps.None;
-
- ///
- /// 包裹版本
- ///
- public string PackageVersion { private set; get; }
-
-
- public RequestWechatPackageVersionOperation(WechatFileSystem fileSystem, bool appendTimeTicks, int timeout)
- {
- _fileSystem = fileSystem;
- _appendTimeTicks = appendTimeTicks;
- _timeout = timeout;
- }
- internal override void InternalStart()
- {
- _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestWechatPackageVersionOperation));
- _steps = ESteps.RequestPackageVersion;
- }
- internal override void InternalUpdate()
- {
- if (_steps == ESteps.None || _steps == ESteps.Done)
- return;
-
- if (_steps == ESteps.RequestPackageVersion)
- {
- if (_webTextRequestOp == null)
- {
- string fileName = YooAssetSettingsData.GetPackageVersionFileName(_fileSystem.PackageName);
- string url = GetRequestURL(fileName);
- _webTextRequestOp = new UnityWebTextRequestOperation(url, _timeout);
- _webTextRequestOp.StartOperation();
- AddChildOperation(_webTextRequestOp);
- }
-
- _webTextRequestOp.UpdateOperation();
- Progress = _webTextRequestOp.Progress;
- if (_webTextRequestOp.IsDone == false)
- return;
-
- if (_webTextRequestOp.Status == EOperationStatus.Succeed)
- {
- PackageVersion = _webTextRequestOp.Result;
- if (string.IsNullOrEmpty(PackageVersion))
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = $"Web package version file content is empty !";
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Succeed;
- }
- }
- else
- {
- _steps = ESteps.Done;
- Status = EOperationStatus.Failed;
- Error = _webTextRequestOp.Error;
- WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestWechatPackageVersionOperation));
- }
- }
- }
-
- private string GetRequestURL(string fileName)
- {
- string url;
-
- // 轮流返回请求地址
- if (_requestCount % 2 == 0)
- url = _fileSystem.RemoteServices.GetRemoteMainURL(fileName);
- else
- url = _fileSystem.RemoteServices.GetRemoteFallbackURL(fileName);
-
- // 在URL末尾添加时间戳
- if (_appendTimeTicks)
- return $"{url}?{System.DateTime.UtcNow.Ticks}";
- else
- return url;
- }
-}
-#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta
deleted file mode 100644
index 8958ebe2..00000000
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/Operation/internal/RequestWechatPackageVersionOperation.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 758fbcd91469b3f4e843a9ea7e3deda9
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/WechatFileSystem.cs b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/WechatFileSystem.cs
index 8ada8f2f..a02a4e9b 100644
--- a/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/WechatFileSystem.cs
+++ b/Assets/YooAsset/Samples~/Mini Game/Runtime/WechatFileSystem/WechatFileSystem.cs
@@ -196,10 +196,10 @@ internal class WechatFileSystem : IFileSystem
if (string.IsNullOrEmpty(_wxCacheRoot))
{
- throw new System.Exception("请配置微信小游戏缓存根目录!");
+ throw new System.Exception("请配置小游戏缓存根目录!");
}
- // 注意:CDN服务未启用的情况下,使用微信WEB服务器
+ // 注意:CDN服务未启用的情况下,使用WEB服务器
if (RemoteServices == null)
{
string webRoot = PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName, packageName);