Khoatv: fix logic merge

Assets/2D image/VFX/Prefab/CameraEffect.prefab

@@ -15,7 +15,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4386202184102293615
 Transform:
   m_ObjectHideFlags: 0
@@ -50,7 +50,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4386202184619213228
 Transform:
   m_ObjectHideFlags: 0
@@ -80,7 +80,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4386202184654976372}
   - component: {fileID: 4386202184654976371}
-  - component: {fileID: 4386202184654976370}
   - component: {fileID: 4386202184654976369}
   m_Layer: 0
   m_Name: CameraEffect
@@ -149,14 +148,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &4386202184654976370
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4386202184654976368}
-  m_Enabled: 1
 --- !u!114 &4386202184654976369
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -169,7 +160,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_RenderShadows: 1
+  m_RenderShadows: 0
   m_RequiresDepthTextureOption: 2
   m_RequiresOpaqueTextureOption: 2
   m_CameraType: 0
@@ -204,7 +195,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4386202184855054682
 Transform:
   m_ObjectHideFlags: 0

Assets/Epic Toon FX/Materials/Basics/glow4_ADD.mat

@@ -8,14 +8,13 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: glow4_ADD
-  m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
-  m_ShaderKeywords: _EMISSION _FADING_ON _SOFTPARTICLES_ON
-  m_LightmapFlags: 0
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _FADING_ON _SOFTPARTICLES_ON
+  m_LightmapFlags: 6
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
   disabledShaderPasses:
   - ALWAYS
   - SHADOWCASTER
@@ -40,7 +39,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
-    - _Blend: 2
+    - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1
     - _CameraFadingEnabled: 0
@@ -53,7 +52,7 @@ Material:
     - _DistortionEnabled: 0
     - _DistortionStrength: 1
     - _DistortionStrengthScaled: 0
-    - _DstBlend: 1
+    - _DstBlend: 10
     - _EmissionEnabled: 0
     - _FlipbookBlending: 0
     - _FlipbookMode: 0

Assets/Epic Toon FX/Materials/Basics/sparkle_ADD.mat

@@ -21,14 +21,13 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: sparkle_ADD
-  m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
-  m_ShaderKeywords: _EMISSION
-  m_LightmapFlags: 0
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _COLORCOLOR_ON
+  m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
   disabledShaderPasses:
   - ALWAYS
   - SHADOWCASTER
@@ -53,20 +52,20 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AlphaClip: 0
-    - _Blend: 2
+    - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1
     - _CameraFadingEnabled: 0
     - _CameraFarFadeDistance: 2
     - _CameraNearFadeDistance: 1
-    - _ColorMode: 0
+    - _ColorMode: 4
     - _Cull: 2
     - _Cutoff: 0.5
     - _DistortionBlend: 0.5
     - _DistortionEnabled: 0
     - _DistortionStrength: 1
     - _DistortionStrengthScaled: 0
-    - _DstBlend: 1
+    - _DstBlend: 10
     - _EmissionEnabled: 0
     - _FlipbookBlending: 0
     - _FlipbookMode: 0

Assets/Epic Toon FX/Materials/Misc/Unsorted/grab2_ADD.mat

@@ -8,14 +8,13 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: grab2_ADD
-  m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION _FADING_ON _SOFTPARTICLES_ON
-  m_LightmapFlags: 0
+  m_LightmapFlags: 6
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
   disabledShaderPasses:
   - ALWAYS
   - SHADOWCASTER

Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a187246822bbb47529482707f3e0eff8, type: 3}
   m_Name: GoogleMobileAdsSettings
   m_EditorClassIdentifier: 
-  adMobAndroidAppId: 
+  adMobAndroidAppId: ca-app-pub-9085952480111777~7996189377
   adMobIOSAppId: 
   delayAppMeasurementInit: 0

Assets/MaxSdk/Mediation/AdColony.meta

+fileFormatVersion: 2
+guid: 91403944b5f324e2e97449216ed04dbb
+labels:
+- al_max
+- al_max_export_path-MaxSdk\Mediation\AdColony
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/AdColony/Editor.meta

+fileFormatVersion: 2
+guid: 780819632c7324fe4aa48674fca743de
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/AdColony/Editor
+- al_max_export_path-MaxSdk\Mediation\AdColony\Editor
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/AdColony/Editor/Dependencies.xml

