Merge branch 'develop_mjb_cscmnq_1.0.5' of…

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

Assets/AdSDK.meta

 fileFormatVersion: 2
-guid: 3bdf81920b9ea8e46abd100e083eefe7
+guid: b9b263a922fc04fb18572f38d7307beb
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/AdSDK/AD/CSJ/PangleAdapterScripts/Scripts.meta

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

Assets/AdSDK/AD/CSJ/PangleSDK/iOS.meta

-fileFormatVersion: 2
-guid: 9b3f9e305d4804719b5f4505912accf2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AdSDK/NetWork.meta

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

Assets/Game/Main/Prefabs/Car.prefab

@@ -4465,7 +4465,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 4}
   m_SizeDelta: {x: 160, y: 62.890503}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5038603703423831735

Assets/Game/Main/Resource/ui/baiyuanhongbao/按钮-9.png.meta → Assets/Game/Main/Resource/ui/baiyuanhongbao/按钮-10.png.meta

 fileFormatVersion: 2
-guid: c9db3a352544b4ae986bee67f25f2f9b
+guid: 1b93cd08a0d004f8c8640dc35b258047
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -75393,7 +75393,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c9db3a352544b4ae986bee67f25f2f9b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1b93cd08a0d004f8c8640dc35b258047, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

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

@@ -123,6 +123,7 @@ public class CaomeiItem : MonoBehaviour
         {
             return;
         }
+        EventUtils.OnEvent("caomei_jiugongge");
         AdUtils.PlayRewardAd("caomei_addProcess", new Action<bool>((cb) =>
         {
             if (cb)

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

@@ -149,6 +149,9 @@ public class AdUtils
             else if (actionName.Equals("video_reward2"))
             {
                 EventUtils.OnEvent("reward_onlinePacket2", "激励视频_晃动红包");
+            }else if (actionName.Equals("caomei_addProcess"))
+            {
+                EventUtils.OnEvent("caomei_video_show");
             }
         }
 

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

@@ -601,7 +601,7 @@ public class DialogControl : MonoBehaviour
     }
     private void moveAllSpeedDialog()
     {
-        allspeedcontent.transform.localPosition += new Vector3(0, 300, 0);
+        allspeedcontent.transform.localPosition += new Vector3(0, 320, 0);
     }
     private void showAd()
     {
@@ -614,7 +614,7 @@ public class DialogControl : MonoBehaviour
     /// </summary>
     public void OnClickCloseAllSpeedDialog()
     {
-        allspeedcontent.transform.localPosition -= new Vector3(0, 300, 0);
+        allspeedcontent.transform.localPosition -= new Vector3(0, 320, 0);
         AudioUtils.ins.PlayBtnAudio();
         AllSpeedDialog.SetActive(false);
         AdUtils.closeFeedAd();

Packages/packages-lock.json

@@ -5,14 +5,14 @@
       "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",
@@ -21,14 +21,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.test-framework": {
       "version": "1.1.20",
@@ -39,7 +39,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",
@@ -48,14 +48,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",