fix：1、修复bug

Assets/AddressableAssetsData/link.xml

@@ -0,0 +1,14 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.TextAsset" preserve="all" />
+  </assembly>
+</linker>

Assets/AddressableAssetsData/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 796bb1165da86824ca3f53d1b1005e20
+guid: 79c31e8565590ac419eabb9381c360af
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Configs/public_conf_1780296287.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cfbaddc877b6fb14396b53751ad7c1c1
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Legend/Define/Model/Config/Game/CommonModel.cs

@@ -30,6 +30,7 @@ namespace IgnoreOPS
         public int rewardinsertion;
         public int exchangeCD = 120;
         public int PayRate;
+        public int non;
 
         public int AddDiscountLevel;
         public int AddDiscountCD;

Assets/Legend/Helper/GameHelper.cs

@@ -517,7 +517,7 @@ namespace BallKingdomCrush
             try
             {
                 countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName;
-                Debug.Log("国家代码: " + countryCode); // 例如：US, CN, JP, DE 等
+                // Debug.Log("国家代码: " + countryCode); // 例如：US, CN, JP, DE 等
             }
             catch (System.Exception e)
             {

Assets/Legend/Manager/HallManager.cs

@@ -144,6 +144,7 @@ namespace BallKingdomCrush
         private void openWB(object obj) {
             SdkConfigMgr.Instance.Open();
             CreatAnimalCard.instance.SetCameraVisible(false);
+            CameraManager.Instance.SetMainCameraBackgroundTransparent();
             if (UIManager.Instance.IsExistUI(UIConst.RainPlayUI)) {
                 UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, false);
             } else {

Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">120df273-b302-4553-adff-4fad18c4d418</string></resources>
+<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">7ee01aac-7ff8-45e0-af00-e878e21c22e1</string></resources>

Assets/Scenes/MainScene.unity

@@ -704,7 +704,7 @@ Transform:
   m_GameObject: {fileID: 275783129}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.2556, y: -34.4, z: 401}
+  m_LocalPosition: {x: -0.2556, y: -34.4, z: 399}
   m_LocalScale: {x: 5.2, y: 5.2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Scripts/Define/Constant/AppConst.cs

@@ -9,7 +9,7 @@ namespace BallKingdomCrush
         #region Field
 
 #if GAME_RELEASE
-        public static bool IsEnabledEngineLog = true;
+        public static bool IsEnabledEngineLog = false;
 #else
         public static bool IsEnabledEngineLog = true;
 #endif

Assets/Scripts/Manager/Manager/CameraManager.cs

@@ -143,6 +143,15 @@ namespace BallKingdomCrush
             GeneralKit.Destroy(AppObjConst.CameraGo);
         }
 
+        public void SetMainCameraBackgroundTransparent()
+        {
+            // if (mainCamera != null)
+            // {
+            //     mainCamera.clearFlags = CameraClearFlags.SolidColor;
+            //     mainCamera.backgroundColor = new Color(0, 0, 0, 0);
+            // }
+        }
+        
         #endregion
     }
 }

Assets/Scripts/System/Network/ConfigSystem.cs

@@ -44,7 +44,7 @@ namespace BallKingdomCrush
             TrackKit.TrackLoginFunnel(LoginFunnelEventType.LoadBegin); //加载开始打点
 
             var loginModel = LoginKit.Instance.LoginModel;
-            Log.Info("Config", $"服务器传过来的配置表：{loginModel.Setting}");
+            Debug.Log($"服务器传过来的配置表：{loginModel.Setting}");
             ConfigLoader.Instance.Init(new ConfigInitOptions
             {
                 Setting = loginModel.Setting,
@@ -142,14 +142,18 @@ namespace BallKingdomCrush
         /// 
         /// </summary>
         /// <returns>true：非自然  false：自然</returns>
-        public static bool IsOrganic()
+        private static bool IsOrganic()
         {
             bool b = false;
             
-            if (GameHelper.IsGiftSwitch() && SuperApplication.Instance.attribution == "organic")
+            if (GameHelper.IsGiftSwitch())
             {
-                b = GetCommonConf().IsOrganic == 1;
+                if (SuperApplication.Instance.attribution == "organic")
+                {
+                    b = GetCommonConf().non == 1;
                 }
+            }
+            // Debug.Log($"上传---------开关：{GetCommonConf().non}");
 
             Debug.Log($"下载---------开关：{b}");
             return b;
@@ -157,7 +161,7 @@ namespace BallKingdomCrush
         
         public static string GetConfigResVersion()
         {
-            return IsOrganic() ? GetCommonConf().ResVersion : GetCommonConf().ResVersion1;
+            return IsOrganic() ? GetCommonConf().ResVersion1 : GetCommonConf().ResVersion;
         }
         
         public static List<T> GetConfig<T>() where T : class
@@ -167,7 +171,7 @@ namespace BallKingdomCrush
         
         private static List<T> GetConfigWithOrganicFallback<T, TOrganic>() where T : class
         {
-            if (!IsOrganic())
+            if (IsOrganic())
             {
                 var organicConfig = ConfigLoader.Instance.GetConfig<List<TOrganic>>();
                 if (organicConfig != null)

Assets/ThinkupTpnPlugin/Resources/json/2.1.5/plugin_setting_data.json

@@ -1 +1 @@
-{"curCountry":2,"china":{"android_version":"","ios_version":"","androidXSetting":0,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"6.5.10","ios_version":"6.4.87","androidXSetting":1,"country":2,"android_admob_app_id":"ca-app-pub-3940256099942544~3347511713","ios_admob_app_id":""}}
+{"curCountry":2,"china":{"android_version":"","ios_version":"","androidXSetting":0,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"6.5.10","ios_version":"6.4.87","androidXSetting":1,"country":2,"android_admob_app_id":"ca-app-pub-4727531460679709~6995531643","ios_admob_app_id":""}}

BallCrushBest_GP.sln.DotSettings.user

@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003F1a_003Fb93f31c4_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACameraClearFlags_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003F58_003F4605d830_003FCameraClearFlags_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AConfigSystem_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F45d8d9c6e50e4d1ebc0a5d7339f0472728a00_003F4b_003F6379d388_003FConfigSystem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADateTimeOffset_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F84fcf9255ea045aab003a751cdb5a2f6573620_003F1e_003F6b54b81f_003FDateTimeOffset_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc6c8374a51994d45a37d1659d5e2b9f017ab98_003Fc5_003F9e2ca964_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

ProjectSettings/ProjectSettings.asset

@@ -141,7 +141,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 1.0.9
+  bundleVersion: 1.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -170,7 +170,7 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 9
+  AndroidBundleVersionCode: 10
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 36
   AndroidPreferredInstallLocation: 1