+<?xml version="1.0" encoding="utf-8"?>
+<dependencies>
+    <androidPackages>
+        <androidPackage spec="com.applovin.mediation:adcolony-adapter:4.6.5.0"/>
+    </androidPackages>
+    <iosPods>
+        <iosPod name="AppLovinMediationAdColonyAdapter" version="4.7.2.0.0"/>
+    </iosPods>
+</dependencies>

Assets/MaxSdk/Mediation/AdColony/Editor/Dependencies.xml.meta

+fileFormatVersion: 2
+guid: a351b114cfc11494ba8c131833b1bf74
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/AdColony/Editor/Dependencies.xml
+- al_max_export_path-MaxSdk\Mediation\AdColony\Editor\Dependencies.xml
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Facebook.meta

+fileFormatVersion: 2
+guid: c44d4f0f178014127a271c8dbcbeffe5
+labels:
+- al_max
+- al_max_export_path-MaxSdk\Mediation\Facebook
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Facebook/Editor.meta

+fileFormatVersion: 2
+guid: 28880992a399a48b7abe95b66649d711
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Facebook/Editor
+- al_max_export_path-MaxSdk\Mediation\Facebook\Editor
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml

+<?xml version="1.0" encoding="utf-8"?>
+<dependencies>
+    <androidPackages>
+        <!-- Ensure that Resolver doesn't inadvertently pull Facebook's beta versions of the SDK by forcing a specific version.
+             Since FAN SDK depends on older versions of a few support and play serives versions
+             `com.applovin.mediation:facebook-adapter:x.y.z.a` resolves to `com.applovin.mediation:facebook-adapter:+` which pulls down the beta versions of FAN SDK.
+             Note that forcing the adapter is enough to stop Jar Resolver from pulling the latest FAN SDK. -->
+        <androidPackage spec="com.applovin.mediation:facebook-adapter:[6.8.0.2]" />
+        <androidPackage spec="com.android.support:recyclerview-v7:28.+" />
+        <androidPackage spec="com.android.support:appcompat-v7:28.+" />
+    </androidPackages>
+    <iosPods>
+        <iosPod name="AppLovinMediationFacebookAdapter" version="6.9.0.1" />
+    </iosPods>
+</dependencies>

Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml.meta

+fileFormatVersion: 2
+guid: aea9bdf974328420db5ae118ef0d2b87
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Facebook/Editor/Dependencies.xml
+- al_max_export_path-MaxSdk\Mediation\Facebook\Editor\Dependencies.xml
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google.meta

+fileFormatVersion: 2
+guid: bd173679e095e434cba0d7d8261166e5
+labels:
+- al_max
+- al_max_export_path-MaxSdk\Mediation\Google
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google/Editor.meta

+fileFormatVersion: 2
+guid: e8015bd045cea462c8f39c8a05867d08
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Google/Editor
+- al_max_export_path-MaxSdk\Mediation\Google\Editor
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml

+<?xml version="1.0" encoding="utf-8"?>
+<dependencies>
+    <androidPackages>
+        <!-- Ensure that Resolver doesn't inadvertently pull the latest Play Services Ads' SDK that we haven't certified against. -->
+        <androidPackage spec="com.applovin.mediation:google-adapter:[20.5.0.2]" />
+    </androidPackages>
+    <iosPods>
+        <iosPod name="AppLovinMediationGoogleAdapter" version="8.13.0.2" />
+    </iosPods>
+</dependencies>

Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml.meta

+fileFormatVersion: 2
+guid: 053b810d3594744e38b6fd0fa378fb57
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Google/Editor/Dependencies.xml
+- al_max_export_path-MaxSdk\Mediation\Google\Editor\Dependencies.xml
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google/Editor/MaxGoogleInitialize.cs

