diff --git a/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml b/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml
index b88d12e5..8220892c 100644
--- a/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml
+++ b/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml
@@ -1,10 +1,10 @@
- 380257640583
- merge-tactics.appspot.com
- merge-tactics
- AIzaSyDdl8vC5Ok61_-wryarpqBiM8jaPumKNBU
- AIzaSyDdl8vC5Ok61_-wryarpqBiM8jaPumKNBU
- 1:380257640583:android:73321d680e8a8cf8a7d822
- 380257640583-vcfb26drh9k22gu2ohqbfnrg5tdu7qst.apps.googleusercontent.com
+ 259843998511
+ mergemilitary.appspot.com
+ mergemilitary
+ AIzaSyDD0oYordyDObO5PdEvzsdcStgmbLWUQtQ
+ AIzaSyDD0oYordyDObO5PdEvzsdcStgmbLWUQtQ
+ 1:259843998511:android:1dc2bd04842ece53e797da
+ 259843998511-epsbvdgi2d01i1pjf1rrgq4rd7rv0ohb.apps.googleusercontent.com
diff --git a/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml b/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml
index ba266b85..10a5e6a2 100644
--- a/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml
+++ b/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml
@@ -1 +1 @@
-2c3cf3a7-6183-43f5-a4b0-69d154816acd
+948f82ee-ce4d-40f3-baa4-673c8ae4525c
diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index 8a87fc70..f8a28fbc 100644
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -8,7 +8,7 @@
url "https://maven.google.com"
}
maven {
- url "file:////Users/yangjing/Documents/Copy2022/MergeTactics_Android/Assets/GeneratedLocalRepo/Firebase/m2repository" // Assets/Firebase/Editor/AnalyticsDependencies.xml:18, Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/CrashlyticsDependencies.xml:20, Assets/Firebase/Editor/RemoteConfigDependencies.xml:20
+ url "file:////Users/yangjing/Documents/Merge3D/MergeMilitary_Android/Assets/GeneratedLocalRepo/Firebase/m2repository" // Assets/Firebase/Editor/AnalyticsDependencies.xml:18, Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/CrashlyticsDependencies.xml:20, Assets/Firebase/Editor/RemoteConfigDependencies.xml:20
}
maven {
url "https://artifact.bytedance.com/repository/pangle" // Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml:8
diff --git a/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
index f26c42eb..24bf63f1 100644
--- a/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
+++ b/Assets/ThirdPlugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
@@ -33,7 +33,10 @@ MonoBehaviour:
- Assembly-CSharp
- StompyRobot.SRF
- Purchasing.Common
+ - MaxSdk.Scripts
+ - MaxSdk.Scripts.IntegrationManager.Editor
- StompyRobot.SRDebugger.Editor
+ - MaxSdk.Scripts.Editor
- StompyRobot.SRF.Editor
showAdvancedSettings: 0
addMgrToSceneAutomatically: 0
diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
index 5ba860ed..0f26c8b4 100644
--- a/ProjectSettings/AndroidResolverDependencies.xml
+++ b/ProjectSettings/AndroidResolverDependencies.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index 4706883c..9b996cb4 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -38,6 +38,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}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index af95ba5e..33421d7b 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -192,7 +192,7 @@ PlayerSettings:
buildNumber:
Standalone: 1
iPhone: 3
- AndroidBundleVersionCode: 1
+ AndroidBundleVersionCode: 2
AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
@@ -296,7 +296,99 @@ PlayerSettings:
m_Width: 128
m_Height: 128
m_Kind: 0
- m_BuildTargetPlatformIcons: []
+ m_BuildTargetPlatformIcons:
+ - m_BuildTarget: Android
+ m_Icons:
+ - m_Textures: []
+ m_Width: 432
+ m_Height: 432
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 324
+ m_Height: 324
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 216
+ m_Height: 216
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 162
+ m_Height: 162
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 108
+ m_Height: 108
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 81
+ m_Height: 81
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 192
+ m_Height: 192
+ m_Kind: 0
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 144
+ m_Height: 144
+ m_Kind: 0
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 96
+ m_Height: 96
+ m_Kind: 0
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 72
+ m_Height: 72
+ m_Kind: 0
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 48
+ m_Height: 48
+ m_Kind: 0
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 36
+ m_Height: 36
+ m_Kind: 0
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 192
+ m_Height: 192
+ m_Kind: 1
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 144
+ m_Height: 144
+ m_Kind: 1
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 96
+ m_Height: 96
+ m_Kind: 1
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 72
+ m_Height: 72
+ m_Kind: 1
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 48
+ m_Height: 48
+ m_Kind: 1
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 36
+ m_Height: 36
+ m_Kind: 1
+ m_SubKind:
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1