修改bug

Assets/Game/Main/Resource/LeeScripts/LeeMainController.cs

@@ -40,6 +40,7 @@ public class LeeMainController : MonoBehaviour
                 TitleBG2.Find("Fruit" + i.ToString() + "/imgProcess").GetComponent<Image>().fillAmount = (float)model.infoList[i].current / (float)model.infoList[i].targetNum;
                 TitleBG2.Find("Fruit" + i.ToString() + "/txtProcess").GetComponent<Text>().text = string.Format("{0}/{1}", (float)model.infoList[i].current, model.infoList[i].targetNum);
                 int woodId = (int)model.infoList[i].woodId;
+                TitleBG2.Find("Fruit" + i.ToString()).GetComponent<Button>().onClick.RemoveAllListeners();
                 TitleBG2.Find("Fruit" + i.ToString()).GetComponent<Button>().onClick.AddListener(() =>
                 {
                     DidSelectedToPlanting(woodId);

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -1200,7 +1200,7 @@ PrefabInstance:
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -63
+      value: -101
       objectReference: {fileID: 0}
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
@@ -9657,9 +9657,9 @@ RectTransform:
   m_Father: {fileID: 1548415916}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 355, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 355, y: -72.29167}
   m_SizeDelta: {x: 710, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &300181110
@@ -11938,7 +11938,7 @@ PrefabInstance:
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 84.5
+      value: 46.5
       objectReference: {fileID: 0}
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
@@ -13097,7 +13097,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 160, y: 61}
+  m_AnchoredPosition: {x: 122, y: 61}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &382383541
@@ -38343,7 +38343,7 @@ PrefabInstance:
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 213
+      value: 175
       objectReference: {fileID: 0}
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
@@ -47147,7 +47147,7 @@ PrefabInstance:
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -134
+      value: -172
       objectReference: {fileID: 0}
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
@@ -68976,7 +68976,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.00011539459}
+  m_AnchoredPosition: {x: 0, y: -0.00011444092}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2116027665
@@ -70288,7 +70288,7 @@ PrefabInstance:
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -34
+      value: -72
       objectReference: {fileID: 0}
     - target: {fileID: 455528768202490615, guid: db026780330de104d920b4c604141362,
         type: 3}

Assets/Game/Main/Scripts/Item/TaskItem.cs

@@ -194,7 +194,7 @@ public class TaskItem : MonoBehaviour
                     if (cb)
                     {
 
-                        EventCenter.Broadcast(MyEventType.UpdateTaskList);
+                        EventCenter.Broadcast(MyEventType.UPDATE_HARVEST_DATA, 1);
                     }
                     else
                     {

Assets/Game/Main/Scripts/View/DialogControl.cs

@@ -241,23 +241,19 @@ public class DialogControl : MonoBehaviour
 
     private void OnEnable()
     {
-#if UNITY_IOS
-        // 害虫背景
-        Image EncounterpestsDialogBg = transform.Find("EncounterpestsDialog/Image").GetComponent<Image>();
-        // 外星礼物背景
-        Image FlyBoxRewardBg = transform.Find("FlyBoxReward/Image").GetComponent<Image>();
-
-        if (!Constant.Instance.shubiao)
-        {
-            EncounterpestsDialogBg.sprite = Resources.Load<Sprite>("shubiaoBg0");
-            FlyBoxRewardBg.sprite = Resources.Load<Sprite>("shubiaoBg0");
-        }
-        else
-        {
-            EncounterpestsDialogBg.sprite = Resources.Load<Sprite>("shubiaoBg1");
-            FlyBoxRewardBg.sprite = Resources.Load<Sprite>("shubiaoBg1");
-        }
-#endif
+//#if UNITY_IOS
+//        // 外星礼物背景
+//        Image FlyBoxRewardBg = transform.Find("FlyBoxReward/Image").GetComponent<Image>();
+
+//        if (!Constant.Instance.shubiao)
+//        {
+//            FlyBoxRewardBg.sprite = Resources.Load<Sprite>("shubiaoBg0");
+//        }
+//        else
+//        {
+//            FlyBoxRewardBg.sprite = Resources.Load<Sprite>("shubiaoBg1");
+//        }
+//#endif
 
     }
 

Assets/Game/Main/Scripts/View/StickDialog.cs

@@ -71,7 +71,7 @@ public class StickDialog : MonoBehaviour
                 {
                     
                     EventCenter.Broadcast(MyEventType.UPDATE_LAND_DATA, bean.landStatus);
-                    if (bean.rewardContent.currencyType == 5)
+                    if (bean.rewardContent.currencyType == 20)
                     {
                         GameObject.Find("Dialog").GetComponent<DialogControl>().showReceiveDiamondDialog(bean.rewardContent.cash.ToString());
                     }

Assets/Plugins/iOS/CustomUnityAppController.mm

@@ -6,12 +6,12 @@
 #import "KeychainItemManager.h"
 #import "WKWebViewController.h"
  
-@interface CustomAppController : UnityAppController < WXApiDelegate >
+@interface CustomUnityAppController : UnityAppController < WXApiDelegate >
 @end
  
-IMPL_APP_CONTROLLER_SUBCLASS (CustomAppController)
+IMPL_APP_CONTROLLER_SUBCLASS (CustomUnityAppController)
  
-@implementation CustomAppController
+@implementation CustomUnityAppController
  
 #if defined(__cplusplus)
 extern "C" {

Packages/packages-lock.json

@@ -19,7 +19,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.analytics": {
       "version": "3.3.5",
@@ -28,21 +28,21 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
       "version": "1.2.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
       "version": "1.1.4",
@@ -51,14 +51,14 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.multiplayer-hlapi": {
       "version": "1.0.8",
@@ -67,7 +67,7 @@
       "dependencies": {
         "nuget.mono-cecil": "0.1.6-preview"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.purchasing": {
       "version": "2.2.1",
@@ -76,7 +76,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
       "version": "1.1.20",
@@ -87,7 +87,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
       "version": "2.1.1",
@@ -96,14 +96,14 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
       "version": "1.2.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
       "version": "1.0.0",
@@ -122,14 +122,14 @@
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "nuget.mono-cecil": {
       "version": "0.1.6-preview",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

ProjectSettings/PackageManagerSettings.asset

@@ -17,7 +17,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
   m_UserSelectedRegistryName: