Merge branch 'develop_mjb_cscmnq_1.0.7' of…

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

Assets/FunScripts/UI/BasePanel.cs

@@ -21,7 +21,7 @@ public abstract class BasePanel : MonoBehaviour
 
     private void GetAllControls<T>() where T:UIBehaviour
     {
-        T[] controls = GetComponentsInChildren<T>();
+        T[] controls = GetComponentsInChildren<T>(true);
 
         for (int i = 0; i < controls.Length; i++)
         {

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

@@ -49,8 +49,20 @@ public class LeeMainController : MonoBehaviour
         {
             Transform Content = ZhongCaiTiXian.Find("MainBK/SV/Viewport/Content");
 
-            ZhongCaiTiXian.Find("MainBK/btnClose").GetComponent<Button>().onClick.RemoveAllListeners();
-            ZhongCaiTiXian.Find("MainBK/btnClose").GetComponent<Button>().onClick.AddListener(HideZhongCaiTiXianPanel);
+            ZhongCaiTiXian.Find("btnClose").GetComponent<Button>().onClick.RemoveAllListeners();
+            ZhongCaiTiXian.Find("btnClose").GetComponent<Button>().onClick.AddListener(HideZhongCaiTiXianPanel);
+
+            if (Content.childCount != 0)
+            {
+                for (int i = 0; i < model.wdDataList.Count; i++)
+                {
+                    Content.GetChild(i).GetComponent<TiXianCell>().Init(model.wdDataList[i]);
+                }
+
+                return;
+            }
+
+            
 
             for (int i = 0; i < model.wdDataList.Count; i++)
             {
@@ -63,6 +75,11 @@ public class LeeMainController : MonoBehaviour
         });
     }
 
+    public void ClearZhongCaiTiXianPanel() 
+    {
+    
+        
+    }
     public void HideZhongCaiTiXianPanel() 
     {
         Transform Content = ZhongCaiTiXian.Find("MainBK/SV/Viewport/Content");

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

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class NeedMoreEXP : MonoBehaviour
+{
+    public Text Line1;
+
+    public Text Line2;
+
+    private int? id;
+
+    private void Awake()
+    {
+        Init();
+    }
+
+    public void Init()
+    {
+
+        //WithDrawDialogBean
+        transform.Find("btnClose").GetComponent<Button>().onClick.AddListener(Hide);
+
+        transform.Find("MainBK/btnOK").GetComponent<Button>().onClick.AddListener(() => 
+        {
+            AdUtils.PlayRewardAd("GET_EXP", new Action<bool>((cb) =>
+            {
+                if (cb)
+                {
+                    DialogControl.Instance.NetWorkRequest<WithDrawDialogBean>(false, "app/v2/cscmnq/wd_addExp", new Dictionary<string, object>() { { "uid", (int)id } }, (_) => 
+                    {
+                        LeeMainController.Instance.UpdateZhongCaiTiXianPanel();
+                        Hide();
+                    });
+                }
+                else
+                {
+                    Hide();
+                }
+
+            }));
+        });
+    }
+
+    public void Show(int? id, WithDrawDialogBean model)
+    {
+        this.id = id;
+
+        Line1.text = model.title;
+
+        gameObject.SetActive(true);
+    }
+
+    public void Hide() 
+    {
+        gameObject.SetActive(false);
+    }
+}

Assets/Game/Main/Resource/LeeScripts/NeedMoreEXP.cs.meta

+fileFormatVersion: 2
+guid: 2e0827e5ab1b83e4488b25683b190cce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -4,9 +4,18 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
-public class ReceiveDiamondPanel : MonoBehaviour
+public class ReceiveDiamondPanel
+    : MonoBehaviour
 {
     public bool IsInit;
+
+    public static ReceiveDiamondPanel Instance;
+
+    private void Awake()
+    {
+        Instance = this;
+        Init();
+    }
     public void Init() 
     {
         transform.Find("MainBK/btnClose").GetComponent<Button>().onClick.AddListener(() =>

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

 using System.Collections;
 using System.Collections.Generic;
+using ToastPlugin;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -23,10 +24,18 @@ public class TiXianCell : BasePanel
             case 2:
                 GetControl<Button>("btnGo").onClick.AddListener(() => 
                 {
-                    Debug.LogError(info.id);
-                    DialogControl.Instance.NetWorkRequest<object>(false, "app/v2/cscmnq/do_wd", new Dictionary<string, object>() { { "wdId",(int)info.id } },(obj)=> 
+                    DialogControl.Instance.NetWorkRequest<WithDrawDialogBean>(false, "app/v2/cscmnq/do_wd", new Dictionary<string, object>() { { "wdId",(int)info.id } },(obj)=> 
                     {
-                        
+                        switch (obj.status)
+                        {
+                            case 1:
+                            case 2:
+                            case 3:
+                            case 7:
+                                ToastHelper.ShowToast(obj.reason);
+                                return;
+                        }
+                        DialogControl.Instance.nme.Show(info.id, obj);
                     });
                 });
 

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -3028,7 +3028,6 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1541119557}
   - {fileID: 2030695797}
   - {fileID: 596913243}
   m_Father: {fileID: 1824402362}
@@ -9658,9 +9657,9 @@ RectTransform:
   m_Father: {fileID: 1548415916}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 355, y: -72.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 355, y: 0}
   m_SizeDelta: {x: 710, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &300181110
@@ -20863,7 +20862,7 @@ RectTransform:
   m_Children:
   - {fileID: 359346045}
   m_Father: {fileID: 92939073}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26226,14 +26225,14 @@ MonoBehaviour:
   path:
     wpLengths:
     - 0
-    - 11.212016
-    - 5.5597563
+    - 10.90613
+    - 5.5463805
     - 6.1961856
     type: 1
     subdivisionsXSegment: 10
     subdivisions: 40
     wps:
-    - {x: -3.5024998, y: 2.955, z: 100}
+    - {x: -2.8756156, y: 2.4261084, z: 100}
     - {x: -1.3436712, y: -1.5280215, z: 90}
     - {x: 0.21024093, y: 3.2540216, z: 90}
     - {x: 3.7466066, y: -1.7448426, z: 90}
@@ -26242,7 +26241,7 @@ MonoBehaviour:
       b: {x: 0, y: 0, z: 0}
     - a: {x: 7.2829723, y: -6.7437067, z: 90}
       b: {x: 0, y: 0, z: 0}
-    length: 22.983376
+    length: 22.663618
     isFinalized: 1
     timesTable:
     - 0.025
@@ -26286,46 +26285,46 @@ MonoBehaviour:
     - 0.975
     - 1
     lengthsTable:
-    - 0.15471439
-    - 0.5889805
-    - 1.2580361
-    - 2.1171157
-    - 3.1214933
-    - 4.226496
-    - 5.387515
-    - 6.5600595
-    - 7.6998096
-    - 8.762795
-    - 9.705688
-    - 10.4866905
-    - 11.068326
-    - 11.458006
-    - 11.790817
-    - 12.147154
-    - 12.5613785
-    - 13.035387
-    - 13.555864
-    - 14.102991
-    - 14.654059
-    - 15.185122
-    - 15.67202
-    - 16.091513
-    - 16.423817
-    - 16.66177
-    - 16.849846
-    - 17.07897
-    - 17.374407
-    - 17.73803
-    - 18.163519
-    - 18.64145
-    - 19.161064
-    - 19.710953
-    - 20.279375
-    - 20.854437
-    - 21.424185
-    - 21.976715
-    - 22.500265
-    - 22.983376
+    - 0.15035214
+    - 0.5723822
+    - 1.2226055
+    - 2.0575345
+    - 3.0337222
+    - 4.1077776
+    - 5.236377
+    - 6.3763185
+    - 7.4845796
+    - 8.518503
+    - 9.436096
+    - 10.196958
+    - 10.765153
+    - 11.149754
+    - 11.484675
+    - 11.845319
+    - 12.262508
+    - 12.737176
+    - 13.256148
+    - 13.800106
+    - 14.346965
+    - 14.873441
+    - 15.356062
+    - 15.772276
+    - 16.102968
+    - 16.341343
+    - 16.530088
+    - 16.759212
+    - 17.05465
+    - 17.418272
+    - 17.843761
+    - 18.321693
+    - 18.841307
+    - 19.391195
+    - 19.959618
+    - 20.53468
+    - 21.104427
+    - 21.656958
+    - 22.180508
+    - 22.663618
   inspectorMode: 0
   pathType: 1
   handlesType: 0
@@ -36878,6 +36877,7 @@ GameObject:
   - component: {fileID: 1132365598}
   - component: {fileID: 1132365600}
   - component: {fileID: 1132365599}
+  - component: {fileID: 1132365601}
   m_Layer: 5
   m_Name: NeedMoreEXP
   m_TagString: Untagged
@@ -36944,6 +36944,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1132365597}
   m_CullTransparentMesh: 0
+--- !u!114 &1132365601
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1132365597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2e0827e5ab1b83e4488b25683b190cce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Line1: {fileID: 5808459}
+  Line2: {fileID: 539065261}
 --- !u!1 &1135140078
 GameObject:
   m_ObjectHideFlags: 0
@@ -50183,12 +50197,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1541119556}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 92939073}
-  m_RootOrder: 0
+  m_Father: {fileID: 1824402362}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -60337,6 +60351,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 92939073}
+  - {fileID: 1541119557}
   m_Father: {fileID: 2052625159}
   m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -66035,7 +66050,7 @@ RectTransform:
   - {fileID: 1405951376}
   - {fileID: 60622861}
   m_Father: {fileID: 92939073}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -66692,6 +66707,7 @@ MonoBehaviour:
   RealAwards: {fileID: 3336770981114390305, guid: c8a7c6a15b5684cebbd1bbb8dec4d3b6,
     type: 3}
   rdp: {fileID: 1520725255}
+  nme: {fileID: 1132365601}
 --- !u!1 &2053463148
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -51,6 +51,8 @@ public class DialogControl : MonoBehaviour
 
     public ReceiveDiamondPanel rdp;
 
+    public NeedMoreEXP nme;
+
     private void Awake()
     {
         Instance = this;
@@ -541,8 +543,13 @@ public class DialogControl : MonoBehaviour
         EventUtils.OnEvent("addDiamond_click", "点击钻石加号");
         HttpTool.Instance._Get("app/v2/cscmnq/diamond_by_video_status", null, new Action<DiamondStatusBean>((bean) =>
         {
+<<<<<<< HEAD
+            DiamondRewardNum = bean.rewardDiamondNum;
+
+=======
             DiamondplayNum = bean.playNum;
             DiamondRewardNum = bean.rewardDiamondNum;
+>>>>>>> 9b00e1332e9bbf41d0221509f4e86bb98a4b5535
             if (DiamondplayNum > 0)
             {
                 rdp.Show(bean.rewardDiamondNum);

Packages/packages-lock.json

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