Merge pull request #236 from UltraStar-Deluxe/anst/unity-2021

Anst/unity 2021
UltraStar-Deluxe · Apr 7, 2021 · 2edb0dd · 2edb0dd
2 parents 5b4142f + b9bdd2c
commit 2edb0dd
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,55 +34,55 @@ jobs:
   include:
   - stage: test
     script: "./tools/travis/docker_test.sh"
-    env: TEST_PLATFORM=editmode IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-linux-il2cpp-0.7.0
+    env: TEST_PLATFORM=editmode IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-linux-il2cpp-0
     addons:
       artifacts:
         s3_region: "eu-west-1"
         paths:
         - "$(pwd)/$TEST_PLATFORM-results.xml"
   - stage: test
     script: "./tools/travis/docker_test.sh"
-    env: TEST_PLATFORM=playmode IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-linux-il2cpp-0.7.0
+    env: TEST_PLATFORM=playmode IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-linux-il2cpp-0
     addons:
       artifacts:
         s3_region: "eu-west-1"
         paths:
         - "$(pwd)/$TEST_PLATFORM-results.xml"
 
   - stage: build
-    env: BUILD_TARGET=StandaloneLinux64 IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-linux-il2cpp-0.7.0
+    env: BUILD_TARGET=StandaloneLinux64 IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-linux-il2cpp-0
     script: "./tools/travis/docker_build.sh"
     addons:
       artifacts:
         s3_region: "eu-west-1"
         paths:
         - "$(pwd)/UltraStarPlay-build.tar.gz"
   - stage: build
-    env: BUILD_TARGET=StandaloneOSX IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-mac-mono-0.7.0
+    env: BUILD_TARGET=StandaloneOSX IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-mac-mono-0
     script: "./tools/travis/docker_build.sh"
     addons:
       artifacts:
         s3_region: "eu-west-1"
         paths:
         - "$(pwd)/UltraStarPlay-build.tar.gz"
   - stage: build
-    env: BUILD_TARGET=StandaloneWindows64 IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-windows-mono-0.7.0
+    env: BUILD_TARGET=StandaloneWindows64 IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-windows-mono-0
     script: "./tools/travis/docker_build.sh"
     addons:
       artifacts:
         s3_region: "eu-west-1"
         paths:
         - "$(pwd)/UltraStarPlay-build.tar.gz"
   - stage: build
-    env: BUILD_TARGET=Android IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-android-0.7.0
+    env: BUILD_TARGET=Android IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-android-0
     script: "./tools/travis/docker_build.sh"
     addons:
       artifacts:
         s3_region: "eu-west-1"
         paths:
         - "$(pwd)/UltraStarPlay-build.tar.gz"
   - stage: build
-    env: BUILD_TARGET=iOS IMAGE_NAME=unityci/editor:ubuntu-2020.2.1f1-ios-0.7.0
+    env: BUILD_TARGET=iOS IMAGE_NAME=unityci/editor:ubuntu-2021.1.1f1-ios-0
     script: "./tools/travis/docker_build.sh"
     addons:
       artifacts:

diff --git a/UltraStar Play/Assets/Common/Graphics/SmallTexturesSpriteAtlas.spriteatlas b/UltraStar Play/Assets/Common/Graphics/SmallTexturesSpriteAtlas.spriteatlas
@@ -28,14 +28,14 @@ SpriteAtlas:
       allowAlphaSplitting: 0
       enableRotation: 0
       enableTightPacking: 0
+      enableAlphaDilation: 0
     secondaryTextureSettings: {}
     variantMultiplier: 1
     packables:
     - {fileID: 102900000, guid: 6f90ded3314a23f4ea0842ea48638f28, type: 3}
     - {fileID: 102900000, guid: 6bc1d9ad819e6184fa5a33e186a677b9, type: 3}
     - {fileID: 102900000, guid: 9058f218a30b4ca499aa3608584c4cc5, type: 3}
     - {fileID: 102900000, guid: b25a54fc37b9389438e58e08c751d7d4, type: 3}
-    totalSpriteSurfaceArea: 623641
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
@@ -62,6 +62,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: fc9005b45ccd7424fbb9fbe707e57f7b, type: 3}
   - {fileID: 21300000, guid: 3320a9c41743da34690ecfd21f6181c3, type: 3}
   - {fileID: 21300000, guid: caa92ed4b08666749a91f4258c0e22ec, type: 3}
+  - {fileID: 21300000, guid: 3a770ae44a43b6e4c8f744668b0fb921, type: 3}
   - {fileID: 21300000, guid: 97edaf255cd31ad44bd8783a17d1f302, type: 3}
   - {fileID: 21300000, guid: 3406fac525d9a894b9906cb27b4def17, type: 3}
   - {fileID: 21300000, guid: 9980dbf5e3842134fb87698ef7219f1a, type: 3}
@@ -128,6 +129,7 @@ SpriteAtlas:
   - FavoriteIconEmpty
   - GradientTopWhiteBottomTransparent
   - NotePlain
+  - '[icon]leader_crown'
   - LyricAreaVoiceButton
   - '[score]rating_1'
   - '[button]13'