+//
+//  MaxGoogleInitialize.cs
+//  AppLovin MAX Unity Plugin
+//
+//  Created by Santosh Bagadi on 10/5/20.
+//  Copyright © 2020 AppLovin. All rights reserved.
+//
+
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace AppLovinMax.Mediation.Google.Editor
+{
+    [InitializeOnLoad]
+    public class MaxGoogleInitialize
+    {
+        private static readonly string LegacyMaxMediationGoogleDir = Path.Combine("Assets", "Plugins/Android/MaxMediationGoogle");
+
+        static MaxGoogleInitialize()
+        {
+            // Check if the MaxMediationGoogle directory exists and append .androidlib to it.
+            if (Directory.Exists(LegacyMaxMediationGoogleDir))
+            {
+                Debug.Log("[AppLovin MAX] Updating Google Android library directory name to make it compatible with Unity 2020+ versions.");
+
+                FileUtil.MoveFileOrDirectory(LegacyMaxMediationGoogleDir, LegacyMaxMediationGoogleDir + ".androidlib");
+                FileUtil.MoveFileOrDirectory(LegacyMaxMediationGoogleDir + ".meta", LegacyMaxMediationGoogleDir + ".androidlib" + ".meta");
+                AssetDatabase.Refresh();
+            }
+        }
+    }
+}

Assets/MaxSdk/Mediation/Google/Editor/MaxGoogleInitialize.cs.meta

+fileFormatVersion: 2
+guid: 2376824a26af1414bbc62440698ccc89
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Google/Editor/MaxGoogleInitialize.cs
+- al_max_export_path-MaxSdk\Mediation\Google\Editor\MaxGoogleInitialize.cs
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google/Editor/MaxMediationGoogleUtils.cs

+//
+//  MaxMediationGoogleUtils.cs
+//  AppLovin MAX Unity Plugin
+//
+//  Created by Santosh Bagadi on 11/7/19.
+//  Copyright © 2019 AppLovin. All rights reserved.
+//
+
+using System;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace AppLovinMax.Mediation.Google.Editor
+{
+    /// <summary>
+    /// An Utils class containing shared convenience methods.
+    /// </summary>
+    public static class MaxMediationGoogleUtils
+    {
+        private const string AppLovinSettingsExportPath = "MaxSdk/Resources/AppLovinSettings.asset";
+
+        /// <summary>
+        /// Loads the AppLovin Settings asset if it is available and returns the value for the given property name.
+        /// </summary>
+        /// <param name="property">The name of the property for which to get the value of from <c>AppLovinSettings.asset</c> file.</param>
+        /// <returns>The string value of the property if found.</returns>
+        public static string GetAppIdFromAppLovinSettings(string property)
+        {
+            var settingsFileName = GetAppLovinSettingsAssetPath();
+            if (!File.Exists(settingsFileName))
+            {
+                Debug.LogError("[AppLovin MAX] The current plugin version is incompatible with the AdMob adapter. Please update the AppLovin MAX plugin to version 2.4.0 or higher.");
+                return null;
+            }
+
+            var instance = AssetDatabase.LoadAssetAtPath(settingsFileName, Type.GetType("AppLovinSettings, MaxSdk.Scripts.IntegrationManager.Editor"));
+            if (instance == null)
+            {
+                Debug.LogError("[AppLovin MAX] The current plugin version is incompatible with the AdMob adapter. Please update the AppLovin MAX plugin to version 2.4.15 or higher");
+                return null;
+            }
+
+            var adMobAppIdProperty = instance.GetType().GetProperty(property);
+            return adMobAppIdProperty == null ? null : adMobAppIdProperty.GetValue(instance, null).ToString();
+        }
+
+        private static string GetAppLovinSettingsAssetPath()
+        {
+            // Since the settings asset is generated during compile time, the asset label will contain platform specific path separator. So, use platform specific export path.  
+            var assetLabel = "l:al_max_export_path-" + AppLovinSettingsExportPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            var guids = AssetDatabase.FindAssets(assetLabel);
+
+            var defaultPath = Path.Combine("Assets", AppLovinSettingsExportPath);
+
+            return guids.Length > 0 ? AssetDatabase.GUIDToAssetPath(guids[0]) : defaultPath;
+        }
+    }
+}

Assets/MaxSdk/Mediation/Google/Editor/MaxMediationGoogleUtils.cs.meta

+fileFormatVersion: 2
+guid: 6de4e4d420b14431a7d169724e23361e
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Google/Editor/MaxMediationGoogleUtils.cs
+- al_max_export_path-MaxSdk\Mediation\Google\Editor\MaxMediationGoogleUtils.cs
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google/Editor/PostProcessor.cs

