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

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
fc778077 · zhangzhe · 10a9014d · 94357a0c · fc778077 · fc778077
Commit fc778077 authored Jun 23, 2021 by zhangzhe
19 changed files
--- a/Assets/Base/AdSDK/AD/AD_Manager/AdManager.cs
+++ b/Assets/Base/AdSDK/AD/AD_Manager/AdManager.cs
@@ -244,16 +244,17 @@ public class AdManager
        if (adList == null || adList.Count == 0)
        {
            Debug.unityLogger.Log(ZXADConfig.ADManagerTAG, "Splash没有广告数据");
+            listener.onLastError();
            return;
        }
-
-        // 首次启动时倒序加载
-        if (PlayerPrefs.GetInt("isFirstLoadSplashAd") != 1)
-        {
        adList.Reverse();
+        //// 首次启动时倒序加载
+        //if (PlayerPrefs.GetInt("isFirstLoadSplashAd") != 1)
+        //{
+        //    adList.Reverse();

-            PlayerPrefs.SetInt("isFirstLoadSplashAd", 1);
-        }
+        //    PlayerPrefs.SetInt("isFirstLoadSplashAd", 1);
+        //}

        List<AdEntity> totalEntityList = adList;
        AdEntity entity = totalEntityList[0];

--- a/Assets/Base/AdSDK/AD/Demo/AdDemo.cs
+++ b/Assets/Base/AdSDK/AD/Demo/AdDemo.cs
@@ -18,7 +18,7 @@ public class AdDemo : MonoBehaviour

    private void Awake()
    {  //AdManager.Instance.LoadSplshAd(new SplshAdListener(this));
-        AppConfig.Instance.InitProgect(true, true, "c4f628fe0c45566f");
+        AppConfig.Instance.InitProgect(false, true, "c4f628fe0c45566f");
    }
    private void Start()
    {

--- a/Assets/Base/AdSDK/AD/Funshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar
+++ b/Assets/Base/AdSDK/AD/Funshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar
--- a/Assets/Base/AdSDK/AD/Funshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar.meta
+++ b/Assets/Base/AdSDK/AD/Funshion/Plugins/Android/GDTSDK.unionNormal.4.333.1203.aar.meta
-fileFormatVersion: 2
-guid: 313bb0c6c369747158b3e1a958090eed
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Base/AdSDK/AD/GDT/UnionDemo/IOSDemoUtils.cs
+++ b/Assets/Base/AdSDK/AD/GDT/UnionDemo/IOSDemoUtils.cs
@@ -3,6 +3,7 @@ using System.Runtime.InteropServices;

 public class IOSDemoUtils
 {
+#if UNITY_IOS
    public static void ShowView(IntPtr view)
    {
        GDT_UnionPlatform_Ad_ShowAdView(view);
@@ -10,4 +11,6 @@ public class IOSDemoUtils

    [DllImport("__Internal")]
    private static extern void GDT_UnionPlatform_Ad_ShowAdView(IntPtr adView);
+#endif
+
 }
\ No newline at end of file
--- a/Assets/Base/AdSDK/AD/GDT/UnionDemo/Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar
+++ b/Assets/Base/AdSDK/AD/GDT/UnionDemo/Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar
--- a/Assets/Base/AdSDK/AD/GDT/UnionDemo/Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar.meta
+++ b/Assets/Base/AdSDK/AD/GDT/UnionDemo/Plugins/Android/wechat-sdk-android-without-mta-6.6.14.aar.meta
-fileFormatVersion: 2
-guid: 1ce90202173eb411e904f5932583b2a0
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Base/Umeng/EventReportHttp/EventUtils.cs
+++ b/Assets/Base/Umeng/EventReportHttp/EventUtils.cs
@@ -60,8 +60,8 @@ public class EventUtils
            map["code_id"] = entity.codeId;
            map["reqId"] = entity.reqId;
            map["slot"] = entity.actionName;
-            map["errorMsg"] = code;
-            map["errorCode"] = msg;
+            map["errorMsg"] = msg;
+            map["errorCode"] = code ;
            EventHttp.Instance._PostEvent(JsonMapper.ToJson(map));

            if (entity.pullfail_tracking != null && entity.pullfail_tracking.Count > 0)

--- a/Assets/Game/Main/Resource/ui/dialog/luckyturntable/开启幸运.png
+++ b/Assets/Game/Main/Resource/ui/dialog/luckyturntable/开启幸运.png
--- a/Assets/Game/Main/Scenes/CrazyCar.unity
+++ b/Assets/Game/Main/Scenes/CrazyCar.unity
@@ -1508,6 +1508,80 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 48029598}
  m_CullTransparentMesh: 0
+--- !u!1 &48656713
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 48656714}
+  - component: {fileID: 48656716}
+  - component: {fileID: 48656715}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &48656714
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 48656713}
+  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: 703223718}
+  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}
+  m_AnchoredPosition: {x: -235, y: -528}
+  m_SizeDelta: {x: 98, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &48656715
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 48656713}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ff8fe5f5113094fbbb0ef45fa9265048, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &48656716
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 48656713}
+  m_CullTransparentMesh: 0
 --- !u!1 &48981434
 GameObject:
  m_ObjectHideFlags: 0
