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/AdSDK.meta

-fileFormatVersion: 2
-guid: 3bdf81920b9ea8e46abd100e083eefe7
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AdSDK/InitProject.meta

-fileFormatVersion: 2
-guid: 699ec949cb5539f48b04345cd60af6dd
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AdSDK/InitProject/InitScene.unity.meta

-fileFormatVersion: 2
-guid: b0fdeff412c9a1f4e82faa8ef0aeb063
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Prefabs/Car.prefab

@@ -1563,7 +1563,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &455528768205073270
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -3459,7 +3459,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 782149801}
   m_HandleRect: {fileID: 782149800}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -4419,11 +4419,11 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 2118302534}
+  - {fileID: 634203768}
   - {fileID: 716226832}
   - {fileID: 835587878}
   - {fileID: 1776466864}
   - {fileID: 223744066}
-  - {fileID: 634203768}
   - {fileID: 771430749}
   - {fileID: 904973031}
   - {fileID: 842828050}
@@ -8717,7 +8717,7 @@ RectTransform:
   m_LocalScale: {x: 0.0074962517, y: 0.0074962517, z: 0.0074962517}
   m_Children: []
   m_Father: {fileID: 105570271}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -20552,8 +20552,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1531958713}
   m_HandleRect: {fileID: 1531958712}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1.0000033
+  m_Size: 0.93547666
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -26636,7 +26636,7 @@ RectTransform:
   - {fileID: 1077792143}
   - {fileID: 592572115}
   m_Father: {fileID: 105570271}
-  m_RootOrder: 5
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -29857,7 +29857,7 @@ RectTransform:
   - {fileID: 1747314418}
   - {fileID: 1142096296}
   m_Father: {fileID: 105570271}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -34024,7 +34024,7 @@ RectTransform:
   - {fileID: 1259928011}
   - {fileID: 953610385}
   m_Father: {fileID: 105570271}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -70477,7 +70477,7 @@ RectTransform:
   - {fileID: 300107173}
   - {fileID: 1206812857221506103}
   m_Father: {fileID: 105570271}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}

Assets/Game/Main/Scenes/InitScene.unity

@@ -419,7 +419,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 145}
+  m_AnchoredPosition: {x: 0, y: 130}
   m_SizeDelta: {x: 720, y: 260}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2010092452
@@ -441,7 +441,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: e5d6b9eed3a874a0397c699b5154addb, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

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

@@ -23,6 +23,10 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
     public GameObject baiyuanhongbao,caomeiDialog;
     private void Awake()
     {
+#if UNITY_EDITOR
+        AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8");
+        Constant.Instance.shubiao = true;
+#endif
         mPresenter = new HomePresenter(this);
         EventCenter.AddListener(MyEventType.UPDATE_CAR_LIST_DATA, OnUpdateCarListData);
         EventCenter.AddListener(MyEventType.OPEN_ALL_SPEED_PAGE, OnClickAllSpeed);
@@ -106,9 +110,9 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
         GameObject Coin1 = transform.Find("Car_list_bg/FloatCoin/Coin1").gameObject;
         Coin1.SetActive(Constant.Instance.shubiao);
 
-        // 卖菜赚钱
-        GameObject SellingVegetables = transform.Find("BottomFun/SellingVegetables").gameObject;
-        SellingVegetables.SetActive(Constant.Instance.shubiao);
+        //// 卖菜赚钱
+        //GameObject SellingVegetables = transform.Find("BottomFun/SellingVegetables").gameObject;
+        //SellingVegetables.SetActive(Constant.Instance.shubiao);
 
         // 一箱草莓
         GameObject Strawberries = transform.Find("BottomFun/Strawberries").gameObject;

Packages/packages-lock.json

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