From 0bd5f325de72565680ff058411944cf6becc0e6b Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Fri, 22 Jul 2022 13:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Prefab/Panel/UserInfoPanel.prefab      |  2 +-
 Assets/Resources/UI/language.json             |  6 +++--
 Assets/Scripts/UI/Prefab/MapList/MapItem.cs   | 27 +++++++++----------
 ProjectSettings/ProjectSettings.asset         |  4 +--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab b/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
index f9a49824..2ebd35b2 100644
--- a/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
+++ b/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
diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json
index b9c03004..d154def2 100644
--- a/Assets/Resources/UI/language.json
+++ b/Assets/Resources/UI/language.json
@@ -377,7 +377,8 @@
     "CANCEL": "取消",
     "Are you sure you want to delete the account?": "是否确认注销账号？",
     "Delete Your Route": "删除您的线路",
-    "Are you sure you want to delete this route?": "你确定要删除这条线路吗？"
+    "Are you sure you want to delete this route?": "你确定要删除这条线路吗？",
+    "DELETE ACCOUNT": "注销账号"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -750,6 +751,7 @@
     "CANCEL": "CANCEL",
     "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?"
+    "Are you sure you want to delete this route?": "Are you sure you want to delete this route?",
+    "DELETE ACCOUNT": "DELETE ACCOUNT"
   }
 }
diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs
index dcd60523..12953748 100644
--- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs
+++ b/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 =
-            App.CurrentRouteType != "My Upload"?UIManager.Instance.collectDict[myMap.IsFavorite]: UIManager.Instance.uploadDict[myMap.IsEnabled];
-        if (App.CurrentRouteType == "My Upload") 
-        {
-            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
+//#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);
 
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 7425d41c..7d859916 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/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