修改迭代需求

Assets/Game/Main/Resource/ui/dialog/plantTree/提示语.png.meta → Assets/Game/Main/Resource/ui/dialog/HarvestHongBao/底框-6.png.meta

 fileFormatVersion: 2
-guid: 8b82cb11f774d4acf8a24c5ebe4c5653
+guid: 430fac33e36dd43749c93d32c2a5b813
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Resource/ui/dialog/plantTree/提示语-2.png.meta → Assets/Game/Main/Resource/ui/dialog/plantTree/组 1-6.png.meta

 fileFormatVersion: 2
-guid: 0854bc9bf1b2e4d4eb5668639bed273f
+guid: 491c26bb2258343a9845aff6448302ab
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Resources/Fruit/种树提现.png.meta → Assets/Game/Main/Resource/ui/dialog/plantTree/组 1-7.png.meta

 fileFormatVersion: 2
-guid: 2e038c1e47800be4f96da129cc6af7d2
+guid: fe8b1d4f9eb494e5fb3e247ee1fb6e8d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Resource/ui/dialog/plantTree/提示语-3.png.meta → Assets/Game/Main/Resource/ui/dialog/plantTree/组 1-8.png.meta

 fileFormatVersion: 2
-guid: 85aca769f08c84ae8864bc4438aad6e8
+guid: bf84ded8fdc25426b811e369a81b1b36
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Scripts/Model/HavestBean.cs

 using System;
+using System.Collections.Generic;
+
 public class HavestBean
 {
     public LandListData landStatusDTO;
     public int harvestPlantId;
     public double harvestPlantPrice;
     public double rewardCash;
+    public WdInfo wdInfo;
+
+    public class WdInfo
+    {
+        public int id;
+        public double yuan;
+        public List<InfoList> infoList;
+
+        public class InfoList
+        {
+            public int woodId;
+            public int current;
+            public int targetNum;
+        }
+    }
 }

Assets/Game/Main/Scripts/Presenter/CarPresenter.cs

