Merge branch 'develop_mjb_cscmnq_1.0.9' of…

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

Assets/Game/Main/Resource/LeePic/ZhongCaiTiXianPanel/底-19.png.meta → Assets/Game/Main/Resource/LeePic/ZhongCaiTiXianPanel/底.png.meta

 fileFormatVersion: 2
-guid: c5b6f259535934fe590c6be2094e4d9c
+guid: 2beb17b131fd94929a57c7ed87367555
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -15,7 +15,7 @@ public class TiXianCell : BasePanel
     public Text tv_process,tv_countdown;
     public void Init(HomeTitleInfo info) 
     {
-        GetControl<Text>("txtMoney").text = info.yuan.ToString();
+       
         if (info.countdown > 0)
         {
             countdown.SetActive(true);
@@ -49,6 +49,7 @@ public class TiXianCell : BasePanel
         {
             bg.sprite = sprites[1];
         }
+        GetControl<Text>("txtMoney").text = info.yuan.ToString();
         switch (info.status)
         {
             case 0:
@@ -69,6 +70,8 @@ public class TiXianCell : BasePanel
                     
                     DialogControl.Instance.NetWorkRequest<WithDrawDialogBean>(false, "app/v3/cscmnq/do_wd", new Dictionary<string, object>() { { "wdId",(int)info.id } },(obj)=> 
                     {
+                        EventCenter.Broadcast(MyEventType.RefreshPlantTreeWithDraw);
+                        LeeMainController.Instance.UpdateZhongCaiTiXianPanel();
                         if ((int)info.id == 1)
                         {
                             //如果id为1 则提现0.3元
@@ -92,8 +95,7 @@ public class TiXianCell : BasePanel
                             case 7:
                                 return;
                         }
-                        EventCenter.Broadcast(MyEventType.RefreshPlantTreeWithDraw);
-                        LeeMainController.Instance.UpdateZhongCaiTiXianPanel();
+                   
                         EventUtils.OnEvent("jy_ts_click");
                         DialogControl.Instance.nme.Show(info.id, obj);
                     });

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

@@ -259,6 +259,12 @@ public class AdUtils
             else if (actionName.Equals("dt_tttx_rw_show"))
             {
                 EventUtils.OnEvent("dt_tttx_rw_show");
+            }else if (actionName.Equals("cs_video_show"))
+            {
+                EventUtils.OnEvent("cs_ljlq_show");
+            }else if (actionName.Equals("hb_video_show"))
+            {
+                EventUtils.OnEvent("hb_sblq_show");
             }
         }
 

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

@@ -765,6 +765,7 @@ public class DialogControl : MonoBehaviour
                         {
                             //
                             sid = bean.sid;
+                            action = 2;
                             showNewHappyGetDialog(bean.cash.ToString());
                         }
                         else
@@ -839,22 +840,41 @@ public class DialogControl : MonoBehaviour
         newhappygetDialog.SetActive(true);
         tv_new_cash.text = cash;
     }
+    private int action;
     //关闭带双倍领取的开心收下弹窗
     public void closeNewHappyGetDialog()
     {
+        if (action == 1)
+        {
+            EventUtils.OnEvent("cs_ljlq_click");
+        }else if (action == 2)
+        {
+            EventUtils.OnEvent("hb_ljlq_click");
+        }
         AudioUtils.ins.PlayBtnAudio();
         newhappygetDialog.SetActive(false);
         EventCenter.Broadcast(MyEventType.FlyHongbao);
         EventCenter.Broadcast(MyEventType.RefreshHomeInfo);
     }
+    private string action_name;
     //双倍领取
     public void doubleGetReceive()
     {
         AudioUtils.ins.PlayBtnAudio();
+        if (action == 1)
+        {
+            EventUtils.OnEvent("cs_sblq_click");
+            action_name = "cs_video_show";
+        }
+        else if (action == 2)
+        {
+            EventUtils.OnEvent("hb_sblq_click");
+            action_name = "hb_video_show";
+        }
         newhappygetDialog.SetActive(false);
         parm.Clear();
         parm["sid"] = sid;
-        AdUtils.PlayRewardAd("double_reward", new Action<bool>((cb) =>
+        AdUtils.PlayRewardAd(action_name, new Action<bool>((cb) =>
         {
             if (cb)
             {
@@ -1011,6 +1031,7 @@ public class DialogControl : MonoBehaviour
                     {
                         //
                         sid = bean.sid;
+                        action =1;
                         showNewHappyGetDialog(bean.cash.ToString());
                     }
                     else

Assets/Resources/Cell.prefab

@@ -440,7 +440,7 @@ MonoBehaviour:
   withdraw: {fileID: 7752375703414735778}
   sprites:
   - {fileID: 21300000, guid: 87bd69ddaefeb51499b29739a7258483, type: 3}
-  - {fileID: 21300000, guid: c5b6f259535934fe590c6be2094e4d9c, type: 3}
+  - {fileID: 21300000, guid: 2beb17b131fd94929a57c7ed87367555, type: 3}
   img_process: {fileID: 6884567047368652589}
   tv_process: {fileID: 7169505402414716405}
   tv_countdown: {fileID: 793209000852770342}