From d6ec73488f1108a26ed35b1e4f8f0d3e9fffd5aa Mon Sep 17 00:00:00 2001 From: yangjing Date: Mon, 26 Sep 2022 17:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=89=93=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Plugins/Android.meta | 8 ++ Assets/Plugins/Android/AndroidManifest.xml | 40 +++++++ .../Plugins/Android/AndroidManifest.xml.meta | 7 ++ .../UI/Image/Shop/extracash_icon-AD.png | Bin 1675 -> 4097 bytes ProjectSettings/GvhProjectSettings.xml | 2 +- ProjectSettings/ProjectSettings.asset | 110 +++++++----------- 6 files changed, 99 insertions(+), 68 deletions(-) create mode 100644 Assets/Plugins/Android.meta create mode 100644 Assets/Plugins/Android/AndroidManifest.xml create mode 100644 Assets/Plugins/Android/AndroidManifest.xml.meta 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 f5d85023038f9ecd7c2245957cf8aaf2ff127a5e..e535680abf628ca795bdff9b5bd6dcf732d2a9eb 100644 GIT binary patch literal 4097 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 VVyIMTC;XG{WVh3{Z2SJh{{oI)=(qp? literal 1675 zcmds0`#Tc~7+$DQjyeiaC-+2mm5Jk4k`m=oE#xwba?hm@~Uxoo4{$C_Mo zAIA)v+zsK(Y}nZScJ`b<<9yHiz3=nBzrD}%eW|yc?3ENX6afH$lEbwtE>iWDuDiUf zl+_h*#Zr+Au(@di0Mupf5&G_w`W=xj_O^iPp~I^HfK25rM>jiZnD3_Z|As^&krw1I z*To_sdy|HM01*(gF>DDDQ`C=09YFlmoF24Ir_A;=h=fAc`f4fo0%d$qEEW+P3M(S) zC1UYdV<~rgbD7xpHOYsBEhb{%f0t#9))$PRKXRBG!?k&%^`A&zi>ErO;hrZ-d`(Jx z&$YY`VQ;RDeM4;1{;7q!E{*n7MLAZ4Uxj;}Ec7s5ogBiIyyA0MojI|r4Jsz_!DL&- z<_cNJ=azymVw3&Go6Gp@?b%+8fXhZb`u$6oU9rzOgum%XT|Q+3Ul;GrTBjfb%qt_W zW0QP}yw6lTxmNVx^w!!khe0RzH!a}Xn3Tn3VlRWTKqHTl`@aeKJVI4=V+v%ZyM6$b zjtaD>dFssgXTHSm{KnGsTpzaamH+0-95UdNfXDgz(i*9(71sL830xmf@*KD#Bj7b1|@^Mg)ZuWq!nUk4qAl0kpUGx~Tv z(f(&YuRz)zH2?rveTOSHZuh$AlhLl4Hivi3?=)%vl4hmzQAuHRm#vE7fv3i&koStM zZyZPdm(Q}&4zNG;dxgfFTcy>!&ufv;@GYi83spB%Q6MY5ggk5|+f6u;BQ4I@_Upd*vNcYT z+q0jl9qe9pC)|+@vx&YOxNj0zd3zHN={#i{s5LnpxpFW&$t(TM!O4_)x^a?D_3H>C6ccA*mjH079{7SEW#-lQ7zTCMlhZg1LKfwSQRBY!^6QS<$BR{KK zk_gWii1N?Z{rR`i<`yZxE$sr;7xK^c_HgiyRt~62m3^F>=!d$jadkDA2CCf?b)vMb zy%J=T0GHr6{=Bvz2;S(!(LQz;WFUqbhs)0?$n}qZmY4K7fvOD`(%RD8I*=>u% zvjn_6@Gz07RRd4N`F&qA(KS|Mimy*7@Zy0VWO(uB6j@%p<$km#g|iHsJ;gX0_FQDC z>h}q}B9j6VH!b%1D8rgbNGs&^CS;!0{-kuO9CiPtj`bWWPdn`pe z)teW|m+)ON4UBT9qA)|kBI%vZoK@cHTHcxolF2&Mgoqh$sV`Q2>%GXc*4v2m{t;hSg_7V z4tvZQ)OSbO)*xJ-?BzWlSD^`J!xyJnvWs4;9M|Tz`ONwhVb_~?sVnw=WY(jHmxgq&YLcu#3#RM4&4P-gj|gzEbGlM(>y!8|_04)N 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