@@ -132,7 +132,7 @@ public class CarPresenter : CarContract.Presenter
     {
         parm.Clear();
         parm.Add("landId", landId);
-        HttpTool.Instance._Post("app/v2/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
+        HttpTool.Instance._Post("app/v3/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
         //HttpTool.Instance._Post("app/v1/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
         {
             UnityEngine.Debug.Log("收取接口成功");
@@ -155,7 +155,7 @@ public class CarPresenter : CarContract.Presenter
             }
             else
             {
-                DialogControl.Instance.ShowHarvestHongBao(bean.harvestPlantPrice, landId);
+                DialogControl.Instance.ShowHarvestHongBao(bean.harvestPlantPrice, landId,bean.harvestPlantId,bean.wdInfo);
             }
             // EventCenter.Broadcast(MyEventType.FlyGuoshi, landId);
             mView.CarInfo(bean.landStatusDTO);

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

@@ -88,7 +88,7 @@ public class Guide : MonoBehaviour
 
     public void showGuide(bool isUser)
     {
-        //isUser = true;
+       //isUser = true;
         if (isStartShow)
         {
             return;
@@ -216,12 +216,12 @@ public class Guide : MonoBehaviour
     {
         Debug.Log("点击第5步");
         DissmissGuide(false);
-        if (PlayerPrefs.GetInt(step6Key, 0) == 0)
-        {
-            PlayerPrefs.SetInt(step6Key, 1);
-            Debug.Log("显示第7步");
-            Step7.SetActive(true);
-        }
+        //if (PlayerPrefs.GetInt(step6Key, 0) == 0)
+        //{
+        //    PlayerPrefs.SetInt(step6Key, 1);
+        //    Debug.Log("显示第7步");
+        //    Step7.SetActive(true);
+        //}
         //EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
         //ObjStep5.SetActive(false);
         //hand_5.SetActive(false);
@@ -241,52 +241,52 @@ public class Guide : MonoBehaviour
     public void onClickStep6()
     {
         DissmissGuide(false);
-        if (PlayerPrefs.GetInt(step7Key, 0) == 0)
-        {
-            PlayerPrefs.SetInt(step7Key, 1);
-            Debug.Log("显示第7步");
-            Step7.SetActive(true);
-        }
+        //if (PlayerPrefs.GetInt(step7Key, 0) == 0)
+        //{
+        //    PlayerPrefs.SetInt(step7Key, 1);
+        //    Debug.Log("显示第7步");
+        //    Step7.SetActive(true);
+        //}
     }
     public void onClickStep7()
     {
         DissmissGuide(false);
-        if (PlayerPrefs.GetInt(step8Key, 0) == 0)
-        {
-            PlayerPrefs.SetInt(step8Key, 1);
-            Debug.Log("显示第8步");
-            Step8.SetActive(true);
-        }
+        //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);
-        }
+        //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);
-        }
+        //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);
-        }
+        //if (PlayerPrefs.GetInt(step11Key, 0) == 0)
+        //{
+        //    PlayerPrefs.SetInt(step11Key, 1);
+        //    Debug.Log("显示第11步");
+        //    Step11.SetActive(true);
+        //}
     }
     public void onClickStep11()
     {

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

@@ -65,9 +65,9 @@ public class JumpUtils : MonoBehaviour
         AudioUtils.ins.PlayBtnAudio();
         HomeCamera.depth = 1;
         SettingCamera.depth = 0;
-        WithDrawCamera.depth = 0;
+       // WithDrawCamera.depth = 0;
         WithDrawRecordCamera.depth = 0;
-        WithDrawEveryDayCamera.depth = 0;
+       // WithDrawEveryDayCamera.depth = 0;
     }
 
     /// <summary>

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

@@ -46,6 +46,9 @@ public class DialogControl : MonoBehaviour
     public GameObject jingxiDialog;
     public GameObject newhappygetDialog;//有双倍领取的开心收下弹窗
     public Text tv_new_cash;
+    public Sprite[] fruitSprites;
+    public Text tvshouyi, tvtiaojian, oneNum, twoNum, threeNum;
+    public Image imgBig, imglittleone,imglittletwo,imglittlethree;
     /// <summary>
     /// 实物奖励弹窗预制体
     /// </summary>
@@ -817,7 +820,7 @@ public class DialogControl : MonoBehaviour
     public void showHappyGetDialog(string cash)
     {
         happygetDialog.SetActive(true);
-        tv_cash.text = cash;
+        tv_cash.text = "¥"+cash;
 
         Text TitleText = happygetDialog.transform.Find("Image/Text").GetComponent<Text>();
         TitleText.text = Constant.Instance.shubiao ? "恭喜获得 现金奖励" : "恭喜获得 金币奖励";
@@ -838,7 +841,7 @@ public class DialogControl : MonoBehaviour
     public void showNewHappyGetDialog(string cash)
     {
         newhappygetDialog.SetActive(true);
-        tv_new_cash.text = cash;
+        tv_new_cash.text = "¥"+cash;
     }
     private int action;
     //关闭带双倍领取的开心收下弹窗
@@ -1376,17 +1379,131 @@ public class DialogControl : MonoBehaviour
     /// 显示收货奖励弹窗
     /// </summary>
     /// <param name="money">奖励金额</param>
-    public void ShowHarvestHongBao(double money, int landId)
+    public void ShowHarvestHongBao(double money, int landId, int harvestPlantId, HavestBean.WdInfo wdInfo)
     {
         transform.Find("HarvestHongBao").gameObject.SetActive(true);
         transform.Find("HarvestHongBao/BgImage/MoneyText").GetComponent<Text>().text = "¥" + money.ToString();
-
+        setBigImg(harvestPlantId, imgBig);
+        setTvtijian(harvestPlantId);
+        if (wdInfo.infoList.Count > 0)
+        {
+            int num1 = wdInfo.infoList[0].targetNum - wdInfo.infoList[0].current;
+            if (num1 <=0)
+            {
+                oneNum.text = "x  " + 0;
+            }
+            else
+            {
+                oneNum.text = "x  " + num1;
+            }
+            int num2 = wdInfo.infoList[1].targetNum - wdInfo.infoList[1].current;
+            if (num2 <= 0)
+            {
+                twoNum.text = "x  " + 0;
+            }
+            else
+            { 
+                twoNum.text = "x  " + num2;
+            }
+            int num3 = wdInfo.infoList[2].targetNum - wdInfo.infoList[2].current;
+            if (num3 <= 0)
+            {
+                threeNum.text = "x  " + 0;
+            }
+            else
+            {
+                threeNum.text = "x  " + num3;
+            }
+            setBigImg(wdInfo.infoList[0].woodId, imglittleone);
+            setBigImg(wdInfo.infoList[1].woodId, imglittletwo);
+            setBigImg(wdInfo.infoList[2].woodId, imglittlethree);
+        }
+       
         DialogControl.landId = landId;
-
+        tvtiaojian.text = "距离"+ "<color=#FF0000><size=45>" + wdInfo.yuan+"元</size></color>"+"无门槛提现还差";
         Invoke("showAd", 0.5f);
         Invoke("moveHarvestHongBao", 1f);
     }
 
+    private void setTvtijian(int harvestPlantId)
+    {
+        switch (harvestPlantId)
+        {
+            case 1:
+                tvshouyi.text = "白菜收益";
+                break;
+            case 2:
+                tvshouyi.text = "西红柿收益";
+                break;
+            case 3:
+                tvshouyi.text = "南瓜收益";
+                break;
+            case 4:
+                tvshouyi.text = "萝卜收益";
+                break;
+            case 5:
+                tvshouyi.text = "玉米收益";
+                break;
+            case 6:
+                tvshouyi.text = "茄子收益";
+                break;
+            case 7:
+                tvshouyi.text = "西瓜收益";
+                break;
+            case 8:
+                tvshouyi.text = "葡萄收益";
+                break;
+            case 9:
+                tvshouyi.text = "草莓收益";
+                break;
+        }
+    }
+    private void setBigImg(int landId,Image image)
+    {
+        switch (landId)
+        {
+            case 1:
+                image.sprite = fruitSprites[0];
+                
+                break;
+            case 2:
+                image.sprite = fruitSprites[1];
+               
+                break;
+            case 3:
+                image.sprite = fruitSprites[2];
+               
+                break;
+            case 4:
+                image.sprite = fruitSprites[3];
+               
+                break;
+            case 5:
+                image.sprite = fruitSprites[4];
+               
+                break;
+            case 6:
+                image.sprite = fruitSprites[5];
+                
+                break;
+            case 7:
+                image.sprite = fruitSprites[6];
+               
+                break;
+            case 8:
+                image.sprite = fruitSprites[7];
+                
+                break;
+            case 9:
+                image.sprite = fruitSprites[8];
+              
+                break;
+          
+             
+        }
+
+    }
+
     /// <summary>
     /// 收货奖励弹窗移动
     /// </summary>

ProjectSettings/ProjectSettings.asset

@@ -131,7 +131,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.9
+  bundleVersion: 1.0.10
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -179,7 +179,7 @@ PlayerSettings:
     iPhone: com.ym.simulator
   buildNumber:
     iPhone: 6
-  AndroidBundleVersionCode: 10
+  AndroidBundleVersionCode: 11
   AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1