bugly

Assets/AdSDK/AD/CSJ.meta

+fileFormatVersion: 2
+guid: 62d1c1fa98be64555b74d41268d96b0a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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/Base/UnityTool/UnityPhoneUtils.cs

@@ -178,12 +178,12 @@ public class UnityPhoneUtils
         string vc = "";
 
 #if UNITY_EDITOR
-        vc = "5";
+        vc = "6";
 #elif UNITY_ANDROID
        vc = GetPhoneUtil().Call<int>("getAppVersionCode", GetActivity())+"";
 #elif UNITY_IOS
 
-        vc = "5";
+        vc = "6";
 #endif
         Debug.unityLogger.Log("GetVC " + vc);
         return vc;

Assets/Base/UnityTool/WxLoginUtil.cs

@@ -99,22 +99,19 @@ public class WxLoginUtil : MonoBehaviour
         HttpTool.Instance._Post("app/v1/auth/tourist-login", null, new Action<LoginUserInfoBean>((bean) =>
         {
             AppConfig.Instance.setTokenAndUid(bean.token, bean.uid.ToString());
+            wxCallBack = loginCallBack;
             if (wxCallBack != null)
             {
                 wxCallBack(true);
             }
 
-            loginCallBack = wxCallBack;
-
         }), new Action<string, string>((code, errMsg) =>
         {
+            wxCallBack = loginCallBack;
             if (wxCallBack != null)
             {
                 wxCallBack(false);
             }
-
-            loginCallBack = wxCallBack;
-
         }));
     }
 

Assets/Editor/ConfigXcode.cs

@@ -33,6 +33,10 @@ public class ConfigXcode
         project.AddFrameworkToProject(frameworkTargetGuid, "libsqlite3.tbd", false);
         project.AddFrameworkToProject(frameworkTargetGuid, "CoreTelephony.framework", false);
         project.AddFrameworkToProject(frameworkTargetGuid, "WebKit.framework", false);
+        project.AddFrameworkToProject(frameworkTargetGuid, "Security.framework", false);
+        project.AddFrameworkToProject(frameworkTargetGuid, "SystemConfiguration.framework", false);
+        project.AddFrameworkToProject(frameworkTargetGuid, "JavaScriptCore.framework", true);
+        project.AddFrameworkToProject(frameworkTargetGuid, "libc++.dylib", false);
 
         // ----------------------------- 添加universal link -----------------------------
         string fileName = "my.entitlements";    // 这个名字任意

Assets/Editor/XUPorter/Mods/Bugly/Bugly.framework.meta

 fileFormatVersion: 2
 guid: 75b10080bdc104b83beb6663fc9985fb
 folderAsset: yes
-DefaultImporter:
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -245,7 +245,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
         EventCenter.RemoveListener(MyEventType.FlyHongbao, flyhongbao);
         EventCenter.RemoveListener(MyEventType.FlyDiamond, flydiamond);
         EventCenter.RemoveListener(MyEventType.FlyVideoRedPack, flyVideoRedPack);
-        EventCenter.AddListener(MyEventType.PLAY_INTERSITIAL_AD, playIntersitialAd);
+        EventCenter.RemoveListener(MyEventType.PLAY_INTERSITIAL_AD, playIntersitialAd);
     }
 
   

Assets/Scripts/Splash/Splash.cs

@@ -213,7 +213,7 @@ public class Splash : MonoBehaviour
 
         public void onError(string errorMsg)
         {
-            //print("splash onError" + errorMsg);
+            print("splash onError" + errorMsg);
         }
 
         public void onLastError()

Packages/packages-lock.json

@@ -5,14 +5,14 @@
       "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",
@@ -21,14 +21,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.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.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
       "version": "2.1.1",
@@ -48,14 +48,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",

ProjectSettings/GraphicsSettings.asset

@@ -34,7 +34,6 @@ 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.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
   m_UserSelectedRegistryName: 

ProjectSettings/ProjectSettings.asset

@@ -41,12 +41,6 @@ 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
@@ -124,7 +118,6 @@ PlayerSettings:
   vulkanNumSwapchainBuffers: 3
   vulkanEnableSetSRGBWrite: 0
   vulkanEnableLateAcquireNextImage: 0
-  useSecurityBuild: 0
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -178,7 +171,7 @@ PlayerSettings:
     Android: com.ym.cscmnq
     iPhone: com.ym.simulator
   buildNumber:
-    iPhone: 4
+    iPhone: 6
   AndroidBundleVersionCode: 6
   AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
@@ -472,7 +465,6 @@ PlayerSettings:
       m_Kind: 4
       m_SubKind: App Store
   m_BuildTargetBatching: []
-  m_BuildTargetEncrypting: []
   m_BuildTargetGraphicsJobs:
   - m_BuildTarget: MacStandaloneSupport
     m_GraphicsJobs: 0