@@ -188,18 +188,16 @@ private static void OnBeforeAssemblyReload()
188188 {
189189 Debug . LogFormat ( logYellow , "Begin Reload Domain..." ) ;
190190 //记录时间
191- SessionState . SetInt (
192- kReloadDomainTimer ,
193- ( int ) ( EditorApplication . timeSinceStartup * 1000 )
194- ) ;
191+ SessionState . SetInt ( kReloadDomainTimer , ( int ) ( EditorApplication . timeSinceStartup * 1000 ) ) ;
195192 }
196193
197194 //结束reload domain
198195 private static void OnAfterAssemblyReload ( )
199196 {
200197 var timeMS = ( int ) ( EditorApplication . timeSinceStartup * 1000 ) - SessionState . GetInt ( kReloadDomainTimer , 0 ) ;
201198 Debug . LogFormat ( logYellow , $ "End Reload Domain : { timeMS } ms") ;
202- LockRealodDomain ( ) ;
199+ if ( ManuallyReloadSetting . Instance . IsEnableManuallyReload )
200+ LockRealodDomain ( ) ;
203201 isNewCompile = false ;
204202 }
205203 #endregion
@@ -309,12 +307,12 @@ public static SettingsProvider CreateMyManuallyReloadProvider()
309307 {
310308 EditorGUIUtility . labelWidth = 500 ;
311309 if ( so == null )
312- {
310+ {
313311 so = new SerializedObject ( ManuallyReloadSetting . Instance ) ;
314312 p_isEnableManuallyReload = so . FindProperty ( nameof ( ManuallyReloadSetting . Instance . IsEnableManuallyReload ) ) ;
315- p_isEditorUseManuallyReload = so . FindProperty ( nameof ( ManuallyReloadSetting . Instance . IsEditorUseManuallyReload ) ) ;
313+ p_isEditorUseManuallyReload = so . FindProperty ( nameof ( ManuallyReloadSetting . Instance . IsEditorUseManuallyReload ) ) ;
316314 }
317-
315+ 318316 var settings = ManuallyReloadSetting . Instance ;
319317 using ( var check = new EditorGUI . ChangeCheckScope ( ) )
320318 {
@@ -333,7 +331,8 @@ public static SettingsProvider CreateMyManuallyReloadProvider()
333331 }
334332 else
335333 {
336- ManuallyReloadDomainTool . UnlockReloadDomain ( ) ;
334+ Debug . Log ( "Disable reload" ) ;
335+ ManuallyReloadDomainTool . ForceReloadDomain ( ) ;
337336 EditorSettings . enterPlayModeOptionsEnabled = false ;
338337 }
339338 }
0 commit comments