Merge branch 'develop_mjb_cscmnq_1.0.6' of…

Merge branch 'develop_mjb_cscmnq_1.0.6' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.6

Assets/Game/Main/Scripts/Utils/Guide.cs

@@ -216,6 +216,51 @@ public class Guide : MonoBehaviour
             Step7.SetActive(true);
         }
     }
+    public void onClickStep7()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step8Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step8Key, 1);
+            Debug.Log("显示第8步");
+            Step8.SetActive(true);
+        }
+    }
+    public void onClickStep8()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step9Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step9Key, 1);
+            Debug.Log("显示第9步");
+            Step9.SetActive(true);
+        }
+    }
+    public void onClickStep9()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step10Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step10Key, 1);
+            Debug.Log("显示第10步");
+            Step10.SetActive(true);
+        }
+    }
+    public void onClickStep10()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step11Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step11Key, 1);
+            Debug.Log("显示第11步");
+            Step11.SetActive(true);
+        }
+    }
+    public void onClickStep11()
+    {
+        DissmissGuide(false);
+       
+    }
     //public void onClickStep6()
     //{
     //    Debug.Log("点击第6步");

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

@@ -514,17 +514,21 @@ public class DialogControl : MonoBehaviour
     //关闭获取钻石弹窗
     public void closeDiamondDialog()
     {
-
-        AudioUtils.ins.PlayBtnAudio();
-        DiamondDialog.SetActive(false);
-        diamondcontent.transform.localPosition -= new Vector3(0, 340, 0);
-        AdUtils.closeFeedAd();
+        if (DiamondDialog.activeSelf)
+        {
+            AudioUtils.ins.PlayBtnAudio();
+            DiamondDialog.SetActive(false);
+            diamondcontent.transform.localPosition -= new Vector3(0, 340, 0);
+            AdUtils.closeFeedAd();
+        }
+       
     }
     //获取钻石奖励
     public void getDiamondReward()
     {
 
         //closeDiamondDialog();
+        closeDiamondDialog();
         AudioUtils.ins.PlayBtnAudio();
         EventUtils.OnEvent("addDiamond_click", "点击钻石加号");
         HttpTool.Instance._Get("app/v1/wdlc/reward/diamond_by_video_status", null, new Action<DiamondStatusBean>((bean) =>

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

@@ -708,7 +708,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
     public void DidSelectedShiwujiangli()
     {
         AudioUtils.ins.PlayBtnAudio();
-
+        Guide.guide.onClickStep7();
         EventUtils.OnEvent("click_wodelibao", "点击我的礼包");
 
         if (RealAwardsVM.dataModel != null)

Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs

@@ -13,14 +13,14 @@ public class PlantTreeControl : MonoBehaviour
     {
         clickone();
     }
-    //private void Awake()
-    //{
-    //    EventCenter.AddListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
-    //}
-    //private void OnDestroy()
-    //{
-    //    EventCenter.RemoveListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
-    //}
+    private void Awake()
+    {
+        EventCenter.AddListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
+    }
+    private void OnDestroy()
+    {
+        EventCenter.RemoveListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
+    }
     //void Start()
     //{
     //   // getWithDrawData();

ProjectSettings/PackageManagerSettings.asset

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