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/Scenes/CrazyCar.unity

@@ -7480,6 +7480,17 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2012954744}
+        m_MethodName: onClickStep6
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &244231225
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16396,6 +16407,17 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2012954744}
+        m_MethodName: onClickStep5
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &492199890
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -23427,6 +23449,7 @@ MonoBehaviour:
   cashTitleDescTv: {fileID: 1718676778}
   tvTitle: {fileID: 5414249951143182002}
   tv_process: {fileID: 5414249951374873190}
+  tv_cash: {fileID: 1890460382}
   lables:
   - {fileID: 21300000, guid: 06eed7c796a1a40cdaee2a224a648531, type: 3}
   - {fileID: 21300000, guid: 07e7c47f587414ecfa2292dc9e01c603, type: 3}
@@ -30714,7 +30737,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 4
+  m_SortingOrder: 1
   m_TargetDisplay: 0
 --- !u!224 &970469213
 RectTransform:
@@ -37613,6 +37636,17 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2012954744}
+        m_MethodName: onClickStep10
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &1230170803
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -50177,6 +50211,17 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2012954744}
+        m_MethodName: onClickStep11
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!95 &1599538627
 Animator:
   serializedVersion: 3
@@ -54884,6 +54929,17 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2012954744}
+        m_MethodName: onClickStep8
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!95 &1747314420
 Animator:
   serializedVersion: 3
@@ -55274,6 +55330,17 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 2012954744}
+        m_MethodName: onClickStep9
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1001 &1757219671
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -59630,7 +59697,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "2000\u5143"
+  m_Text: 
 --- !u!222 &1890460383
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -79971,7 +80038,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 2
   m_TargetDisplay: 0
 --- !u!224 &6910674076541744956
 RectTransform:

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

@@ -26,12 +26,12 @@ public class ExchangeItem : MonoBehaviour
     }
     public void clickDuihuan()
     {
-        Debug.Log(""+ bean.id);
         if (bean.status==0)
         {
             ToastPlugin.ToastHelper.ShowToast("余额不足");
             return;
         }
+        EventUtils.OnEvent("click_duihuan_goods");
         FindObjectOfType<DialogControl>().ShowRealAwardsWinDialog().SetUpSubviews(bean.img, bean.name, bean.id);
        
     }

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

@@ -199,7 +199,11 @@ public class AdUtils
             else if (actionName.Equals("hot_lunch_reward"))
             {
                 EventUtils.OnEvent("hot_lunch_reward", "热启动广告");
+            }else if (actionName.Equals("jingxihongbao")) {
+
+                EventUtils.OnEvent("jingxi_hongbao_video_show", "惊喜红包视频");
             }
+
         }
 
         public void onAdVideoBarClick()

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

@@ -1227,6 +1227,7 @@ public class DialogControl : MonoBehaviour
     //打开惊喜红包
     public void openJingxiHongbao()
     {
+        EventUtils.OnEvent("open_jingxi_hongbao");
         CloseJingxiDialog();
         AdUtils.PlayRewardAd("jingxihongbao", new Action<bool>((cb) =>
         {

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

@@ -13,7 +13,7 @@ public class TitleControl : MonoBehaviour
     private Animator m_Animator,btn_Animator;
     public Image img_withdraw;
    // public GameObject contentParent, item_prefab;
-    public Text cashTitleDescTv,tvTitle,tv_process;
+    public Text cashTitleDescTv,tvTitle,tv_process,tv_cash;
    // public Image img_bottom_icon;
     public Sprite[] lables;
     //获取首页第一个提现信息
@@ -51,6 +51,7 @@ public class TitleControl : MonoBehaviour
     private void setSliderData(WithDrawFirstInfoBean bean)
     {
         Debug.Log("给首页进度条设置数据");
+        tv_cash.text= "<size=28>" + bean.wdlcWdDataList[0].yuan + "</size>" + "元";
         img_icon.sprite = lables[bean.nextSeedPlantId - 1];
         img_procress.fillAmount = (float)bean.wdlcWdDataList[0].current / bean.wdlcWdDataList[0].targetNum;
         tv_process.text = bean.wdlcWdDataList[0].current + "/" + bean.wdlcWdDataList[0].targetNum;
@@ -144,10 +145,10 @@ public class TitleControl : MonoBehaviour
         {
             EventUtils.OnEvent("tixian");
         }
-        else
-        {
-            EventUtils.OnEvent("maicaizhuanqian");
-        }
+        //else
+        //{
+        //    EventUtils.OnEvent("maicaizhuanqian");
+        //}
         GameObject.Find("Dialog").GetComponent<DialogControl>().showPlantTreeWithDrawDialog();
     }
     public void clickEveryReward()

Assets/Game/Main/Scripts/View/chouti/ChouTiDongHua.cs

@@ -31,6 +31,7 @@ public class ChouTiDongHua : MonoBehaviour
     private List<RectTransform> ObjList = new List<RectTransform>();
     public GameObject imghongbao;
     public void clickhongbao() {
+        EventUtils.OnEvent("click_tixian_hongbao");
         if (IsOpen)
         {
             Close();
@@ -226,7 +227,7 @@ public class ChouTiDongHua : MonoBehaviour
     {
         if (!IsOpen)
             return;
-        Debug.Log("展示弹窗");
+        EventUtils.OnEvent("click_tixian_renwu");
         GameObject.Find("Title").GetComponent<TitleControl>().clickWithDrawBg(1);
     }
 }

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

@@ -147,7 +147,8 @@ public class PlantTreeControl : MonoBehaviour
         scrollview1.SetActive(false);
         scrollview2.SetActive(true);
         getExchangeListData();
-      //  index = 2;
+        //  index = 2;
+        EventUtils.OnEvent("click_duihui_shangcheng");
     }
     public void clickthree()
     {
@@ -157,7 +158,8 @@ public class PlantTreeControl : MonoBehaviour
         scrollview1.SetActive(true);
         scrollview2.SetActive(false);
         getRecordLog();
-      //  index = 3;
+        EventUtils.OnEvent("click_duihui_jilu");
+        //  index = 3;
     }
     //完成填写信息后
     public void FinishWriteInfo(int id, Action<string> action)
@@ -167,7 +169,6 @@ public class PlantTreeControl : MonoBehaviour
         parm.Add("id", id);
         HttpTool.Instance._Post("app/v1/game/module/exchange/choose", parm, new Action<GoodsBean>((bean) =>
         {
-            // setItemData(bean);
             action(bean.no);
 
         }), new Action<string, string>((code, errMsg) =>

ProjectSettings/EditorBuildSettings.asset

@@ -5,19 +5,19 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/Game/Main/Scenes/InitScene.unity
     guid: 902436d14e36d4d42921eab701175b51
-  - enabled: 0
+  - enabled: 1
     path: Assets/Game/Splash/Splash.unity
     guid: 37af8cf3fb373478ab04e3ee2f3b700a
-  - enabled: 0
+  - enabled: 1
     path: Assets/Game/Main/Scenes/CrazyCar.unity
     guid: 2ae344869669f6641a05481805b94e98
   - enabled: 0
     path: Assets/Base/AdSDK/AD/GDT/UnionDemo/UnionExample.unity
     guid: 6c963ae210fa3c3438c2f6770ee81fc9
-  - enabled: 1
+  - enabled: 0
     path: Assets/Base/AdSDK/AD/Demo/AdDemo.unity
     guid: ef80a35d44f809e4a8957d1ed9571fd2
   m_configObjects: {}