From f8e0c0e90442d984f18684937ca37a9cb3dd8e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JasonXuDeveloper=20-=20=E5=82=91?= Date: Sat, 31 Dec 2022 17:30:13 +1100 Subject: [PATCH 1/2] removed TimeMgr #446 --- .../RegisterMethodRedirection.cs | 2 +- .../Core/Localization/LocalizedText.cs | 2 +- .../JEngine/Core/Manager/AssetMgr.cs | 4 +- .../JEngine/Core/Manager/TimeMgr.cs | 52 ------------------ .../JEngine/Core/Manager/TimeMgr.cs.meta | 3 - .../JEngine/Editor/ABTools/BuildBundles.cs | 2 +- .../ILRuntimeTools/SerializeILTypeInstance.cs | 2 +- .../Editor/JEngineTools/ClassBindEditor.cs | 8 +-- .../JEngineTools/EditorUpdates/ChangeScene.cs | 2 +- .../JEngine/Editor/JEngineTools/Tools.cs | 4 +- .../JEngine/Net/JSocket/SocketIOComponent.cs | 10 ++-- .../JEngine/Templates/MonoAdapter.txt | 4 +- .../Dll/Hidden~/HotUpdateScripts.dll | Bin 107520 -> 107520 bytes .../Dll/Hidden~/HotUpdateScripts.pdb | Bin 44292 -> 44292 bytes .../ClassBindNonMonoBehaviourAdapter.cs | 2 +- .../Scripts/Adapters/GenericExampleAdapter.cs | 4 +- .../Scripts/Adapters/MonoBehaviourAdapter.cs | 4 +- .../ExampleAPIAdapter.MonoMethods.cs | 4 +- .../HotUpdateScripts/JEngine/Core/JAction.cs | 8 +-- .../JEngine/Core/JBehaviour.cs | 7 ++- .../HotUpdateScripts/JEngine/Core/JPrefab.cs | 4 +- .../JEngine/Examples/Event/EventDemo.cs | 2 +- 22 files changed, 38 insertions(+), 92 deletions(-) delete mode 100644 UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs delete mode 100644 UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs.meta diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/ILRuntimeHelper/RegisterMethodRedirection.cs b/UnityProject/Assets/Dependencies/JEngine/Core/ILRuntimeHelper/RegisterMethodRedirection.cs index 71ad7510..210984ad 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Core/ILRuntimeHelper/RegisterMethodRedirection.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Core/ILRuntimeHelper/RegisterMethodRedirection.cs @@ -1654,7 +1654,7 @@ private static async Task Wait(float time, CancellationToken token, GameObject g //当计时器的时间小于暂停时间转毫秒除以时间系数时，等待1帧 if (Time.timeScale == 0 || sw.ElapsedMilliseconds < (time * 1000) / Time.timeScale) { - await TimeMgr.Delay(1); + await Task.Delay(1); } else //不满足条件就结束了 { diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Localization/LocalizedText.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Localization/LocalizedText.cs index 9a611cc0..3d97fdf6 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Core/Localization/LocalizedText.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Core/Localization/LocalizedText.cs @@ -47,7 +47,7 @@ private void Start() public async void SetText() { - await TimeMgr.Delay(100); + await Task.Delay(100); text.text = Localization.GetString(key); } } diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/AssetMgr.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Manager/AssetMgr.cs index 0c9b00a4..ab38a538 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/AssetMgr.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Core/Manager/AssetMgr.cs @@ -169,11 +169,11 @@ public static async void LoadSceneAsync(string path, bool additive = false, stri while (!operation.isDone && operation.progress < 0.9f) { loadingCallback?.Invoke(operation.progress); - await TimeMgr.Delay(1); + await Task.Delay(1); } loadingCallback?.Invoke(1); - await TimeMgr.Delay(30);//1/30秒的时间去刷新UI + await Task.Delay(30);//1/30秒的时间去刷新UI operation.allowSceneActivation = true; operation.completed += asyncOperation => { diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs deleted file mode 100644 index 2d7b12de..00000000 --- a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs +++ /dev/null @@ -1,52 +0,0 @@ -// -// TimeMgr.cs -// -// Author: -// JasonXuDeveloper（傑） -// -// Copyright (c) 2020 JEngine -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -using ET; -using System.Threading; -using System.Collections.Generic; -using System.Collections.Concurrent; -using System.Threading.Tasks; -using Timer = System.Threading.Timer; - -namespace JEngine.Core -{ - /// - /// Time Manager - /// - public static partial class TimeMgr - { - /// - /// Delay for delay ms - /// - /// - /// - public static async Task Delay(int delayInMs) - { - //TODO 待重做 - await Task.Delay(delayInMs); - } - } -} \ No newline at end of file diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs.meta b/UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs.meta deleted file mode 100644 index 590cd745..00000000 --- a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/TimeMgr.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d9d5da5ab3ef4a11bb904c407af15e2b -timeCreated: 1657279884 \ No newline at end of file diff --git a/UnityProject/Assets/Dependencies/JEngine/Editor/ABTools/BuildBundles.cs b/UnityProject/Assets/Dependencies/JEngine/Editor/ABTools/BuildBundles.cs index 3683b209..f575faee 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Editor/ABTools/BuildBundles.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Editor/ABTools/BuildBundles.cs @@ -54,7 +54,7 @@ private static void BuildAssetBundles() Setting.EncryptPassword = s; - await TimeMgr.Delay(3); + await Task.Delay(3); AssetDatabase.Refresh(); watch = new Stopwatch(); diff --git a/UnityProject/Assets/Dependencies/JEngine/Editor/ILRuntimeTools/SerializeILTypeInstance.cs b/UnityProject/Assets/Dependencies/JEngine/Editor/ILRuntimeTools/SerializeILTypeInstance.cs index c0645acb..d5157d20 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Editor/ILRuntimeTools/SerializeILTypeInstance.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Editor/ILRuntimeTools/SerializeILTypeInstance.cs @@ -67,7 +67,7 @@ public static async Task OnEnable(AnimBool[] fadeGroup, UnityAction repaint) //ignored } - await TimeMgr.Delay(500); + await Task.Delay(500); } } diff --git a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/ClassBindEditor.cs b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/ClassBindEditor.cs index da081eac..2facda43 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/ClassBindEditor.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/ClassBindEditor.cs @@ -138,7 +138,7 @@ public static async void CleanFields(ClassBind instance, bool toast = true) field.fieldName, data.fields.IndexOf(field), data.fields.Length), data.fields.IndexOf(field) / (float) data.fields.Length); - await TimeMgr.Delay(50); //延迟一下，动画更丝滑 + await Task.Delay(50); //延迟一下，动画更丝滑 } var f = data.fields.OrderBy(s => s.fieldName); @@ -211,7 +211,7 @@ public static async void DoFieldType(ClassBind instance, bool toast = true) field.fieldName, data.fields.IndexOf(field), data.fields.Length), data.fields.IndexOf(field) / (float) data.fields.Length); - await TimeMgr.Delay(50); //延迟一下，动画更丝滑 + await Task.Delay(50); //延迟一下，动画更丝滑 } } @@ -315,11 +315,11 @@ public static async void DoConvert(ClassBind instance, bool toast = true) affectCounts++; } - await TimeMgr.Delay(10); //延迟一下，动画更丝滑 + await Task.Delay(10); //延迟一下，动画更丝滑 } } - await TimeMgr.Delay(50); //延迟一下，动画更丝滑 + await Task.Delay(50); //延迟一下，动画更丝滑 EditorUtility.ClearProgressBar(); diff --git a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/EditorUpdates/ChangeScene.cs b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/EditorUpdates/ChangeScene.cs index 531cb644..c35bc95f 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/EditorUpdates/ChangeScene.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/EditorUpdates/ChangeScene.cs @@ -29,7 +29,7 @@ private static async void DoChange() while (SceneManager.GetActiveScene().name != name) { if (!Application.isPlaying) return; - await TimeMgr.Delay(10); + await Task.Delay(10); } DynamicGI.UpdateEnvironment(); } diff --git a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/Tools.cs b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/Tools.cs index 97163ab5..64c95243 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/Tools.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/Tools.cs @@ -94,7 +94,7 @@ public static async Task Post(string url, Dictionary dic throw new TimeoutException("Post request time out"); } timeout--; - await TimeMgr.Delay(1); + await Task.Delay(1); } return result; } @@ -133,7 +133,7 @@ private static async void Pop(string title, string info) while (isPopping) { EditorUtility.DisplayProgressBar(title, info, Random.Range(0f, 1f)); - await TimeMgr.Delay(1); + await Task.Delay(1); } EditorUtility.ClearProgressBar(); diff --git a/UnityProject/Assets/Dependencies/JEngine/Net/JSocket/SocketIOComponent.cs b/UnityProject/Assets/Dependencies/JEngine/Net/JSocket/SocketIOComponent.cs index d174b7d3..dfdc40b1 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Net/JSocket/SocketIOComponent.cs +++ b/UnityProject/Assets/Dependencies/JEngine/Net/JSocket/SocketIOComponent.cs @@ -427,7 +427,7 @@ private async void RunSocketThread(object obj) { if (webSocket.IsConnected || !inGame) { - await TimeMgr.Delay(config.reconnectDelay); + await Task.Delay(config.reconnectDelay); } else { @@ -451,7 +451,7 @@ private async void RunPingThread(object obj) { if (!wsConnected) { - await TimeMgr.Delay( + await Task.Delay( config.reconnectDelay); } else @@ -465,7 +465,7 @@ await TimeMgr.Delay( while (webSocket.IsConnected && thPinging && (DateTime.Now.Subtract(pingStart).TotalSeconds < timeoutMilis)) { - await TimeMgr.Delay(200); + await Task.Delay(200); } if (!thPong) @@ -473,7 +473,7 @@ await TimeMgr.Delay( webSocket.Close(); } - await TimeMgr.Delay(intervalMilis); + await Task.Delay(intervalMilis); } } } @@ -566,7 +566,7 @@ private async Task EmitPacketAsync(Packet packet) while (wsConnected && !complete) { - await TimeMgr.Delay(10); + await Task.Delay(10); } return result; diff --git a/UnityProject/Assets/Dependencies/JEngine/Templates/MonoAdapter.txt b/UnityProject/Assets/Dependencies/JEngine/Templates/MonoAdapter.txt index 0fa3e556..5405cec7 100644 --- a/UnityProject/Assets/Dependencies/JEngine/Templates/MonoAdapter.txt +++ b/UnityProject/Assets/Dependencies/JEngine/Templates/MonoAdapter.txt @@ -32,7 +32,7 @@ { while (Application.isPlaying && !_destoryed && !gameObject.activeInHierarchy) { - await JEngine.Core.TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 @@ -92,7 +92,7 @@ { while (Application.isPlaying && !awaked) { - await TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 diff --git a/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll b/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll index eea0c00d62be740ae048b264e91766f65848b9c6..cb984b4850e102b57f7e87205bf31b85217d6986 100644 GIT binary patch delta 10142 zcmcIq3sjU<*WPE|cLtDQF5G1xxeVaT05by&YKX?KWT1u$l;ou_(!5Zql$sins8Lwq zF^z=J8|M9vke4LNyjS{5rKTxq7MUgKXIYm2K6?g%*80Eo{cHUnYw@t3z4zH?pM5Ux zjX8%ka}I0Xd__9*#ny_~LYRNW`bXJEoUv&2L%SLDR#} zzba5e(=LD_i2++`tYSTO4pFUptJkE_01+<%oW{SuC8L~OG-doVVS-j!x@EX4^ zFemYlwhPRQ6nN23;CVi<(viP5rpC`33KZdgM)Rmn2ivs(-WXfxE6}O~AC1T&AW&qt zByd-Z1{S-Ep11i4&DQP$^CE@jvuGh7M;~t}HHfy~^5)8j;x5)7;&re#_=ouWAUAe& zv<|`&E?YHVHD`tE;6AH}{|}AHqJxvv*S2t>ueFI*e;KO%b+E~++P@2AhS$b=LtmT7 zt&wt0pse0h?u)}3_=p@f;V3jP66>ddJBT`*)4A^iL>{(Xw(6kJB>KHyQ-M`{0ei$M z(O7nL%?h`|a^CPxKw`N~#L4^`B#605)0D(}!vVx;Fd8)@AeHncv(V2>D8Z_|*?o2- z&IeUw38FXj<{nj+0sRugVU8Kh;b2$5d>{O79UUD7Q+(#*oV*cU?XLk(8u3H1V%+=u z1#XHK8H6O?7pH@PitzcE&#Ve@+n|V9TE~}H1=w>*pQRO^571f|+FgwCN&P~THyp=x zq=817?Pc8obnqR&RyCsdT_N9o%XMUS zvbDNrS^|+J5Hm(QZHdI@VU!BAIfxze&$LuR5~L6-v}Iaik@Y4vvKWJEkoG0&=8BNGFr9c+2Py?)?MEgPx*`|AmwA0~fVs4aL223DUN489u zMC>iEV&OUn3WO!U?MCf zR*h^O7VT|fsW@rZv1XOT&frR@gsD(X>^M$gCDvsPt*0cTSWnYoBiZ68wdt^p*js{i zN8=8nGhN17V%KQA)1i)7eN-mDy1Z-LZR=&Lf`#2n+Mon&f`WxT0}QVatwwFapD-Vq z$rjmF%k3+o^)q9t{S{aQzrzXu2;}2dWV0Xm-W3-1F8^-DRrU)%wKAVA-04_#hV}So zVxj!VoI4hQjf4lBnjoR^)CpWlnwTUZuO%G9(`%lJoJjJl647`jJQ1&h_I7zoF!k@z;nFoyT|O;trJkzIZmVXt0dBg z7Gl4nl}9kXyX`#U4ZX;4f%O|9bHBCL!lUtpvK=Nl3bF0oZjWGFlU;}BNfqX-ftz8% zzctP~oWU)OX@rV6Q@9cSOo&8$I!@s9I4fG$Xhr@#tRg}eZ;?r&LqwS3SAbYRxR`HW zYjxWa+dte6-u%0@5lrHq>l|La;=RLt!7Fiy8j%lPm&X?Hwd*1fkF9$g(Xw7a%w3=6 z=5E`Gxw-S|^%4E<+9!JB^(XcKj-^=6$KIy~2z2U8sYhW=29x%^aDUu7-(YUSM+08n zM~Svv+FX|5tiZ12Zt?)-4cO!Wa_f;A)&Z`V18h&f_Gjp(#hZhp0!0`Pw*LAX6uEe3%ndD z{7PU9S8q)Z8KbDoS{NQBbW31Gl84y~wzV-nZfm;!a#FI{9|G};Bs?zjy;~Li3Tuuz z7~JvtO|AHit(C<|iCfI^a2ih&p-W1vGh5*|7uyokV79}MSf_1E%pr3EJV&e|aE~%p zp9CGVPlCH-bB-km+~Y*MHs(w0AdImwy!71jS#@*!eN)k>p{YHotQJ<)b^~X-H=e~$JMSg zi|s`=I3M@9ITfm1Y_{^1xlj8n^6XlLMwJGd`Aswo9}cwJW`s7DRFzjd*x*t=UZI-ih%}tgekcNa>z#qr?WL zQyBNpll$PnvR&*-axY{fi8&{5AiUzV1=jMtbtcxpzpP8w`y?~Gb!vIgl?u1iXJes? z>+=zt>qXK2tTzo1MH|woXhWbVgW6CL{%$)lNZ1a-z~Ca*!Nwnd&x8|tKr;lU40g7j z%FEs}g-o^@B6HxnOE=SMip+)IU5xX__e^Z|&hzgjGW~=EC9)I>hB_Pj@NRq3DY=C( z;8CG-?zDxFM{K_PHRHg@g^=%Lv{o0wjC*V-+7>(8!6CkJkBM#OhxRD?-L{F5@4)vX zM8qZV3BS9i2Q%^>d-K^IUb)v~>1X|c?Sjis2zv=c1qkMrFPQTL+694aj9=Jm!d8Fm zO%HiGrY>?1z*yn81fGt`QSXJ`F7`SfwNL5gh&dGbK8zYik=&ot7P0;Cl#3-{pZnoC zCxh>epGNM7Z7z0=H|)!2emv~`9u{#5HNf{1M2tnS#@ZCw0KF$V*+l?}2C0jrYa56SBXD8}TzHEQG>P|fWX8)`D1Y2U%1t^~^8kgV$ zHuikfRWRIRv!Z^2`|h!_sOu0*tOQr`v=0>h1f>t&8;+b#t=&WT)(^5(cjLI+*dLc~ zMx&{hxPG{^gR_J~DXju`c7oUv_vekRQSQtm#uRCw}A{LwvghH)K33a7}!|NE20;nYoWO60}AD2Z;#7U56s3M_a1Pbbv@bl<<87hQe<>b)_tL1V#3tW zi>+|QJMGWle%6z07(KBMvJFn=vB>@~vK=m)51!fWwkERe?hy0-_Lw;sG=&}S5Hy7) zzb?9Orl2XEg0|a4&=l5(Je|iuN{8XC|JY;^#Ykb(ov|=o!P_kOd>q1xS2iT@XE*-Xhpi}DyI<-z? zukg0kjR(boIDfDQE$V@t{06e=i-q4@_?c27R|kn?sTi`BUNf0jS+ z$m-y+@{oxZ=FoN>j-mtOXAU`QFpTxYS97$ea1_Hjjba!pSR!oB46@r}@wmgz{BzrN z7(bU)kpEmTL#Q^FRds0nNV_MmK5WVrTj|ku9kzayHMm+&Q-x|f+lI4~E?ZA2R6D#= zyF7N8Y+_q@9dWLX$Jn4{?W20E)2JR}hH7D(j}JWAN9d?~=SVW`uxHu>^9x55oG6c@ z3R#|I7gx9f^0cGQCG{Lzx2jDy@u;($lUeC%mk!H0xl_lJ+oR)fr?5#iZLJ$z5vQ_! zYua=z7*P}nFTkNf=RB>8*tWHT&4n6xKDx8*1vX@zu!%yX9&_e1jn%Gq=`f#Zo${H+ zE^ZJu=k!i*?}t|$6N_{+;gMq|cd_B7Gwnux;+QWQ*l}k8rn8)luHf9_(#>FjyV`WQ z$0OL&e8%yJ;-2_wlfjBm@$$F{5g$?<0uA?21rPiE$27(NxzPVsWTP0F*<0YEM1iOI z#!vFRzQEU&sE-y^`GOli9nix{ntzQlcBulVk4xrnd>T?*lO&=ERKbFPHn~lcY;M!2 zK*&-DAE&0x^DaK}b(A}McC`NG)$aLM4wBBUoy=tIn1rxOl#1Lbm3BSDC-LIXB8t`c zgeid(10chdP=f*Aeo#Tn9HM*fD+Vm|61?<(&=?G=d;UUB2S+~*)%b*tPm#EpoU#Pv{%slt?`qrS`TX+}5v+{gJ`vF` z)geX}OAAlTfC|Q&g+}P*e@nldKYnsB3*wtkF7t}Ai%guGHHzo{x3ySkWS8do;PxDx zo4zx49))u(4Cdq9w#gm+zoQX-OAGR$AmJmHpUA&m4oWtvaCzwQg#d$9v^$2I0wIGmmJBV59he zrtJTxT6g8QnvT-5su9GUT318{VTfJu&3`T4r=}tLK?dn73Da1u5(^oK4D#rvD36Jo zp&6tpA*>)=iKvG4ByT5KpaBH-0!1Yv*j2T~7%ok974PDDsl+W|Fx;?bpqzlWfW1^V z@GdP6U5CMB#9lB1F%Q;L<5tAcV3cZ=ryvXw?>wLpUq}q4MDt;*&rFDgCmiL7QQ?aa zMM4$uovjiSmSL+w`K+zD5)E_p8}SX02$6(u(hehD2|W%il4NayR_UVYEWQ=F(=`Ke zVdxd;kDj;Tw)CdoUG!Y7@??Wtn&Clr@xz3OlLN1LC$Jp4Qy)pz0@4?tehe#s{dfnj zupqypVAdjCil5F}rFqI({087iE@t_#(YFZo63_cG#LJnll6;XJk&^h_FIUo(6;ZfZ zgr$V#go_EQ2x|y85!Mp!BRoKOoUm1zpKunMP!_cj6I21K!Y4@;;BK5Ot%N}PG-)W5 z`oAnSVVP=J6O?Nc7D!t737;T+;U~WJ^k7QJPBX2gpuU8YSyVu)G?_Id{3?k-s%6Hi z^q%rLwBClx@Obxbato}`$H+gD=B7(?HoOnM=AV~X#MZ;>i6WtEL4CkOzTw|b-VS|3 zbL2ExM97dI@BWxvhPMhc&sd8u#h1!=sNXv@pLb}|MZeXu%rrqYOvVgrn3lb0%K)uQ z?uwCpNrSf>X!T`66HJ<5(gc%cH!hf?awFnNS;(hJz93h?!$G~^48wJN8;-DNy=dO7 zf5~QSd>dj3lL%!dme35Dd&jAJqlQ6m#&r2|Z#GmnL_Jgm& zJpS`p#jOaJ*+{Hex32=amE%l~WKrQ8G$pD_`aZZVCg|%?9%IArovNuk_bW%SZ2LvC zTRvwnfWY5SKf-2!5>>74FHHf?u%BB2&2Rx578>a$tX9NYT?)y=Nghq|^CZtEc?rpD z+#2Omv0?6$a7eeIQ66JWaTkLe;a zgCzkm0N3{>s_P~eXB_XbiEWISAUDfdamq6uwX6Z*(u(9E+k8Auf?cQ!)-de#>@G^YPm(qwf)nhQNERM z$KyB+hT%bmb0}Rg_;nddFUH2p6N7`hv`B}N;}E~?wm=$>eGNVz;B!+^%eUp)gonE@ zwG#YDm)mj+pLX8bb3JOt%XyAC#4N|{E=F~=(ZkcIF2ip7K%@QtVuOXWwl zKR(^7zp6^f_Zmd`++h{|vr!gH>qi=Pj!G;`F?;yMgyfN`A91_qs6@10YB8$?DhV%h zlT=Xwx4b5)8u<1LX{o|LhelLEZPV1NgI?5CNP&)0-B9&3{SsZ6Dj~KMHMPobnl$z1 zplY3%Lp83lQ`~wnz(<^}jnc5t-*mgBr~p~NTWa8W7p=MDtz-3h>fJ$SVX;blVXGlL zDZh%BmV8j?GIKPD>+R~Bwn}{kOpV`w_+msQR=XlXXvRcr(6>kmZmSmQdbbNwz8YUC zTnunakGrAYgf;);qWGrNtvTeWO1xOFgsJ9nhV7VVq2U~k=r%r=CPtPSCbQLOogsNU zHW^kzxP6jzQe5}gN%p(fKEq`7aQ%mf0r~|}Gy6RLQ$sV({uhQBSg{sE2_jz5u?{~O z%J|A=A9W?3-DP}tbEKD$3aEzywwhmU4xy!c2WPv?qggctH?&L@l_l}bPnH(MjzN4V zXdCoiB;|nS4pScFmVE@FPUN^i@o&caf@` zzyD1H9S^f;8T6*Mr6iXV7OBJm-JkURaiSyLCaJ)XZJ4AI<(;HjZL47gs=eJcx&l=I z_E?~*MWF2qPuY zwvqfB$^VSB%-r91yV@R?>02OGDWiQSNn&G;XJd^;tO#?v4O+@jmQKs-eYMhhe)3X) zUF0@PCC=ViIEqEkTM}|_Nyw$7Z=@+MC2P6riJe_95BBI*=a`L;t0jgK#E1RnA^u95 zdEsR!|G?*6i^zB;fur1NtVA4OU5@yUR(SR#`Bg=DhQ-$)RvWk6!#Mj+lqV9pihQT5KPw+1QoQYb4MY&iE~!$8k%ru4eyJB!vf| z&%g!`Q32o`2EZKr54br?3zxBg;41vbx2h_9GnU;y+dO>L6Dbed2QS!L^z%d9_EY_e zWlYZ!TTO90mvVUJM^v5$3P@bx-~6D(1&3Y}$I= TKiKb*DlnzqxQhLZ8n^!e2ESnh delta 10161 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 diff --git a/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb b/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb index 4883934c4590f571e11d6feaf00ab4d97f42b576..58b7638ae35974e86387b9f49def75bb5a2c43de 100644 GIT binary patch delta 3045 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 UwjYFDI|FxJRnGU#al>W&4@^t6EC2ui diff --git a/UnityProject/Assets/Scripts/Adapters/ClassBindNonMonoBehaviourAdapter.cs b/UnityProject/Assets/Scripts/Adapters/ClassBindNonMonoBehaviourAdapter.cs index 47613309..23b15812 100644 --- a/UnityProject/Assets/Scripts/Adapters/ClassBindNonMonoBehaviourAdapter.cs +++ b/UnityProject/Assets/Scripts/Adapters/ClassBindNonMonoBehaviourAdapter.cs @@ -80,7 +80,7 @@ public async void Awake() { while (Application.isPlaying && !_destoryed && !gameObject.activeInHierarchy) { - await TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 diff --git a/UnityProject/Assets/Scripts/Adapters/GenericExampleAdapter.cs b/UnityProject/Assets/Scripts/Adapters/GenericExampleAdapter.cs index 811faf93..72442252 100644 --- a/UnityProject/Assets/Scripts/Adapters/GenericExampleAdapter.cs +++ b/UnityProject/Assets/Scripts/Adapters/GenericExampleAdapter.cs @@ -83,7 +83,7 @@ public async void Awake() { while (Application.isPlaying && !destoryed && !gameObject.activeInHierarchy) { - await JEngine.Core.TimeMgr.Delay(20); + await System.Threading.Tasks.Task.Delay(20); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 @@ -1400,7 +1400,7 @@ public async void Awake() { while (Application.isPlaying && !destoryed && !gameObject.activeInHierarchy) { - await JEngine.Core.TimeMgr.Delay(20); + await Task.Delay(20); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 diff --git a/UnityProject/Assets/Scripts/Adapters/MonoBehaviourAdapter.cs b/UnityProject/Assets/Scripts/Adapters/MonoBehaviourAdapter.cs index 40f7cf6a..0eccc93d 100644 --- a/UnityProject/Assets/Scripts/Adapters/MonoBehaviourAdapter.cs +++ b/UnityProject/Assets/Scripts/Adapters/MonoBehaviourAdapter.cs @@ -138,7 +138,7 @@ public async void Awake() { while (Application.isPlaying && !_destoryed && !gameObject.activeInHierarchy) { - await TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 @@ -198,7 +198,7 @@ async void OnEnable() { while (Application.isPlaying && !awaked) { - await TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 diff --git a/UnityProject/Assets/Scripts/Adapters/MonoMethods/ExampleAPIAdapter.MonoMethods.cs b/UnityProject/Assets/Scripts/Adapters/MonoMethods/ExampleAPIAdapter.MonoMethods.cs index b587f3f2..01486e40 100644 --- a/UnityProject/Assets/Scripts/Adapters/MonoMethods/ExampleAPIAdapter.MonoMethods.cs +++ b/UnityProject/Assets/Scripts/Adapters/MonoMethods/ExampleAPIAdapter.MonoMethods.cs @@ -47,7 +47,7 @@ public async void Awake() { while (Application.isPlaying && !_destoryed && !gameObject.activeInHierarchy) { - await JEngine.Core.TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 @@ -107,7 +107,7 @@ async void OnEnable() { while (Application.isPlaying && !awaked) { - await TimeMgr.Delay(1); + await System.Threading.Tasks.Task.Delay(1); } } catch (MissingReferenceException) //如果gameObject被删了，就会触发这个，这个时候就直接return了 diff --git a/UnityProject/HotUpdateScripts/JEngine/Core/JAction.cs b/UnityProject/HotUpdateScripts/JEngine/Core/JAction.cs index f12e5edb..95d836fe 100644 --- a/UnityProject/HotUpdateScripts/JEngine/Core/JAction.cs +++ b/UnityProject/HotUpdateScripts/JEngine/Core/JAction.cs @@ -403,7 +403,7 @@ private async ET.ETTask Do(bool onMainThread) //Delay if (_item.delays.ContainsKey(_index)) { - await JEngine.Core.TimeMgr.Delay((int)(_item.delays[_index] * 1000)); + await Task.Delay((int)(_item.delays[_index] * 1000)); continue; } @@ -413,7 +413,7 @@ private async ET.ETTask Do(bool onMainThread) //计算1帧时间(ms) var durationPerFrame = 1000 / (int)(Application.targetFrameRate <= 0 ? GameStats.FPS : Application.targetFrameRate); var duration = durationPerFrame * _item.delayFrames[_index]; - await JEngine.Core.TimeMgr.Delay(duration); + await Task.Delay(duration); continue; } @@ -435,7 +435,7 @@ private async ET.ETTask Do(bool onMainThread) throw new TimeoutException(); } - await JEngine.Core.TimeMgr.Delay((int)(_item.frequency[_index] * 1000)); + await Task.Delay((int)(_item.frequency[_index] * 1000)); time += _item.frequency[_index]; } continue; @@ -477,7 +477,7 @@ await Task.Run(() => await Task.Run(action, _item.cancellationTokenSource.Token); } - await JEngine.Core.TimeMgr.Delay((int)(frequency * 1000)); + await Task.Delay((int)(frequency * 1000)); time += frequency; } continue; diff --git a/UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs b/UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs index 8382835a..3709604c 100644 --- a/UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs +++ b/UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs @@ -29,6 +29,7 @@ using System.Threading; using System.Diagnostics; using System.Collections.Generic; +using System.Threading.Tasks; namespace JEngine.Core { @@ -155,7 +156,7 @@ private static async void JBehavioursLoop() for(; ; ) { if (!Application.isPlaying) break; - await TimeMgr.Delay(1); + await Task.Delay(1); int cnt = LoopJBehaviours.Count; for (int i = 0; i < cnt; i++) { @@ -549,7 +550,7 @@ public JBehaviour Activate() int duration; duration = (int)((1f / ((float)Application.targetFrameRate <= 0 ? GameStats.FPS : Application.targetFrameRate)) * 1000f); duration = (int)(duration / TimeScale); - await TimeMgr.Delay(duration); + await Task.Delay(duration); OnEnable(); Start(); }); @@ -572,7 +573,7 @@ private protected async void Launch() break; } - await JEngine.Core.TimeMgr.Delay(1); + await Task.Delay(1); } if (JBehaviours is null || _gameObject is null) diff --git a/UnityProject/HotUpdateScripts/JEngine/Core/JPrefab.cs b/UnityProject/HotUpdateScripts/JEngine/Core/JPrefab.cs index 52d7f315..23bc9f22 100644 --- a/UnityProject/HotUpdateScripts/JEngine/Core/JPrefab.cs +++ b/UnityProject/HotUpdateScripts/JEngine/Core/JPrefab.cs @@ -97,10 +97,10 @@ public async Task WaitForAsyncLoading() { if (!AssetMgr.RuntimeMode) { - await JEngine.Core.TimeMgr.Delay(1); + await Task.Delay(1); while (!Loaded) { - await JEngine.Core.TimeMgr.Delay(10); + await Task.Delay(10); } } else diff --git a/UnityProject/HotUpdateScripts/JEngine/Examples/Event/EventDemo.cs b/UnityProject/HotUpdateScripts/JEngine/Examples/Event/EventDemo.cs index ef20317b..2355e562 100644 --- a/UnityProject/HotUpdateScripts/JEngine/Examples/Event/EventDemo.cs +++ b/UnityProject/HotUpdateScripts/JEngine/Examples/Event/EventDemo.cs @@ -60,7 +60,7 @@ public override async void Init() //取消注册ExtensionManager，这样下次不会post到这个实例内的方法 JEvent.defaultEvent.Unregister(ExtensionManager); - await JEngine.Core.TimeMgr.Delay(3000); + await Task.Delay(3000); //创建独立的JEvent JEvent e = new JEvent(); From d473e0bb2c6b837c750134c22d43665b1966a9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JasonXuDeveloper=20-=20=E5=82=91?= Date: Sat, 31 Dec 2022 17:32:47 +1100 Subject: [PATCH 2/2] changed log level --- .../BundleMaster/BundleMasterRuntime/AssetComponentTools.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnityProject/Assets/Dependencies/BundleMaster/BundleMasterRuntime/AssetComponentTools.cs b/UnityProject/Assets/Dependencies/BundleMaster/BundleMasterRuntime/AssetComponentTools.cs index d3648e2a..cc88219f 100644 --- a/UnityProject/Assets/Dependencies/BundleMaster/BundleMasterRuntime/AssetComponentTools.cs +++ b/UnityProject/Assets/Dependencies/BundleMaster/BundleMasterRuntime/AssetComponentTools.cs @@ -248,7 +248,7 @@ public int[] GetVersion(string bundlePackageName) { if (AssetComponentConfig.AssetLoadMode != AssetLoadMode.Build) { - AssetLogHelper.LogError("仅Build模式可用获取版本索引"); + AssetLogHelper.Log("仅Build模式可用获取版本索引"); return null; } if (!PackageToVersion.TryGetValue(bundlePackageName, out int[] versionData))