diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta
new file mode 100644
index 00000000..75451fee
--- /dev/null
+++ b/Assets/Plugins/Android.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6619e31543ff44c46bbe9a15d51f66a0
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
new file mode 100644
index 00000000..8d1ad628
--- /dev/null
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta
new file mode 100644
index 00000000..2ccb5aab
--- /dev/null
+++ b/Assets/Plugins/Android/AndroidManifest.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 683ae343e269e401d9aa8d81710ea743
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/UI/Image/Shop/extracash_icon-AD.png b/Assets/Resources/UI/Image/Shop/extracash_icon-AD.png
index f5d85023..e535680a 100644
Binary files a/Assets/Resources/UI/Image/Shop/extracash_icon-AD.png and b/Assets/Resources/UI/Image/Shop/extracash_icon-AD.png differ
diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml
index 8882cf82..f3dcefd0 100644
--- a/ProjectSettings/GvhProjectSettings.xml
+++ b/ProjectSettings/GvhProjectSettings.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index b4b3c787..596a7b8d 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
- serializedVersion: 20
+ serializedVersion: 22
productGUID: 0ef24a14e2ecd4b8d858de5a9fdc19ca
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
@@ -55,6 +55,8 @@ PlayerSettings:
m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
m_MTRendering: 1
+ mipStripping: 0
+ numberOfMipsStripped: 0
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
@@ -134,15 +136,16 @@ PlayerSettings:
stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
+ vulkanEnablePreTransform: 0
vulkanEnableLateAcquireNextImage: 0
- useSecurityBuild: 0
+ vulkanEnableCommandBufferRecycling: 1
m_SupportedAspectRatios:
4:3: 1
5:4: 1
16:10: 1
16:9: 1
Others: 1
- bundleVersion: 1.0.6
+ bundleVersion: 1.0.7
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@@ -150,31 +153,6 @@ PlayerSettings:
xboxOneDisableKinectGpuReservation: 1
xboxOneEnable7thCore: 1
vrSettings:
- cardboard:
- depthFormat: 0
- enableTransitionView: 0
- daydream:
- depthFormat: 0
- useSustainedPerformanceMode: 0
- enableVideoLayer: 0
- useProtectedVideoMemory: 0
- minimumSupportedHeadTracking: 0
- maximumSupportedHeadTracking: 1
- hololens:
- depthFormat: 1
- depthBufferSharingEnabled: 1
- lumin:
- depthFormat: 0
- frameTiming: 2
- enableGLCache: 0
- glCacheMaxBlobSize: 524288
- glCacheMaxFileSize: 8388608
- oculus:
- sharedDepthBuffer: 1
- dashSupport: 1
- lowOverheadMode: 0
- protectedContext: 0
- v2Signing: 1
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0
@@ -183,16 +161,19 @@ PlayerSettings:
m_ColorGamuts: 00000000
targetPixelDensity: 30
resolutionScalingMode: 0
+ resetResolutionOnWindowResize: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
- Android: com.hotpotgames.mergemilitary.global
+ Android: com.HotpotGames.MergeMilitary
Standalone: com.hotpotgames.mergemilitary.global
iPhone: com.hotpotgames.mergemilitary.global
buildNumber:
Standalone: 1
iPhone: 2
- AndroidBundleVersionCode: 7
+ tvOS: 0
+ overrideDefaultApplicationIdentifier: 0
+ AndroidBundleVersionCode: 8
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
@@ -208,10 +189,10 @@ PlayerSettings:
StripUnusedMeshComponents: 1
VertexChannelCompressionMask: 4054
iPhoneSdkVersion: 988
- iOSTargetOSVersionString: 10.0
+ iOSTargetOSVersionString: 11.0
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
- tvOSTargetOSVersionString: 10.0
+ tvOSTargetOSVersionString: 11.0
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1
@@ -245,8 +226,8 @@ PlayerSettings:
iOSLaunchScreeniPadFillPct: 100
iOSLaunchScreeniPadSize: 100
iOSLaunchScreeniPadCustomXibPath:
- iOSUseLaunchScreenStoryboard: 0
iOSLaunchScreenCustomStoryboardPath:
+ iOSLaunchScreeniPadCustomStoryboardPath:
iOSDeviceRequirements: []
iOSURLSchemes: []
iOSBackgroundModes: 0
@@ -264,9 +245,17 @@ PlayerSettings:
iOSRequireARKit: 0
iOSAutomaticallyDetectAndAddCapabilities: 1
appleEnableProMotion: 0
+ shaderPrecisionModel: 0
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@4.2.8
templateDefaultScene: Assets/Scenes/SampleScene.unity
+ useCustomMainManifest: 0
+ useCustomLauncherManifest: 0
+ useCustomMainGradleTemplate: 0
+ useCustomLauncherGradleManifest: 0
+ useCustomBaseGradleTemplate: 0
+ useCustomGradlePropertiesTemplate: 0
+ useCustomProguardFile: 0
AndroidTargetArchitectures: 3
AndroidTargetDevices: 0
AndroidSplashScreenScale: 0
@@ -286,6 +275,9 @@ PlayerSettings:
banner: {fileID: 0}
androidGamepadSupportLevel: 0
chromeosInputEmulation: 1
+ AndroidMinifyWithR8: 0
+ AndroidMinifyRelease: 0
+ AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons:
@@ -405,7 +397,7 @@ PlayerSettings:
- m_BuildTarget: WebGL
m_StaticBatching: 0
m_DynamicBatching: 0
- m_BuildTargetEncrypting: []
+ m_BuildTargetSecurityBuild: []
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0
@@ -447,7 +439,7 @@ PlayerSettings:
m_Automatic: 1
- m_BuildTarget: AppleTVSupport
m_APIs: 10000000
- m_Automatic: 0
+ m_Automatic: 1
- m_BuildTarget: WebGLSupport
m_APIs: 0b000000
m_Automatic: 1
@@ -467,6 +459,7 @@ PlayerSettings:
tvOS: 1
m_BuildTargetGroupLightmapEncodingQuality: []
m_BuildTargetGroupLightmapSettings: []
+ m_BuildTargetNormalMapEncoding: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1
@@ -476,12 +469,15 @@ PlayerSettings:
cameraUsageDescription:
locationUsageDescription:
microphoneUsageDescription:
+ bluetoothUsageDescription:
+ switchNMETAOverride:
switchNetLibKey:
switchSocketMemoryPoolSize: 6144
switchSocketAllocatorPoolSize: 128
switchSocketConcurrencyLimit: 14
switchScreenResolutionBehavior: 2
switchUseCPUProfiler: 0
+ switchUseGOLDLinker: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchTitleNames_0:
@@ -610,6 +606,7 @@ PlayerSettings:
switchSocketInitializeEnabled: 1
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
+ switchUseNewStyleFilepaths: 0
switchUseMicroSleepForYield: 1
switchEnableRamDiskSupport: 0
switchMicroSleepForYieldTime: 25
@@ -689,31 +686,6 @@ PlayerSettings:
ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: []
ps4attribVROutputEnabled: 0
- ps5ParamFilePath:
- ps5VideoOutPixelFormat: 0
- ps5VideoOutInitialWidth: 1920
- ps5VideoOutOutputMode: 1
- ps5BackgroundImagePath:
- ps5StartupImagePath:
- ps5Pic2Path:
- ps5StartupImagesFolder:
- ps5IconImagesFolder:
- ps5SaveDataImagePath:
- ps5SdkOverride:
- ps5BGMPath:
- ps5ShareOverlayImagePath:
- ps5NPConfigZipPath:
- ps5Passcode: 5PN2qmWqBlQ9wQj99nsQzldVI5ZuGXbE
- ps5UseResolutionFallback: 0
- ps5UseAudio3dBackend: 0
- ps5ScriptOptimizationLevel: 2
- ps5Audio3dVirtualSpeakerCount: 14
- ps5UpdateReferencePackage:
- ps5disableAutoHideSplash: 0
- ps5OperatingSystemCanDisableSplashScreen: 0
- ps5IncludedModules: []
- ps5SharedBinaryContentLabels: []
- ps5SharedBinarySystemFolders: []
monoEnv:
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -730,13 +702,15 @@ PlayerSettings:
webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 1
+ webGLWasmArithmeticExceptions: 0
webGLLinkerTarget: 1
webGLThreadsSupport: 0
- webGLWasmStreaming: 0
+ webGLDecompressionFallback: 0
scriptingDefineSymbols:
1: USE_IAP;USE_FIREBASE
4: USE_IAP;AppStore_GB
7: USE_IAP
+ additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend:
Android: 1
@@ -745,6 +719,9 @@ PlayerSettings:
incrementalIl2cppBuild: {}
suppressCommonWarnings: 1
allowUnsafeCode: 0
+ useDeterministicCompilation: 1
+ useReferenceAssemblies: 1
+ enableRoslynAnalyzers: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 0
@@ -780,6 +757,7 @@ PlayerSettings:
metroFTAName:
metroFTAFileTypes: []
metroProtocolName:
+ vcxProjDefaultLanguage:
XboxOneProductId:
XboxOneUpdateKey:
XboxOneSandboxId:
@@ -807,10 +785,7 @@ PlayerSettings:
XboxOneXTitleMemory: 8
XboxOneOverrideIdentityName:
XboxOneOverrideIdentityPublisher:
- vrEditorSettings:
- daydream:
- daydreamIconForeground: {fileID: 0}
- daydreamIconBackground: {fileID: 0}
+ vrEditorSettings: {}
cloudServicesEnabled:
UNet: 1
luminIcon:
@@ -825,11 +800,12 @@ PlayerSettings:
m_VersionCode: 1
m_VersionName:
apiCompatibilityLevel: 6
+ activeInputHandler: 0
cloudProjectId: af0f904d-024e-4c4b-b9cc-5ae7fdbf3ba2
framebufferDepthMemorylessMode: 0
+ qualitySettingsNames: []
projectName: Merge&Tactics
organizationId: shinryu139391213
cloudEnabled: 0
- enableNativePlatformBackendsForNewInputSystem: 0
- disableOldInputManagerSupport: 0
legacyClampBlendShapeWeights: 0
+ virtualTexturingSupportEnabled: 0