@@ -6591,6 +6665,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 223744065}
  m_CullTransparentMesh: 0
+--- !u!1 &225291232
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 225291233}
+  m_Layer: 5
+  m_Name: Step9
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &225291233
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 225291232}
+  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:
+  - {fileID: 2098422174}
+  m_Father: {fileID: 970469213}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -667}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &227095874
 GameObject:
  m_ObjectHideFlags: 0
@@ -9593,6 +9703,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 311469826}
  m_CullTransparentMesh: 0
+--- !u!1 &312064228
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 312064229}
+  m_Layer: 5
+  m_Name: Step7
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &312064229
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 312064228}
+  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:
+  - {fileID: 1725500822}
+  m_Father: {fileID: 970469213}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &318501426
 GameObject:
  m_ObjectHideFlags: 0
@@ -22633,6 +22779,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 700544935}
  m_CullTransparentMesh: 0
+--- !u!1 &703223717
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 703223718}
+  m_Layer: 5
+  m_Name: Step10
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &703223718
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 703223717}
+  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:
+  - {fileID: 48656714}
+  m_Father: {fileID: 970469213}
+  m_RootOrder: 7
+  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: 667}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &703432075
 GameObject:
  m_ObjectHideFlags: 0
@@ -30549,6 +30731,11 @@ RectTransform:
  - {fileID: 577554102}
  - {fileID: 290488167}
  - {fileID: 699910950}
+  - {fileID: 312064229}
+  - {fileID: 1284155201}
+  - {fileID: 225291233}
+  - {fileID: 703223718}
+  - {fileID: 1274492072}
  m_Father: {fileID: 0}
  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -38617,6 +38804,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1268367642}
  m_CullTransparentMesh: 0
+--- !u!1 &1274492071
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1274492072}
+  m_Layer: 5
+  m_Name: Step11
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1274492072
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274492071}
+  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:
+  - {fileID: 1439787991}
+  m_Father: {fileID: 970469213}
+  m_RootOrder: 8
+  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: 667}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1274549007
 GameObject:
  m_ObjectHideFlags: 0
@@ -39121,6 +39344,42 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
+--- !u!1 &1284155200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1284155201}
+  m_Layer: 5
+  m_Name: Step8
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1284155201
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1284155200}
+  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:
+  - {fileID: 1443660351}
+  m_Father: {fileID: 970469213}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1286803938
 GameObject:
  m_ObjectHideFlags: 0
@@ -44452,6 +44711,80 @@ RectTransform:
    type: 3}
  m_PrefabInstance: {fileID: 1438114496}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1439787990
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1439787991}
+  - component: {fileID: 1439787993}
+  - component: {fileID: 1439787992}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1439787991
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439787990}
+  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: 1274492072}
+  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}
+  m_AnchoredPosition: {x: 186, y: -521}
+  m_SizeDelta: {x: 98, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1439787992
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439787990}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ff8fe5f5113094fbbb0ef45fa9265048, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1439787993
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439787990}
+  m_CullTransparentMesh: 0
 --- !u!1 &1440887898
 GameObject:
  m_ObjectHideFlags: 0
@@ -44735,6 +45068,80 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1443636807}
  m_CullTransparentMesh: 0
