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

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];

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()
     {

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: 

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

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: 

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)

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步");

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) =>

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)

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();

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

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: {}

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}

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: 

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