Parcourir la source

修复停止Play报异常的bug

tanghai il y a 7 ans
Parent
commit
4f9e0b04f4

+ 1 - 1
Unity/Assets/Bundles/UI/UILobby.prefab

@@ -196,7 +196,7 @@ MonoBehaviour:
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 0.5
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96

+ 1 - 1
Unity/Assets/Bundles/UI/UILogin.prefab

@@ -157,7 +157,7 @@ MonoBehaviour:
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 0.5
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96

+ 0 - 11
Unity/Assets/Editor/BuildEditor/BuildIOSEditor.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2d9e797a78884f0b87db09a7423425fc
-timeCreated: 1510919356
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 5 - 3
Unity/Assets/Hotfix/Entity/Game.cs

@@ -46,10 +46,12 @@ namespace ETHotfix
 
 		public static void Close()
 		{
-			scene.Dispose();
-			scene = null;
 			eventSystem = null;
-			objectPool.Dispose();
+			
+			scene?.Dispose();
+			scene = null;
+			
+			objectPool?.Dispose();
 			objectPool = null;
 		}
 	}

+ 2 - 2
Unity/Assets/Model/Entity/Game.cs

@@ -58,10 +58,10 @@ namespace ETModel
 		{
 			eventSystem = null;
 			
-			scene.Dispose();
+			scene?.Dispose();
 			scene = null;
 			
-			objectPool.Dispose();
+			objectPool?.Dispose();
 			objectPool = null;
 			
 			hotfix = null;

+ 1 - 0
Unity/ProjectSettings/ProjectSettings.asset

@@ -675,6 +675,7 @@ PlayerSettings:
   scriptingRuntimeVersion: 1
   apiCompatibilityLevelPerPlatform:
     Android: 3
+    Standalone: 3
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Unity