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 94cb8ce..bcf0890 100644 Binary files a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ 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 3d415b0..51bf462 100644 Binary files a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar and b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.0.0.aar differ 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 55634ad..2fc2e03 100644 Binary files a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar and b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar differ 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 0455963..0b93133 100644 Binary files a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar and b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-22.2.0.aar differ 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 e1ac0ef..113ddef 100644 Binary files a/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar and b/Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar differ 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}