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/AD/CSJ/PangleAdapterScripts.meta

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

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

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

Assets/AdSDK/AD/CSJ/PangleSDK.meta

-fileFormatVersion: 2
-guid: 9216b5ab3159c44e594fa8e3a6bfcd90
-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/Scenes/CrazyCar.unity

@@ -1584,7 +1584,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: -124.2, y: 609.1}
+  m_AnchoredPosition: {x: -124.2, y: 612}
   m_SizeDelta: {x: 136.7032, y: 122.00984}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &54350470
@@ -4912,6 +4912,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 369872322}
     m_Modifications:
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -10
+      objectReference: {fileID: 0}
     - target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
         type: 3}
       propertyPath: m_Sprite
@@ -45856,6 +45861,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 369872322}
     m_Modifications:
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -1
+      objectReference: {fileID: 0}
     - target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
         type: 3}
       propertyPath: m_Sprite
@@ -52149,6 +52164,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 369872322}
     m_Modifications:
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -4
+      objectReference: {fileID: 0}
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 11
+      objectReference: {fileID: 0}
     - target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
         type: 3}
       propertyPath: m_Sprite
@@ -52304,7 +52329,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: 10.6, y: 629.2}
+  m_AnchoredPosition: {x: 10.6, y: 634}
   m_SizeDelta: {x: 121.23505, y: 163.89551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1747314419
@@ -54700,6 +54725,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 369872322}
     m_Modifications:
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 7
+      objectReference: {fileID: 0}
     - target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
         type: 3}
       propertyPath: m_Sprite
@@ -77802,6 +77832,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 369872322}
     m_Modifications:
+    - target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5
+      objectReference: {fileID: 0}
     - target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
         type: 3}
       propertyPath: m_Sprite

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

@@ -67,7 +67,11 @@ public class AdUtils
 
         public void onAdClose(AdEntity entity)
         {
-            AudioUtils.ins.music.Play();
+            if(PlayerPrefs.GetInt("IS_OPEN_MUSIC", 0) == 0)
+            {
+                AudioUtils.ins.music.Play();
+            }
+          
 
             setCurrentAdEntity(entity);
 

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

@@ -391,6 +391,10 @@ public class CarUIControl : MonoBehaviour
                 floatStickObj.SetActive(true);
                 imghaichongs.SetActive(true);
             }
+            else
+            {
+                floatSpeedObj.SetActive(false);
+            }
             //if (floatStickTipsObj.activeSelf != true)
             //{
             //    floatStickTipsObj.SetActive(true);
@@ -414,6 +418,10 @@ public class CarUIControl : MonoBehaviour
                 floatStickObj.SetActive(false);
                 imghaichongs.SetActive(false);
             }
+            else
+            {
+                floatSpeedObj.SetActive(true);
+            }
             //if (floatStickTipsObj.activeSelf != false)
             //{
             //    floatStickTipsObj.SetActive(false);

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

@@ -1013,7 +1013,7 @@ public class DialogControl : MonoBehaviour
     }
     public void showTaoxinDialog(int rewardcount)
     {
-       
+        EventUtils.OnEvent("happy_get_dialog");
         taoxinDialog.SetActive(true);
         tv_taoxin_num.text = rewardcount.ToString();
     }

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",