+--- !u!1 &1443660350
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1443660351}
+  - component: {fileID: 1443660353}
+  - component: {fileID: 1443660352}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1443660351
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1443660350}
+  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: 1284155201}
+  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}
+  m_AnchoredPosition: {x: 55, y: -236}
+  m_SizeDelta: {x: 97, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1443660352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1443660350}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ce65a2a00524549f3978918c7a7bbcec, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1443660353
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1443660350}
+  m_CullTransparentMesh: 0
 --- !u!1 &1444234398
 GameObject:
  m_ObjectHideFlags: 0
@@ -53779,6 +54186,80 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1722435939}
  m_CullTransparentMesh: 0
+--- !u!1 &1725500821
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1725500822}
+  - component: {fileID: 1725500824}
+  - component: {fileID: 1725500823}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1725500822
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1725500821}
+  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: 312064229}
+  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}
+  m_AnchoredPosition: {x: -80, y: -220}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1725500823
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1725500821}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ce65a2a00524549f3978918c7a7bbcec, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1725500824
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1725500821}
+  m_CullTransparentMesh: 0
 --- !u!1 &1725731800
 GameObject:
  m_ObjectHideFlags: 0
@@ -62483,12 +62964,12 @@ MonoBehaviour:
  flyBox: {fileID: 771430748}
  step4: {fileID: 415499551}
  Step5: {fileID: 290488166}
-  Step6: {fileID: 0}
-  Step7: {fileID: 0}
-  Step8: {fileID: 0}
-  Step9: {fileID: 0}
-  Step10: {fileID: 0}
-  Step11: {fileID: 0}
+  Step6: {fileID: 699910949}
+  Step7: {fileID: 312064228}
+  Step8: {fileID: 1284155200}
+  Step9: {fileID: 225291232}
+  Step10: {fileID: 703223717}
+  Step11: {fileID: 1274492071}
 --- !u!1 &2020284656
 GameObject:
  m_ObjectHideFlags: 0
@@ -64987,6 +65468,80 @@ RectTransform:
  m_AnchoredPosition: {x: -5.3914, y: 13.21}
  m_SizeDelta: {x: 124.05795, y: 41.419693}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2098422173
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2098422174}
+  - component: {fileID: 2098422176}
+  - component: {fileID: 2098422175}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2098422174
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098422173}
+  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: 225291233}
+  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}
+  m_AnchoredPosition: {x: -232, y: 426}
+  m_SizeDelta: {x: 97, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2098422175
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098422173}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ce65a2a00524549f3978918c7a7bbcec, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2098422176
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098422173}
+  m_CullTransparentMesh: 0
 --- !u!1 &2102020959
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Game/Main/Scripts/Utils/Guide.cs
+++ b/Assets/Game/Main/Scripts/Utils/Guide.cs
@@ -216,6 +216,51 @@ public class Guide : MonoBehaviour
            Step7.SetActive(true);
        }
    }
+    public void onClickStep7()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step8Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step8Key, 1);
+            Debug.Log("显示第8步");
+            Step8.SetActive(true);
+        }
+    }
+    public void onClickStep8()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step9Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step9Key, 1);
+            Debug.Log("显示第9步");
+            Step9.SetActive(true);
+        }
+    }
+    public void onClickStep9()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step10Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step10Key, 1);
+            Debug.Log("显示第10步");
+            Step10.SetActive(true);
+        }
+    }
+    public void onClickStep10()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step11Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step11Key, 1);
+            Debug.Log("显示第11步");
+            Step11.SetActive(true);
+        }
+    }
+    public void onClickStep11()
+    {
+        DissmissGuide(false);
+       
+    }
    //public void onClickStep6()
    //{
    //    Debug.Log("点击第6步");