diff --git a/UltraStar Play/Assets/Resources.meta b/UltraStar Play/Assets/Resources.meta
diff --git a/UltraStar Play/Assets/Resources/BillingMode.json b/UltraStar Play/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
diff --git a/UltraStar Play/Assets/Resources/BillingMode.json.meta b/UltraStar Play/Assets/Resources/BillingMode.json.meta
diff --git a/UltraStar Play/Assets/Scenes/SongSelect/SongSelectScene.unity b/UltraStar Play/Assets/Scenes/SongSelect/SongSelectScene.unity
@@ -6009,6 +6009,9 @@ MonoBehaviour:
   m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
+  m_OnSubmit:
+    m_PersistentCalls:
+      m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls:
@@ -6031,6 +6034,7 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
+  m_ShouldActivateOnSelect: 1
 --- !u!114 &1588346263
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/UltraStar Play/Logs/Packages-Update.log b/UltraStar Play/Logs/Packages-Update.log
@@ -68,3 +68,19 @@ The following packages were updated:
   com.unity.purchasing from version 2.1.0 to 2.1.1
   com.unity.test-framework from version 1.1.16 to 1.1.19
   com.unity.xr.legacyinputhelpers from version 2.1.4 to 2.1.6
+
+=== Mon Apr  5 12:41:02 2021
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were updated:
+  com.unity.ext.nunit from version 1.0.5 to 1.0.6
+  com.unity.ide.rider from version 2.0.7 to 3.0.5
+  com.unity.ide.visualstudio from version 2.0.5 to 2.0.7
+  com.unity.mobile.android-logcat from version 1.1.1 to 1.2.1
+  com.unity.purchasing from version 2.1.1 to 3.0.1
+  com.unity.test-framework from version 1.1.19 to 1.1.24
+  com.unity.textmeshpro from version 3.0.1 to 3.0.4
+  com.unity.timeline from version 1.2.6 to 1.5.2
+  com.unity.xr.legacyinputhelpers from version 2.1.6 to 2.1.7
diff --git a/UltraStar Play/Packages/manifest.json b/UltraStar Play/Packages/manifest.json
@@ -5,21 +5,21 @@
     "com.unity.ads": "3.5.2",
     "com.unity.analytics": "3.5.3",
     "com.unity.collab-proxy": "1.3.9",
-    "com.unity.ext.nunit": "1.0.5",
-    "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.5",
+    "com.unity.ext.nunit": "1.0.6",
+    "com.unity.ide.rider": "3.0.5",
+    "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.ide.vscode": "1.2.3",
     "com.unity.inputsystem": "1.0.2",
-    "com.unity.mobile.android-logcat": "1.1.1",
+    "com.unity.mobile.android-logcat": "1.2.1",
     "com.unity.multiplayer-hlapi": "1.0.2",
-    "com.unity.purchasing": "2.1.1",
-    "com.unity.test-framework": "1.1.19",
-    "com.unity.textmeshpro": "3.0.1",
-    "com.unity.timeline": "1.2.6",
+    "com.unity.purchasing": "3.0.1",
+    "com.unity.test-framework": "1.1.24",
+    "com.unity.textmeshpro": "3.0.4",
+    "com.unity.timeline": "1.5.2",
     "com.unity.ugui": "1.0.0",
-    "com.unity.ui": "1.0.0-preview.13",
-    "com.unity.ui.builder": "1.0.0-preview.11",
-    "com.unity.xr.legacyinputhelpers": "2.1.6",
+    "com.unity.ui": "1.0.0-preview.14",
+    "com.unity.ui.builder": "1.0.0-preview.14",
+    "com.unity.xr.legacyinputhelpers": "2.1.7",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/UltraStar Play/Packages/packages-lock.json b/UltraStar Play/Packages/packages-lock.json
@@ -38,26 +38,26 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.5",
+      "version": "1.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "2.0.7",
+      "version": "3.0.5",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.test-framework": "1.1.1"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.5",
+      "version": "2.0.7",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
@@ -75,7 +75,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.mobile.android-logcat": {
-      "version": "1.1.1",
+      "version": "1.2.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -91,20 +91,24 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.purchasing": {
-      "version": "2.1.1",
+      "version": "3.0.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ugui": "1.0.0"
+        "com.unity.ugui": "1.0.0",
+        "com.unity.modules.unityanalytics": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.androidjni": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.19",
+      "version": "1.1.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.5",
+        "com.unity.ext.nunit": "1.0.6",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
@@ -118,7 +122,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.1",
+      "version": "3.0.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -127,10 +131,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.2.6",
+      "version": "1.5.2",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
@@ -143,36 +152,30 @@
       }
     },
     "com.unity.ui": {
-      "version": "1.0.0-preview.13",
+      "version": "1.0.0-preview.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "nuget.moq": "1.0.0",
-        "nuget.castle-core": "1.0.1",
         "com.unity.modules.uielementsnative": "1.0.0",
         "com.unity.textcore": "1.0.0-preview.2"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ui.builder": {
-      "version": "1.0.0-preview.11",
+      "version": "1.0.0-preview.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.legacyinputhelpers": {
-      "version": "2.1.6",
+      "version": "2.1.7",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "nuget.castle-core": {
-      "version": "1.0.1",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "nuget.mono-cecil": {
@@ -182,15 +185,6 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "nuget.moq": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "nuget.castle-core": "1.0.1"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,