+//
+//  PostProcessor.cs
+//  AppLovin MAX Unity Plugin
+//
+//  Created by Santosh Bagadi on 6/4/19.
+//  Copyright © 2019 AppLovin. All rights reserved.
+//
+
+#if UNITY_IPHONE || UNITY_IOS
+
+using System.IO;
+using UnityEditor;
+using UnityEditor.Callbacks;
+using UnityEditor.iOS.Xcode;
+using UnityEngine;
+
+namespace AppLovinMax.Mediation.Google.Editor
+{
+    /// <summary>
+    /// A post processor that will add the AdMob App ID to the <c>info.plist</c> file.
+    /// </summary>
+    public class PostProcessor
+    {
+        [PostProcessBuild]
+        public static void OnPostProcessBuild(BuildTarget buildTarget, string buildPath)
+        {
+            var appId = MaxMediationGoogleUtils.GetAppIdFromAppLovinSettings("AdMobIosAppId");
+
+            // Log error if the App ID is not set.
+            if (string.IsNullOrEmpty(appId) || !appId.StartsWith("ca-app-pub-"))
+            {
+                Debug.LogError("[AppLovin MAX] AdMob App ID is not set. Please enter a valid app ID within the AppLovin Integration Manager window.");
+                return;
+            }
+
+            var plistPath = Path.Combine(buildPath, "Info.plist");
+            var plist = new PlistDocument();
+            plist.ReadFromFile(plistPath);
+
+            // Actually set (then write) AdMob app id to Info.plist if valid
+            plist.root.SetString("GADApplicationIdentifier", appId);
+
+            File.WriteAllText(plistPath, plist.WriteToString());
+        }
+    }
+}
+
+#endif

Assets/MaxSdk/Mediation/Google/Editor/PostProcessor.cs.meta

+fileFormatVersion: 2
+guid: 42aa959278164e1683addd3bd5ff03d2
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Google/Editor/PostProcessor.cs
+- al_max_export_path-MaxSdk\Mediation\Google\Editor\PostProcessor.cs
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Google/Editor/PreProcessor.cs

+//
+//  PreProcessor.cs
+//  AppLovin MAX Unity Plugin
+//
+//  Created by Santosh Bagadi on 11/7/19.
+//  Copyright © 2019 AppLovin. All rights reserved.
+//
+
+#if UNITY_ANDROID
+
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using UnityEditor;
+using UnityEditor.Build;
+#if UNITY_2018_1_OR_NEWER
+using UnityEditor.Build.Reporting;
+#endif
+using UnityEngine;
+
+namespace AppLovinMax.Mediation.Google.Editor
+{
+    /// <summary>
+    /// A pre processor that will add the AdMob App ID to the <c>AndroidManifest.xml</c> file.
+    /// </summary>
+    public class PreProcessor :
+#if UNITY_2018_1_OR_NEWER
+        IPreprocessBuildWithReport
+#else
+        IPreprocessBuild
+#endif
+    {
+#if UNITY_2018_1_OR_NEWER
+        public void OnPreprocessBuild(BuildReport report)
+#else
+        public void OnPreprocessBuild(BuildTarget target, string path)
+#endif
+        {
+            var appId = MaxMediationGoogleUtils.GetAppIdFromAppLovinSettings("AdMobAndroidAppId");
+            if (string.IsNullOrEmpty(appId))
+            {
+                Debug.LogError("[AppLovin MAX] AdMob App ID is not set. Please enter a valid app ID within the ");
+                return;
+            }
+
+            var manifestPath = Path.Combine(Application.dataPath, "Plugins/Android/MaxMediationGoogle.androidlib/AndroidManifest.xml");
+
+            XDocument manifest;
+            try
+            {
+                manifest = XDocument.Load(manifestPath);
+            }
+#pragma warning disable 0168
+            catch (IOException exception)
+#pragma warning restore 0168
+            {
+                Debug.LogError("[AppLovin MAX] Google mediation AndroidManifest.xml is missing. Ensure that MAX Google mediation plugin is imported correctly.");
+                return;
+            }
+
+            // Get the `manifest` element.
+            var elementManifest = manifest.Element("manifest");
+            if (elementManifest == null)
+            {
+                Debug.LogError("[AppLovin MAX] Google mediation AndroidManifest.xml is invalid. Ensure that MAX Google mediation plugin is imported correctly.");
+                return;
+            }
+
+            // Get the `application` element under `manifest`.
+            var elementApplication = elementManifest.Element("application");
+            if (elementApplication == null)
+            {
+                Debug.LogError("[AppLovin MAX] Google mediation AndroidManifest.xml is invalid. Ensure that MAX Google mediation plugin is imported correctly.");
+                return;
+            }
+
+            // Get all the `meta-data` elements under `application`.
+            var adMobMetaData = elementApplication.Descendants().First(element => element.Name.LocalName.Equals("meta-data"));
+            XNamespace androidNamespace = "http://schemas.android.com/apk/res/android";
+
+            if (!adMobMetaData.FirstAttribute.Name.Namespace.Equals(androidNamespace) ||
+                !adMobMetaData.FirstAttribute.Name.LocalName.Equals("name") ||
+                !adMobMetaData.FirstAttribute.Value.Equals("com.google.android.gms.ads.APPLICATION_ID"))
+            {
+                Debug.LogError("[AppLovin MAX] Google mediation AndroidManifest.xml is invalid. Ensure that MAX Google mediation plugin is imported correctly.");
+                return;
+            }
+
+            var lastAttribute = adMobMetaData.LastAttribute;
+            // Log error if the AdMob App ID is not set.
+            if (!lastAttribute.Name.LocalName.Equals("value"))
+            {
+                Debug.LogError("[AppLovin MAX] Google mediation AndroidManifest.xml is invalid. Ensure that MAX Google mediation plugin is imported correctly.");
+            }
+
+            // Set the App ID value.
+            lastAttribute.Value = appId;
+
+            // Save the updated manifest file.
+            manifest.Save(manifestPath);
+        }
+
+        public int callbackOrder
+        {
+            get { return 0; }
+        }
+    }
+}
+
+#endif
\ No newline at end of file

