diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 8658d0b..5254035 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -129729,7 +129729,7 @@ PrefabInstance: - target: {fileID: 2673194344194583631, guid: f3a5c8bf38a7dfa408f601a424edb92d, type: 3} propertyPath: m_AnchoredPosition.x - value: 519.25 + value: 478.125 objectReference: {fileID: 0} - target: {fileID: 2673194344194583631, guid: f3a5c8bf38a7dfa408f601a424edb92d, type: 3} @@ -129739,12 +129739,12 @@ PrefabInstance: - target: {fileID: 2673194344194583631, guid: f3a5c8bf38a7dfa408f601a424edb92d, type: 3} propertyPath: m_SizeDelta.x - value: 1028.5 + value: 946.25 objectReference: {fileID: 0} - target: {fileID: 2673194344194583631, guid: f3a5c8bf38a7dfa408f601a424edb92d, type: 3} propertyPath: m_SizeDelta.y - value: 145 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2673194344194583631, guid: f3a5c8bf38a7dfa408f601a424edb92d, type: 3} diff --git a/Packages/manifest.json b/Packages/manifest.json index 7f1f6ae..39e1081 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,9 +4,9 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.1", + "com.unity.ide.vscode": "1.2.3", "com.unity.postprocessing": "2.3.0", - "com.unity.test-framework": "1.1.16", + "com.unity.test-framework": "1.1.18", "com.unity.timeline": "1.2.10", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 100643d..073d176 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -39,7 +39,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.1", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -53,7 +53,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.16", + "version": "1.1.18", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 9418901..ca9e773 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -9,9 +9,9 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 0} + m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0} m_Name: - m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings + m_EditorClassIdentifier: m_ScopedRegistriesSettingsExpanded: 1 oneTimeWarningShown: 0 m_Registries: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ae9c8eb..1b23926 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.12f1 -m_EditorVersionWithRevision: 2019.4.12f1 (225e826a680e) +m_EditorVersion: 2019.4.15f1 +m_EditorVersionWithRevision: 2019.4.15f1 (fbf367ac14e9)