diff --git a/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta index fa0745149..153879c42 100644 --- a/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta +++ b/Assets/Plugins/Android/GooglePlayGamesManifest.androidlib.meta @@ -1,143 +1,127 @@ fileFormatVersion: 2 guid: 44f4150f398dc4f22b230f8c74866383 -folderAsset: yes -timeCreated: 1504033921 -licenseType: Pro PluginImporter: + externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 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: + - 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 + - first: + : Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + OS: AnyOS + - first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: {} + - first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + WebGL: WebGL + second: + enabled: 1 + settings: {} + - first: + iPhone: iOS + second: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Public/GooglePlayGames/com.google.play.games/Editor/GooglePlayGamesPlugin.txt.meta b/Assets/Public/GooglePlayGames/com.google.play.games/Editor/GooglePlayGamesPlugin.txt.meta deleted file mode 100644 index 5932b27aa..000000000 --- a/Assets/Public/GooglePlayGames/com.google.play.games/Editor/GooglePlayGamesPlugin.txt.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 693a823b8f0ad41fe8231a1b1c8a50da -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -labels: -- gvh -- gvh_manifest diff --git a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/GameInfo.cs b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/GameInfo.cs index d6a65d680..8b821eb80 100644 --- a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/GameInfo.cs +++ b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/GameInfo.cs @@ -13,10 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // - #if UNITY_ANDROID -namespace GooglePlayGames -{ + +namespace GooglePlayGames { /// /// This file is automatically generated DO NOT EDIT! /// @@ -30,32 +29,33 @@ namespace GooglePlayGames /// by checking whether it still retains its initial value - we prevent the constants from being /// replaced in the aforementioned search/replace by stripping off the leading and trailing "__". /// - public static class GameInfo - { + public static class GameInfo { + private const string UnescapedApplicationId = "APP_ID"; + private const string UnescapedIosClientId = "IOS_CLIENTID"; private const string UnescapedWebClientId = "WEB_CLIENTID"; private const string UnescapedNearbyServiceId = "NEARBY_SERVICE_ID"; - public const string ApplicationId = "__APP_ID__"; // Filled in automatically - public const string WebClientId = "__WEB_CLIENTID__"; // Filled in automatically - public const string NearbyConnectionServiceId = "__NEARBY_SERVICE_ID__"; + public const string ApplicationId = ""; // Filled in automatically + public const string IosClientId = "__IOS_CLIENTID__"; // Filled in automatically + public const string WebClientId = ""; // Filled in automatically + public const string NearbyConnectionServiceId = ""; + public static bool ApplicationIdInitialized() { + return !string.IsNullOrEmpty(ApplicationId) && !ApplicationId.Equals(ToEscapedToken(UnescapedApplicationId)); + } - public static bool ApplicationIdInitialized() - { - return !string.IsNullOrEmpty(ApplicationId) && - !ApplicationId.Equals(ToEscapedToken(UnescapedApplicationId)); + public static bool IosClientIdInitialized() { + return !string.IsNullOrEmpty(IosClientId) && !IosClientId.Equals(ToEscapedToken(UnescapedIosClientId)); } - public static bool WebClientIdInitialized() - { + public static bool WebClientIdInitialized() { return !string.IsNullOrEmpty(WebClientId) && !WebClientId.Equals(ToEscapedToken(UnescapedWebClientId)); } - public static bool NearbyConnectionsInitialized() - { + public static bool NearbyConnectionsInitialized() { return !string.IsNullOrEmpty(NearbyConnectionServiceId) && - !NearbyConnectionServiceId.Equals(ToEscapedToken(UnescapedNearbyServiceId)); + !NearbyConnectionServiceId.Equals(ToEscapedToken(UnescapedNearbyServiceId)); } /// @@ -63,10 +63,9 @@ public static bool NearbyConnectionsInitialized() /// /// The escaped token. /// The Token - private static string ToEscapedToken(string token) - { + private static string ToEscapedToken(string token) { return string.Format("__{0}__", token); } } } -#endif //UNITY_ANDROID \ No newline at end of file +#endif diff --git a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/ISocialPlatform/PlayGamesUserProfile.cs b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/ISocialPlatform/PlayGamesUserProfile.cs index 62820e448..741d82866 100644 --- a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/ISocialPlatform/PlayGamesUserProfile.cs +++ b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/ISocialPlatform/PlayGamesUserProfile.cs @@ -207,7 +207,7 @@ public override string ToString() private void setAvatarUrl(string avatarUrl) { mAvatarUrl = avatarUrl; - if (!avatarUrl.StartsWith("https") && avatarUrl.StartsWith("http")) + if (!string.IsNullOrEmpty(avatarUrl) && !avatarUrl.StartsWith("https") && avatarUrl.StartsWith("http")) { mAvatarUrl = avatarUrl.Insert(4, "s"); } diff --git a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidJavaConverter.cs b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidJavaConverter.cs index f4bd0674f..f37519c7a 100644 --- a/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidJavaConverter.cs +++ b/Assets/Public/GooglePlayGames/com.google.play.games/Runtime/Scripts/Platforms/Android/AndroidJavaConverter.cs @@ -85,6 +85,10 @@ internal static Player ToPlayer(AndroidJavaObject player) string displayName = player.Call("getDisplayName"); string playerId = player.Call("getPlayerId"); string avatarUrl = player.Call("getIconImageUrl"); + if (string.IsNullOrEmpty(avatarUrl)) + { + avatarUrl = player.Call("getHiResImageUrl"); + } return new Player(displayName, playerId, avatarUrl); } @@ -96,6 +100,10 @@ internal static PlayerProfile ToPlayerProfile(AndroidJavaObject player) { string displayName = player.Call("getDisplayName"); string playerId = player.Call("getPlayerId"); string avatarUrl = player.Call("getIconImageUrl"); + if (string.IsNullOrEmpty(avatarUrl)) + { + avatarUrl = player.Call("getHiResImageUrl"); + } bool isFriend = player.Call("getRelationshipInfo").Call("getFriendStatus") == 4 /* PlayerFriendStatus.Friend*/; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7a43c5a57..f61b789b5 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/SupportFiles/Public/PlayGamesPluginSupport/build.gradle b/SupportFiles/Public/PlayGamesPluginSupport/build.gradle index 653b9352e..6a4aee872 100644 --- a/SupportFiles/Public/PlayGamesPluginSupport/build.gradle +++ b/SupportFiles/Public/PlayGamesPluginSupport/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.2.2' } } @@ -96,6 +96,6 @@ uploadArchives { } dependencies { - implementation 'com.google.android.gms:play-services-games-v2:17.0.0' - implementation 'com.google.android.gms:play-services-nearby:18.5.0' + implementation 'com.google.android.gms:play-services-games-v2:19.0.0' + implementation 'com.google.android.gms:play-services-nearby:19.1.0' } diff --git a/build.gradle b/build.gradle index ab7c5e55c..b956faad4 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ project.ext { // Take a guess at where Unity is located as a last resort. if (unity_exe == null || unity_exe.isEmpty()) { if (os_osx) { - unity_exe ='/Applications/Unity/Unity.app/Contents/MacOS/Unity' + unity_exe ='/Applications/Unity/Hub/Editor/2021.3.35f1/Unity.app/Contents/MacOS/Unity' } else if (os_windows) { unity_exe ='c:\\program files\\unity\\editor\\unity.exe' } else { diff --git a/current-build/GooglePlayGamesPlugin-0.11.01-hyunjong-lee.unitypackage b/current-build/GooglePlayGamesPlugin-0.11.01-hyunjong-lee.unitypackage new file mode 100644 index 000000000..2f81e4893 Binary files /dev/null and b/current-build/GooglePlayGamesPlugin-0.11.01-hyunjong-lee.unitypackage differ