Assets/MaxSdk/Mediation/Google/Editor/PreProcessor.cs.meta

+fileFormatVersion: 2
+guid: bfbc947903224d09a77085f74b86a409
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Google/Editor/PreProcessor.cs
+- al_max_export_path-MaxSdk\Mediation\Google\Editor\PreProcessor.cs
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Mintegral.meta

+fileFormatVersion: 2
+guid: cab786f5f9cf6472193f9b0e0efc04ef
+labels:
+- al_max
+- al_max_export_path-MaxSdk\Mediation\Mintegral
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Mintegral/Editor.meta

+fileFormatVersion: 2
+guid: db1de4066dc4e4290b3879b34fa87de2
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Mintegral/Editor
+- al_max_export_path-MaxSdk\Mediation\Mintegral\Editor
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml

+<?xml version="1.0" encoding="utf-8"?>
+<dependencies>
+    <androidPackages>
+        <androidPackage spec="com.applovin.mediation:mintegral-adapter:15.7.61.0">
+            <repositories>
+                <repository>https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea</repository>
+            </repositories>
+        </androidPackage>
+    </androidPackages>
+    <iosPods>
+        <iosPod name="AppLovinMediationMintegralAdapter" version="7.0.4.0.0" />
+    </iosPods>
+</dependencies>

Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml.meta

+fileFormatVersion: 2
+guid: 221b2a20a58a04f2cb4afb0779587206
+labels:
+- al_max
+- al_max_export_path-MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml
+- al_max_export_path-MaxSdk\Mediation\Mintegral\Editor\Dependencies.xml
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MaxSdk/Resources/AppLovinSettings.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: AppLovinSettings
   m_EditorClassIdentifier: 
   qualityServiceEnabled: 1
-  sdkKey: 
+  sdkKey: iVth1Xns1vXaWlDJGqmE995884znPLc6rUpt1ai2TFc--qHFe2ToBZwKeu53DiA2C-vDTcF0ss_rfH5JJZ5V80
   consentFlowEnabled: 0
   consentFlowPrivacyPolicyUrl: 
   consentFlowTermsOfServiceUrl: 
@@ -25,6 +25,6 @@ MonoBehaviour:
   userTrackingUsageDescriptionJa: 
   userTrackingUsageDescriptionKo: 
   userTrackingUsageDescriptionZhHans: 
-  userTrackingUsageDescriptionZhHant: default_localization
-  adMobAndroidAppId: 
+  userTrackingUsageDescriptionZhHant: 
+  adMobAndroidAppId: ca-app-pub-9085952480111777~7996189377
   adMobIosAppId: 

