diff --git a/Unity/Assets/Bundles/UI/UILobby.prefab b/Unity/Assets/Bundles/UI/UILobby.prefab index 4c2f86ced4ff2938b1c5711333186411c9c789a1..aa3870d81abe4b65b1c0b66ce5c7d3eab7221e93 100644 --- a/Unity/Assets/Bundles/UI/UILobby.prefab +++ b/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 diff --git a/Unity/Assets/Bundles/UI/UILogin.prefab b/Unity/Assets/Bundles/UI/UILogin.prefab index 6321e28bcbc4f39e6249f2f18a1c26d32d3fbee1..ee1e23d96b2e68f56c61e514710d0d114062412e 100644 --- a/Unity/Assets/Bundles/UI/UILogin.prefab +++ b/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 diff --git a/Unity/Assets/Editor/BuildEditor/BuildIOSEditor.cs.meta b/Unity/Assets/Editor/BuildEditor/BuildIOSEditor.cs.meta deleted file mode 100644 index dac6449058667822ea8cc3cb338189ca36557d66..0000000000000000000000000000000000000000 --- a/Unity/Assets/Editor/BuildEditor/BuildIOSEditor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2d9e797a78884f0b87db09a7423425fc -timeCreated: 1510919356 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Hotfix/Entity/Game.cs b/Unity/Assets/Hotfix/Entity/Game.cs index 930162f4d2d3fb4b9b2f9f6f6269c0aa9789098b..071ae575849a2cfbfbe3c8039314674554131432 100644 --- a/Unity/Assets/Hotfix/Entity/Game.cs +++ b/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; } } diff --git a/Unity/Assets/Model/Entity/Game.cs b/Unity/Assets/Model/Entity/Game.cs index ef2ea0014c43aca971a15f9f163927abd44045cf..f8f24eeb606845348058d06e547242cc4c64dc75 100644 --- a/Unity/Assets/Model/Entity/Game.cs +++ b/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; diff --git a/Unity/ProjectSettings/ProjectSettings.asset b/Unity/ProjectSettings/ProjectSettings.asset index d6ccdd7234a6dde998d6023829bd7308b0212cc9..4931385f5a3907a778f1cb8370f4c3f1875a6ef8 100644 --- a/Unity/ProjectSettings/ProjectSettings.asset +++ b/Unity/ProjectSettings/ProjectSettings.asset @@ -675,6 +675,7 @@ PlayerSettings: scriptingRuntimeVersion: 1 apiCompatibilityLevelPerPlatform: Android: 3 + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Unity