Merge branch 'dev_release' into feature_AR

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab

@@ -2469,7 +2469,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 3
-  Tooltips: CHANGE ACCOUNT
+  Tooltips: DELETE ACCOUNT
 --- !u!1 &5404217437987161135
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/language.json

@@ -378,6 +378,7 @@
     "Are you sure you want to delete the account?": "是否确认注销账号？",
     "Delete Your Route": "删除您的线路",
     "Are you sure you want to delete this route?": "你确定要删除这条线路吗？",
+    "DELETE ACCOUNT": "注销账号",
     "BATTLE": "对战"
   },
   "en": {
@@ -752,6 +753,7 @@
     "Are you sure you want to delete the account?": "Are you sure you want to delete the account?",
     "Delete Your Route": "Delete Your Route",
     "Are you sure you want to delete this route?": "Are you sure you want to delete this route?",
+    "DELETE ACCOUNT": "DELETE ACCOUNT",
     "BATTLE": "BATTLE"
   }
 }

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -113,28 +113,27 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
         tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
         tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
-        if (!isModal) 
+        transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
+        transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
+        transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite = UIManager.Instance.collectDict[myMap.IsFavorite];
+        if (!isModal)
         {
-            transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
             if (App.CurrentRouteType == "My Upload")
             {
                 transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(ApplyOpenRoute);
             }
-            else
+
+            transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
+                App.CurrentRouteType != "My Upload" ? UIManager.Instance.collectDict[myMap.IsFavorite] : UIManager.Instance.uploadDict[myMap.IsEnabled];
+            if (App.CurrentRouteType == "My Upload")
             {
-                transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
+                transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(25, 20f);
             }
+            ChangeUploadImageMode();
         }
-        transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
+//#if !(UNITY_ANDROID || UNITY_IOS)
-            App.CurrentRouteType != "My Upload"?UIManager.Instance.collectDict[myMap.IsFavorite]: UIManager.Instance.uploadDict[myMap.IsEnabled];
+//        transform.Find("CollectImg").gameObject.SetActive(false);
-        if (App.CurrentRouteType == "My Upload") 
+//#endif
-        {
-            transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(25, 20f);
-        }
-        ChangeUploadImageMode();
-#if !(UNITY_ANDROID || UNITY_IOS)
-        transform.Find("CollectImg").gameObject.SetActive(false);
-#endif
         transform.Find("BtnInfo").GetComponent<Button>().onClick.AddListener(Info);
         transform.Find("BtnRide").GetComponent<Button>().onClick.AddListener(Ride);
 

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.3
+  bundleVersion: 2.1.4
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -179,7 +179,7 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
-    iPhone: 2.1.3.1
+    iPhone: 2.1.4.1
   AndroidBundleVersionCode: 18
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30