Assets/OSG Infinity Square Space/Scenes/firstloading.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1684,7 +1684,7 @@ PrefabInstance:
     - target: {fileID: 8609939059637033751, guid: f0fc5c17fd614f641bd5dc8b9500be4b,
         type: 3}
       propertyPath: testAds
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8609939059637033751, guid: f0fc5c17fd614f641bd5dc8b9500be4b,
         type: 3}

Assets/Plugins/Android/mainTemplate.gradle

@@ -13,6 +13,9 @@
         maven {
             url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7
         }
+        maven {
+            url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" // Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8
+        }
         mavenLocal()
         jcenter()
         mavenCentral()
@@ -26,10 +29,16 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
     implementation 'com.android.installreferrer:installreferrer:2.1' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:10
-    implementation 'com.android.support:appcompat-v7:25.3.1' // Facebook.Unity.Editor.AndroidSupportLibraryResolver.addSupportLibraryDependency
+    // implementation 'com.android.support:appcompat-v7:25.3.1' // Facebook.Unity.Editor.AndroidSupportLibraryResolver.addSupportLibraryDependency
+    implementation 'com.android.support:appcompat-v7:28.+' // Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml:10
     implementation 'com.android.support:cardview-v7:25.3.1' // Facebook.Unity.Editor.AndroidSupportLibraryResolver.addSupportLibraryDependency
     implementation 'com.android.support:customtabs:25.3.1' // Facebook.Unity.Editor.AndroidSupportLibraryResolver.addSupportLibraryDependency
+    implementation 'com.android.support:recyclerview-v7:28.+' // Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml:9
     implementation 'com.android.support:support-v4:25.3.1' // Facebook.Unity.Editor.AndroidSupportLibraryResolver.addSupportLibraryDependency
+    implementation 'com.applovin.mediation:adcolony-adapter:4.6.5.0' // Assets/MaxSdk/Mediation/AdColony/Editor/Dependencies.xml:4
+    implementation 'com.applovin.mediation:facebook-adapter:[6.8.0.2]' // Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml:8
+    implementation 'com.applovin.mediation:google-adapter:[20.5.0.2]' // Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml:5
+    implementation 'com.applovin.mediation:mintegral-adapter:15.7.61.0' // Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8
     implementation 'com.applovin:applovin-sdk:10.3.1' // Assets/MaxSdk/AppLovin/Editor/Dependencies.xml:4
     implementation 'com.appsflyer:af-android-sdk:6.4.1' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:6
     implementation 'com.appsflyer:unity-wrapper:6.4.1' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:8

Assets/Scripts/UI/ArsenalPopup.cs

@@ -12,6 +12,11 @@ public class ArsenalPopup : BasePopup
     public Slot slot_1;
     public Slot slot_2;
     public Slot slot_result;
+    public GameObject slot1UI;
+    public GameObject slot2UI;
+    public GameObject resultUI;
+    public GameObject effMergeStart;
+    public GameObject effMergeEnd;
 
     [Header("Spaceship")]
     public List<RectTransform> spaceShips = new List<RectTransform>();
@@ -50,6 +55,7 @@ public class ArsenalPopup : BasePopup
     public override void OnShow()
     {
         base.OnShow();
+        RefreshAll();
         OnClick_SpaceShip();
     }
     public void OnClick_SpaceShip()
