diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadPackageManifestOperation.cs deleted file mode 100644 index 758fec72..00000000 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadPackageManifestOperation.cs +++ /dev/null @@ -1,88 +0,0 @@ -#if UNITY_WEBGL && BYTEMINIGAME -using YooAsset; - -internal class BGFSLoadPackageManifestOperation : FSLoadPackageManifestOperation -{ - private enum ESteps - { - None, - RequestRemotePackageHash, - LoadRemotePackageManifest, - Done, - } - - private readonly ByteGameFileSystem _fileSystem; - private readonly string _packageVersion; - private readonly int _timeout; - private RequestByteGamePackageHashOperation _requestRemotePackageHashOp; - private LoadByteGamePackageManifestOperation _loadRemotePackageManifestOp; - private ESteps _steps = ESteps.None; - - - public BGFSLoadPackageManifestOperation(ByteGameFileSystem fileSystem, string packageVersion, int timeout) - { - _fileSystem = fileSystem; - _packageVersion = packageVersion; - _timeout = timeout; - } - internal override void InternalOnStart() - { - _steps = ESteps.RequestRemotePackageHash; - } - internal override void InternalOnUpdate() - { - if (_steps == ESteps.None || _steps == ESteps.Done) - return; - - if (_steps == ESteps.RequestRemotePackageHash) - { - if (_requestRemotePackageHashOp == null) - { - _requestRemotePackageHashOp = new RequestByteGamePackageHashOperation(_fileSystem, _packageVersion, _timeout); - OperationSystem.StartOperation(_fileSystem.PackageName, _requestRemotePackageHashOp); - } - - if (_requestRemotePackageHashOp.IsDone == false) - return; - - if (_requestRemotePackageHashOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.LoadRemotePackageManifest; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _requestRemotePackageHashOp.Error; - } - } - - if (_steps == ESteps.LoadRemotePackageManifest) - { - if (_loadRemotePackageManifestOp == null) - { - string packageHash = _requestRemotePackageHashOp.PackageHash; - _loadRemotePackageManifestOp = new LoadByteGamePackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout); - OperationSystem.StartOperation(_fileSystem.PackageName, _loadRemotePackageManifestOp); - } - - Progress = _loadRemotePackageManifestOp.Progress; - if (_loadRemotePackageManifestOp.IsDone == false) - return; - - if (_loadRemotePackageManifestOp.Status == EOperationStatus.Succeed) - { - _steps = ESteps.Done; - Manifest = _loadRemotePackageManifestOp.Manifest; - Status = EOperationStatus.Succeed; - } - else - { - _steps = ESteps.Done; - Status = EOperationStatus.Failed; - Error = _loadRemotePackageManifestOp.Error; - } - } - } -} -#endif \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSDownloadFileOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs similarity index 89% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSDownloadFileOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs index d204e686..039a32c2 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSDownloadFileOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs @@ -1,15 +1,14 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using UnityEngine; using UnityEngine.Networking; using YooAsset; -using StarkSDKSpace; -internal class BGFSDownloadFileOperation : DefaultDownloadFileOperation +internal class TTFSDownloadFileOperation : DefaultDownloadFileOperation { - private ByteGameFileSystem _fileSystem; + private TiktokFileSystem _fileSystem; private ESteps _steps = ESteps.None; - internal BGFSDownloadFileOperation(ByteGameFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param) + internal TTFSDownloadFileOperation(TiktokFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param) { _fileSystem = fileSystem; } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSDownloadFileOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSDownloadFileOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSDownloadFileOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSInitializeOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs similarity index 85% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSInitializeOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs index 9af003d1..837e6dae 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSInitializeOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs @@ -1,7 +1,7 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using YooAsset; -internal partial class BGFSInitializeOperation : FSInitializeFileSystemOperation +internal partial class TTFSInitializeOperation : FSInitializeFileSystemOperation { private enum ESteps { @@ -10,11 +10,11 @@ internal partial class BGFSInitializeOperation : FSInitializeFileSystemOperation Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private RecordTiktokCacheFilesOperation _recordTiktokCacheFilesOp; private ESteps _steps = ESteps.None; - public BGFSInitializeOperation(ByteGameFileSystem fileSystem) + public TTFSInitializeOperation(TiktokFileSystem fileSystem) { _fileSystem = fileSystem; } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSInitializeOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSInitializeOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSInitializeOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadBundleOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs similarity index 92% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadBundleOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs index 3d03047a..9b1a7fc5 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadBundleOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs @@ -1,10 +1,10 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using UnityEngine; using UnityEngine.Networking; using YooAsset; using TTSDK; -internal class BGFSLoadBundleOperation : FSLoadBundleOperation +internal class TTFSLoadBundleOperation : FSLoadBundleOperation { private enum ESteps { @@ -13,12 +13,12 @@ internal class BGFSLoadBundleOperation : FSLoadBundleOperation Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private readonly PackageBundle _bundle; private UnityWebRequest _webRequest; private ESteps _steps = ESteps.None; - internal BGFSLoadBundleOperation(ByteGameFileSystem fileSystem, PackageBundle bundle) + internal TTFSLoadBundleOperation(TiktokFileSystem fileSystem, PackageBundle bundle) { _fileSystem = fileSystem; _bundle = bundle; diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadBundleOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadBundleOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadBundleOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs new file mode 100644 index 00000000..b9875e6e --- /dev/null +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs @@ -0,0 +1,88 @@ +#if UNITY_WEBGL && DOUYINMINIGAME +using YooAsset; + +internal class TTFSLoadPackageManifestOperation : FSLoadPackageManifestOperation +{ + private enum ESteps + { + None, + RequestPackageHash, + LoadPackageManifest, + Done, + } + + private readonly TiktokFileSystem _fileSystem; + private readonly string _packageVersion; + private readonly int _timeout; + private RequestTiktokPackageHashOperation _requestPackageHashOp; + private LoadTiktokPackageManifestOperation _loadPackageManifestOp; + private ESteps _steps = ESteps.None; + + + public TTFSLoadPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout) + { + _fileSystem = fileSystem; + _packageVersion = packageVersion; + _timeout = timeout; + } + internal override void InternalOnStart() + { + _steps = ESteps.RequestPackageHash; + } + internal override void InternalOnUpdate() + { + if (_steps == ESteps.None || _steps == ESteps.Done) + return; + + if (_steps == ESteps.RequestPackageHash) + { + if (_requestPackageHashOp == null) + { + _requestPackageHashOp = new RequestTiktokPackageHashOperation(_fileSystem, _packageVersion, _timeout); + OperationSystem.StartOperation(_fileSystem.PackageName, _requestPackageHashOp); + } + + if (_requestPackageHashOp.IsDone == false) + return; + + if (_requestPackageHashOp.Status == EOperationStatus.Succeed) + { + _steps = ESteps.LoadPackageManifest; + } + else + { + _steps = ESteps.Done; + Status = EOperationStatus.Failed; + Error = _requestPackageHashOp.Error; + } + } + + if (_steps == ESteps.LoadPackageManifest) + { + if (_loadPackageManifestOp == null) + { + string packageHash = _requestPackageHashOp.PackageHash; + _loadPackageManifestOp = new LoadTiktokPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout); + OperationSystem.StartOperation(_fileSystem.PackageName, _loadPackageManifestOp); + } + + Progress = _loadPackageManifestOp.Progress; + if (_loadPackageManifestOp.IsDone == false) + return; + + if (_loadPackageManifestOp.Status == EOperationStatus.Succeed) + { + _steps = ESteps.Done; + Manifest = _loadPackageManifestOp.Manifest; + Status = EOperationStatus.Succeed; + } + else + { + _steps = ESteps.Done; + Status = EOperationStatus.Failed; + Error = _loadPackageManifestOp.Error; + } + } + } +} +#endif \ No newline at end of file diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadPackageManifestOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSLoadPackageManifestOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSLoadPackageManifestOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSRequestPackageVersionOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs similarity index 52% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSRequestPackageVersionOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs index f37c13f9..8a044f52 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSRequestPackageVersionOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs @@ -1,7 +1,7 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using YooAsset; -internal class BGFSRequestPackageVersionOperation : FSRequestPackageVersionOperation +internal class TTFSRequestPackageVersionOperation : FSRequestPackageVersionOperation { private enum ESteps { @@ -10,13 +10,13 @@ internal class BGFSRequestPackageVersionOperation : FSRequestPackageVersionOpera Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private readonly int _timeout; - private RequestByteGamePackageVersionOperation _requestWebPackageVersionOp; + private RequestTiktokPackageVersionOperation _requestPackageVersionOp; private ESteps _steps = ESteps.None; - internal BGFSRequestPackageVersionOperation(ByteGameFileSystem fileSystem, int timeout) + internal TTFSRequestPackageVersionOperation(TiktokFileSystem fileSystem, int timeout) { _fileSystem = fileSystem; _timeout = timeout; @@ -32,27 +32,27 @@ internal class BGFSRequestPackageVersionOperation : FSRequestPackageVersionOpera if (_steps == ESteps.RequestPackageVersion) { - if (_requestWebPackageVersionOp == null) + if (_requestPackageVersionOp == null) { - _requestWebPackageVersionOp = new RequestByteGamePackageVersionOperation(_fileSystem, _timeout); - OperationSystem.StartOperation(_fileSystem.PackageName, _requestWebPackageVersionOp); + _requestPackageVersionOp = new RequestTiktokPackageVersionOperation(_fileSystem, _timeout); + OperationSystem.StartOperation(_fileSystem.PackageName, _requestPackageVersionOp); } - Progress = _requestWebPackageVersionOp.Progress; - if (_requestWebPackageVersionOp.IsDone == false) + Progress = _requestPackageVersionOp.Progress; + if (_requestPackageVersionOp.IsDone == false) return; - if (_requestWebPackageVersionOp.Status == EOperationStatus.Succeed) + if (_requestPackageVersionOp.Status == EOperationStatus.Succeed) { _steps = ESteps.Done; - PackageVersion = _requestWebPackageVersionOp.PackageVersion; + PackageVersion = _requestPackageVersionOp.PackageVersion; Status = EOperationStatus.Succeed; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _requestWebPackageVersionOp.Error; + Error = _requestPackageVersionOp.Error; } } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSRequestPackageVersionOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/BGFSRequestPackageVersionOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/TTFSRequestPackageVersionOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/LoadByteGamePackageManifestOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs similarity index 89% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/LoadByteGamePackageManifestOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs index c4ca2863..2101425a 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/LoadByteGamePackageManifestOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs @@ -1,7 +1,7 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using YooAsset; -internal class LoadByteGamePackageManifestOperation : AsyncOperationBase +internal class LoadTiktokPackageManifestOperation : AsyncOperationBase { private enum ESteps { @@ -12,7 +12,7 @@ internal class LoadByteGamePackageManifestOperation : AsyncOperationBase Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private readonly string _packageVersion; private readonly string _packageHash; private readonly int _timeout; @@ -27,7 +27,7 @@ internal class LoadByteGamePackageManifestOperation : AsyncOperationBase public PackageManifest Manifest { private set; get; } - internal LoadByteGamePackageManifestOperation(ByteGameFileSystem fileSystem, string packageVersion, string packageHash, int timeout) + internal LoadTiktokPackageManifestOperation(TiktokFileSystem fileSystem, string packageVersion, string packageHash, int timeout) { _fileSystem = fileSystem; _packageVersion = packageVersion; @@ -36,7 +36,7 @@ internal class LoadByteGamePackageManifestOperation : AsyncOperationBase } internal override void InternalOnStart() { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadByteGamePackageManifestOperation)); + _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation)); _steps = ESteps.RequestFileData; } internal override void InternalOnUpdate() @@ -67,7 +67,7 @@ internal class LoadByteGamePackageManifestOperation : AsyncOperationBase _steps = ESteps.Done; Status = EOperationStatus.Failed; Error = _webDataRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadByteGamePackageManifestOperation)); + WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(LoadTiktokPackageManifestOperation)); } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/LoadByteGamePackageManifestOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/LoadByteGamePackageManifestOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/LoadTiktokPackageManifestOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RecordByteGameCacheFilesOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RecordTiktokCacheFilesOperation.cs similarity index 90% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RecordByteGameCacheFilesOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RecordTiktokCacheFilesOperation.cs index ec691dbf..d4f82e03 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RecordByteGameCacheFilesOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RecordTiktokCacheFilesOperation.cs @@ -1,4 +1,4 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using YooAsset; using TTSDK; @@ -12,10 +12,10 @@ internal class RecordTiktokCacheFilesOperation : AsyncOperationBase Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private ESteps _steps = ESteps.None; - public RecordTiktokCacheFilesOperation(ByteGameFileSystem fileSystem) + public RecordTiktokCacheFilesOperation(TiktokFileSystem fileSystem) { _fileSystem = fileSystem; } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RecordByteGameCacheFilesOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RecordTiktokCacheFilesOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RecordByteGameCacheFilesOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RecordTiktokCacheFilesOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageHashOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs similarity index 86% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageHashOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs index c1508aa8..438ccf8b 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageHashOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs @@ -1,7 +1,7 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using YooAsset; -internal class RequestByteGamePackageHashOperation : AsyncOperationBase +internal class RequestTiktokPackageHashOperation : AsyncOperationBase { private enum ESteps { @@ -10,7 +10,7 @@ internal class RequestByteGamePackageHashOperation : AsyncOperationBase Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private readonly string _packageVersion; private readonly int _timeout; private UnityWebTextRequestOperation _webTextRequestOp; @@ -23,7 +23,7 @@ internal class RequestByteGamePackageHashOperation : AsyncOperationBase public string PackageHash { private set; get; } - public RequestByteGamePackageHashOperation(ByteGameFileSystem fileSystem, string packageVersion, int timeout) + public RequestTiktokPackageHashOperation(TiktokFileSystem fileSystem, string packageVersion, int timeout) { _fileSystem = fileSystem; _packageVersion = packageVersion; @@ -31,7 +31,7 @@ internal class RequestByteGamePackageHashOperation : AsyncOperationBase } internal override void InternalOnStart() { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestByteGamePackageHashOperation)); + _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation)); _steps = ESteps.RequestPackageHash; } internal override void InternalOnUpdate() @@ -73,7 +73,7 @@ internal class RequestByteGamePackageHashOperation : AsyncOperationBase _steps = ESteps.Done; Status = EOperationStatus.Failed; Error = _webTextRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestByteGamePackageHashOperation)); + WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageHashOperation)); } } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageHashOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageHashOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageHashOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageVersionOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs similarity index 86% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageVersionOperation.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs index 0bacc2a3..7696dab8 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageVersionOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs @@ -1,7 +1,7 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using YooAsset; -internal class RequestByteGamePackageVersionOperation : AsyncOperationBase +internal class RequestTiktokPackageVersionOperation : AsyncOperationBase { private enum ESteps { @@ -10,7 +10,7 @@ internal class RequestByteGamePackageVersionOperation : AsyncOperationBase Done, } - private readonly ByteGameFileSystem _fileSystem; + private readonly TiktokFileSystem _fileSystem; private readonly int _timeout; private UnityWebTextRequestOperation _webTextRequestOp; private int _requestCount = 0; @@ -22,14 +22,14 @@ internal class RequestByteGamePackageVersionOperation : AsyncOperationBase public string PackageVersion { private set; get; } - public RequestByteGamePackageVersionOperation(ByteGameFileSystem fileSystem, int timeout) + public RequestTiktokPackageVersionOperation(TiktokFileSystem fileSystem, int timeout) { _fileSystem = fileSystem; _timeout = timeout; } internal override void InternalOnStart() { - _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestByteGamePackageVersionOperation)); + _requestCount = WebRequestCounter.GetRequestFailedCount(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation)); _steps = ESteps.RequestPackageVersion; } internal override void InternalOnUpdate() @@ -71,7 +71,7 @@ internal class RequestByteGamePackageVersionOperation : AsyncOperationBase _steps = ESteps.Done; Status = EOperationStatus.Failed; Error = _webTextRequestOp.Error; - WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestByteGamePackageVersionOperation)); + WebRequestCounter.RecordRequestFailed(_fileSystem.PackageName, nameof(RequestTiktokPackageVersionOperation)); } } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageVersionOperation.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/Operation/internal/RequestByteGamePackageVersionOperation.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/Operation/internal/RequestTiktokPackageVersionOperation.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/ByteGameFileSystem.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs similarity index 91% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/ByteGameFileSystem.cs rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs index 1501c731..3fc0c8e1 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/ByteGameFileSystem.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs @@ -1,17 +1,16 @@ -#if UNITY_WEBGL && BYTEMINIGAME +#if UNITY_WEBGL && DOUYINMINIGAME using System.Collections.Generic; using UnityEngine; using YooAsset; using TTSDK; using System.Linq; -using WeChatWASM; using System; -public static class ByteGameFileSystemCreater +public static class TiktokFileSystemCreater { public static FileSystemParameters CreateByteGameFileSystemParameters(IRemoteServices remoteServices, string packageRoot) { - string fileSystemClass = $"{nameof(ByteGameFileSystem)},YooAsset.RuntimeExtension"; + string fileSystemClass = $"{nameof(TiktokFileSystem)},YooAsset.RuntimeExtension"; var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot); fileSystemParams.AddParameter("REMOTE_SERVICES", remoteServices); return fileSystemParams; @@ -22,7 +21,7 @@ public static class ByteGameFileSystemCreater /// 抖音小游戏文件系统 /// 参考:https://developer.open-douyin.com/docs/resource/zh-CN/mini-game/develop/guide/know /// </summary> -internal class ByteGameFileSystem : IFileSystem +internal class TiktokFileSystem : IFileSystem { private class WebRemoteServices : IRemoteServices { @@ -94,24 +93,24 @@ internal class ByteGameFileSystem : IFileSystem #endregion - public ByteGameFileSystem() + public TiktokFileSystem() { } public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync() { - var operation = new BGFSInitializeOperation(this); + var operation = new TTFSInitializeOperation(this); OperationSystem.StartOperation(PackageName, operation); return operation; } public virtual FSLoadPackageManifestOperation LoadPackageManifestAsync(string packageVersion, int timeout) { - var operation = new BGFSLoadPackageManifestOperation(this, packageVersion, timeout); + var operation = new TTFSLoadPackageManifestOperation(this, packageVersion, timeout); OperationSystem.StartOperation(PackageName, operation); return operation; } public virtual FSRequestPackageVersionOperation RequestPackageVersionAsync(bool appendTimeTicks, int timeout) { - var operation = new BGFSRequestPackageVersionOperation(this, timeout); + var operation = new TTFSRequestPackageVersionOperation(this, timeout); OperationSystem.StartOperation(PackageName, operation); return operation; } @@ -125,7 +124,7 @@ internal class ByteGameFileSystem : IFileSystem { param.MainURL = RemoteServices.GetRemoteMainURL(bundle.FileName); param.FallbackURL = RemoteServices.GetRemoteFallbackURL(bundle.FileName); - var operation = new BGFSDownloadFileOperation(this, bundle, param); + var operation = new TTFSDownloadFileOperation(this, bundle, param); OperationSystem.StartOperation(PackageName, operation); return operation; } @@ -133,13 +132,13 @@ internal class ByteGameFileSystem : IFileSystem { if (bundle.BundleType == (int)EBuildBundleType.AssetBundle) { - var operation = new BGFSLoadBundleOperation(this, bundle); + var operation = new TTFSLoadBundleOperation(this, bundle); OperationSystem.StartOperation(PackageName, operation); return operation; } else { - string error = $"{nameof(ByteGameFileSystem)} not support load bundle type : {bundle.BundleType}"; + string error = $"{nameof(TiktokFileSystem)} not support load bundle type : {bundle.BundleType}"; var operation = new FSLoadBundleCompleteOperation(error); OperationSystem.StartOperation(PackageName, operation); return operation; @@ -255,7 +254,7 @@ internal class ByteGameFileSystem : IFileSystem { if (_recorders.Contains(filePath)) { - YooLogger.Error($"{nameof(WechatFileSystem)} has element : {filePath}"); + YooLogger.Error($"{nameof(TiktokFileSystem)} has element : {filePath}"); return false; } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/ByteGameFileSystem.cs.meta b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/ByteGameFileSystem/ByteGameFileSystem.cs.meta rename to Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/TiktokFileSystem.cs.meta diff --git a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs index e801be16..09b69adc 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSLoadPackageManifestOperation.cs @@ -6,16 +6,16 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation private enum ESteps { None, - RequestRemotePackageHash, - LoadRemotePackageManifest, + RequestPackageHash, + LoadPackageManifest, Done, } private readonly WechatFileSystem _fileSystem; private readonly string _packageVersion; private readonly int _timeout; - private RequestWechatPackageHashOperation _requestRemotePackageHashOp; - private LoadWechatPackageManifestOperation _loadRemotePackageManifestOp; + private RequestWechatPackageHashOperation _requestPackageHashOp; + private LoadWechatPackageManifestOperation _loadPackageManifestOp; private ESteps _steps = ESteps.None; @@ -27,60 +27,60 @@ internal class WXFSLoadPackageManifestOperation : FSLoadPackageManifestOperation } internal override void InternalOnStart() { - _steps = ESteps.RequestRemotePackageHash; + _steps = ESteps.RequestPackageHash; } internal override void InternalOnUpdate() { if (_steps == ESteps.None || _steps == ESteps.Done) return; - if (_steps == ESteps.RequestRemotePackageHash) + if (_steps == ESteps.RequestPackageHash) { - if (_requestRemotePackageHashOp == null) + if (_requestPackageHashOp == null) { - _requestRemotePackageHashOp = new RequestWechatPackageHashOperation(_fileSystem, _packageVersion, _timeout); - OperationSystem.StartOperation(_fileSystem.PackageName, _requestRemotePackageHashOp); + _requestPackageHashOp = new RequestWechatPackageHashOperation(_fileSystem, _packageVersion, _timeout); + OperationSystem.StartOperation(_fileSystem.PackageName, _requestPackageHashOp); } - if (_requestRemotePackageHashOp.IsDone == false) + if (_requestPackageHashOp.IsDone == false) return; - if (_requestRemotePackageHashOp.Status == EOperationStatus.Succeed) + if (_requestPackageHashOp.Status == EOperationStatus.Succeed) { - _steps = ESteps.LoadRemotePackageManifest; + _steps = ESteps.LoadPackageManifest; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _requestRemotePackageHashOp.Error; + Error = _requestPackageHashOp.Error; } } - if (_steps == ESteps.LoadRemotePackageManifest) + if (_steps == ESteps.LoadPackageManifest) { - if (_loadRemotePackageManifestOp == null) + if (_loadPackageManifestOp == null) { - string packageHash = _requestRemotePackageHashOp.PackageHash; - _loadRemotePackageManifestOp = new LoadWechatPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout); - OperationSystem.StartOperation(_fileSystem.PackageName, _loadRemotePackageManifestOp); + string packageHash = _requestPackageHashOp.PackageHash; + _loadPackageManifestOp = new LoadWechatPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout); + OperationSystem.StartOperation(_fileSystem.PackageName, _loadPackageManifestOp); } - Progress = _loadRemotePackageManifestOp.Progress; - if (_loadRemotePackageManifestOp.IsDone == false) + Progress = _loadPackageManifestOp.Progress; + if (_loadPackageManifestOp.IsDone == false) return; - if (_loadRemotePackageManifestOp.Status == EOperationStatus.Succeed) + if (_loadPackageManifestOp.Status == EOperationStatus.Succeed) { _steps = ESteps.Done; - Manifest = _loadRemotePackageManifestOp.Manifest; + Manifest = _loadPackageManifestOp.Manifest; Status = EOperationStatus.Succeed; } else { _steps = ESteps.Done; Status = EOperationStatus.Failed; - Error = _loadRemotePackageManifestOp.Error; + Error = _loadPackageManifestOp.Error; } } }