--- a/Assets/Game/Main/Scripts/View/DialogControl.cs
+++ b/Assets/Game/Main/Scripts/View/DialogControl.cs
@@ -514,17 +514,21 @@ public class DialogControl : MonoBehaviour
    //关闭获取钻石弹窗
    public void closeDiamondDialog()
    {
-
+        if (DiamondDialog.activeSelf)
+        {
            AudioUtils.ins.PlayBtnAudio();
            DiamondDialog.SetActive(false);
            diamondcontent.transform.localPosition -= new Vector3(0, 340, 0);
            AdUtils.closeFeedAd();
        }
+       
+    }
    //获取钻石奖励
    public void getDiamondReward()
    {

        //closeDiamondDialog();
+        closeDiamondDialog();
        AudioUtils.ins.PlayBtnAudio();
        EventUtils.OnEvent("addDiamond_click", "点击钻石加号");
        HttpTool.Instance._Get("app/v1/wdlc/reward/diamond_by_video_status", null, new Action<DiamondStatusBean>((bean) =>

--- a/Assets/Game/Main/Scripts/View/HomeInfoControl.cs
+++ b/Assets/Game/Main/Scripts/View/HomeInfoControl.cs
@@ -708,7 +708,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
    public void DidSelectedShiwujiangli()
    {
        AudioUtils.ins.PlayBtnAudio();
-
+        Guide.guide.onClickStep7();
        EventUtils.OnEvent("click_wodelibao", "点击我的礼包");

        if (RealAwardsVM.dataModel != null)

--- a/Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
+++ b/Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
@@ -13,14 +13,14 @@ public class PlantTreeControl : MonoBehaviour
    {
        clickone();
    }
-    //private void Awake()
-    //{
-    //    EventCenter.AddListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
-    //}
-    //private void OnDestroy()
-    //{
-    //    EventCenter.RemoveListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
-    //}
+    private void Awake()
+    {
+        EventCenter.AddListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
+    }
+    private void OnDestroy()
+    {
+        EventCenter.RemoveListener(MyEventType.RefreshPlantTreeWithDraw, getWithDrawData);
+    }
    //void Start()
    //{
    //   // getWithDrawData();

--- a/Packages/packages-lock.json
+++ b/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",

--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,16 +5,19 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: Assets/Game/Main/Scenes/InitScene.unity
    guid: 902436d14e36d4d42921eab701175b51
-  - enabled: 1
+  - enabled: 0
    path: Assets/Game/Splash/Splash.unity
    guid: 37af8cf3fb373478ab04e3ee2f3b700a
-  - enabled: 1
+  - enabled: 0
    path: Assets/Game/Main/Scenes/CrazyCar.unity
    guid: 2ae344869669f6641a05481805b94e98
  - enabled: 0
    path: Assets/Base/AdSDK/AD/GDT/UnionDemo/UnionExample.unity
    guid: 6c963ae210fa3c3438c2f6770ee81fc9
+  - enabled: 1
+    path: Assets/Base/AdSDK/AD/Demo/AdDemo.unity
+    guid: ef80a35d44f809e4a8957d1ed9571fd2
  m_configObjects: {}
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -34,6 +34,7 @@ GraphicsSettings:
  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
  m_PreloadedShaders: []
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
    type: 0}

--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -17,7 +17,7 @@ MonoBehaviour:
  m_Registries:
  - m_Id: main
    m_Name: 
-    m_Url: https://packages.unity.com
+    m_Url: https://packages.unity.cn
    m_Scopes: []
    m_IsDefault: 1
  m_UserSelectedRegistryName: 

--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -41,6 +41,12 @@ PlayerSettings:
    height: 1
  m_SplashScreenLogos: []
  m_VirtualRealitySplashScreen: {fileID: 0}
+  m_ShowUnitySplashAds: 0
+  m_AdsAndroidGameId: 
+  m_AdsIosGameId: 
+  m_ShowSplashAdsSlogan: 0
+  m_SloganImage: {fileID: 0}
+  m_SloganHeight: 150
  m_HolographicTrackingLossScreen: {fileID: 0}
  defaultScreenWidth: 1024
  defaultScreenHeight: 768
@@ -118,6 +124,7 @@ PlayerSettings:
  vulkanNumSwapchainBuffers: 3
  vulkanEnableSetSRGBWrite: 0
  vulkanEnableLateAcquireNextImage: 0
+  useSecurityBuild: 0
  m_SupportedAspectRatios:
    4:3: 1
    5:4: 1
@@ -258,7 +265,7 @@ PlayerSettings:
  AndroidEnableTango: 0
  androidEnableBanner: 1
  androidUseLowAccuracyLocation: 0
-  androidUseCustomKeystore: 0
+  androidUseCustomKeystore: 1
  m_AndroidBanners:
  - width: 320
    height: 180
@@ -465,6 +472,7 @@ PlayerSettings:
      m_Kind: 4
      m_SubKind: App Store
  m_BuildTargetBatching: []
+  m_BuildTargetEncrypting: []
  m_BuildTargetGraphicsJobs:
  - m_BuildTarget: MacStandaloneSupport
    m_GraphicsJobs: 0