@@ -86,7 +92,7 @@ public class ArsenalPopup : BasePopup
     {
         amountText.text = slider.value.ToString();
         sliderText.text = slider.value.ToString();
-        if(slot_1.IsEmpty() || slot_2.IsEmpty())
+        if (slot_1.IsEmpty() || slot_2.IsEmpty())
         {
             slider.interactable = false;
             mergePreBtn.interactable = false;
@@ -127,22 +133,44 @@ public class ArsenalPopup : BasePopup
     }
     public void OnClick_Fuse()
     {
-        if(!slot_1.IsEmpty() && !slot_2.IsEmpty())
+        if (!slot_1.IsEmpty() && !slot_2.IsEmpty())
         {
+            fuseBtn.interactable = false;
             int amount = (int)slider.value;
             DataManager.Instance.AddSkill(slot_1.SkillID, -amount);
             DataManager.Instance.AddSkill(slot_2.SkillID, -amount);
             DataManager.Instance.AddSkill(slot_result.SkillID, amount);
             GuiManager.Instance.mergePopup.amount = amount;
             GuiManager.Instance.mergePopup.resultID = slot_result.SkillID;
-            GuiManager.Instance.mergePopup.gameObject.SetActive(true);
-            OnClick_Slot1();
-            OnClick_Slot2();
-            LoadSkillElements();
             
+            StartCoroutine(ShowMergeEffect());
             GuiManager.Instance.tutorialManager.ShowTut();
         }
     }
+
+    IEnumerator ShowMergeEffect()
+    {
+        slot1Effect.SetActive(false);
+        slot2Effect.SetActive(false);
+        slot1UI.transform.DOLocalMoveX(0, 0.5f).SetEase(Ease.InBack);
+        slot2UI.transform.DOLocalMoveX(0, 0.5f).SetEase(Ease.InBack);
+        yield return new WaitForSecondsRealtime(0.4f);
+        effMergeStart.SetActive(true);
+        yield return new WaitForSecondsRealtime(2.5f);
+        effMergeEnd.SetActive(true);
+        yield return new WaitForSecondsRealtime(0.3f);
+        effMergeStart.SetActive(false);
+        effMergeEnd.SetActive(false);
+        slot1Effect.SetActive(false);
+        slot2Effect.SetActive(false);
+        slot1UI.transform.DOLocalMoveX(-250, 0.2f).SetEase(Ease.Linear);
+        slot2UI.transform.DOLocalMoveX(250, 0.2f).SetEase(Ease.Linear);
+        OnClick_Slot1();
+        OnClick_Slot2();
+        LoadSkillElements();
+        fuseBtn.interactable = true;
+        GuiManager.Instance.mergePopup.gameObject.SetActive(true);
+    }
     public void OnClick_AutoFill()
     {
         if (slot_1.IsEmpty() && slot_2.IsEmpty())
@@ -241,6 +269,7 @@ public class ArsenalPopup : BasePopup
     {
         basicSkills.ForEach(a => a.LoadData(this));
         specialSkills.ForEach(a => a.LoadData(this));
+        CheckRemainSlot();
     }
     private void LoadBasicContent()
     {
@@ -262,37 +291,43 @@ public class ArsenalPopup : BasePopup
         slot_1.Deactive();
         slot_2.Deactive();
         slot_result.Deactive();
+        resultUI.transform.DORewind();
         LoadSkillElements();
     }
     public void PushSlot(int id)
     {
-        if(slot_1.IsEmpty())
+        if (slot_1.IsEmpty())
         {
             slot_1.Active(id);
             slot1Effect.SetActive(true);
         }
         else if (slot_2.IsEmpty())
+        {
+            if(slot_1.SkillID != id)
             {
                 slot_2.Active(id);
                 slot2Effect.SetActive(true);
             }
+        }
         CheckResultSlot();
         CheckRemainSlot();
         RefreshMergeSystem();
     }
     private void CheckResultSlot()
     {
-        if(!slot_1.IsEmpty() && !slot_2.IsEmpty())
+        if (!slot_1.IsEmpty() && !slot_2.IsEmpty())
         {
             DataManager.MergeData resultData = DataManager.Instance.GetMergeResult(slot_1.SkillID, slot_2.SkillID);
             if (resultData != null)
             {
                 slot_result.Active(resultData.skill_id_result);
+                resultUI.transform.DOScale(1.1f, 0.5f).SetEase(Ease.Linear).SetLoops(-1, LoopType.Yoyo);
                 centerEffect.SetActive(true);
                 DisableAll();
             }
             else
             {
+                fuseBtn.interactable = false;
                 Debug.Log("Result merge no data");
             }
         }
@@ -312,6 +347,7 @@ public class ArsenalPopup : BasePopup
         else
         {
             slot_result.Deactive();
+            resultUI.transform.DORewind();
             CheckRemainSlot();
         }
     }
@@ -330,6 +366,7 @@ public class ArsenalPopup : BasePopup
         else
         {
             slot_result.Deactive();
+            resultUI.transform.DORewind();
             CheckRemainSlot();
         }
     }
@@ -339,6 +376,7 @@ public class ArsenalPopup : BasePopup
         slot2Effect.SetActive(false);
         centerEffect.SetActive(false);
         slot_result.Deactive();
+        resultUI.transform.DORewind();
         basicSkills.ForEach(a => a.LoadData(this));
     }
     private void DisableAll()
