Bladeren bron

FiberManager.cs对外返回的Task改成ETTask

tanghai 2 jaren geleden
bovenliggende
commit
c85e3bde0e
2 gewijzigde bestanden met toevoegingen van 4 en 18 verwijderingen
  1. 1 15
      .gitignore
  2. 3 3
      Unity/Assets/Scripts/Core/World/Module/Fiber/FiberManager.cs

+ 1 - 15
.gitignore

@@ -40,7 +40,6 @@ _ReSharper.CSharp/
 .idea/
 /Unity/Logs
 /Unity/Assets/StreamingAssets/
-/netcoreapp2.0
 /Unity/Assets/StreamingAssets.meta
 .DS_Store
 Server/.DS_Store
@@ -49,12 +48,7 @@ Server/.DS_Store
 .objs/
 /Unity/.gradle
 /*.user
-/ToolsApp/
 /Unity/Unity.Editor.csproj
-/Unity/Assets/Bundles/Code/Code.dll.bytes
-/Unity/Assets/Bundles/Code/Code.dll.bytes.meta
-/Unity/Assets/Bundles/Code/Code.pdb.bytes
-/Unity/Assets/Bundles/Code/Code.pdb.bytes.meta
 /Unity/Assembly-CSharp.csproj
 ~$*.xlsx
 ~$*.xlsx.meta
@@ -73,15 +67,6 @@ Server/.DS_Store
 /Unity/Unity.Ignore.csproj
 Publish/
 /Unity/Assets/Bundles/Code/*
-/Unity/Assets/Bundles/AssetBundleOutput.meta
-/Unity/Assets/Bundles/AssetBundleOutput
-/Unity/Assets/Bundles/AssetBundleSourceData
-/Unity/Assets/Bundles/AssetBundleSourceData.meta
-/Unity/Unity.Editor.Codes.csproj
-/Unity/Unity.Hotfix.Codes.csproj
-/Unity/Unity.HotfixView.Codes.csproj
-/Unity/Unity.Model.Codes.csproj
-/Unity/Unity.ModelView.Codes.csproj
 /Unity/Unity.GenerateClient.csproj
 /Unity/Unity.GenerateServer.csproj
 
@@ -92,3 +77,4 @@ Publish/
 
 /Unity/*.csproj
 /Unity/*.vsconfig
+WebGL

+ 3 - 3
Unity/Assets/Scripts/Core/World/Module/Fiber/FiberManager.cs

@@ -61,7 +61,7 @@ namespace ET
             this.fibers = null;
         }
 
-        public async Task<int> Create(SchedulerType schedulerType, int fiberId, int zone, SceneType sceneType, string name)
+        public async ETTask<int> Create(SchedulerType schedulerType, int fiberId, int zone, SceneType sceneType, string name)
         {
             try
             {
@@ -98,13 +98,13 @@ namespace ET
             }
         }
         
-        public async Task<int> Create(SchedulerType schedulerType, int zone, SceneType sceneType, string name)
+        public async ETTask<int> Create(SchedulerType schedulerType, int zone, SceneType sceneType, string name)
         {
             int fiberId = Interlocked.Increment(ref this.idGenerator);
             return await this.Create(schedulerType, fiberId, zone, sceneType, name);
         }
         
-        public async Task Remove(int id)
+        public async ETTask Remove(int id)
         {
             Fiber fiber = this.Get(id);
             TaskCompletionSource<bool> tcs = new();