From ee1f2e8f176bfc8d723ef86020595fc36ee354f3 Mon Sep 17 00:00:00 2001 From: "sewmina7@gmail.com" Date: Mon, 21 Aug 2023 08:23:07 +0530 Subject: [PATCH] prod v8 --- .../Editor/CHANGELOG.md | 51 +------ .../Editor/CHANGELOG.md.meta | 4 +- .../Editor/Google.VersionHandler.dll | Bin 14848 -> 14848 bytes .../Editor/Google.VersionHandler.dll.meta | 4 +- .../Editor/LICENSE.meta | 4 +- .../Editor/README.md | 2 +- .../Editor/README.md.meta | 4 +- Assets/GPGSIds.cs | 30 ++++ Assets/GPGSIds.cs.meta | 11 ++ .../GooglePlayGamesManifest.androidlib.meta | 143 ++++++++++++++++++ .../AndroidManifest.xml | 27 ++++ .../project.properties | 2 + .../project.properties.meta | 6 + ...androidx.startup.startup-runtime-1.0.0.aar | Bin 19177 -> 19177 bytes .../androidx.work.work-runtime-2.7.0.aar | Bin 1530134 -> 1530134 bytes ...roid.gms.play-services-ads-lite-22.2.0.aar | Bin 747219 -> 747219 bytes ...gle.signin.google-signin-support-1.0.4.aar | Bin 198795 -> 198795 bytes Assets/Scripts/CheckUpdates.cs | 4 +- Assets/Scripts/DataManager.cs | 6 +- Assets/Scripts/Helpers.cs | 4 +- Assets/Scripts/LoginManager.cs | 30 +++- Assets/Scripts/PlayerController.cs | 2 +- ProjectSettings/GooglePlayGameSettings.txt | 7 + ProjectSettings/GvhProjectSettings.xml | 3 +- .../com.unity.services.core/Settings.json | 0 ProjectSettings/ProjectSettings.asset | 20 ++- 26 files changed, 288 insertions(+), 76 deletions(-) create mode 100644 Assets/GPGSIds.cs create mode 100644 Assets/GPGSIds.cs.meta create mode 100644 Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta create mode 100644 Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/AndroidManifest.xml create mode 100644 Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties create mode 100644 Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties.meta create mode 100644 ProjectSettings/Packages/com.unity.services.core/Settings.json diff --git a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md index a1e8793..79d7b94 100644 --- a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,53 +1,4 @@ -# Version 1.2.176 - Apr 27, 2023 -* Android Resolver - Added two Android Resolver settings to determine whether - EDM4U injects custom local Maven repo path as a relative path or full path. - Fixes #537 -* Android Resolver - Inject Maven Repo to `settingTemplate.gradle` from - Unity 2022.2+ - Fixes #594 -* Android Resolver - Jetifier option is enabled by default now. -* Android Resolver - `Explode Aar` option applies to all cases, whether the - project will be exported or not. - Fixes #584 - Fixes #287 - -# Version 1.2.175 - Nov 16, 2022 -* General - Added tvOS podfile support to the iOS resolver. - -# Version 1.2.174 - Oct 06, 2022 -* General - Added tvOS support to the iOS resolver. -* General - Fixed #484 - Changed `EditorMeasurement` to use secure connection. -* Android Resolver - Fixed Android Resolver unable to resolve - `mainTemplate.gradle` in Unity `2022.2+` or `2023.1+`. - -# Version 1.2.173 - Sep 28, 2022 -* General - Added tvOS library support to the export unity package scripts. - -# Version 1.2.172 - Jun 23, 2022 -* iOS Resolver - Stop forcing `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` to `YES`, - which seems to cause problem for some when submitting apps. See #526 for more - information. - -# Version 1.2.171 - May 11, 2022 -* iOS Resolver - Change `Enable Swift Framework Support Workaround` setting to - be `ON` by default since more pods are using Swift Framework now. - -# Version 1.2.170 - Apr 4, 2022 -* Android Resolver - Fixes #498 - Fix the path separator of the Maven repo - injected to `mainTemplate.gradle`. -* iOS Resolver - Fixes #470 - Switch default Cocoapods master repo from Github - to CDN. -* iOS Resolver - `Link Framework Statically` setting is now default to `true`. - That is, `use_frameworks! :linkage => static` will be added to `Podfile` by - default instead of `use_frameworks!`. This can be changed in iOS Resolver - settings. This fixes odd behaviors when pods include static libraries, ex. - Firebase Analytics. -* iOS Resolver - Added a workaround when app crashes on launch due to - `Library not loaded: @rpath/libswiftCore.dylib` when some pods includes Swift - framework. This is turned `OFF` by default and can be changed in iOS Resolver - settings. - -# Version 1.2.169 - Jan 20, 2022 +# Version 1.2.169 - Jan 20, 2021 * General - Fixes #425 - Change to save `GvhProjectSettings.xml` without Unicode byte order mark (BoM). * Android Resolver - Remove reference to `jcenter()` diff --git a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 73a35c6..93230e5 100644 --- a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c59750df28b54a599d43c4d5204fb1b8 +guid: deafbeef1ed04f639e3195087b6d2e9f labels: - gvh -- gvh_version-8.4.1 +- gvh_version-1.2.169 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md TextScriptImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index 94cb8ce50a49fa0b73cda3ef9a0c4d577a6f7f15..bcf08901957d46d6ac08da2d551e27789db0ce2f 100644 GIT binary patch literal 14848 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 literal 14848 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 BqSgQa diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 880db65..6781b96 100644 --- a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9083229ed99f4fb0993b5625e8ea47f8 +guid: 17e39196248d458daa69b514bc09b6a7 labels: - gvh -- gvh_version-8.4.1 +- gvh_version-1.2.169 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor PluginImporter: diff --git a/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 41ef6c3..4de234f 100644 --- a/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d980a3fa4da0408e910fde746ce3b558 +guid: 61e923e8fff245a9bf5cfcf0774e75df labels: - gvh -- gvh_version-8.4.1 +- gvh_version-1.2.169 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/README.md b/Assets/ExternalDependencyManager/Editor/README.md index b49cf1e..cbc98e1 100644 --- a/Assets/ExternalDependencyManager/Editor/README.md +++ b/Assets/ExternalDependencyManager/Editor/README.md @@ -26,7 +26,7 @@ This causes the following problems: Unity project can be complex and a burden on a Unity plugin maintainer. * The process of resolving conflicting dependencies on platform specific libraries is pushed to the developer attempting to use a Unity plugin. - The developer trying to use your plugin is very likely to give up when + The developer trying to use you plugin is very likely to give up when faced with Android or iOS specific build errors. * The process of resolving conflicting Unity plugins (due to shared Unity plugin components) is pushed to the developer attempting to use your Unity diff --git a/Assets/ExternalDependencyManager/Editor/README.md.meta b/Assets/ExternalDependencyManager/Editor/README.md.meta index 34428ef..dc57bb6 100644 --- a/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b86aa3582c084272a2ff16841e0523f7 +guid: 57b5c3f72b65480eba2cc96380835972 labels: - gvh -- gvh_version-8.4.1 +- gvh_version-1.2.169 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md TextScriptImporter: externalObjects: {} diff --git a/Assets/GPGSIds.cs b/Assets/GPGSIds.cs new file mode 100644 index 0000000..dcb086b --- /dev/null +++ b/Assets/GPGSIds.cs @@ -0,0 +1,30 @@ +// +// Copyright (C) 2015 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +/// +/// This file is automatically generated DO NOT EDIT! +/// +/// These are the constants defined in the Play Games Console for Game Services +/// Resources. +/// + + +public static class GPGSIds +{ + public const string achievement_welcome = "CgkIr-rjoI4TEAIQAQ"; // + +} + diff --git a/Assets/GPGSIds.cs.meta b/Assets/GPGSIds.cs.meta new file mode 100644 index 0000000..50425e5 --- /dev/null +++ b/Assets/GPGSIds.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ac9697ce925af5a46a3b8c43badca3a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta new file mode 100644 index 0000000..fa07451 --- /dev/null +++ b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 44f4150f398dc4f22b230f8c74866383 +folderAsset: yes +timeCreated: 1504033921 +licenseType: Pro +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude iOS: 0 + data: + first: + '': Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + OS: AnyOS + data: + first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + data: + first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: {} + data: + first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} + data: + first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/AndroidManifest.xml b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/AndroidManifest.xml new file mode 100644 index 0000000..3fe7ba5 --- /dev/null +++ b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties new file mode 100644 index 0000000..f438126 --- /dev/null +++ b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties @@ -0,0 +1,2 @@ +target=android-16 +android.library=true diff --git a/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties.meta b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties.meta new file mode 100644 index 0000000..e472b75 --- /dev/null +++ b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib/project.properties.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 6156f0fc2bafa4f0c86d61673c0068d0 +DefaultImporter: + userData: +labels: +- gvh_v0.11.01 diff --git a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar index 3d415b0be33160aa7dd192a46a3af1b1e3ce5bdd..51bf462c70c6fc6525a46aa44dea7e4b7ee4b957 100644 GIT binary patch delta 126 zcmaDkmGR|NM!o=VW)=|!4h{~6LluJI8~Ls|v49wpUpOg482rxa5QderK7^6$Yzk&< oUgq4u3=z_D-vD9Ub2o-CL_N$Qi~tXN2xGE`E10qQjt4Ij0A1ND0RR91 delta 126 zcmaDkmGR|NM!o=VW)=|!4h{~6iY@=cHu7C_VgWHGzi?89F!-I-Aq*>LeF!7h*%Zv! oyv(_Q86u?Rz5&9x=WYyPhe60Ijz*bpQYW diff --git a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar index 55634ad66a8718ee665d701f9462ae0963d438c2..2fc2e034d78f25aec2bf5d8e5ef597722ade9b81 100644 GIT binary patch delta 206 zcmXBMKMuiQ9LDi#UseAeZI#~vIv5Qi27}2UlD7tB>Iq!HVvu;QP#185CeqzvbP1bF zpzrp{H&33t$nqk?X6>lR@;uLa9E1HCM2)ZshfqYFaES)t5lx~+w22PUC4S2u;S&K7 z5`7{f2E_0VIcW8NyPmYfMmH@ZqnDPkk)6o2QaMlLtxSx!@-YfinHa57nHgPDSr|Q2 LSyn3jow&{y={q`V delta 206 zcmXBMy$ym;7=>YkE8^b~5&Z_Bu(UA7!oteJn1F?sjtQK=!otL}0xsYLM8gP{E@9^o z{&2e|Z%$5LWOV LSyd|iR9xo^yR1a& diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar index 0455963810a765e6aa7370fbc6b52f475d798321..0b9313306a94158890c67c6c1c72f6b32ad1c931 100644 GIT binary patch delta 131 zcmcb7R`>E*UA_QsW)=|!4h{~6!xe(zjeMpNO zoLl+0Jn~sU%BDxhhxSvBE*UA_QsW)=|!4h{~6sxAM+8u?oJ7+d+6TKSk;`B+-{SX=qnTKU*p`8Znn zIJfd~dE~QzlueJy=aPf4YVx`Mf?3;Z3%KTeh6u{1a6gBzxKg?GAS|0y?iM&pYWlrY G?ymqvKQONV diff --git a/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar b/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar index e1ac0ef6cd1cf50e721923a84f43a4d190f2c07a..113ddef6f1a3900d97a65b2fd57d2a5708e3c468 100644 GIT binary patch delta 77 zcmeC4$kRQMXTxkamZKGd;gjdP$$=To2i>+GbYsk(1m?9H++^HtaFgknE|@$07aOx4 Qgr&pI+zVmtWoJGI0G{_9NB{r; delta 77 zcmeC4$kRQMXTxkamg+74!zRynlLIrF54vqX=*E~m3CwFZxXHNP;3m^CT`+h0FE(a9 Q2up{ZxfjCP%g%fb09R%rf&c&j diff --git a/Assets/Scripts/CheckUpdates.cs b/Assets/Scripts/CheckUpdates.cs index a110171..08306c5 100644 --- a/Assets/Scripts/CheckUpdates.cs +++ b/Assets/Scripts/CheckUpdates.cs @@ -4,7 +4,7 @@ using UnityEngine; public class CheckUpdates : MonoBehaviour { - public static int ClientVersion = 1; + public static int ClientVersion = 3; public static int ServerVersion; public static bool EverythingOkay => ClientVersion == ServerVersion; @@ -39,7 +39,7 @@ public class CheckUpdates : MonoBehaviour ServerVersion = int.Parse(req.text); if(ServerVersion <= 0){ LoadingScreen.LoadLevel("maintaince"); - }else if(ServerVersion != ClientVersion){ + }else if(ServerVersion > ClientVersion){ LoadingScreen.LoadLevel("update"); } } diff --git a/Assets/Scripts/DataManager.cs b/Assets/Scripts/DataManager.cs index ef4d4c6..cc8e77b 100644 --- a/Assets/Scripts/DataManager.cs +++ b/Assets/Scripts/DataManager.cs @@ -134,15 +134,15 @@ public static class DataManager{ } Debug.Log("Success parsing userdata"); - PlayerPrefs.SetString("username", username); - PlayerPrefs.SetString("password", username); + PlayerPrefs.SetString("username", username + "#0"); + PlayerPrefs.SetString("password", username+ "#0"); PlayerPrefs.Save(); }catch(Exception e){ Debug.Log("Error parsing userdata"); } }else{ if(request.downloadHandler.text == "0"){ - userData = new UserData(){username = username}; + userData = new UserData(){username = username+ "#0"}; }else{ MessageBox.ShowMessage("Error logging in, Server said\n" +request.downloadHandler.text); return; diff --git a/Assets/Scripts/Helpers.cs b/Assets/Scripts/Helpers.cs index 0f57b98..1d61b70 100644 --- a/Assets/Scripts/Helpers.cs +++ b/Assets/Scripts/Helpers.cs @@ -31,7 +31,9 @@ public class Helpers{ if(hours>0){output+=$"{hours}H ";} if(mins>0){output+=$"{mins}m ";} if(showSeconds){output+=$"{seconds}s";} - + if(output.Length <= 0){ + output = time + " seconds"; + } return output; } } \ No newline at end of file diff --git a/Assets/Scripts/LoginManager.cs b/Assets/Scripts/LoginManager.cs index 03f4f52..02610f5 100644 --- a/Assets/Scripts/LoginManager.cs +++ b/Assets/Scripts/LoginManager.cs @@ -14,12 +14,38 @@ public class LoginManager : MonoBehaviour void Awake(){ loadingPanel.SetActive(true); + // PlayGamesPlatform.Activate(); + // LoginGooglePlayGames(); configuration = new GoogleSignInConfiguration { - WebClientId = "656661869871-klbj2ujfiucqic4uugb0d2t3p3vbe4jp.apps.googleusercontent.com", - RequestIdToken = true, + WebClientId = "143863534373-b4f6l0esj5jr7kl2m66bkd0je21fsp7s.apps.googleusercontent.com", + RequestIdToken = false, RequestEmail=true, }; } +// public void LoginGooglePlayGames() +// { +// PlayGamesPlatform.Instance.Authenticate((success) => +// { +// if (success == SignInStatus.Success) +// { +// Debug.Log("Login with Google Play games successful."); +// PlayGamesPlatform.Instance.Get +// PlayGamesPlatform.Instance.RequestServerSideAccess(true, code => +// { +// Debug.Log("Authorization code: " + code); +// // Token = code; +// StartCoroutine(DoneLogin(task.Result.Email)); + +// // This token serves as an example to be used for SignInWithGooglePlayGames +// }); +// } +// else +// { +// MessageBox.ShowMessage("Failed to retrieve Google play games authorization code", "Error Auth"); +// Debug.Log("Login Unsuccessful"); +// } +// }); +// } async void Start(){ // DataManager.GoogleLogin("sewmina7d@gmail.com"); diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index e884045..56f22d8 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -130,7 +130,7 @@ public class PlayerController : MonoBehaviour GameOverUI.Activate(); AdCounter++; - if(AdCounter > 1){ + if(AdCounter > 1 || DataManager.userData.faucet_id > 0){ AdCounter =0; AdsManager.instance.ShowIntAd(); diff --git a/ProjectSettings/GooglePlayGameSettings.txt b/ProjectSettings/GooglePlayGameSettings.txt index 8f98efe..8e16872 100644 --- a/ProjectSettings/GooglePlayGameSettings.txt +++ b/ProjectSettings/GooglePlayGameSettings.txt @@ -1,2 +1,9 @@ lastUpgrade=01101 proj.pluginVersion=0.11.01 +proj.AppId=656661869871 +and.BundleId=com.Xperience.UfoRun +proj.classDir=Assets +proj.ConstantsClassName=GPGSIds +and.ResourceData=%3c%3fxml+version%3d%221.0%22+encoding%3d%22utf-8%22%3f%3e%0a%3c%21--Google+Play+game+services+IDs.+Save+this+file+as+res%2fvalues%2fgames-ids.xml+in+your+project.--%3e%0a%3cresources%3e%0a++%3c%21--app_id--%3e%0a++%3cstring+name%3d%22app_id%22+translatable%3d%22false%22%3e656661869871%3c%2fstring%3e%0a++%3c%21--package_name--%3e%0a++%3cstring+name%3d%22package_name%22+translatable%3d%22false%22%3ecom.Xperience.UfoRun%3c%2fstring%3e%0a++%3c%21--achievement+Welcome%21--%3e%0a++%3cstring+name%3d%22achievement_welcome%22+translatable%3d%22false%22%3eCgkIr-rjoI4TEAIQAQ%3c%2fstring%3e%0a%3c%2fresources%3e +and.ClientId= +android.SetupDone=true diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml index 0a41df4..b17921a 100644 --- a/ProjectSettings/GvhProjectSettings.xml +++ b/ProjectSettings/GvhProjectSettings.xml @@ -4,7 +4,8 @@ - + + diff --git a/ProjectSettings/Packages/com.unity.services.core/Settings.json b/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000..e69de29 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1cf9673..d002a28 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.14 + bundleVersion: 1.8 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -162,7 +162,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 4 + AndroidBundleVersionCode: 8 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 @@ -256,7 +256,7 @@ PlayerSettings: AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: H:/keys/xperience.keystore + AndroidKeystoreName: I:/keys/xperience.keystore AndroidKeyaliasName: xperience AndroidEnableArmv9SecurityFeatures: 1 AndroidBuildApkPerCpuArchitecture: 0 @@ -886,7 +886,13 @@ PlayerSettings: XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: vrEditorSettings: {} - cloudServicesEnabled: {} + cloudServicesEnabled: + Build: 0 + Game Performance: 0 + Legacy Analytics: 0 + Purchasing: 0 + UDP: 0 + Unity Ads: 0 luminIcon: m_Name: m_ModelFolderPath: @@ -906,11 +912,11 @@ PlayerSettings: apiCompatibilityLevel: 3 activeInputHandler: 0 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: 4a2e5e94-7ab1-4678-85ba-ad35ec8d9ab7 framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: UFO Run + organizationId: sewmina7 cloudEnabled: 0 legacyClampBlendShapeWeights: 0 hmiLoadingImage: {fileID: 0}