@@ -364,7 +402,7 @@ public class ArsenalPopup : BasePopup
     }
     private void CheckStatus(List<SkillElement> skills, List<int> remainIds)
     {
-        foreach(SkillElement skill in skills)
+        foreach (SkillElement skill in skills)
         {
             bool hasTip = remainIds.Contains(skill.skillId);
             skill.SetTip(hasTip);

Assets/Scripts/UI/ConfirmPopup.cs

@@ -74,6 +74,8 @@ public class ConfirmPopup : BasePopup
         AdsController.instance.ShowReward(() =>
         {
             DataManager.Instance.AddSkill(skill.skillId, 2);
+            LoadPopup();
+            skill.arsenalPopup.LoadSkillElements();
 
             GuiManager.Instance.buyCallbackPopup.LoadData(2, icon.sprite);
             GuiManager.Instance.buyCallbackPopup.gameObject.SetActive(true);

Assets/Shader/Atmosphere/Shader Graphs_Atmosphere.mat

@@ -36,8 +36,8 @@ Material:
     - Vector1_037422ac7c3343b3b7493dead063f9bb: 0.006
     - Vector1_7fc372182bde42b39d4fce1ca0ef8b6e: 6.8
     - Vector1_dcb7b53c006f40ef9ae4c2c1d71198be: 0.5
-    - _Alpha: 0.0044400003
+    - _Alpha: 0.0036600004
     m_Colors:
     - Color_7b883b4cd7c248a580d2475d1da9ed40: {r: 0, g: 65110.777, b: 259086.64, a: 0}
-    - _AtmosphereColor: {r: 219995.36, g: 219995.36, b: 219995.36, a: 1}
+    - _AtmosphereColor: {r: 0, g: 30840.47, b: 262144, a: 1}
   m_BuildTextureStacks: []

Assets/SolarSystem/Materials/EarthDay.mat

@@ -34,7 +34,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 840fc8d7538628540b64d39d6f9dd942, type: 3}
+        m_Texture: {fileID: 2800000, guid: 37f26343ab0104244b5e17234eb29512, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:

Assets/StarSparrow/Materials/BonusContent/AsteroidsLava_Red.mat

@@ -122,6 +122,6 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 3.0756862, g: 2.7717648, b: 1.5803922, a: 3.1}
+    - _EmissionColor: {r: 2.9371772, g: 2.6469424, b: 1.5092216, a: 2.960396}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

ProjectSettings/AndroidResolverDependencies.xml

@@ -2,9 +2,15 @@
   <packages>
     <package>com.android.installreferrer:installreferrer:2.1</package>
     <package>com.android.support:appcompat-v7:25.3.1</package>
+    <package>com.android.support:appcompat-v7:28.+</package>
     <package>com.android.support:cardview-v7:25.3.1</package>
     <package>com.android.support:customtabs:25.3.1</package>
+    <package>com.android.support:recyclerview-v7:28.+</package>
     <package>com.android.support:support-v4:25.3.1</package>
+    <package>com.applovin.mediation:adcolony-adapter:4.6.5.0</package>
+    <package>com.applovin.mediation:facebook-adapter:[6.8.0.2]</package>
+    <package>com.applovin.mediation:google-adapter:[20.5.0.2]</package>
+    <package>com.applovin.mediation:mintegral-adapter:15.7.61.0</package>
     <package>com.applovin:applovin-sdk:10.3.1</package>
     <package>com.appsflyer:af-android-sdk:6.4.1</package>
     <package>com.appsflyer:unity-wrapper:6.4.1</package>

UserSettings/EditorUserSettings.asset

@@ -27,13 +27,13 @@ EditorUserSettings:
       value: 224247031146467c02010b2e15636c1813120c396c0e29226d1c133af6f97b0df2e337fde27a1b3d2d03af0f073b0f3abc1f0702e212
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
+      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733403e6324a2b0f36e613
+      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c73310de2394a2b0f36e613
+      value: 22424703114646743e294c0b1e25561e1f03016a1f3933313f2c5d00f2e1373dadd435ece93f2c733f0bfd2f10320e3ef603070cb81e04020517
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650