Explorar o código

漏了几个Task没有改到,改成ETTask

tanghai %!s(int64=7) %!d(string=hai) anos
pai
achega
312e7fdab2

+ 1 - 1
Server/Hotfix/Handler/Actor_TransferHandler.cs

@@ -8,7 +8,7 @@ namespace ETHotfix
 	[ActorMessageHandler(AppType.Map)]
 	[ActorMessageHandler(AppType.Map)]
 	public class Actor_TransferHandler : AMActorRpcHandler<Unit, Actor_TransferRequest, Actor_TransferResponse>
 	public class Actor_TransferHandler : AMActorRpcHandler<Unit, Actor_TransferRequest, Actor_TransferResponse>
 	{
 	{
-		protected override async Task Run(Unit unit, Actor_TransferRequest message, Action<Actor_TransferResponse> reply)
+		protected override async ETTask Run(Unit unit, Actor_TransferRequest message, Action<Actor_TransferResponse> reply)
 		{
 		{
 			Actor_TransferResponse response = new Actor_TransferResponse();
 			Actor_TransferResponse response = new Actor_TransferResponse();
 
 

+ 1 - 1
Server/Hotfix/Module/Actor/ActorMessageDispatherComponentSystem.cs

@@ -95,7 +95,7 @@ namespace ETHotfix
 			}
 			}
 		}
 		}
 
 
-		public static async Task Handle(
+		public static async ETTask Handle(
 				this ActorMessageDispatherComponent self, MailBoxComponent mailBoxComponent, ActorMessageInfo actorMessageInfo)
 				this ActorMessageDispatherComponent self, MailBoxComponent mailBoxComponent, ActorMessageInfo actorMessageInfo)
 		{
 		{
 			// 有拦截器使用拦截器处理
 			// 有拦截器使用拦截器处理

+ 1 - 1
Server/Hotfix/Module/BigWorld/LockComponentSystem.cs

@@ -89,7 +89,7 @@ namespace ETHotfix
 			}
 			}
 		}
 		}
 
 
-		public static async Task Release(this LockComponent self)
+		public static async ETTask Release(this LockComponent self)
 		{
 		{
 			--self.lockCount;
 			--self.lockCount;
 			if (self.lockCount != 0)
 			if (self.lockCount != 0)

+ 1 - 1
Server/Model/Module/Actor/AMActorRpcHandler.cs

@@ -13,7 +13,7 @@ namespace ETModel
 			reply(response);
 			reply(response);
 		}
 		}
 
 
-		protected abstract Task Run(E unit, Request message, Action<Response> reply);
+		protected abstract ETTask Run(E unit, Request message, Action<Response> reply);
 
 
 		public async ETTask Handle(Session session, Entity entity, object actorMessage)
 		public async ETTask Handle(Session session, Entity entity, object actorMessage)
 		{
 		{

+ 1 - 1
Unity/Assets/Model/Helper/BundleHelper.cs

@@ -7,7 +7,7 @@ namespace ETModel
 {
 {
 	public static class BundleHelper
 	public static class BundleHelper
 	{
 	{
-		public static async Task DownloadBundle()
+		public static async ETTask DownloadBundle()
 		{
 		{
 			if (Define.IsAsync)
 			if (Define.IsAsync)
 			{
 			{

+ 2 - 2
Unity/Assets/Model/Module/AssetsBundle/BundleDownloaderComponent.cs

@@ -33,7 +33,7 @@ namespace ETModel
 
 
 		public UnityWebRequestAsync webRequest;
 		public UnityWebRequestAsync webRequest;
 
 
-		public async Task StartAsync()
+		public async ETTask StartAsync()
 		{
 		{
 			// 获取远程的Version.txt
 			// 获取远程的Version.txt
 			string versionUrl = "";
 			string versionUrl = "";
@@ -125,7 +125,7 @@ namespace ETModel
 			}
 			}
 		}
 		}
 
 
-		public async Task DownloadAsync()
+		public async ETTask DownloadAsync()
 		{
 		{
 			if (this.bundles.Count == 0 && this.downloadingBundle == "")
 			if (this.bundles.Count == 0 && this.downloadingBundle == "")
 			{
 			{

+ 2 - 2
Unity/Assets/Model/Module/AssetsBundle/ResourcesComponent.cs

@@ -347,7 +347,7 @@ namespace ETModel
 		/// </summary>
 		/// </summary>
 		/// <param name="assetBundleName"></param>
 		/// <param name="assetBundleName"></param>
 		/// <returns></returns>
 		/// <returns></returns>
-		public async Task LoadBundleAsync(string assetBundleName)
+		public async ETTask LoadBundleAsync(string assetBundleName)
 		{
 		{
             assetBundleName = assetBundleName.ToLower();
             assetBundleName = assetBundleName.ToLower();
 			string[] dependencies = AssetBundleHelper.GetSortedDependencies(assetBundleName);
 			string[] dependencies = AssetBundleHelper.GetSortedDependencies(assetBundleName);
@@ -362,7 +362,7 @@ namespace ETModel
 			}
 			}
         }
         }
 
 
-		public async Task LoadOneBundleAsync(string assetBundleName)
+		public async ETTask LoadOneBundleAsync(string assetBundleName)
 		{
 		{
 			ABInfo abInfo;
 			ABInfo abInfo;
 			if (this.bundles.TryGetValue(assetBundleName, out abInfo))
 			if (this.bundles.TryGetValue(assetBundleName, out abInfo))