diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..93d91da Binary files /dev/null and b/.DS_Store differ diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2b2b863 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index cf1bcb7..9e1af00 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,12 @@ /[Bb]uilds/ /[Ll]ogs/ /[Uu]ser[Ss]ettings/ +/Firebase/ + +/Assets/google-services.json +/Assets/google-services.json.meta +/Assets/StreamingAssets/google-services.json +/Assets/StreamingAssets/google-services.json.meta # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/.gitignore b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/.gitignore new file mode 100644 index 0000000..96abd27 --- /dev/null +++ b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/projectSettingsUpdater.xml +/.idea.Unity-Firebase-Multiplayer-Example.iml +/contentModel.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/aws.xml b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/aws.xml new file mode 100644 index 0000000..b63b642 --- /dev/null +++ b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/aws.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/encodings.xml b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/indexLayout.xml b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/misc.xml b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/misc.xml new file mode 100644 index 0000000..1d8c84d --- /dev/null +++ b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/vcs.xml b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/.idea.Unity-Firebase-Multiplayer-Example/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assembly-CSharp.csproj.DotSettings b/Assembly-CSharp.csproj.DotSettings index c54c126..b5b235a 100644 --- a/Assembly-CSharp.csproj.DotSettings +++ b/Assembly-CSharp.csproj.DotSettings @@ -1,2 +1,2 @@  - CSharp70 \ No newline at end of file + Default \ No newline at end of file diff --git a/Assets/.DS_Store b/Assets/.DS_Store new file mode 100644 index 0000000..b3f7671 Binary files /dev/null and b/Assets/.DS_Store differ diff --git a/Assets/Editor Default Resources/Firebase/fb_analytics.png b/Assets/Editor Default Resources/Firebase/fb_analytics.png index b3eef77..3f19563 100755 Binary files a/Assets/Editor Default Resources/Firebase/fb_analytics.png and b/Assets/Editor Default Resources/Firebase/fb_analytics.png differ diff --git a/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta b/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta index ca85a40..e3b604b 100644 --- a/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: dc218b335b1d14cd5ae532f65042d829 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_analytics.png timeCreated: 1473376337 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png b/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png index f1c0f70..e6b922e 100755 Binary files a/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png and b/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png differ diff --git a/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta index b258b1c..9b4ec72 100644 --- a/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 9fe4b3bd3b7d2477dac92fb7429d1d1b labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_analytics_dark.png timeCreated: 1472679008 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_auth.png.meta b/Assets/Editor Default Resources/Firebase/fb_auth.png.meta index c647b65..472c84e 100644 --- a/Assets/Editor Default Resources/Firebase/fb_auth.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_auth.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 394b3ec4d60c24476a12e4ba696d9e5d labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_auth.png timeCreated: 1473376335 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta index c56ef64..4b30816 100644 --- a/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 3a9e1ef6287664c389bb09e2ac1b23b7 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_auth_dark.png timeCreated: 1472679008 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta b/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta index f1c1288..e5b70b6 100644 --- a/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 837e8e1f35e334e81931d0857680cebf labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_cloud_messaging.png timeCreated: 1473376336 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta index a45a61a..7718f44 100644 --- a/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 20c5b8a1f82cb4aadb77ca20683d2a6e labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_cloud_messaging_dark.png timeCreated: 1472679008 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_config.png.meta b/Assets/Editor Default Resources/Firebase/fb_config.png.meta index 757e715..8ec50ec 100644 --- a/Assets/Editor Default Resources/Firebase/fb_config.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_config.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 415eaec414af14d11955222a282aca08 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_config.png timeCreated: 1473376335 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta index ec3dca2..ad2b27d 100644 --- a/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 0ad9ef5fff5524355a9670c90a99cbba labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_config_dark.png timeCreated: 1472679008 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta b/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta index ea8300c..8c2e9ae 100644 --- a/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 008a5e76206e49f9b06d8ba144aabb38 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_crashlytics.png timeCreated: 1473376335 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta index cf7f72b..5c40a85 100644 --- a/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 214009068900439da4a9cded17d58090 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_crashlytics_dark.png timeCreated: 1472679008 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_database.png.meta b/Assets/Editor Default Resources/Firebase/fb_database.png.meta index 4f20f7f..2a68922 100644 --- a/Assets/Editor Default Resources/Firebase/fb_database.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_database.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 3eea7b558c67b48e18acf3c278392e3d labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_database.png timeCreated: 1476203961 licenseType: Free TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta index 6ea6a0b..24badda 100644 --- a/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 9f6bfa9d8aefb40dc92461c372c73b0f labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_database_dark.png timeCreated: 1476203949 licenseType: Free TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta b/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta index f8f8b65..1abe232 100644 --- a/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: df6f219c396f4ad9b5048bae6944cb8e labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_dynamic_links.png timeCreated: 1473376335 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta index d933bde..cd9ac52 100644 --- a/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 9355a4671cfe4eef90879863318d1a4b labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_dynamic_links_dark.png timeCreated: 1472679009 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_functions.png.meta b/Assets/Editor Default Resources/Firebase/fb_functions.png.meta index 0dcd1d9..1afe355 100644 --- a/Assets/Editor Default Resources/Firebase/fb_functions.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_functions.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 953367231f9e3e22e70e5d1c91a40fe5 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_functions.png timeCreated: 1473376335 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta index 3f15803..aab8348 100644 --- a/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: b5aa3e4f7432e1c5698417cc13f85271 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_functions_dark.png timeCreated: 1472679008 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_invites.png b/Assets/Editor Default Resources/Firebase/fb_invites.png new file mode 100755 index 0000000..be9a9b9 Binary files /dev/null and b/Assets/Editor Default Resources/Firebase/fb_invites.png differ diff --git a/Assets/Editor Default Resources/Firebase/fb_invites.png.meta b/Assets/Editor Default Resources/Firebase/fb_invites.png.meta new file mode 100644 index 0000000..6d2c1fa --- /dev/null +++ b/Assets/Editor Default Resources/Firebase/fb_invites.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 741b269777f30488482ef4937b456b28 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_invites.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor Default Resources/Firebase/fb_invites_dark.png b/Assets/Editor Default Resources/Firebase/fb_invites_dark.png new file mode 100755 index 0000000..1bd1a90 Binary files /dev/null and b/Assets/Editor Default Resources/Firebase/fb_invites_dark.png differ diff --git a/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta new file mode 100644 index 0000000..8936d03 --- /dev/null +++ b/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: a734ad7414926404e90f8b5be37b7e23 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_invites_dark.png +timeCreated: 1472679009 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor Default Resources/Firebase/fb_storage.png.meta b/Assets/Editor Default Resources/Firebase/fb_storage.png.meta index 0749847..4721464 100644 --- a/Assets/Editor Default Resources/Firebase/fb_storage.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_storage.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 573eb851c99f948f4bf2de49322bfd53 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_storage.png timeCreated: 1481243899 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta b/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta index 2428bfe..b9fd050 100644 --- a/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 2955864b938094f579ea9902b65ac10c labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_storage_dark.png timeCreated: 1481243898 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta b/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta index 43e7933..19e85c7 100644 --- a/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta +++ b/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 9f058f25e8e2d47cfb894951d4d7e48a labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/firebase_lockup.png timeCreated: 1473376336 licenseType: Pro TextureImporter: diff --git a/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta b/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta index 68cdfca..32f993f 100644 --- a/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta +++ b/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: b93330fc8ea08407dbc514b5101afa14 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Editor Default Resources/Firebase/firebase_lockup_dark.png timeCreated: 1472601251 licenseType: Pro TextureImporter: diff --git a/Assets/Firebase/Plugins/Crashlytics.meta b/Assets/ExternalDependencyManager.meta similarity index 77% rename from Assets/Firebase/Plugins/Crashlytics.meta rename to Assets/ExternalDependencyManager.meta index c0ae6ec..e1577cc 100644 --- a/Assets/Firebase/Plugins/Crashlytics.meta +++ b/Assets/ExternalDependencyManager.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5b1fae8d1cfc3f139606e3c8f228ed1 +guid: 9fe3d8acceb7c4192bf90b1a0db917fe folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/PlayServicesResolver/Editor.meta b/Assets/ExternalDependencyManager/Editor.meta similarity index 77% rename from Assets/PlayServicesResolver/Editor.meta rename to Assets/ExternalDependencyManager/Editor.meta index 49e4c78..a8d536c 100644 --- a/Assets/PlayServicesResolver/Editor.meta +++ b/Assets/ExternalDependencyManager/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 724c2543c1e17a743a176da7b98ac417 +guid: e74a956bd5fa64b35883d201fbd4837e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Firebase/Plugins/Http.meta b/Assets/ExternalDependencyManager/Editor/1.2.174.meta similarity index 77% rename from Assets/Firebase/Plugins/Http.meta rename to Assets/ExternalDependencyManager/Editor/1.2.174.meta index 581e2a5..a2f8e67 100644 --- a/Assets/Firebase/Plugins/Http.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.174.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 559d8750f5ab7cb6db98158a0085ceca +guid: b479adc8aa80e4477b91cec254a54a9d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll new file mode 100755 index 0000000..5bbf5c1 Binary files /dev/null and b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll differ diff --git a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.meta similarity index 79% rename from Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.meta index f3b0b8b..fa6fd7a 100644 --- a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: a1e8415cfe85469f9aa0aea941166031 +guid: 83ff4764cfaa404ab9546c5a00b1b54f labels: - gvh -- gvh_targets-editor -- gvh_version-1.2.135.0 +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll +- gvhp_targets-editor PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll similarity index 51% rename from Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll rename to Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll index 576b70c..a722d92 100755 Binary files a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll and b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll differ diff --git a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.meta similarity index 79% rename from Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.meta index 22e9d7b..48b2897 100644 --- a/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 97738b29c18143b0a469277b09d35889 +guid: d9cf2414188e40c9a9f7a254a5436601 labels: - gvh -- gvh_targets-editor -- gvh_version-1.2.135.0 +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll +- gvhp_targets-editor PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll new file mode 100755 index 0000000..45d0f06 Binary files /dev/null and b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll differ diff --git a/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.meta new file mode 100644 index 0000000..562b309 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: 789ffd788f924bd0bdb33e26b367ad70 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll +- gvhp_targets-editor +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll new file mode 100755 index 0000000..b84bff0 Binary files /dev/null and b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll.meta b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.meta similarity index 78% rename from Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll.meta rename to Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.meta index 83d8867..6e60a7c 100644 --- a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 369cd88e7aa04bd98e0f6c229f7c1510 +guid: 149319a041c7420b94473745b1919576 labels: - gvh -- gvh_targets-editor -- gvh_version-1.2.135.0 +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll +- gvhp_targets-editor PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md new file mode 100755 index 0000000..5dce1c7 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -0,0 +1,1371 @@ +# 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 +* General - Fixes #425 - Change to save `GvhProjectSettings.xml` without + Unicode byte order mark (BoM). +* Android Resolver - Remove reference to `jcenter()` +* iOS Resolver - Force setting `LANG` when executing Cocoapods in shell mode on + Mac. + +# Version 1.2.168 - Dec 9, 2021 +* All - Fixes #472 by removing the use of `System.Diagnostics.Debug.Assert` +* All - Fixed #477 by properly enabling EDM4U libraries for Unity 2021.2+ when + the package is installed through `.tgz` + +# Version 1.2.167 - Oct 6, 2021 +* All - Moved versioned `.dll` in EDM4U to a versioned folder and remove their + version postfix in their filename. For instance, `IOSResolver.dll` will be + placed at `ExternalDependencyManager/Editor/1.2.167/Google.IOSResolver.dll`. +* Android Resolver - Fixed #243 by only using the highest version in + `mainTemplate.gradle` when duplicated dependencies are presented. +* Android Resolver - Added supports to x86_64 to ABI list for Android apps on + Chrome OS. + +# Version 1.2.166 - Jun 30, 2021 +* All - Fixed #440 and fixed #447 by specifying the parameter type while calling + `GetApplicationIdentifier()` Unity API using reflection, due to a new + overloaded method introduced in Unity 2021.2. +* Android Resolver - Fixed #442 by patching `Dependency.IsGreater()` when the + version strings end '+'. + +# Version 1.2.165 - Apr 28, 2021 +## Bug Fixes +* Version Handler - Fixed #431 by replacing the use of `HttpUtility.UrlEncode()` + which causes NullReferenceException in certain version of Unity. +* Android Resolver - Check that androidSdkRootPath directory exists before using + as sdkPath. +* Android Resolver - Fixed Android Resolver integration tests with Unity + 2019.3+. + +# Version 1.2.164 - Feb 4, 2021 +## New Features +* Android Resolver - Added support for Android packages with classifier in their + namespaces. +* iOS Resolver - Added new settings in iOS Resolver to configure generated + Podfile. +* iOS Resolver - Added a new attribute `addToAllTargets` in Dependencies.xml. + +## Bug Fixes +* iOS Resolver - Fixed XML parsing for `bitcodeEnabled` attribute in + Dependencies.xml. + +# Version 1.2.163 - Dec 15, 2020 +## Bug Fixes +* Version Handler - Fixed measurement reporting + +# Version 1.2.162 - Nov 19, 2020 +## Bug Fixes +* Version Handler - Improved #413 by preventing Version Handler from running + from static constructor when it is disabled. +* Package Manager Resolver - Remove GPR + +# Version 1.2.161 - Oct 12, 2020 +## Bug Fixes +* Android Resolver - Fixed the issue that Android Resolver does not resolve + again before build in Unity 2020 if it failed to resolve previously. + +# Version 1.2.160 - Sep 30, 2020 +## Bug Fixes +* Android Resolver - Fixed a regression that gradleResolver can be null until + Initialize() is called. +* Android Resolver - Fixed a regression that Android Resolver failed in Unity + 2019.3+ due to `gradleTemplate.properties` not enabled when + `mainTemplate.gradle` is not enabled at all. + +# Version 1.2.159 - Sep 11, 2020 +## Bug Fixes +* Android Resolver - Fixed #322 where the Unity editor will lose its target SDK + setting between Unity restarts if `>28` is selected in 2019. This is due to + Unity AndroidSdkVersions enum does not contain values above 28. +* Android Resolver - Fixed #360 where building Android app with Untiy 2019.3+ + may fail due to Jetifier and AndroidX not enabled properly in generated + Gradle project. This fix requires the user to enable + `Custom Gradle Properties Template` found under + `Player Settings > Settings for Android > Publishing Settings`. + +# Version 1.2.158 - Sep 3, 2020 +## Bug Fixes +* Version Handler: Fixed editor freeze when `-executeMethod` is used in + non-batch mode. +* Android Resolver: Normalized file paths when generating local Maven repo + since the path may contains a mix of forward and backward slash on Windows. +* Export Unity Package: Fixed generation of .unitypackage with tarfile on + Windows. + +# Version 1.2.157 - Aug 6, 2020 +## Bug Fixes +* Android Resolver: Delay initialization until active build target is Android + and the editor is not in play mode. +* iOS Resolver: Delay initialization until active build target is iOS + and the editor is not in play mode. +* Export Unity Package: Workaround directory creation racy if multiple export + operations are spawned at the same time. + +# Version 1.2.156 - June 10, 2020 +## Bug Fixes +* Android Resolver: Fixed that the generated local repo assets contains + redundent labels which are causing Version Handler to failed while + uninstalling packages. +* Android Resolver: Fixed that the repo url injected into mainTemplate.gradle + is incorrect when Unity is configured to export gradle project. +* Android Resolver: Limited to only create local Maven repo when the source + repo contains ".srcaar" file. + +## Changes +* All: Described EDM4U analytics data usage in readme. + +# Version 1.2.155 - May 14, 2020 +## Bug Fixes +* All: Fixed compiler error when build with Unity 5.4 or below due to the + usage of Rect.zero. +* All: Ignore cases when checking command line arguments. + +# Version 1.2.154 - May 14, 2020 +## Bug Fixes +* All: Make each MultiSelectWindow for different purposes to have its own + unique window. + +## Changes +* All: Replace all dialog with DialogWindow which is implemented from + EditorWindow. +* Package Manager Resolver: Clarify how manifest.json will be changed in Package + Manager Resolver window. + +# Version 1.2.153 - Apr 24, 2020 +## Bug Fixes +* Android Resolver: Fixed an exception when repainting the Android resolution + window in Unity 2019.3.x. + +# Version 1.2.152 - Apr 17, 2020 +## Bug Fixes +* Version Handler: Fixed exception when waiting for enabled editor DLLs to + load. +* Android Resolver: Fixed regression when using a Custom Gradle Template + on Windows. + +# Version 1.2.151 - Apr 16, 2020 +## Bug Fixes +* Version Handler: When waiting for newly enabled editor DLLs to load, ignore + all DLLs that do not have a file-system location. +* Android Resolver: Fixed resolution when using a Custom Gradle Template with + libraries stored in a local maven repository distributed with a plugin + installed with the Unity Package Manager. + +# Version 1.2.150 - Apr 9, 2020 +## Bug Fixes +* All: The new packaging script when run on MacOS was generating a + .unitypackage archive that could not be read by Unity on Windows. + This release simply repackages the plugin with tar/gzip to fix the problem. + +# Version 1.2.149 - Apr 8, 2020 +## Bug Fixes +* Package Manager Resolver: Fixed spurious error message when resuming + migration after installing a UPM package. + +# Version 1.2.148 - Apr 8, 2020 +## Bug Fixes +* Package Manager Resolver: Fixed an exception when resuming migration + after installing a UPM package. + +# Version 1.2.147 - Apr 8, 2020 +## Bug Fixes +* Version Handler: Fixed alias traversal bug which caused problems when + migrating from installed .unitypackage files to UPM packages. + +# Version 1.2.146 - Apr 8, 2020 +## Bug Fixes +* Version Handler: Fixed exception in manifest parsing when a manifest is + detected with no aliases. + +# Version 1.2.145 - Apr 2, 2020 +## New Features +* Package Manager Resolver: Added a method to migrate Version Handler + managed packages installed via `.unitypackage` to Unity Package Manager + packages. This is initially used to migrate the External Dependency Manager + to UPM. + +## Changes +* All: Verbose logging is now no longer automatically enabled in batch mode + across all components. Instead logging can be configured using each + component's verbose logging setting or by using the `-gvh_log_debug` command + line flag when starting Unity. +* Version Handler: Sped up version handler updates when the app domain isn't + reloaded. + +## Bug Fixes +* Version Handler: Fixed the display of the obsolete files clean up dialog + when the asset database refreshes. +* Version Handler: Improved reliability of callback from + the VersionHandler.UpdateCompleteMethods event when an asset database + refresh occurs. +* Version Handler: Fixed duplicate exportPath labels when 'Assets/' is the + root of paths assigned to files. +* Version Handler: Handle empty lines in manifest files. + +# Version 1.2.144 - Mar 23, 2020 +## Changed +* iOS Resolver: Removed the ability to configure the Xcode target a Cocoapod + is added to. + +## Bug Fixes +* iOS Resolver: Reverted support for adding Cocoapods to multiple targets as + it caused a regression (exception thrown during post-build step) in some + versions of Unity. + +# Version 1.2.143 - Mar 20, 2020 +## Bug Fixes +* Android Resolver: Fixed caching of resolution state which was causing + the resolver to always run when no dependencies had changed. + +# Version 1.2.142 - Mar 19, 2020 +## Changes +* Package Manager Resolver: Enabled auto-add by default. + +# Version 1.2.141 - Mar 19, 2020 +## Bug Fixes +* Fixed a bug when retrieving project settings. If a plugin was configured + to fetch project settings, if a setting was fetched (e.g "foo") and this + setting existed in the system settings but not the project settings the + system value would override the default value leading to unexpected + behavior. +* Fixed a warning when caching web request classes in Unity 5.6. + +# Version 1.2.140 - Mar 19, 2020 +## Bug Fixes +* Fixed measurement reporting in Unity 5.x. +* Version Handler: Fixed NullReferenceException when an asset doesn't have + an AssetImporter. + +# Version 1.2.139 - Mar 18, 2020 +## Changed +* Added documentation to the built plugin. + +# Version 1.2.138 - Mar 17, 2020 +## New Features +* Package Manager Resolver: Added the Package Manager Resolver + component that allows developers to easily boostrap Unity Package Manager + (UPM) registry addition using unitypackage plugins. +* Version Handler: Added a window that allows plugins to managed by the + Version Handler to be uninstalled. +* Version Handler: Added support for displaying installed plugins. +* Version Handler: Added support for moving files in plugins to their install + locations (if the plugin has been configured to support this). +* iOS Resolver: Added the ability to configure the Xcode target a Cocoapod is + added to. + +## Bug Fixes +* Fixed upgrade from version 1.2.137 and below after the plugin rename to + EDM4U broke the upgrade process. +* Android Resolver: Worked around PlayerSettings.Android.targetSdkVersion + returning empty names for some values in 2019.x. +* Version Handler: Fixed the display of the obsolete files clean up window. +* Version Handler: Fixed managed file check when assets are modified in the + project after plugin import. + +# Version 1.2.137 - Mar 6, 2020 +## Changed +* Renamed package to External Package Manager for Unity (EDM4U). + We changed this to reflect what this plugin is doing today which is far more + than the original scope which just consisted of importing jar files from the + Android SDK maven repository. + Scripts that used to pull `play-services-resolver*.unitypackage` will now have + to request `external-dependency-manager*.unitypackage` instead. + We'll still be shipping a `play-services-resolver*_manifest.txt` file to + handle upgrading from older versions of the plugin. + +## New Features +* All Components: Added reporting of usage so that we can remotely detect + errors and target improvements. +* Android Resolver: Added support for *Dependencies.xml files in Unity Package + Manager packages. +* iOS Resolver: Added support for *Dependencies.xml files in Unity Package + Manager packages. + +## Bug Fixes +* Version Handler: Disabled attempts to disable asset metadata modification + when assets are in a Unity Package Manager managed package. + +# Version 1.2.136 - Feb 19, 2019 +## Bug Fixes +* Android Resolver: Fixed OpenJDK path discovery in Unity 2019.3.1. + +# Version 1.2.135 - Dec 5, 2019 +## Bug Fixes +* All Components: Fixed stack overflow when loading project settings. + +# Version 1.2.134 - Dec 4, 2019 +## Bug Fixes +* All Components: Fixed an issue which caused project settings to be cleared + when running in batch mode. + +# Version 1.2.133 - Nov 18, 2019 +## Bug Fixes +* All Components: Failure to save project settings will now report an error + to the log rather than throwing an exception. + +# Version 1.2.132 - Nov 11, 2019 +## Bug Fixes +* Android Resolver: Worked around expansion of DIR_UNITYPROJECT on Windows + breaking Gradle builds when used as part of a file URI. +* Android Resolver: mainTemplate.gradle is only written if it needs to be + modified. + +# Version 1.2.131 - Oct 29, 2019 +## Bug Fixes +* Version Handler: Improved execution of events on the main thread in batch + mode. +* Version Handler: Improved log level configuration at startup. +* Version Handler: Improved performance of class lookup in deferred method + calls. +* Version Handler: Fixed rename to enable / disable for editor assets. +* iOS Resolver: Improved log level configuration at startup. +* Android Resolver: Improved local maven repo path reference in + mainTemplate.gradle using DIR_UNITYPROJECT. DIR_UNITYPROJECT by Unity + to point to the local filesystem path of the Unity project when Unity + generates the Gradle project. + +# Version 1.2.130 - Oct 23, 2019 +## New Features +* iOS Resolver: Added support for modifying the Podfile before `pod install` + is executed. + +## Bug Fixes +* Version Handler: Fixed invalid classname error when calling + `VersionHandler.UpdateVersionedAssets()`. + +# Version 1.2.129 - Oct 2, 2019 +## Bug Fixes +* iOS Resolver: Changed Cocoapod integration in Unity 2019.3+ to + only add Pods to the UnityFramework target. + +# Version 1.2.128 - Oct 1, 2019 +## Bug Fixes +* iOS Resolver: Fixed Cocoapod project integration mode with Unity + 2019.3+. + +# Version 1.2.127 - Sep 30, 2019 +## Changes +* Android Resolver: All Android Resolver settings File paths are now + serialized with POSIX directory separators. + +# Version 1.2.126 - Sep 27, 2019 +## Changes +* Android Resolver: File paths are now serialized with POSIX directory + separators. +## Bug Fixes +* Android Resolver: Fixed resolution when the parent directory of a Unity + project contains a Gradle project (i.e `settings.gradle` file). + +# Version 1.2.125 - Sep 23, 2019 +## Bug Fixes +* All components: Silenced a warning about not being able to set the console + encoding to UTF8. +* Android Resolver: Worked around broken AndroidSDKTools class in some + versions of Unity. +* iOS Resolver: Fixed iOS target SDK version check +* Version Handler: Changed clean up obsolete files window so that it doesn't + exceed the screen size. + +# Version 1.2.124 - Jul 28, 2019 +## Bug Fixes +* All components: Fixed regression with source control integration when using + Unity 2019.1+. + +# Version 1.2.123 - Jul 23, 2019 +## New Features +* All components: Source control integration for project settings. +## Changes +* Android Resolver: Removed AAR cache as it now makes little difference to + incremental resolution performance. +* Android Resolver: Improved embedded resource management so that embedded + resources should upgrade when the plugin is updated without restarting + the Unity editor. +## Bug Fixes +* Version Handler: Fixed InvokeMethod() and InvokeStaticMethod() when calling + methods that have interface typed arguments. + +# Version 1.2.122 - Jul 2, 2019 +## Bug Fixes +* iOS Resolver: Worked around Unity not loading the iOS Resolver DLL as it + referenced the Xcode extension in a public interface. The iOS Resolver + DLL still references the Xcode extension internally and just handles + missing type exceptions dynamically. + +# Version 1.2.121 - Jun 27, 2019 +## Bug Fixes +* Android Resolver: Fixed warning about missing Packages folder when loading + XML dependencies files in versions of Unity without the package manager. +* Android Resolver: Fixed resolution window progress bar exceeding 100%. +* Android Resolver: If AndroidX is detected in the set of resolved libraries, + the user will be prompted to enable the Jetifier. +* Android Resolver: Improved text splitting in text area windows. +* iOS Resolver: Added support for Unity's breaking changes to the Xcode API + in 2019.3.+. Cocoapods are now added to build targets, Unity-iPhone and + UnityFramework in Unity 2019.3+. + +# Version 1.2.120 - Jun 26, 2019 +## New Features +* Android Resolver: Added support for loading *Dependencies.xml files from + Unity Package Manager packages. +* Android Resolver: Resolution window is now closed if resolution runs as + a pre-build step. +* iOS Resolver: Added support for loading *Dependencies.xml files from + Unity Package Manager packages. +## Bug Fixes +* Android Resolver: Fixed generation of relative repo paths when using + mainTemplate.gradle resolver. +* Android Resolver: Fixed copy of .srcaar to .aar files in repos embedded in a + project when a project path has characters (e.g whitespace) that are escaped + during conversion to URIs. +* Android Resolver: Fixed auto-resolution always running if the Android SDK + is managed by Unity Hub. + +# Version 1.2.119 - Jun 19, 2019 +## Bug Fixes +* Android Resolver: Fixed error reported when using Jetifier integration + in Unity 2018+ if the target SDK is set to "highest installed". + +# Version 1.2.118 - Jun 18, 2019 +## New Features +* Android Resolver: Added initial + [Jetifier](https://developer.android.com/studio/command-line/jetifier) + integration which simplifies + [migration](ttps://developer.android.com/jetpack/androidx/migrate) + to Jetpack ([AndroidX](https://developer.android.com/jetpack/androidx)) + libraries in cases where all dependencies are managed by the Android + Resolver. + This can be enabled via the `Use Jetifier` option in the + `Assets > Play Services Resolver > Android Resolver > Settings` menu. + Caveats: + - If your project contains legacy Android Support Library .jar and .aar + files, these files will need to be removed and replaced with references to + artifacts on Maven via `*Dependencies.xml` files so that the Jetifier + can map them to Jetpack (AndroidX) libraries. + For example, remove the file `support-v4-27.0.2.jar` and replace it with + `` in a + `*Dependencies.xml` file. + - If your project contains .jar or .aar files that use the legacy Android + Support Libraries, these will need to be moved into a local Maven repo + [See this guide](https://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html) + and then these files should be removed from your Unity project and instead + referenced via `*Dependencies.xml` files so that the Jetifier can + patch them to reference the Jetpack lirbaries. + +## Bug Fixes +* Android Resolver: Disabled version locking of com.android.support:multidex + does not use the same versioning scheme as other legacy Android support + libraries. +* Version Handler: Made Google.VersionHandler.dll's asset GUID stable across + releases. This faciliates error-free import into projects where + Google.VersionHandler.dll is moved from the default install location. + +# Version 1.2.117 - Jun 12, 2019 +## Bug Fixes +* Android Resolver: Fix copying of .srcaar to .aar files for + mainTemplate.gradle resolution. PluginImporter configuration was previously + not being applied to .aar files unless the Unity project was saved. + +# Version 1.2.116 - Jun 7, 2019 +## Bug Fixes +* Android Resolver: Fixed resolution of Android dependencies without version + specifiers. +* Android Resolver: Fixed Maven repo not found warning in Android Resolver. +* Android Resolver: Fixed Android Player directory not found exception in + Unity 2019.x when the Android Player isn't installed. + +# Version 1.2.115 - May 28, 2019 +## Bug Fixes +* Android Resolver: Fixed exception due to Unity 2019.3.0a4 removing + x86 from the set of supported ABIs. + +# Version 1.2.114 - May 27, 2019 +## New Features +* Android Resolver: Added support for ABI stripping when using + mainTemplate.gradle. This only works with AARs stored in repos + on the local filesystem. + +# Version 1.2.113 - May 24, 2019 +## New Features +* Android Resolver: If local repos are moved, the plugin will search the + project for matching directories in an attempt to correct the error. +* Version Handler: Files can be now targeted to multiple build targets + using multiple "gvh_" asset labels. +## Bug Fixes +* Android Resolver: "implementation" or "compile" are now added correctly + to mainTemplate.gradle in Unity versions prior to 2019. + +# Version 1.2.112 - May 22, 2019 +## New Features +* Android Resolver: Added option to disable addition of dependencies to + mainTemplate.gradle. + See `Assets > Play Services Resolver > Android Resolver > Settings`. +* Android Resolver: Made paths to local maven repositories in + mainTemplate.gradle relative to the Unity project when a project is not + being exported. +## Bug Fixes +* Android Resolver: Fixed builds with mainTemplate.gradle integration in + Unity 2019. +* Android Resolver: Changed dependency inclusion in mainTemplate.gradle to + use "implementation" or "compile" depending upon the version of Gradle + included with Unity. +* Android Resolver: Gracefully handled exceptions if the console encoding + can't be modified. +* Android Resolver: Now gracefully fails if the AndroidPlayer directory + can't be found. + +# Version 1.2.111 - May 9, 2019 +## Bug Fixes +* Version Handler: Fixed invocation of methods with named arguments. +* Version Handler: Fixed occasional hang when the editor is compiling + while activating plugins. + +# Version 1.2.110 - May 7, 2019 +## Bug Fixes +* Android Resolver: Fixed inclusion of some srcaar artifacts in builds with + Gradle builds when using mainTemplate.gradle. + +# Version 1.2.109 - May 6, 2019 +## New Features: +* Added links to documentation from menu. +* Android Resolver: Added option to auto-resolve Android libraries on build. +* Android Resolver: Added support for packaging specs of Android libraries. +* Android Resolver: Pop up a window when displaying Android dependencies. + +## Bug Fixes +* Android Resolver: Support for Unity 2019 Android SDK and JDK install locations +* Android Resolver: e-enable AAR explosion if internal builds are enabled. +* Android Resolver: Gracefully handle exceptions on file deletion. +* Android Resolver: Fixed Android Resolver log spam on load. +* Android Resolver: Fixed save of Android Resolver PromptBeforeAutoResolution + setting. +* Android Resolver: Fixed AAR processing failure when an AAR without + classes.jar is found. +* Android Resolver: Removed use of EditorUtility.DisplayProgressBar which + was occasionally left displayed when resolution had completed. +* Version Handler: Fixed asset rename to disable when a disabled file exists. + +# Version 1.2.108 - May 3, 2019 +## Bug Fixes: +* Version Handler: Fixed occasional hang on startup. + +# Version 1.2.107 - May 3, 2019 +## New Features: +* Version Handler: Added support for enabling / disabling assets that do not + support the PluginImporter, based upon build target selection. +* Android Resolver: Added support for the global specification of maven repos. +* iOS Resolver: Added support for the global specification of Cocoapod sources. + +# Version 1.2.106 - May 1, 2019 +## New Features +* iOS Resolver: Added support for development pods in Xcode project integration + mode. +* iOS Resolver: Added support for source pods with resources in Xcode project + integration mode. + +# Version 1.2.105 - Apr 30, 2019 +## Bug fixes +* Android Resolver: Fixed reference to Java tool path in logs. +* Android and iOS Resolvers: Changed command line execution to emit a warning + rather than throwing an exception and failing, when it is not possible to + change the console input and output encoding to UTF-8. +* Android Resolver: Added menu option and API to delete resolved libraries. +* Android Resolver: Added menu option and API to log the repos and libraries + currently included in the project. +* Android Resolver: If Plugins/Android/mainTemplate.gradle file is present and + Gradle is selected as the build type, resolution will simply patch the file + with Android dependencies specified by plugins in the project. + +# Version 1.2.104 - Apr 10, 2019 +## Bug Fixes +* Android Resolver: Changed Android ABI selection method from using whitelisted + Unity versions to type availability. This fixes an exception on resolution + in some versions of Unity 2017.4. + +# Version 1.2.103 - Apr 2, 2019 +## Bug Fixes +* Android Resolver: Whitelisted Unity 2017.4 and above with ARM64 support. +* Android Resolver: Fixed Java version check to work with Java SE 12 and above. + +# Version 1.2.102 - Feb 13, 2019 +## Bug Fixes +* Android Resolver: Fixed the text overflow on the Android Resolver + prompt before initial run to fit inside the buttons for + smaller screens. + +# Version 1.2.101 - Feb 12, 2019 +## New Features +* Android Resolver: Prompt the user before the resolver runs for the + first time and allow the user to elect to disable from the prompt. +* Android Resolver: Change popup warning when resolver is disabled + to be a console warning. + +# Version 1.2.100 - Jan 25, 2019 +## Bug Fixes +* Android Resolver: Fixed AAR processing sometimes failing on Windows + due to file permissions. + +# Version 1.2.99 - Jan 23, 2019 +## Bug Fixes +* Android Resolver: Improved performance of project property polling. +* Version Handler: Fixed callback of VersionHandler.UpdateCompleteMethods + when the update process is complete. + +# Version 1.2.98 - Jan 9, 2019 +## New Features +* iOS Resolver: Pod declaration properties can now be set via XML pod + references. For example, this can enable pods for a subset of build + configurations. +## Bug Fixes +* iOS Resolver: Fixed incremental builds after local pods support caused + regression in 1.2.96. + +# Version 1.2.97 - Dec 17, 2018 +## Bug Fixes +* Android Resolver: Reduced memory allocation for logic that monitors build + settings when auto-resolution is enabled. If auto-resolution is disabled, + almost all build settings are no longer polled for changes. + +# Version 1.2.96 - Dec 17, 2018 +## Bug Fixes +* Android Resolver: Fixed repacking of AARs to exclude .meta files. +* Android Resolver: Only perform auto-resolution on the first scene while + building. +* Android Resolver: Fixed parsing of version ranges that include whitespace. +* iOS Resolver: Added support for local development pods. +* Version Handler: Fixed Version Handler failing to rename some files. + +# Version 1.2.95 - Oct 23, 2018 +## Bug Fixes: +* Android Resolver: Fixed auto-resolution running in a loop in some scenarios. + +# Version 1.2.94 - Oct 22, 2018 +## Bug Fixes +* iOS Resolver: Added support for PODS_TARGET_SRCROOT in source Cocoapods. + +# Version 1.2.93 - Oct 22, 2018 +## Bug Fixes +* Android Resolver: Fixed removal of Android libraries on auto-resolution when + `*Dependencies.xml` files are deleted. + +# Version 1.2.92 - Oct 2, 2018 +## Bug Fixes +* Android Resolver: Worked around auto-resolution hang on Windows if + resolution starts before compilation is finished. + +# Version 1.2.91 - Sep 27, 2018 +## Bug Fixes +* Android Resolver: Fixed Android Resolution when the selected build target + isn't Android. +* Added C# assembly symbols the plugin to simplify debugging bug reports. + +# Version 1.2.90 - Sep 21, 2018 +## Bug Fixes +* Android Resolver: Fixed transitive dependency selection of version locked + packages. + +# Version 1.2.89 - Aug 31, 2018 +## Bug Fixes +* Fixed FileLoadException in ResolveUnityEditoriOSXcodeExtension an assembly + can't be loaded. + +# Version 1.2.88 - Aug 29, 2018 +## Changed +* Improved reporting of resolution attempts and conflicts found in the Android + Resolver. +## Bug Fixes +* iOS Resolver now correctly handles sample code in CocoaPods. Previously it + would add all sample code to the project when using project level + integration. +* Android Resolver now correctly handles Gradle conflict resolution when the + resolution results in a package that is compatible with all requested + dependencies. + +# Version 1.2.87 - Aug 23, 2018 +## Bug Fixes +* Fixed Android Resolver "Processing AARs" dialog getting stuck in Unity 5.6. + +# Version 1.2.86 - Aug 22, 2018 +## Bug Fixes +* Fixed Android Resolver exception in OnPostProcessScene() when the Android + platform isn't selected. + +# Version 1.2.85 - Aug 17, 2018 +## Changes +* Added support for synchronous resolution in the Android Resolver. + PlayServicesResolver.ResolveSync() now performs resolution synchronously. +* Auto-resolution in the Android Resolver now results in synchronous resolution + of Android dependencies before the Android application build starts via + UnityEditor.Callbacks.PostProcessSceneAttribute. + +# Version 1.2.84 - Aug 16, 2018 +## Bug Fixes +* Fixed Android Resolver crash when the AndroidResolverDependencies.xml + file can't be written. +* Reduced log spam when a conflicting Android library is pinned to a + specific version. + +# Version 1.2.83 - Aug 15, 2018 +## Bug Fixes +* Fixed Android Resolver failures due to an in-accessible AAR / JAR explode + cache file. If the cache can't be read / written the resolver now continues + with reduced performance following recompilation / DLL reloads. +* Fixed incorrect version number in plugin manifest on install. + This was a minor issue since the version handler rewrote the metadata + after installation. + +# Version 1.2.82 - Aug 14, 2018 +## Changed +* Added support for alphanumeric versions in the Android Resolver. + +## Bug Fixes +* Fixed Android Resolver selection of latest duplicated library. +* Fixed Android Resolver conflict resolution when version locked and non-version + locked dependencies are specified. +* Fixed Android Resolver conflict resolution when non-existent artifacts are + referenced. + +# Version 1.2.81 - Aug 9, 2018 +## Bug Fixes +* Fixed editor error that would occur when when + `PlayerSettings.Android.targetArchitectures` was set to + `AndroidArchitecture.All`. + +# Version 1.2.80 - Jul 24, 2018 +## Bug Fixes +* Fixed project level settings incorrectly falling back to system wide settings + when default property values were set. + +# Version 1.2.79 - Jul 23, 2018 +## Bug Fixes +* Fixed AndroidManifest.xml patching on Android Resolver load in Unity 2018.x. + +# Version 1.2.78 - Jul 19, 2018 +## Changed +* Added support for overriding conflicting dependencies. + +# Version 1.2.77 - Jul 19, 2018 +## Changed +* Android Resolver now supports Unity's 2018 ABI filter (i.e arm64-v8a). +* Reduced Android Resolver build option polling frequency. +* Disabled Android Resolver auto-resolution in batch mode. Users now need + to explicitly kick off resolution through the API. +* All Android Resolver and Version Handler dialogs are now disabled in batch + mode. +* Verbose logging for all plugins is now enabled by default in batch mode. +* Version Handler bootstrapper has been improved to no longer call + UpdateComplete multiple times. However, since Unity can still reload the + app domain after plugins have been enabled, users still need to store their + plugin state to persistent storage to handle reloads. + +## Bug Fixes +* Android Resolver no longer incorrectly adds MANIFEST.MF files to AARs. +* Android Resolver auto-resolution jobs are now unscheduled when an explicit + resolve job is started. + +# Version 1.2.76 - Jul 16, 2018 +## Bug Fixes +* Fixed variable replacement in AndroidManifest.xml files in the Android + Resolver. + Version 1.2.75 introduced a regression which caused all variable replacement + to replace the *entire* property value rather than the component of the + property that referenced a variable. For example, + given "applicationId = com.my.app", "${applicationId}.foo" would be + incorrectly expanded as "com.my.app" rather than "com.my.app.foo". This + resulted in numerous issues for Android builds where content provider + initialization would fail and services may not start. + +## Changed +* Gradle prebuild experimental feature has been removed from the Android + Resolver. The feature has been broken for some time and added around 8MB + to the plugin size. +* Added better support for execution of plugin components in batch mode. + In batch mode UnityEditor.update is sometimes never called - like when a + single method is executed - so the new job scheduler will execute all jobs + synchronously from the main thread. + +# Version 1.2.75 - Jun 20, 2018 +## New Features +* Android Resolver now monitors the Android SDK path when + auto-resolution is enabled and triggers resolution when the path is + modified. + +## Changed +* Android auto-resolution is now delayed by 3 seconds when the following build + settings are changed: + - Target ABI. + - Gradle build vs. internal build. + - Project export. +* Added a progress bar display when AARs are being processed during Android + resolution. + +## Bug Fixes +* Fixed incorrect Android package version selection when a mix of + version-locked and non-version-locked packages are specified. +* Fixed non-deterministic Android package version selection to select + the highest version of a specified package rather than the last + package specification passed to the Gradle resolution script. + +# Version 1.2.74 - Jun 19, 2018 +## New Features +* Added workaround for broken AndroidManifest.xml variable replacement in + Unity 2018.x. By default ${applicationId} variables will be replaced by + the bundle ID in the Plugins/Android/AndroidManifest.xml file. The + behavior can be disabled via the Android Resolver settings menu. + +# Version 1.2.73 - May 30, 2018 +## Bug Fixes +* Fixed spurious warning message about missing Android plugins directory on + Windows. + +# Version 1.2.72 - May 23, 2018 +## Bug Fixes +* Fixed spurious warning message about missing Android plugins directory. + +# Version 1.2.71 - May 10, 2018 +## Bug Fixes +* Fixed resolution of Android dependencies when the `Assets/Plugins/Android` + directory is named in a different case e.g `Assets/plugins/Android`. + +# Version 1.2.70 - May 7, 2018 +## Bug Fixes +* Fixed bitcode flag being ignored for iOS pods. + +# Version 1.2.69 - May 7, 2018 +## Bug Fixes +* Fixed escaping of local repository paths in Android Resolver. + +# Version 1.2.68 - May 3, 2018 +## Changes +* Added support for granular builds of Google Play Services. + +# Version 1.2.67 - May 1, 2018 +## Changes +* Improved support for iOS source-only pods in Unity 5.5 and below. + +# Version 1.2.66 - April 27, 2018 +## Bug Fixes +* Fixed Version Handler renaming of Linux libraries with hyphens in filenames. + Previously, libraries named Foo-1.2.3.so were not being renamed to + libFoo-1.2.3.so on Linux which could break native library loading on some + versions of Unity. + +# Version 1.2.65 - April 26, 2018 +## Bug Fixes +* Fix CocoaPods casing in logs and comments. + +# Version 1.2.64 - Mar 16, 2018 +## Bug Fixes +* Fixed bug in download_artifacts.gradle (used by Android Resolver) which + reported a failure if required artifacts already exist. + +# Version 1.2.63 - Mar 15, 2018 +## Bug Fixes +* Fixed iOS Resolver include search paths taking precedence over system headers + when using project level resolution. +* Fixed iOS Resolver includes relative to library root, when using project level + resolution. + +# Version 1.2.62 - Mar 12, 2018 +## Changes +* Improved error reporting when a file can't be moved to trash by the + Version Handler. +## Bug Fixes +* Fixed Android Resolver throwing NullReferenceException when the Android SDK + path isn't set. +* Fixed Version Handler renaming files with underscores if the + "Rename to Canonical Filenames" setting is enabled. + +# Version 1.2.61 - Jan 22, 2018 +## Bug Fixes +* Fixed Android Resolver reporting non-existent conflicting dependencies when + Gradle build system is enabled. + +# Version 1.2.60 - Jan 12, 2018 +## Changes +* Added support for Maven / Ivy version specifications for Android packages. +* Added support for Android SNAPSHOT packages. + +## Bug Fixes +* Fixed Openjdk version check. +* Fixed non-deterministic Android package resolution when two packages contain + an artifact with the same name. + +# Version 1.2.59 - Oct 19, 2017 +## Bug Fixes +* Fixed execution of Android Gradle resolution script when it's located + in a path with whitespace. + +# Version 1.2.58 - Oct 19, 2017 +## Changes +* Removed legacy resolution method from Android Resolver. + It is now only possible to use the Gradle or Gradle prebuild resolution + methods. + +# Version 1.2.57 - Oct 18, 2017 +## Bug Fixes +* Updated Gradle wrapper to 4.2.1 to fix issues using Gradle with the + latest Openjdk. +* Android Gradle resolution now also uses gradle.properties to pass + parameters to Gradle in an attempt to workaround problems with + command line argument parsing on Windows 10. + +# Version 1.2.56 - Oct 12, 2017 +## Bug Fixes +* Fixed Gradle artifact download with non-version locked artifacts. +* Changed iOS resolver to only load dependencies at build time. + +# Version 1.2.55 - Oct 4, 2017 +## Bug Fixes +* Force Android Resolution when the "Install Android Packages" setting changes. + +# Version 1.2.54 - Oct 4, 2017 +## Bug Fixes +* Fixed execution of command line tools on Windows when the path to the tool + contains a single quote (apostrophe). In this case we fallback to executing + the tool via the system shell. + +# Version 1.2.53 - Oct 2, 2017 +## New Features +* Changed Android Resolver "resolution complete" dialog so that it now displays + failures. +* Android Resolver now detects conflicting libraries that it does not manage + warning the user if they're newer than the managed libraries and prompting + the user to clean them up if they're older or at the same version. + +## Bug Fixes +* Improved Android Resolver auto-resolution speed. +* Fixed bug in the Gradle Android Resolver which would result in resolution + succeeding when some dependencies are not found. + +# Version 1.2.52 - Sep 25, 2017 +## New Features +* Changed Android Resolver's Gradle resolution to resolve conflicting + dependencies across Google Play services and Android Support library packages. + +# Version 1.2.51 - Sep 20, 2017 +## Changes +* Changed iOS Resolver to execute the CocoaPods "pod" command via the shell + by default. Some developers customize their shell environment to use + custom ssh certs to access internal git repositories that host pods so + executing "pod" via the shell will work for these scenarios. + The drawback of executing "pod" via the shell could potentially cause + users problems if they break their shell environment. Though users who + customize their shell environments will be able to resolve these issues. + +# Version 1.2.50 - Sep 18, 2017 +## New Features +* Added option to disable the Gradle daemon in the Android Resolver. + This daemon is now disabled by default as some users are getting into a state + where multiple daemon instances are being spawned when changing dependencies + which eventually results in Android resolution failing until all daemon + processes are manually killed. + +## Bug Fixes +* Android resolution is now always executed if the user declines the update + of their Android SDK. This ensure users can continue to use out of date + Android SDK packages if they desire. + +# Version 1.2.49 - Sep 18, 2017 +## Bug Fixes +* Removed modulemap parsing in iOS Resolver. + The framework *.modulemap did not need to be parsed by the iOS Resolver + when injecting Cocoapods into a Xcode project. Simply adding a modular + framework to a Xcode project results in Xcode's Clang parsing the associated + modulemap and injecting any compile and link flags into the build process. + +# Version 1.2.48 - Sep 12, 2017 +## New Features +* Changed settings to be per-project by default. + +## Bug Fixes +* Added Google maven repository to fix GradlePrebuild resolution with Google + components. +* Fixed Android Resolution failure with spaces in paths. + +# Version 1.2.47 - Aug 29, 2017 +## New Features +* Android and iOS dependencies can now be specified using *Dependencies.xml + files. This is now the preferred method for registering dependencies, + we may remove the API for dependency addition in future. +* Added "Reset to Defaults" button to each settings dialog to restore default + settings. +* Android Resolver now validates the configured JDK is new enough to build + recently released Android libraries. +## Bug Fixes +* Fixed a bug that caused dependencies with the "LATEST" version specification + to be ignored when using the Gradle mode of the Android Resolver. +* Fixed a race condition when running Android Resolution. +* Fixed Android Resolver logging if a PlayServicesSupport instance is created + with no logging enabled before the Android Resolver is initialized. +* Fixed iOS resolver dialog in Unity 4. +* Fixed iOS Cocoapod Xcode project integration in Unity 4. + +# Version 1.2.46 - Aug 22, 2017 +## Bug Fixes +* GradlePrebuild Android resolver on Windows now correctly locates dependent + data files. + +# Version 1.2.45 - Aug 22, 2017 +## Bug Fixes +* Improved Android package auto-resolution and fixed clean up of stale + dependencies when using Gradle dependency resolution. + +# Version 1.2.44 - Aug 21, 2017 +## Bug Fixes +* Enabled autoresolution for Gradle Prebuild. +* Made the command line dialog windows have selectable text. +* Fixed incorrect "Android Settings" dialog disabled groups. +* Updated PlayServicesResolver android platform detection to use the package + manager instead of the 'android' tool. +* UnityCompat reflection methods 'GetAndroidPlatform' and + 'GetAndroidBuildToolsVersion' are now Obsolete due to dependence on the + obsolete 'android' build tool. + +# Version 1.2.43 - Aug 18, 2017 +## Bug Fixes +* Fixed Gradle resolution in the Android Resolver when running + PlayServicesResolver.Resolve() in parallel or spawning multiple + resolutions before the previous resolve completed. + +# Version 1.2.42 - Aug 17, 2017 +## Bug Fixes +* Fixed Xcode project level settings not being applied by IOS Resolver when + Xcode project pod integration is enabled. + +# Version 1.2.41 - Aug 15, 2017 +## Bug Fixes +* IOS Resolver's Xcode workspace pod integration is now disabled when Unity + Cloud Build is detected. Unity Cloud Build does not follow the same build + process as the Unity editor and fails to open the generated xcworkspace at + this time. + +# Version 1.2.40 - Aug 15, 2017 +## Bug Fixes +* Moved Android Resolver Gradle Prebuild scripts into Google.JarResolver.dll. + They are now extracted from the DLL when required. +* AARs / JARs are now cleaned up when switching the Android resolution + strategy. + +# Version 1.2.39 - Aug 10, 2017 +## New Features +* Android Resolver now supports resolution with Gradle. This enables support + for non-local artifacts. +## Bug Fixes +* Android Resolver's Gradle Prebuild now uses Android build tools to determine + the Android platform tools version rather than relying upon internal Unity + APIs. +* Android Resolver's Gradle Prebuild now correctly strips binaries that are + not required for the target ABI. + +# Version 1.2.38 - Aug 7, 2017 +## Bug Fixes +* Fixed an issue in VersionHandler where disabled targets are ignored if + the "Any Platform" flag is set on a plugin DLL. + +# Version 1.2.37 - Aug 3, 2017 +## New Features +* Exposed GooglePlayServices.PlayServicesResolver.Resolve() so that it's + possible for a script to be notified when AAR / Jar resolution is complete. + This makes it easier to setup a project to build from the command line. + +# Version 1.2.36 - Aug 3, 2017 +## New Features +* VersionHandler.UpdateCompleteMethods allows a user to provide a list of + methods to be called when VersionHandlerImpl has completed an update. + This makes it easier to import a plugin and wait for VersionHandler to + execute prior executing a build. + +# Version 1.2.35 - Jul 28, 2017 +## New Features +* VersionHandler will now rename Linux libraries so they can target Unity + versions that require different file naming. Libraries need to be labelled + gvh_linuxlibname-${basename} in order to be considered for renaming. + e.g gvh\_linuxlibname-MyLib will be named MyLib.so in Unity 5.5 and below and + libMyLib.so in Unity 5.6 and above. + +# Version 1.2.34 - Jul 28, 2017 +## Bug Fixes +* Made VersionHandler bootstrap module more robust when calling static + methods before the implementation DLL is loaded. + +# Version 1.2.33 - Jul 27, 2017 +## New Features +* Added a bootstrap module for VersionHandler so the implementation + of the VersionHandler module can be versioned without resulting in + a compile error when imported at different versions across multiple + plugins. + +# Version 1.2.32 - Jul 20, 2017 +## New Features +* Added support for build target selection based upon .NET framework + version in the VersionHandler. + When applying either gvh\_dotnet-3.5 or gvh\_dotnet-4.5 labels to + assets, the VersionHandler will only enable the asset for the + specified set of build targets when the matching .NET framework version + is selected in Unity 2017's project settings. This allows assets + to be provided in a plugin that need to differ based upon .NET version. + +# Version 1.2.31 - Jul 5, 2017 +## Bug Fixes +* Force expansion of AARs with native components when using Unity 2017 + with the internal build system. In contrast to Unity 5.x, Unity 2017's + internal build system does not include native libraries included in AARs. + Forcing expansion of AARs with native components generates an + Ant / Eclipse project for each AAR which is correctly included by Unity + 2017's internal build system. + +# Version 1.2.30 - Jul 5, 2017 +## Bug Fixes +* Fixed Cocoapods being installed when the build target isn't iOS. +* Added support for malformed AARs with missing classes.jar. + +# Version 1.2.29 - Jun 16, 2017 +## New Features +* Added support for the Android sdkmanager tool. + +# Version 1.2.28 - Jun 8, 2017 +## Bug Fixes +* Fixed non-shell command line execution (regression from + Cocoapod installation patch). + +# Version 1.2.27 - Jun 7, 2017 +## Bug Fixes +* Added support for stdout / stderr redirection when executing + commands in shell mode. + This fixes CocoaPod tool installation when shell mode is + enabled. +* Fixed incremental builds when additional sources are specified + in the Podfile. + +# Version 1.2.26 - Jun 7, 2017 +## Bug Fixes +* Fixed a crash when importing Version Handler into Unity 4.7.x. + +# Version 1.2.25 - Jun 7, 2017 +## Bug Fixes +* Fixed an issue in the Jar Resolver which incorrectly notified + event handlers of bundle ID changes when the currently selected + (not active) build target changed in Unity 5.6 and above. + +# Version 1.2.24 - Jun 6, 2017 +## New Features +* Added option to control file renaming in Version Handler settings. + Disabling file renaming (default option) significantly increases + the speed of file version management operations with the downside + that any files that are referenced directly by canonical filename + rather than asset ID will no longer be valid. +* Improved logging in the Version Handler. +## Bug Fixes +* Fixed an issue in the Version Handler which caused it to not + re-enable plugins when re-importing a custom package with disabled + version managed files. + +# Version 1.2.23 - May 26, 2017 +## Bug Fixes +* Fixed a bug with gradle prebuild resolver on windows. + +# Version 1.2.22 - May 19, 2017 +## Bug Fixes +* Fixed a bug in the iOS resolver with incremental builds. +* Fixed misdetection of Cocoapods support with Unity beta 5.6. + +# Version 1.2.21 - May 8, 2017 +## Bug Fixes +* Fix for https://github.com/googlesamples/unity-jar-resolver/issues/48 + Android dependency version number parsing when "-alpha" (etc.) are + included in dependency (AAR / JAR) versions. + +# Version 1.2.20 - May 8, 2017 +## Bug Fixes +* Attempted to fix + https://github.com/googlesamples/unity-jar-resolver/issues/48 + where a NullReferenceException could occur if a target file does not + have a valid version string. + +# Version 1.2.19 - May 4, 2017 +## Bug Fixes +* Fixed Jar Resolver exploding and deleting AAR files it isn't managing. + +# Version 1.2.18 - May 4, 2017 +## New Features +* Added support for preserving Unity pods such as when GVR is enabled. + +# Version 1.2.17 - Apr 20, 2017 +## Bug Fixes +* Fixed auto-resolution when an Android application ID is modified. + +# Version 1.2.16 - Apr 17, 2017 +## Bug Fixes +* Fixed Unity version number parsing on machines with a locale that uses + "," for decimal points. +* Fixed null reference exception if JDK path isn't set. + +# Version 1.2.15 - Mar 17, 2017 +## New Features +* Added warning when the Jar Resolver's background resolution is disabled. +## Bug Fixes +* Fixed support of AARs with native libraries when using Gradle. +* Fixed extra repository paths when resolving dependencies. + +# Version 1.2.14 - Mar 7, 2017 +## New Features +* Added experimental Android resolution using Gradle. + This alternative resolver supports proguard stripping with Unity's + internal build system. +* Added Android support for single ABI builds when using AARs include + native libraries. +* Disabled Android resolution on changes to all .cs and .js files. + File patterns that are monitored for auto-resolution can be added + using PlayServicesResolver.AddAutoResolutionFilePatterns(). +* Added tracking of resolved AARs and JARs so they can be cleaned up + if they're no longer referenced by a project. +* Added persistence of AAR / JAR version replacement for each Unity + session. +* Added settings dialog to the iOS resolver. +* Integrated Cocoapod tool installation in the iOS resolver. +* Added option to run pod tool via the shell. +## Bug Fixes +* Fixed build of some source Cocoapods (e.g Protobuf). +* VersionHandler no longer prompts to delete obsolete manifests. +* iOS resolver handles Cocoapod installation when using Ruby < 2.2.2. +* Added workaround for package version selection when including + Google Play Services on Android. +* Fixed support for pods that reference static libraries. +* Fixed support for resource-only pods. + +# Version 1.2.12 - Feb 14, 2017 +## Bug Fixes +* Fixed re-explosion of AARs when the bundle ID is modified. + +# Version 1.2.11 - Jan 30, 2017 +## New Features +* Added support for Android Studio builds. +* Added support for native (C/C++) shared libraries in AARs. + +# Version 1.2.10 - Jan 11, 2017 +## Bug Fixes +* Fixed SDK manager path retrieval. +* Also, report stderr when it's not possible to run the "pod" tool. +* Handle exceptions thrown by Unity.Cecil on asset rename +* Fixed IOSResolver to handle PlayerSettings.iOS.targetOSVersionString + +# Version 1.2.9 - Dec 7, 2016 +## Bug Fixes +* Improved error reporting when "pod repo update" fails. +* Added detection of xml format xcode projects generated by old Cocoapods + installations. + +# Version 1.2.8 - Dec 6, 2016 +## Bug Fixes +* Increased speed of JarResolver resolution. +* Fixed JarResolver caches getting out of sync with requested dependencies + by removing the caches. +* Fixed JarResolver explode cache always being rewritten even when no + dependencies change. + +# Version 1.2.7 - Dec 2, 2016 +## Bug Fixes +* Fixed VersionHandler build errors with Unity 5.5, due to the constantly + changing BuildTarget enum. +* Added support for Unity configured JDK Path rather than requiring + JAVA_HOME to be set in the Jar Resolver. + +# Version 1.2.6 - Nov 15, 2016 +## Bug Fixes +* Fixed IOSResolver errors when iOS support is not installed. +* Added fallback to "pod" executable search which queries the Ruby Gems + package manager for the binary install location. + +# Version 1.2.5 - Nov 3, 2016 +## Bug Fixes +* Added crude support for source only Cocoapods to the IOSResolver. + +# Version 1.2.4 - Oct 27, 2016 +## Bug Fixes +* Automated resolution of out of date pod repositories. + +# Version 1.2.3 - Oct 25, 2016 +## Bug Fixes +* Fixed exception when reporting conflicting dependencies. + +# Version 1.2.2 - Oct 17, 2016 +## Bug Fixes +* Fixed issue working with Unity 5.5 +* Fixed issue with PlayServicesResolver corrupting other iOS dependencies. +* Updated build script to use Unity distributed tools for building. + +# Version 1.2.1 - Jul 25, 2016 +## Bug Fixes +* Removed 1.2 Resolver and hardcoded whitelist of AARs to expand. +* Improved error reporting when the "jar" executable can't be found. +* Removed the need to set JAVA_HOME if "jar" is in the user's path. +* Fixed spurious copying of partially matching AARs. +* Changed resolver to only copy / expand when source AARs change. +* Auto-resolution of dependencies is now performed when the Android + build target is selected. + +## New Features +* Expand AARs that contain manifests with variable expansion like + ${applicationId}. +* Added optional logging in the JarResolverLib module. +* Integration with the Android SDK manager for dependencies that + declare required Android SDK packages. + +# Version 1.2.0 - May 11 2016 +## Bug Fixes +* Handles resolving dependencies when the artifacts are split across 2 repos. +* #4 Misdetecting version for versions like 1.2-alpha. These are now string + compared if alphanumeric +* Removed resolver creation via reflection since it did not work all the time. + Now a resolver needs to be loaded externally (which is existing behavior). + +## New Features +* Expose PlayServicesResolver properties to allow for script access. +* Explodes firebase-common and firebase-measurement aar files to support + ${applicationId} substitution. + +# Version 1.1.1 - 25 Feb 2016 +## Bug Fixes +* #1 Spaces in project path not handled when exploding Aar file. +* #2 Script compilation error: TypeLoadException. + +# Version 1.1.0 - 5 Feb 2016 +## New Features +* Adds friendly alert when JAVA_HOME is not set on Windows platforms. +* Adds flag for disabling background resolution. +* Expands play-services-measurement and replaces ${applicationId} with the + bundle Id. + + ## Bug Fixes +* Fixes infinite loop of resolution triggered by resolution. diff --git a/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta new file mode 100644 index 0000000..f074239 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3d9f779dd5e74fcc9e05e0c450716999 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll new file mode 100755 index 0000000..51d6b7b Binary files /dev/null and b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta similarity index 79% rename from Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta rename to Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index e1588c9..55e0fba 100644 --- a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta +++ b/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: bb6999c8a5ce4ba99688ec579babe5b7 +guid: 2010dfbbc3ff4f499e6892f6681a37df labels: - gvh -- gvh_targets-editor -- gvh_version-1.2.130.0 +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll +- gvhp_targets-editor PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/ExternalDependencyManager/Editor/LICENSE b/Assets/ExternalDependencyManager/Editor/LICENSE new file mode 100755 index 0000000..6258cc4 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/LICENSE @@ -0,0 +1,245 @@ +Copyright (C) 2014 Google Inc. + + 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. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 package uses MiniJSON + +Copyright (c) 2013 Calvin Rien + +Based on the JSON parser by Patrick van Bergen +http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html + +Simplified it so that it doesn't throw exceptions +and can be used in Unity iPhone with maximum code stripping. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/Assets/ExternalDependencyManager/Editor/LICENSE.meta new file mode 100644 index 0000000..7217b3a --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b5a2636858c0483bab69644a94d03b42 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/README.md b/Assets/ExternalDependencyManager/Editor/README.md new file mode 100755 index 0000000..b49cf1e --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/README.md @@ -0,0 +1,768 @@ +External Dependency Manager for Unity +======== + +# Overview + +The External Dependency Manager for Unity (EDM4U) +(formerly Play Services Resolver / Jar Resolver) is intended to be used by any +Unity plugin that requires: + + * Android specific libraries (e.g + [AARs](https://developer.android.com/studio/projects/android-library.html)). + * iOS [CocoaPods](https://cocoapods.org/). + * Version management of transitive dependencies. + * Management of Package Manager (PM) Registries. + +Updated releases are available on +[GitHub](https://github.com/googlesamples/unity-jar-resolver) + +# Background + +Many Unity plugins have dependencies upon Android specific libraries, iOS +CocoaPods, and sometimes have transitive dependencies upon other Unity plugins. +This causes the following problems: + + * Integrating platform specific (e.g Android and iOS) libraries within a + 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 + 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 + plugin. In an effort to resolve conflicts, the developer will very likely + attempt to resolve problems by deleting random files in your plugin, + report bugs when that doesn't work and finally give up. + +EDM provides solutions for each of these problems. + +## Android Dependency Management + +The *Android Resolver* component of this plugin will download and integrate +Android library dependencies and handle any conflicts between plugins that share +the same dependencies. + +Without the Android Resolver, typically Unity plugins bundle their AAR and +JAR dependencies, e.g. a Unity plugin `SomePlugin` that requires the Google +Play Games Android library would redistribute the library and its transitive +dependencies in the folder `SomePlugin/Android/`. When a user imports +`SomeOtherPlugin` that includes the same libraries (potentially at different +versions) in `SomeOtherPlugin/Android/`, the developer using `SomePlugin` and +`SomeOtherPlugin` will see an error when building for Android that can be hard +to interpret. + +Using the Android Resolver to manage Android library dependencies: + + * Solves Android library conflicts between plugins. + * Handles all of the various processing steps required to use Android + libraries (AARs, JARs) in Unity 4.x and above projects. Almost all + versions of Unity have - at best - partial support for AARs. + * (Experimental) Supports minification of included Java components without + exporting a project. + +## iOS Dependency Management + +The *iOS Resolver* component of this plugin integrates with +[CocoaPods](https://cocoapods.org/) to download and integrate iOS libraries +and frameworks into the Xcode project Unity generates when building for iOS. +Using CocoaPods allows multiple plugins to utilize shared components without +forcing developers to fix either duplicate or incompatible versions of +libraries included through multiple Unity plugins in their project. + +## Package Manager Registry Setup + +The [Package Manager](https://docs.unity3d.com/Manual/Packages.html) +(PM) makes use of [NPM](https://www.npmjs.com/) registry servers for package +hosting and provides ways to discover, install, upgrade and uninstall packages. +This makes it easier for developers to manage plugins within their projects. + +However, installing additional package registries requires a few manual steps +that can potentially be error prone. The *Package Manager Resolver* +component of this plugin integrates with +[PM](https://docs.unity3d.com/Manual/Packages.html) to provide a way to +auto-install PM package registries when a `.unitypackage` is installed which +allows plugin maintainers to ship a `.unitypackage` that can provide access +to their own PM registry server to make it easier for developers to +manage their plugins. + +## Unity Plugin Version Management + +Finally, the *Version Handler* component of this plugin simplifies the process +of managing transitive dependencies of Unity plugins and each plugin's upgrade +process. + +For example, without the Version Handler plugin, if: + + * Unity plugin `SomePlugin` includes `EDM4U` plugin at + version 1.1. + * Unity plugin `SomeOtherPlugin` includes `EDM4U` + plugin at version 1.2. + +The version of `EDM4U` included in the developer's project depends upon the +order the developer imports `SomePlugin` or `SomeOtherPlugin`. + +This results in: + + * `EDM4U` at version 1.2, if `SomePlugin` is imported then `SomeOtherPlugin` + is imported. + * `EDM4U` at version 1.1, if `SomeOtherPlugin` is imported then + `SomePlugin` is imported. + +The Version Handler solves the problem of managing transitive dependencies by: + + * Specifying a set of packaging requirements that enable a plugin at + different versions to be imported into a Unity project. + * Providing activation logic that selects the latest version of a plugin + within a project. + +When using the Version Handler to manage `EDM4U` included in `SomePlugin` and +`SomeOtherPlugin`, from the prior example, version 1.2 will always be the +version activated in a developer's Unity project. + +Plugin creators are encouraged to adopt this library to ease integration for +their customers. For more information about integrating EDM4U +into your own plugin, see the [Plugin Redistribution](#plugin-redistribution) +section of this document. + +# Analytics + +The External Dependency Manager for Unity plugin by default logs usage to Google +Analytics. The purpose of the logging is to quantitatively measure the usage of +functionality, to gather reports on integration failures and to inform future +improvements to the developer experience of the External Dependency Manager +plugin. Note that the analytics collected are limited to the scope of the EDM4U +plugin’s usage. + +For details of what is logged, please refer to the usage of +`EditorMeasurement.Report()` in the source code. + +# Requirements + +The *Android Resolver* and *iOS Resolver* components of the plugin only work +with Unity version 4.6.8 or higher. + +The *Version Handler* component only works with Unity 5.x or higher as it +depends upon the `PluginImporter` UnityEditor API. + +The *Package Manager Resolver* component only works with +Unity 2018.4 or above, when +[scoped registry](https://docs.unity3d.com/Manual/upm-scoped.html) +support was added to the Package Manager. + +# Getting Started + +Before you import EDM4U into your plugin project, you first +need to consider whether you intend to *redistribute* `EDM4U` +along with your own plugin. + +## Plugin Redistribution + +If you're a plugin maintainer, redistributing `EDM4U` inside your own plugin +will ease the integration process for your users, by resolving dependency +conflicts between your plugin and other plugins in a user's project. + +If you wish to redistribute `EDM4U` inside your plugin, +you **must** follow these steps when importing the +`external-dependency-manager-*.unitypackage`, and when exporting your own plugin +package: + + 1. Import the `external-dependency-manager-*.unitypackage` into your plugin + project by + [running Unity from the command line](https://docs.unity3d.com/Manual/CommandLineArguments.html), ensuring that + you add the `-gvh_disable` option. + 1. Export your plugin by [running Unity from the command line](https://docs.unity3d.com/Manual/CommandLineArguments.html), ensuring that + you: + - Include the contents of the `Assets/PlayServicesResolver` and + `Assets/ExternalDependencyManager` directory. + - Add the `-gvh_disable` option. + +You **must** specify the `-gvh_disable` option in order for the Version +Handler to work correctly! + +For example, the following command will import the +`external-dependency-manager-1.2.46.0.unitypackage` into the project +`MyPluginProject` and export the entire Assets folder to +`MyPlugin.unitypackage`: + +``` +Unity -gvh_disable \ + -batchmode \ + -importPackage external-dependency-manager-1.2.46.0.unitypackage \ + -projectPath MyPluginProject \ + -exportPackage Assets MyPlugin.unitypackage \ + -quit +``` + +### Background + +The *Version Handler* component relies upon deferring the load of editor DLLs +so that it can run first and determine the latest version of a plugin component +to activate. The build of `EDM4U` plugin has Unity asset metadata that is +configured so that the editor components are not initially enabled when it's +imported into a Unity project. To maintain this configuration when importing +the `external-dependency-manager.unitypackage` into a Unity plugin project, you +*must* specify the command line option `-gvh_disable` which will prevent the +Version Handler component from running and changing the Unity asset metadata. + +# Android Resolver Usage + +The Android Resolver copies specified dependencies from local or remote Maven +repositories into the Unity project when a user selects Android as the build +target in the Unity editor. + + 1. Add the `external-dependency-manager-*.unitypackage` to your plugin + project (assuming you are developing a plugin). If you are redistributing + EDM4U with your plugin, you **must** follow the + import steps in the [Getting Started](#getting-started) section! + + 2. Copy and rename the + [SampleDependencies.xml](https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/SampleDependencies.xml) + file into your plugin and add the dependencies your plugin requires. + + The XML file just needs to be under an `Editor` directory and match the + name `*Dependencies.xml`. For example, + `MyPlugin/Editor/MyPluginDependencies.xml`. + + 3. Follow the steps in the [Getting Started](#getting-started) + section when you are exporting your plugin package. + +For example, to add the Google Play Games library +(`com.google.android.gms:play-services-games` package) at version `9.8.0` to +the set of a plugin's Android dependencies: + +``` + + + + + extra-google-m2repository + + + + +``` + +The version specification (last component) supports: + + * Specific versions e.g `9.8.0` + * Partial matches e.g `9.8.+` would match 9.8.0, 9.8.1 etc. choosing the most + recent version. + * Latest version using `LATEST` or `+`. We do *not* recommend using this + unless you're 100% sure the library you depend upon will not break your + Unity plugin in future. + +The above example specifies the dependency as a component of the Android SDK +manager such that the Android SDK manager will be executed to install the +package if it's not found. If your Android dependency is located on Maven +central it's possible to specify the package simply using the `androidPackage` +element: + +``` + + + + + +``` + +## Auto-resolution + +By default the Android Resolver automatically monitors the dependencies you have +specified and the `Plugins/Android` folder of your Unity project. The +resolution process runs when the specified dependencies are not present in your +project. + +The *auto-resolution* process can be disabled via the +`Assets > External Dependency Manager > Android Resolver > Settings` menu. + +Manual resolution can be performed using the following menu options: + + * `Assets > External Dependency Manager > Android Resolver > Resolve` + * `Assets > External Dependency Manager > Android Resolver > Force Resolve` + +## Deleting libraries + +Resolved packages are tracked via asset labels by the Android Resolver. +They can easily be deleted using the +`Assets > External Dependency Manager > Android Resolver > Delete Resolved Libraries` +menu item. + +## Android Manifest Variable Processing + +Some AAR files (for example play-services-measurement) contain variables that +are processed by the Android Gradle plugin. Unfortunately, Unity does not +perform the same processing when using Unity's Internal Build System, so the +Android Resolver plugin handles known cases of this variable substitution +by exploding the AAR into a folder and replacing `${applicationId}` with the +`bundleID`. + +Disabling AAR explosion and therefore Android manifest processing can be done +via the `Assets > External Dependency Manager > Android Resolver > Settings` +menu. You may want to disable explosion of AARs if you're exporting a project +to be built with Gradle / Android Studio. + +## ABI Stripping + +Some AAR files contain native libraries (.so files) for each ABI supported +by Android. Unfortunately, when targeting a single ABI (e.g x86), Unity does +not strip native libraries for unused ABIs. To strip unused ABIs, the Android +Resolver plugin explodes an AAR into a folder and removes unused ABIs to +reduce the built APK size. Furthermore, if native libraries are not stripped +from an APK (e.g you have a mix of Unity's x86 library and some armeabi-v7a +libraries) Android may attempt to load the wrong library for the current +runtime ABI completely breaking your plugin when targeting some architectures. + +AAR explosion and therefore ABI stripping can be disabled via the +`Assets > External Dependency Manager > Android Resolver > Settings` menu. +You may want to disable explosion of AARs if you're exporting a project to be +built with Gradle / Android Studio. + +## Resolution Strategies + +By default the Android Resolver will use Gradle to download dependencies prior +to integrating them into a Unity project. This works with Unity's internal +build system and Gradle / Android Studio project export. + +It's possible to change the resolution strategy via the +`Assets > External Dependency Manager > Android Resolver > Settings` menu. + +### Download Artifacts with Gradle + +Using the default resolution strategy, the Android resolver executes the +following operations: + + - Remove the result of previous Android resolutions. + e.g Delete all files and directories labeled with "gpsr" under + `Plugins/Android` from the project. + - Collect the set of Android dependencies (libraries) specified by a + project's `*Dependencies.xml` files. + - Run `download_artifacts.gradle` with Gradle to resolve conflicts and, + if successful, download the set of resolved Android libraries (AARs, JARs). + - Process each AAR / JAR so that it can be used with the currently selected + Unity build system (e.g Internal vs. Gradle, Export vs. No Export). + This involves patching each reference to `applicationId` in the + AndroidManifest.xml with the project's bundle ID. This means resolution + must be run if the bundle ID is changed again. + - Move the processed AARs to `Plugins/Android` so they will be included when + Unity invokes the Android build. + +### Integrate into mainTemplate.gradle + +Unity 5.6 introduced support for customizing the `build.gradle` used to build +Unity projects with Gradle. When the *Patch mainTemplate.gradle* setting is +enabled, rather than downloading artifacts before the build, Android resolution +results in the execution of the following operations: + + - Remove the result of previous Android resolutions. + e.g Delete all files and directories labeled with "gpsr" under + `Plugins/Android` from the project and remove sections delimited with + `// Android Resolver * Start` and `// Android Resolver * End` lines. + - Collect the set of Android dependencies (libraries) specified by a + project's `*Dependencies.xml` files. + - Rename any `.srcaar` files in the build to `.aar` and exclude them from + being included directly by Unity in the Android build as + `mainTemplate.gradle` will be patched to include them instead from their + local maven repositories. + - Inject the required Gradle repositories into `mainTemplate.gradle` at the + line matching the pattern + `.*apply plugin: 'com\.android\.(application|library)'.*` or the section + starting at the line `// Android Resolver Repos Start`. + If you want to control the injection point in the file, the section + delimited by the lines `// Android Resolver Repos Start` and + `// Android Resolver Repos End` should be placed in the global scope + before the `dependencies` section. + - Inject the required Android dependencies (libraries) into + `mainTemplate.gradle` at the line matching the pattern `***DEPS***` or + the section starting at the line `// Android Resolver Dependencies Start`. + If you want to control the injection point in the file, the section + delimited by the lines `// Android Resolver Dependencies Start` and + `// Android Resolver Dependencies End` should be placed in the + `dependencies` section. + - Inject the packaging options logic, which excludes architecture specific + libraries based upon the selected build target, into `mainTemplate.gradle` + at the line matching the pattern `android +{` or the section starting at + the line `// Android Resolver Exclusions Start`. + If you want to control the injection point in the file, the section + delimited by the lines `// Android Resolver Exclusions Start` and + `// Android Resolver Exclusions End` should be placed in the global + scope before the `android` section. + +## Dependency Tracking + +The Android Resolver creates the +`ProjectSettings/AndroidResolverDependencies.xml` to quickly determine the set +of resolved dependencies in a project. This is used by the auto-resolution +process to only run the expensive resolution process when necessary. + +## Displaying Dependencies + +It's possible to display the set of dependencies the Android Resolver +would download and process in your project via the +`Assets > External Dependency Manager > Android Resolver > Display Libraries` +menu item. + +# iOS Resolver Usage + +The iOS resolver component of this plugin manages +[CocoaPods](https://cocoapods.org/). A CocoaPods `Podfile` is generated and +the `pod` tool is executed as a post build process step to add dependencies +to the Xcode project exported by Unity. + +Dependencies for iOS are added by referring to CocoaPods. + + 1. Add the `external-dependency-manager-*.unitypackage` to your plugin + project (assuming you are developing a plugin). If you are redistributing + EDM4U with your plugin, you **must** follow the + import steps in the [Getting Started](#getting-started) section! + + 2. Copy and rename the + [SampleDependencies.xml](https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/SampleDependencies.xml) + file into your plugin and add the dependencies your plugin requires. + + The XML file just needs to be under an `Editor` directory and match the + name `*Dependencies.xml`. For example, + `MyPlugin/Editor/MyPluginDependencies.xml`. + + 3. Follow the steps in the [Getting Started](#getting-started) + section when you are exporting your plugin package. + +For example, to add the AdMob pod, version 7.0 or greater with bitcode enabled: + +``` + + + + + +``` + +## Integration Strategies + +The `CocoaPods` are either: + * Downloaded and injected into the Xcode project file directly, rather than + creating a separate xcworkspace. We call this `Xcode project` integration. + * If the Unity version supports opening a xcworkspace file, the `pod` tool + is used as intended to generate a xcworkspace which references the + CocoaPods. We call this `Xcode workspace` integration. + +The resolution strategy can be changed via the +`Assets > External Dependency Manager > iOS Resolver > Settings` menu. + +### Appending text to generated Podfile +In order to modify the generated Podfile you can create a script like this: +``` +using System.IO; +public class PostProcessIOS : MonoBehaviour { +[PostProcessBuildAttribute(45)]//must be between 40 and 50 to ensure that it's not overriden by Podfile generation (40) and that it's added before "pod install" (50) +private static void PostProcessBuild_iOS(BuildTarget target, string buildPath) +{ + if (target == BuildTarget.iOS) + { + + using (StreamWriter sw = File.AppendText(buildPath + "/Podfile")) + { + //in this example I'm adding an app extension + sw.WriteLine("\ntarget 'NSExtension' do\n pod 'Firebase/Messaging', '6.6.0'\nend"); + } + } +} +``` + +# Package Manager Resolver Usage + +Adding registries to the +[Package Manager](https://docs.unity3d.com/Manual/Packages.html) +(PM) is a manual process. The Package Manager Resolver (PMR) component +of this plugin makes it easy for plugin maintainers to distribute new PM +registry servers and easy for plugin users to manage PM registry servers. + +## Adding Registries + + 1. Add the `external-dependency-manager-*.unitypackage` to your plugin + project (assuming you are developing a plugin). If you are redistributing + EDM4U with your plugin, you **must** follow the + import steps in the [Getting Started](#getting-started) section! + + 2. Copy and rename the + [SampleRegistries.xml](https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/sample/Assets/ExternalDependencyManager/Editor/SampleRegistries.xml) + file into your plugin and add the registries your plugin requires. + + The XML file just needs to be under an `Editor` directory and match the + name `*Registries.xml` or labeled with `gumpr_registries`. For example, + `MyPlugin/Editor/MyPluginRegistries.xml`. + + 3. Follow the steps in the [Getting Started](#getting-started) + section when you are exporting your plugin package. + +For example, to add a registry for plugins in the scope `com.coolstuff`: + +``` + + + + com.coolstuff + + + +``` + +When PMR is loaded it will prompt the developer to add the registry to their +project if it isn't already present in the `Packages/manifest.json` file. + +For more information, see Unity's documentation on +[scoped package registries](https://docs.unity3d.com/Manual/upm-scoped.html). + +## Managing Registries + +It's possible to add and remove registries that are specified via PMR +XML configuration files via the following menu options: + +* `Assets > External Dependency Manager > Package Manager Resolver > + Add Registries` will prompt the user with a window which allows them to + add registries discovered in the project to the Package Manager. +* `Assets > External Dependency Manager > Package Manager Resolver > + Remove Registries` will prompt the user with a window which allows them to + remove registries discovered in the project from the Package Manager. +* `Assets > External Dependency Manager > Package Manager Resolver > + Modify Registries` will prompt the user with a window which allows them to + add or remove registries discovered in the project. + +## Migration + +PMR can migrate Version Handler packages installed in the `Assets` folder +to PM packages. This requires the plugins to implement the following: + +* `.unitypackage` must include a Version Handler manifests that describes + the components of the plugin. If the plugin has no dependencies + the manifest would just include the files in the plugin. +* The PM package JSON provided by the registry must include a keyword + (in the `versions.VERSION.keyword` list) that maps the PM package + to a Version Handler package using the format + `vh-name:VERSION_HANDLER_MANIFEST_NAME` where `VERSION_HANDLER_MANIFEST_NAME` + is the name of the manifest defined in the `.unitypackage`. For + more information see the description of the `gvhp_manifestname` asset label + in the *Version Handler Usage* section. + +When using the `Assets > External Dependency Manager > +Package Manager Resolver > Migrate Packages` menu option, PMR then +will: + +* List all Version Handler manager packages in the project. +* Search all available packages in the PM registries and fetch keywords + associated with each package parsing the Version Handler manifest names + for each package. +* Map each installed Version Handler package to a PM package. +* Prompt the user to migrate the discovered packages. +* Perform package migration for all selected packages if the user clicks + the `Apply` button. + +## Configuration + +PMR can be configured via the `Assets > External Dependency Manager > +Package Manager Resolver > Settings` menu option: + +* `Add package registries` when enabled, when the plugin loads or registry + configuration files change, this will prompt the user to add registries + that are not present in the Package Manager. +* `Prompt to add package registries` will cause a developer to be prompted + with a window that will ask for confirmation before adding registries. + When this is disabled registries are added silently to the project. +* `Prompt to migrate packages` will cause a developer to be prompted + with a window that will ask for confirmation before migrating packages + installed in the `Assets` directory to PM packages. +* `Enable Analytics Reporting` when enabled, reports the use of the plugin + to the developers so they can make imrpovements. +* `Verbose logging` when enabled prints debug information to the console + which can be useful when filing bug reports. + +# Version Handler Usage + +The Version Handler component of this plugin manages: + +* Shared Unity plugin dependencies. +* Upgrading Unity plugins by cleaning up old files from previous versions. +* Uninstallation of plugins that are distributed with manifest files. +* Restoration of plugin assets to their original install locations if assets + are tagged with the `exportpath` label. + +Since the Version Handler needs to modify Unity asset metadata (`.meta` files), +to enable / disable components, rename and delete asset files it does not +work with Package Manager installed packages. It's still possible to +include EDM4U in Package Manager packages, the Version Handler component +simply won't do anything to PM plugins in this case. + +## Using Version Handler Managed Plugins + +If a plugin is imported at multiple different versions into a project, if +the Version Handler is enabled, it will automatically check all managed +assets to determine the set of assets that are out of date and assets that +should be removed. To disable automatic checking managed assets disable +the `Enable version management` option in the +`Assets > External Dependency Manager > Version Handler > Settings` menu. + +If version management is disabled, it's possible to check managed assets +manually using the +`Assets > External Dependency Manager > Version Handler > Update` menu option. + +### Listing Managed Plugins + +Plugins managed by the Version Handler, those that ship with manifest files, +can displayed using the `Assets > External Dependency Manager > +Version Handler > Display Managed Packages` menu option. The list of plugins +are written to the console window along with the set of files used by each +plugin. + +### Uninstalling Managed Plugins + +Plugins managed by the Version Handler, those that ship with manifest files, +can be removed using the `Assets > External Dependency Manager > +Version Handler > Uninstall Managed Packages` menu option. This operation +will display a window that allows a developer to select a set of plugins to +remove which will remove all files owned by each plugin excluding those that +are in use by other installed plugins. + +Files managed by the Version Handler, those labeled with the `gvh` asset label, +can be checked to see whether anything needs to be upgraded, disabled or +removed using the `Assets > External Dependency Manager > +Version Handler > Update` menu option. + +### Restore Install Paths + +Some developers move assets around in their project which can make it +harder for plugin maintainers to debug issues if this breaks Unity's +[special folders](https://docs.unity3d.com/Manual/SpecialFolders.html) rules. +If assets are labeled with their original install / export path +(see `gvhp_exportpath` below), Version Handler can restore assets to their +original locations when using the `Assets > External Dependency Manager > +Version Handler > Move Files To Install Locations` menu option. + +### Settings + +Some behavior of the Version Handler can be configured via the +`Assets > External Dependency Manager > Version Handler > Settings` menu +option. + +* `Enable version management` controls whether the plugin should automatically + check asset versions and apply changes. If this is disabled the process + should be run manually when installing or upgrading managed plugins using + `Assets > External Dependency Manager > Version Handler > Update`. +* `Rename to canonical filenames` is a legacy option that will rename files to + remove version numbers and other labels from filenames. +* `Prompt for obsolete file deletion` enables the display of a window when + obsolete files are deleted allowing the developer to select which files to + delete and those to keep. +* `Allow disabling files via renaming` controls whether obsolete or disabled + files should be disabled by renaming them to `myfilename_DISABLED`. + Renaming to disable files is required in some scenarios where Unity doesn't + support removing files from the build via the PluginImporter. +* `Enable Analytics Reporting` enables / disables usage reporting to plugin + developers to improve the product. +* `Verbose logging` enables _very_ noisy log output that is useful for + debugging while filing a bug report or building a new managed plugin. +* `Use project settings` saves settings for the plugin in the project rather + than system-wide. + +## Redistributing a Managed Plugin + +The Version Handler employs a couple of methods for managing version +selection, upgrade and removal of plugins. + +* Each plugin can ship with a manifest file that lists the files it includes. + This makes it possible for Version Handler to calculate the difference + in assets between the most recent release of a plugin and the previous + release installed in a project. If a files are removed the Version Handler + will prompt the user to clean up obsolete files. +* Plugins can ship using assets with unique names, unique GUIDs and version + number labels. Version numbers can be attached to assets using labels or + added to the filename (e.g `myfile.txt` would be `myfile_version-x.y.z.txt). + This allows the Version Handler to determine which set of files are the + same file at different versions, select the most recent version and prompt + the developer to clean up old versions. + +Unity plugins can be managed by the Version Handler using the following steps: + + 1. Add the `gvh` asset label to each asset (file) you want Version Handler + to manage. + 1. Add the `gvh_version-VERSION` label to each asset where `VERSION` is the + version of the plugin you're releasing (e.g 1.2.3). + 1. Add the `gvhp_exportpath-PATH` label to each asset where `PATH` is the + export path of the file when the `.unitypackage` is created. This is + used to track files if they're moved around in a project by developers. + 1. Optional: Add `gvh_targets-editor` label to each editor DLL in your + plugin and disable `editor` as a target platform for the DLL. + The Version Handler will enable the most recent version of this DLL when + the plugin is imported. + 1. Optional: If your plugin is included in other Unity plugins, you should + add the version number to each filename and change the GUID of each asset. + This allows multiple versions of your plugin to be imported into a Unity + project, with the Version Handler component activating only the most + recent version. + 1. Create a manifest text file named `MY_UNIQUE_PLUGIN_NAME_VERSION.txt` + that lists all the files in your plugin relative to the project root. + Then add the `gvh_manifest` label to the asset to indicate this file is + a plugin manifest. + 1. Optional: Add a `gvhp_manifestname-NAME` label to your manifest file + to provide a human readable name for your package. If this isn't provided + the name of the manifest file will be used as the package name. + NAME can match the pattern `[0-9]+[a-zA-Z -]' where a leading integer + will set the priority of the name where `0` is the highest priority + and preferably used as the display name. The lowest value (i.e highest + priority name) will be used as the display name and all other specified + names will be aliases of the display name. Aliases can refer to previous + names of the package allowing renaming across published versions. + 1. Redistribute EDM4U Unity plugin with your plugin. + See the [Plugin Redistribution](#plugin-redistribution) for the details. + +If you follow these steps: + + * When users import a newer version of your plugin, files referenced by the + older version's manifest are cleaned up. + * The latest version of the plugin will be selected when users import + multiple packages that include your plugin, assuming the steps in + [Plugin Redistribution](#plugin-redistribution) are followed. + +# Building from Source + +To build this plugin from source you need the following tools installed: + * Unity (with iOS and Android modules installed) + +You can build the plugin by running the following from your shell +(Linux / OSX): + +``` +./gradlew build +``` + +or Windows: + +``` +./gradlew.bat build +``` + +# Releasing + +Each time a new build of this plugin is checked into the source tree you +need to do the following: + + * Bump the plugin version variable `pluginVersion` in `build.gradle` + * Update `CHANGELOG.md` with the new version number and changes included in + the release. + * Build the release using `./gradlew release` which performs the following: + * Updates `external-dependency-manager-*.unitypackage` + * Copies the unpacked plugin to the `exploded` directory. + * Updates template metadata files in the `plugin` directory. + The GUIDs of all asset metadata is modified due to the version number + change. Each file within the plugin is versioned to allow multiple + versions of the plugin to be imported into a Unity project which allows + the most recent version to be activated by the Version Handler + component. + * Create release commit using `./gradlew gitCreateReleaseCommit` which + performs `git commit -a -m "description from CHANGELOG.md"` + * Once the release commit is merge, tag the release using + `./gradlew gitTagRelease` which performs the following: + * `git tag -a pluginVersion -m "version RELEASE"` to tag the release. + * Update tags on remote branch using `git push --tag REMOTE HEAD:master` diff --git a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.135.0.txt.meta b/Assets/ExternalDependencyManager/Editor/README.md.meta similarity index 52% rename from Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.135.0.txt.meta rename to Assets/ExternalDependencyManager/Editor/README.md.meta index c58a3ec..70dfa41 100644 --- a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.135.0.txt.meta +++ b/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 54730702a56740858922d24dc3f26918 +guid: 8899dd41fdfd4ebc88ca6ef5951c6eb1 labels: - gvh -- gvh_manifest -- gvh_version-1.2.135.0 +- gvh_version-10.1.1 +- gvhp_exportpath-ExternalDependencyManager/Editor/README.md TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt new file mode 100755 index 0000000..5539d77 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt.meta b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt.meta new file mode 100644 index 0000000..f8ea878 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: a9e2518b6d1442f1862700fa1481a623 +labels: +- gvh +- gvh_manifest +- gvh_version-1.2.174 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt +- gvhp_manifestname-0External Dependency Manager +- gvhp_manifestname-play-services-resolver +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/Editor/AnalyticsDependencies.xml b/Assets/Firebase/Editor/AnalyticsDependencies.xml deleted file mode 100755 index 60b2f7b..0000000 --- a/Assets/Firebase/Editor/AnalyticsDependencies.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - diff --git a/Assets/Firebase/Editor/AnalyticsDependencies.xml.meta b/Assets/Firebase/Editor/AnalyticsDependencies.xml.meta deleted file mode 100644 index 77c343a..0000000 --- a/Assets/Firebase/Editor/AnalyticsDependencies.xml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 1e3c2da79be842cd838a9ddd70d20fa9 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/AppDependencies.xml b/Assets/Firebase/Editor/AppDependencies.xml index c1e0a9a..ad4cac8 100755 --- a/Assets/Firebase/Editor/AppDependencies.xml +++ b/Assets/Firebase/Editor/AppDependencies.xml @@ -1,23 +1,24 @@ - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - + + + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/Assets/Firebase/Editor/AppDependencies.xml.meta b/Assets/Firebase/Editor/AppDependencies.xml.meta index b4dfefb..e830d63 100644 --- a/Assets/Firebase/Editor/AppDependencies.xml.meta +++ b/Assets/Firebase/Editor/AppDependencies.xml.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 9b63af95d9364af4a3d8ce58738b6223 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/AppDependencies.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/AuthDependencies.xml b/Assets/Firebase/Editor/AuthDependencies.xml index cc0bce8..149c9c1 100755 --- a/Assets/Firebase/Editor/AuthDependencies.xml +++ b/Assets/Firebase/Editor/AuthDependencies.xml @@ -1,23 +1,22 @@ - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/Assets/Firebase/Editor/AuthDependencies.xml.meta b/Assets/Firebase/Editor/AuthDependencies.xml.meta index b1013f3..232b61e 100644 --- a/Assets/Firebase/Editor/AuthDependencies.xml.meta +++ b/Assets/Firebase/Editor/AuthDependencies.xml.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 2bec2bf8d84d4997ba2dd66263781f3d labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/AuthDependencies.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/CrashlyticsDependencies.xml b/Assets/Firebase/Editor/CrashlyticsDependencies.xml deleted file mode 100755 index 9575daa..0000000 --- a/Assets/Firebase/Editor/CrashlyticsDependencies.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - diff --git a/Assets/Firebase/Editor/CrashlyticsDependencies.xml.meta b/Assets/Firebase/Editor/CrashlyticsDependencies.xml.meta deleted file mode 100644 index 3244405..0000000 --- a/Assets/Firebase/Editor/CrashlyticsDependencies.xml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: be690db6bda046a89e38b20ef9bfe06c -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/DatabaseDependencies.xml b/Assets/Firebase/Editor/DatabaseDependencies.xml index fb1d1ff..4074261 100755 --- a/Assets/Firebase/Editor/DatabaseDependencies.xml +++ b/Assets/Firebase/Editor/DatabaseDependencies.xml @@ -1,23 +1,24 @@ - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - + + + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/Assets/Firebase/Editor/DatabaseDependencies.xml.meta b/Assets/Firebase/Editor/DatabaseDependencies.xml.meta index 3b72d0d..c5c3d74 100644 --- a/Assets/Firebase/Editor/DatabaseDependencies.xml.meta +++ b/Assets/Firebase/Editor/DatabaseDependencies.xml.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 6f0764197a37428ba5aa9658907d1b56 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/DatabaseDependencies.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll b/Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll deleted file mode 100755 index 57d28f2..0000000 Binary files a/Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll and /dev/null differ diff --git a/Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll.meta b/Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll.meta deleted file mode 100644 index 5ac23a1..0000000 --- a/Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 3781f2218eef4d5a823dba406baa434b -labels: -- gvh -- gvh_targets-editor -- gvh_version-6.7.0 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Linux - second: - enabled: 0 - settings: - CPU: None - - first: - : LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - : OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - : OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - - first: - : Web - second: - enabled: 0 - settings: {} - - first: - : WebStreamed - second: - enabled: 0 - settings: {} - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: None - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/Firebase.Editor.dll b/Assets/Firebase/Editor/Firebase.Editor.dll index a7315c1..f029864 100755 Binary files a/Assets/Firebase/Editor/Firebase.Editor.dll and b/Assets/Firebase/Editor/Firebase.Editor.dll differ diff --git a/Assets/Firebase/Editor/Firebase.Editor.dll.meta b/Assets/Firebase/Editor/Firebase.Editor.dll.meta index 5a95b94..8db3bc5 100644 --- a/Assets/Firebase/Editor/Firebase.Editor.dll.meta +++ b/Assets/Firebase/Editor/Firebase.Editor.dll.meta @@ -3,7 +3,8 @@ guid: 9f2edbf81053418f879076c05f816dc2 labels: - gvh - gvh_targets-editor -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/Firebase.Editor.dll PluginImporter: externalObjects: {} serializedVersion: 2 @@ -15,6 +16,46 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Linux + second: + enabled: 0 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + - first: + : Web + second: + enabled: 0 + settings: {} + - first: + : WebStreamed + second: + enabled: 0 + settings: {} + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU - first: Any: second: @@ -25,13 +66,53 @@ PluginImporter: second: enabled: 1 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None - first: Windows Store Apps: WindowsStoreApps second: enabled: 0 settings: CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Editor/FirebaseAnalytics_version-6.7.0_manifest.txt b/Assets/Firebase/Editor/FirebaseAnalytics_version-6.7.0_manifest.txt deleted file mode 100755 index 67fa808..0000000 --- a/Assets/Firebase/Editor/FirebaseAnalytics_version-6.7.0_manifest.txt +++ /dev/null @@ -1,78 +0,0 @@ -Assets/Editor Default Resources/Firebase/fb_analytics.png -Assets/Editor Default Resources/Firebase/fb_analytics_dark.png -Assets/Editor Default Resources/Firebase/fb_auth.png -Assets/Editor Default Resources/Firebase/fb_auth_dark.png -Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png -Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png -Assets/Editor Default Resources/Firebase/fb_config.png -Assets/Editor Default Resources/Firebase/fb_config_dark.png -Assets/Editor Default Resources/Firebase/fb_crashlytics.png -Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png -Assets/Editor Default Resources/Firebase/fb_database.png -Assets/Editor Default Resources/Firebase/fb_database_dark.png -Assets/Editor Default Resources/Firebase/fb_dynamic_links.png -Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png -Assets/Editor Default Resources/Firebase/fb_functions.png -Assets/Editor Default Resources/Firebase/fb_functions_dark.png -Assets/Editor Default Resources/Firebase/fb_storage.png -Assets/Editor Default Resources/Firebase/fb_storage_dark.png -Assets/Editor Default Resources/Firebase/firebase_lockup.png -Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png -Assets/Firebase/Editor/AnalyticsDependencies.xml -Assets/Firebase/Editor/AppDependencies.xml -Assets/Firebase/Editor/Firebase.Editor.dll -Assets/Firebase/Editor/Firebase.Editor.dll.mdb -Assets/Firebase/Editor/FirebaseAnalytics_v1.0.0_manifest.txt -Assets/Firebase/Editor/FirebaseAnalytics_v1.0.1_manifest.txt -Assets/Firebase/Editor/FirebaseAnalytics_v1.1.0_manifest.txt -Assets/Firebase/Editor/FirebaseAnalytics_v1.1.1_manifest.txt -Assets/Firebase/Editor/FirebaseAnalytics_v1.1.2_manifest.txt -Assets/Firebase/Editor/NOTICE -Assets/Firebase/Editor/generate_xml_from_google_services_json.exe -Assets/Firebase/Editor/generate_xml_from_google_services_json.py -Assets/Firebase/Editor/network_request.exe -Assets/Firebase/Editor/network_request.py -Assets/Firebase/Editor/readme.md -Assets/Firebase/Plugins/Firebase.Analytics.dll -Assets/Firebase/Plugins/Firebase.Analytics.dll.mdb -Assets/Firebase/Plugins/Firebase.App.dll -Assets/Firebase/Plugins/Firebase.App.dll.mdb -Assets/Firebase/Plugins/Firebase.Platform.dll -Assets/Firebase/Plugins/Firebase.Platform.dll.mdb -Assets/Firebase/Plugins/Firebase.TaskExtension.dll -Assets/Firebase/Plugins/Firebase.TaskExtension.dll.mdb -Assets/Firebase/Plugins/Google.MiniJson.dll -Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll -Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.mdb -Assets/Firebase/Plugins/iOS/Firebase.App.dll -Assets/Firebase/Plugins/iOS/Firebase.App.dll.mdb -Assets/Firebase/Plugins/link.xml -Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so -Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml -Assets/Parse/Plugins/Unity.Compat.dll -Assets/Parse/Plugins/Unity.Tasks.dll -Assets/Parse/Plugins/dotNet45/Unity.Compat.dll -Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.130.0.txt -Assets/Plugins/Android/Firebase/AndroidManifest.xml -Assets/Plugins/Android/Firebase/project.properties -Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a -Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a diff --git a/Assets/Firebase/Editor/FirebaseAnalytics_version-6.7.0_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseAnalytics_version-6.7.0_manifest.txt.meta deleted file mode 100644 index d3e5985..0000000 --- a/Assets/Firebase/Editor/FirebaseAnalytics_version-6.7.0_manifest.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 95433a25e80c40f7b35190675f3c0cd0 -labels: -- gvh -- gvh_manifest -- gvh_version-6.7.0 -timeCreated: 0 diff --git a/Assets/Firebase/Editor/FirebaseAuth_version-6.7.0_manifest.txt b/Assets/Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt similarity index 56% rename from Assets/Firebase/Editor/FirebaseAuth_version-6.7.0_manifest.txt rename to Assets/Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt index 7f510a4..d8305ea 100755 --- a/Assets/Firebase/Editor/FirebaseAuth_version-6.7.0_manifest.txt +++ b/Assets/Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt @@ -14,65 +14,58 @@ Assets/Editor Default Resources/Firebase/fb_dynamic_links.png Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png Assets/Editor Default Resources/Firebase/fb_functions.png Assets/Editor Default Resources/Firebase/fb_functions_dark.png +Assets/Editor Default Resources/Firebase/fb_invites.png +Assets/Editor Default Resources/Firebase/fb_invites_dark.png Assets/Editor Default Resources/Firebase/fb_storage.png Assets/Editor Default Resources/Firebase/fb_storage_dark.png Assets/Editor Default Resources/Firebase/firebase_lockup.png Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md +Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt Assets/Firebase/Editor/AppDependencies.xml Assets/Firebase/Editor/AuthDependencies.xml Assets/Firebase/Editor/Firebase.Editor.dll -Assets/Firebase/Editor/Firebase.Editor.dll.mdb -Assets/Firebase/Editor/FirebaseAuth_v1.0.0_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.0.1_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.1.0_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.1.1_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.1.2_manifest.txt -Assets/Firebase/Editor/NOTICE +Assets/Firebase/Editor/Firebase.Editor.pdb Assets/Firebase/Editor/generate_xml_from_google_services_json.exe Assets/Firebase/Editor/generate_xml_from_google_services_json.py Assets/Firebase/Editor/network_request.exe Assets/Firebase/Editor/network_request.py -Assets/Firebase/Editor/readme.md Assets/Firebase/Plugins/Firebase.App.dll -Assets/Firebase/Plugins/Firebase.App.dll.mdb +Assets/Firebase/Plugins/Firebase.App.pdb Assets/Firebase/Plugins/Firebase.Auth.dll -Assets/Firebase/Plugins/Firebase.Auth.dll.mdb +Assets/Firebase/Plugins/Firebase.Auth.pdb Assets/Firebase/Plugins/Firebase.Platform.dll -Assets/Firebase/Plugins/Firebase.Platform.dll.mdb +Assets/Firebase/Plugins/Firebase.Platform.pdb Assets/Firebase/Plugins/Firebase.TaskExtension.dll -Assets/Firebase/Plugins/Firebase.TaskExtension.dll.mdb +Assets/Firebase/Plugins/Firebase.TaskExtension.pdb Assets/Firebase/Plugins/Google.MiniJson.dll Assets/Firebase/Plugins/iOS/Firebase.App.dll -Assets/Firebase/Plugins/iOS/Firebase.App.dll.mdb +Assets/Firebase/Plugins/iOS/Firebase.App.pdb Assets/Firebase/Plugins/iOS/Firebase.Auth.dll -Assets/Firebase/Plugins/iOS/Firebase.Auth.dll.mdb -Assets/Firebase/Plugins/link.xml -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so +Assets/Firebase/Plugins/iOS/Firebase.Auth.pdb +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml -Assets/Parse/Plugins/Unity.Compat.dll -Assets/Parse/Plugins/Unity.Tasks.dll -Assets/Parse/Plugins/dotNet45/Unity.Compat.dll -Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.130.0.txt -Assets/Plugins/Android/Firebase/AndroidManifest.xml -Assets/Plugins/Android/Firebase/project.properties Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a diff --git a/Assets/Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt.meta new file mode 100644 index 0000000..2bf5466 --- /dev/null +++ b/Assets/Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 007d837198dd49f7809f06b0936cbee6 +labels: +- gvh +- gvh_manifest +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/FirebaseAuth_version-10.1.1_manifest.txt +- gvhp_manifestname-0Firebase Authentication +- gvhp_manifestname-1FirebaseAuth +timeCreated: 0 diff --git a/Assets/Firebase/Editor/FirebaseAuth_version-6.7.0_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseAuth_version-6.7.0_manifest.txt.meta deleted file mode 100644 index 71acf92..0000000 --- a/Assets/Firebase/Editor/FirebaseAuth_version-6.7.0_manifest.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 06364ea393534c22b083b7eb1faa2b2a -labels: -- gvh -- gvh_manifest -- gvh_version-6.7.0 -timeCreated: 0 diff --git a/Assets/Firebase/Editor/FirebaseCrashlytics_version-6.7.0_manifest.txt b/Assets/Firebase/Editor/FirebaseCrashlytics_version-6.7.0_manifest.txt deleted file mode 100755 index 154367b..0000000 --- a/Assets/Firebase/Editor/FirebaseCrashlytics_version-6.7.0_manifest.txt +++ /dev/null @@ -1,74 +0,0 @@ -Assets/Editor Default Resources/Firebase/fb_analytics.png -Assets/Editor Default Resources/Firebase/fb_analytics_dark.png -Assets/Editor Default Resources/Firebase/fb_auth.png -Assets/Editor Default Resources/Firebase/fb_auth_dark.png -Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png -Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png -Assets/Editor Default Resources/Firebase/fb_config.png -Assets/Editor Default Resources/Firebase/fb_config_dark.png -Assets/Editor Default Resources/Firebase/fb_crashlytics.png -Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png -Assets/Editor Default Resources/Firebase/fb_database.png -Assets/Editor Default Resources/Firebase/fb_database_dark.png -Assets/Editor Default Resources/Firebase/fb_dynamic_links.png -Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png -Assets/Editor Default Resources/Firebase/fb_functions.png -Assets/Editor Default Resources/Firebase/fb_functions_dark.png -Assets/Editor Default Resources/Firebase/fb_storage.png -Assets/Editor Default Resources/Firebase/fb_storage_dark.png -Assets/Editor Default Resources/Firebase/firebase_lockup.png -Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png -Assets/Firebase/Editor/AppDependencies.xml -Assets/Firebase/Editor/CrashlyticsDependencies.xml -Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll -Assets/Firebase/Editor/Firebase.Crashlytics.Editor.dll.mdb -Assets/Firebase/Editor/Firebase.Editor.dll -Assets/Firebase/Editor/Firebase.Editor.dll.mdb -Assets/Firebase/Editor/NOTICE -Assets/Firebase/Editor/generate_xml_from_google_services_json.exe -Assets/Firebase/Editor/generate_xml_from_google_services_json.py -Assets/Firebase/Editor/network_request.exe -Assets/Firebase/Editor/network_request.py -Assets/Firebase/Editor/readme.md -Assets/Firebase/Plugins/Crashlytics/link.xml -Assets/Firebase/Plugins/Firebase.App.dll -Assets/Firebase/Plugins/Firebase.App.dll.mdb -Assets/Firebase/Plugins/Firebase.Crashlytics.dll -Assets/Firebase/Plugins/Firebase.Crashlytics.dll.mdb -Assets/Firebase/Plugins/Firebase.Platform.dll -Assets/Firebase/Plugins/Firebase.Platform.dll.mdb -Assets/Firebase/Plugins/Firebase.TaskExtension.dll -Assets/Firebase/Plugins/Firebase.TaskExtension.dll.mdb -Assets/Firebase/Plugins/Google.MiniJson.dll -Assets/Firebase/Plugins/iOS/Firebase.App.dll -Assets/Firebase/Plugins/iOS/Firebase.App.dll.mdb -Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll -Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll.mdb -Assets/Firebase/Plugins/link.xml -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml -Assets/Parse/Plugins/Unity.Compat.dll -Assets/Parse/Plugins/Unity.Tasks.dll -Assets/Parse/Plugins/dotNet45/Unity.Compat.dll -Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.130.0.txt -Assets/Plugins/Android/Firebase/AndroidManifest.xml -Assets/Plugins/Android/Firebase/project.properties -Assets/Plugins/iOS/Firebase/libCrashlyticsiOSWrapper.a -Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a -Assets/Plugins/iOS/Firebase/libFirebaseCppCrashlytics.a diff --git a/Assets/Firebase/Editor/FirebaseCrashlytics_version-6.7.0_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseCrashlytics_version-6.7.0_manifest.txt.meta deleted file mode 100644 index 1520903..0000000 --- a/Assets/Firebase/Editor/FirebaseCrashlytics_version-6.7.0_manifest.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e711b00da9b64f04a3e9f7093e9efaf4 -labels: -- gvh -- gvh_manifest -- gvh_version-6.7.0 -timeCreated: 0 diff --git a/Assets/Firebase/Editor/FirebaseDatabase_version-6.7.0_manifest.txt b/Assets/Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt similarity index 54% rename from Assets/Firebase/Editor/FirebaseDatabase_version-6.7.0_manifest.txt rename to Assets/Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt index 48938e1..81991fd 100755 --- a/Assets/Firebase/Editor/FirebaseDatabase_version-6.7.0_manifest.txt +++ b/Assets/Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt @@ -14,85 +14,70 @@ Assets/Editor Default Resources/Firebase/fb_dynamic_links.png Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png Assets/Editor Default Resources/Firebase/fb_functions.png Assets/Editor Default Resources/Firebase/fb_functions_dark.png +Assets/Editor Default Resources/Firebase/fb_invites.png +Assets/Editor Default Resources/Firebase/fb_invites_dark.png Assets/Editor Default Resources/Firebase/fb_storage.png Assets/Editor Default Resources/Firebase/fb_storage_dark.png Assets/Editor Default Resources/Firebase/firebase_lockup.png Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md +Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt Assets/Firebase/Editor/AppDependencies.xml Assets/Firebase/Editor/AuthDependencies.xml Assets/Firebase/Editor/DatabaseDependencies.xml Assets/Firebase/Editor/Firebase.Editor.dll -Assets/Firebase/Editor/Firebase.Editor.dll.mdb -Assets/Firebase/Editor/FirebaseAuth_v1.0.0_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.0.1_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.1.0_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.1.1_manifest.txt -Assets/Firebase/Editor/FirebaseAuth_v1.1.2_manifest.txt -Assets/Firebase/Editor/FirebaseDatabase_v1.0.0_manifest.txt -Assets/Firebase/Editor/FirebaseDatabase_v1.0.1_manifest.txt -Assets/Firebase/Editor/FirebaseDatabase_v1.1.0_manifest.txt -Assets/Firebase/Editor/FirebaseDatabase_v1.1.1_manifest.txt -Assets/Firebase/Editor/FirebaseDatabase_v1.1.2_manifest.txt -Assets/Firebase/Editor/NOTICE +Assets/Firebase/Editor/Firebase.Editor.pdb Assets/Firebase/Editor/generate_xml_from_google_services_json.exe Assets/Firebase/Editor/generate_xml_from_google_services_json.py Assets/Firebase/Editor/network_request.exe Assets/Firebase/Editor/network_request.py -Assets/Firebase/Editor/readme.md Assets/Firebase/Plugins/Firebase.App.dll -Assets/Firebase/Plugins/Firebase.App.dll.mdb +Assets/Firebase/Plugins/Firebase.App.pdb Assets/Firebase/Plugins/Firebase.Auth.dll -Assets/Firebase/Plugins/Firebase.Auth.dll.mdb +Assets/Firebase/Plugins/Firebase.Auth.pdb Assets/Firebase/Plugins/Firebase.Database.dll -Assets/Firebase/Plugins/Firebase.Database.dll.mdb +Assets/Firebase/Plugins/Firebase.Database.pdb Assets/Firebase/Plugins/Firebase.Platform.dll -Assets/Firebase/Plugins/Firebase.Platform.dll.mdb +Assets/Firebase/Plugins/Firebase.Platform.pdb Assets/Firebase/Plugins/Firebase.TaskExtension.dll -Assets/Firebase/Plugins/Firebase.TaskExtension.dll.mdb +Assets/Firebase/Plugins/Firebase.TaskExtension.pdb Assets/Firebase/Plugins/Google.MiniJson.dll -Assets/Firebase/Plugins/Google.Sharpen.dll -Assets/Firebase/Plugins/Google.Sharpen.dll.mdb -Assets/Firebase/Plugins/Http/link.xml Assets/Firebase/Plugins/iOS/Firebase.App.dll -Assets/Firebase/Plugins/iOS/Firebase.App.dll.mdb +Assets/Firebase/Plugins/iOS/Firebase.App.pdb Assets/Firebase/Plugins/iOS/Firebase.Auth.dll -Assets/Firebase/Plugins/iOS/Firebase.Auth.dll.mdb +Assets/Firebase/Plugins/iOS/Firebase.Auth.pdb Assets/Firebase/Plugins/iOS/Firebase.Database.dll -Assets/Firebase/Plugins/iOS/Firebase.Database.dll.mdb -Assets/Firebase/Plugins/link.xml -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so +Assets/Firebase/Plugins/iOS/Firebase.Database.pdb +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml -Assets/Parse/Plugins/Unity.Compat.dll -Assets/Parse/Plugins/Unity.Tasks.dll -Assets/Parse/Plugins/dotNet45/Unity.Compat.dll -Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.130.0.dll.mdb -Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.130.0.txt -Assets/Plugins/Android/Firebase/AndroidManifest.xml -Assets/Plugins/Android/Firebase/project.properties Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a diff --git a/Assets/Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt.meta new file mode 100644 index 0000000..fc11319 --- /dev/null +++ b/Assets/Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c98e7330f2c2408eb7934b9ebd8f35f7 +labels: +- gvh +- gvh_manifest +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/FirebaseDatabase_version-10.1.1_manifest.txt +- gvhp_manifestname-0Firebase Realtime Database +- gvhp_manifestname-1FirebaseDatabase +timeCreated: 0 diff --git a/Assets/Firebase/Editor/FirebaseDatabase_version-6.7.0_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseDatabase_version-6.7.0_manifest.txt.meta deleted file mode 100644 index 6e1cc98..0000000 --- a/Assets/Firebase/Editor/FirebaseDatabase_version-6.7.0_manifest.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c6dbec0ea4a24301946fdb03496eeb86 -labels: -- gvh -- gvh_manifest -- gvh_version-6.7.0 -timeCreated: 0 diff --git a/Assets/Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt b/Assets/Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt new file mode 100755 index 0000000..99eba33 --- /dev/null +++ b/Assets/Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt @@ -0,0 +1,71 @@ +Assets/Editor Default Resources/Firebase/fb_analytics.png +Assets/Editor Default Resources/Firebase/fb_analytics_dark.png +Assets/Editor Default Resources/Firebase/fb_auth.png +Assets/Editor Default Resources/Firebase/fb_auth_dark.png +Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png +Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png +Assets/Editor Default Resources/Firebase/fb_config.png +Assets/Editor Default Resources/Firebase/fb_config_dark.png +Assets/Editor Default Resources/Firebase/fb_crashlytics.png +Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png +Assets/Editor Default Resources/Firebase/fb_database.png +Assets/Editor Default Resources/Firebase/fb_database_dark.png +Assets/Editor Default Resources/Firebase/fb_dynamic_links.png +Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png +Assets/Editor Default Resources/Firebase/fb_functions.png +Assets/Editor Default Resources/Firebase/fb_functions_dark.png +Assets/Editor Default Resources/Firebase/fb_invites.png +Assets/Editor Default Resources/Firebase/fb_invites_dark.png +Assets/Editor Default Resources/Firebase/fb_storage.png +Assets/Editor Default Resources/Firebase/fb_storage_dark.png +Assets/Editor Default Resources/Firebase/firebase_lockup.png +Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md +Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt +Assets/Firebase/Editor/AppDependencies.xml +Assets/Firebase/Editor/Firebase.Editor.dll +Assets/Firebase/Editor/Firebase.Editor.pdb +Assets/Firebase/Editor/FunctionsDependencies.xml +Assets/Firebase/Editor/generate_xml_from_google_services_json.exe +Assets/Firebase/Editor/generate_xml_from_google_services_json.py +Assets/Firebase/Editor/network_request.exe +Assets/Firebase/Editor/network_request.py +Assets/Firebase/Plugins/Firebase.App.dll +Assets/Firebase/Plugins/Firebase.App.pdb +Assets/Firebase/Plugins/Firebase.Functions.dll +Assets/Firebase/Plugins/Firebase.Functions.pdb +Assets/Firebase/Plugins/Firebase.Platform.dll +Assets/Firebase/Plugins/Firebase.Platform.pdb +Assets/Firebase/Plugins/Firebase.TaskExtension.dll +Assets/Firebase/Plugins/Firebase.TaskExtension.pdb +Assets/Firebase/Plugins/Google.MiniJson.dll +Assets/Firebase/Plugins/iOS/Firebase.App.dll +Assets/Firebase/Plugins/iOS/Firebase.App.pdb +Assets/Firebase/Plugins/iOS/Firebase.Functions.dll +Assets/Firebase/Plugins/iOS/Firebase.Functions.pdb +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so +Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle +Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll +Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml +Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml +Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a +Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a diff --git a/Assets/Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt.meta new file mode 100644 index 0000000..95e4673 --- /dev/null +++ b/Assets/Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c9fc890f9bb942489e9ae657a26306d9 +labels: +- gvh +- gvh_manifest +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/FirebaseFunctions_version-10.1.1_manifest.txt +- gvhp_manifestname-0Cloud Functions for Firebase +- gvhp_manifestname-1FirebaseFunctions +timeCreated: 0 diff --git a/Assets/Firebase/Editor/FunctionsDependencies.xml b/Assets/Firebase/Editor/FunctionsDependencies.xml new file mode 100755 index 0000000..4a77382 --- /dev/null +++ b/Assets/Firebase/Editor/FunctionsDependencies.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/Assets/Firebase/Editor/NOTICE.meta b/Assets/Firebase/Editor/FunctionsDependencies.xml.meta similarity index 51% rename from Assets/Firebase/Editor/NOTICE.meta rename to Assets/Firebase/Editor/FunctionsDependencies.xml.meta index ca589b3..57905c8 100644 --- a/Assets/Firebase/Editor/NOTICE.meta +++ b/Assets/Firebase/Editor/FunctionsDependencies.xml.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 68c8df498829476fb2afabc46b8b64f0 +guid: ed4a847656034e378c556af26051ce45 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/FunctionsDependencies.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/NOTICE b/Assets/Firebase/Editor/NOTICE deleted file mode 100755 index 46c7d9b..0000000 --- a/Assets/Firebase/Editor/NOTICE +++ /dev/null @@ -1,83 +0,0 @@ ---- parse --- - -BSD License - -For Parse .NET SDK software - -Copyright (c) 2015-present, Parse, LLC. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Parse nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---- minijson --- - -Copyright (c) 2013 Calvin Rien - -Based on the JSON parser by Patrick van Bergen -http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html - -Simplified it so that it doesn't throw exceptions -and can be used in Unity iPhone with maximum code stripping. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.--- sharpen --- - -Sharpen is released under the MIT license: - -Copyright (c) 2010 Novell, Inc (http://www.novell.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - diff --git a/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe b/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe index c8ca8ee..3d26497 100755 Binary files a/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe and b/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe differ diff --git a/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta b/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta index ddfe40e..42009b8 100644 --- a/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta +++ b/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: ae88c0972b7448b5b36def1716f1d711 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/generate_xml_from_google_services_json.exe timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/generate_xml_from_google_services_json.py b/Assets/Firebase/Editor/generate_xml_from_google_services_json.py index c3e9717..88dbb16 100755 --- a/Assets/Firebase/Editor/generate_xml_from_google_services_json.py +++ b/Assets/Firebase/Editor/generate_xml_from_google_services_json.py @@ -30,6 +30,15 @@ import sys from xml.etree import ElementTree +if platform.system().lower() == 'windows': + import ctypes.wintypes # pylint: disable=g-import-not-at-top + +# Map Python 2's unicode method to encode a string as bytes in python 3. +try: + unicode('') # See whether unicode class is available (Python < 3) +except NameError: + unicode = str # pylint: disable=redefined-builtin,invalid-name + # Input filename if it isn't set. DEFAULT_INPUT_FILENAME = 'app/google-services.json' # Output filename if it isn't set. @@ -39,7 +48,7 @@ # Output filename for .json files, if it isn't set. DEFAULT_JSON_OUTPUT_FILENAME = 'google-services-desktop.json' -# Indicates a web client in the oauth_client list. +OAUTH_CLIENT_TYPE_ANDROID_APP = 1 OAUTH_CLIENT_TYPE_WEB = 3 @@ -99,6 +108,35 @@ def construct_plist_dictionary(xml_root): return plist_dict +def update_dict_keys(key_map, input_dict): + """Creates a dict from input_dict with the same values but new keys. + + Two dictionaries are passed to this function: the key_map that represents a + mapping of source keys to destination keys, and the input_dict that is the + dictionary that is to be duplicated, replacing any key that matches a source + key with a destination key. Source keys that are not present in the + input_dict will not have their destination key represented in the result. + + In other words, if key_map is `{'old': 'new', 'foo': 'bar'}`, and input_dict + is `{'old': 10}`, the result will be `{'new': 10}`. + + Args: + key_map (dict): A dictionary of strings to strings that maps source keys to + destination keys. + input_dict (dict): The dictionary of string keys to any value type, which + is to be duplicated, replacing source keys with the corresponding + destination keys from key_map. + + Returns: + dict: A new dictionary with updated keys. + """ + return { + new_key: input_dict[old_key] + for (old_key, new_key) in key_map.items() + if old_key in input_dict + } + + def construct_google_services_json(xml_dict): """Constructs a google services json file from a dictionary. @@ -108,14 +146,17 @@ def construct_google_services_json(xml_dict): Returns: A string representing the output json file. """ + try: json_struct = { - 'project_info': { - 'project_number': xml_dict['GCM_SENDER_ID'], - 'firebase_url': xml_dict['DATABASE_URL'], - 'project_id': xml_dict['PROJECT_ID'], - 'storage_bucket': xml_dict['STORAGE_BUCKET'] - }, + 'project_info': + update_dict_keys( + { + 'GCM_SENDER_ID': 'project_number', + 'DATABASE_URL': 'firebase_url', + 'PROJECT_ID': 'project_id', + 'STORAGE_BUCKET': 'storage_bucket' + }, xml_dict), 'client': [{ 'client_info': { 'mobilesdk_app_id': xml_dict['GOOGLE_APP_ID'], @@ -231,12 +272,12 @@ def argv_as_unicode_win32(): command_line_to_argv_w = ctypes.windll.shell32.CommandLineToArgvW command_line_to_argv_w.argtypes = [ ctypes.wintypes.LPCWSTR, - ctypes.wintypes.POINTER(ctypes.wintypes.c_int) + ctypes.POINTER(ctypes.c_int) ] - command_line_to_argv_w.restype = ctypes.wintypes.POINTER( + command_line_to_argv_w.restype = ctypes.POINTER( ctypes.wintypes.LPWSTR) - argc = ctypes.wintypes.c_int(0) + argc = ctypes.c_int(0) argv = command_line_to_argv_w(get_command_line_w(), argc) # Strip the python executable from the arguments if it exists @@ -298,18 +339,18 @@ def main(): output_filename = DEFAULT_OUTPUT_FILENAME if args.i: - input_filename_raw = args.i # Encode the input string (type unicode) as a normal string (type str) # using the 'utf-8' encoding so that it can be worked with the same as # input names from other sources (like the defaults). - input_filename = input_filename_raw.encode('utf-8') + input_filename_raw = args.i.encode('utf-8') + # Decode the filename to a unicode string using the 'utf-8' encoding to + # properly handle filepaths with unicode characters in them. + input_filename = input_filename_raw.decode('utf-8') if args.o: output_filename = args.o - # Decode the filename to a unicode string using the 'utf-8' encoding to - # properly handle filepaths with unicode characters in them. - with open(input_filename.decode('utf-8'), 'r') as ifile: + with open(input_filename, 'r') as ifile: file_string = ifile.read() json_string = None @@ -336,7 +377,7 @@ def main(): if not project_info: sys.stderr.write('No project info found in %s.' % input_filename) return 1 - for field, value in project_info.iteritems(): + for field, value in sorted(project_info.items()): sys.stdout.write('%s=%s\n' % (field, value)) return 0 @@ -382,15 +423,24 @@ def main(): if client_info: gen_string(root, 'google_app_id', client_info.get('mobilesdk_app_id')) + # Only include the first matching OAuth client ID per type. + client_id_web_parsed = False + client_id_android_parsed = False + oauth_client_list = selected_client.get('oauth_client') if oauth_client_list: for oauth_client in oauth_client_list: client_type = oauth_client.get('client_type') client_id = oauth_client.get('client_id') - if client_type and client_type == OAUTH_CLIENT_TYPE_WEB and client_id: + if not (client_type and client_id): continue + if (client_type == OAUTH_CLIENT_TYPE_WEB and + not client_id_web_parsed): gen_string(root, 'default_web_client_id', client_id) - # Only include the first matching OAuth web client ID. - break + client_id_web_parsed = True + if (client_type == OAUTH_CLIENT_TYPE_ANDROID_APP and + not client_id_android_parsed): + gen_string(root, 'default_android_client_id', client_id) + client_id_android_parsed = True services = selected_client.get('services') if services: @@ -425,11 +475,9 @@ def main(): indent(root) if args.l: - for package in packages: + for package in sorted(packages): if package: - # Encode the output string in case the system's default encoding differs - # from the encoding of the string being printed. - sys.stdout.write((package + '\n').encode(sys.getdefaultencoding()).decode('utf-8')) + sys.stdout.write(package + '\n') else: path = os.path.dirname(output_filename) @@ -439,7 +487,7 @@ def main(): if not args.plist: tree.write(output_filename, 'utf-8', True) else: - with open(output_filename, 'b') as ofile: + with open(output_filename, 'w') as ofile: ofile.write(json_string) return 0 diff --git a/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta b/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta index fd9f699..ad572de 100644 --- a/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta +++ b/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 8f18ed76c0f04ce0a65736104f913ef8 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/generate_xml_from_google_services_json.py timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/network_request.exe b/Assets/Firebase/Editor/network_request.exe index 144b8d5..30f5e8e 100755 Binary files a/Assets/Firebase/Editor/network_request.exe and b/Assets/Firebase/Editor/network_request.exe differ diff --git a/Assets/Firebase/Editor/network_request.exe.meta b/Assets/Firebase/Editor/network_request.exe.meta index 620ec2d..0aaf866 100644 --- a/Assets/Firebase/Editor/network_request.exe.meta +++ b/Assets/Firebase/Editor/network_request.exe.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: d3cd5d0a941c4cdc8ab4b1b684b05191 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/network_request.exe timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/network_request.py b/Assets/Firebase/Editor/network_request.py index 4639af4..04f055f 100755 --- a/Assets/Firebase/Editor/network_request.py +++ b/Assets/Firebase/Editor/network_request.py @@ -22,12 +22,28 @@ """ import argparse -import httplib import inspect import logging import socket import sys -import urlparse + +# pylint: disable=g-import-not-at-top +# pylint: disable=g-importing-member +try: + from six.moves.http_client import HTTPSConnection + from six.moves.http_client import HTTPConnection + from six.moves.http_client import HTTPException +except ImportError: + from http.client import HTTPSConnection + from http.client import HTTPConnection + from http.client import HTTPException + +try: + from six.moves.urllib.parse import urlparse +except ImportError: + from urllib.parse import urlparse +# pylint: enable=g-import-not-at-top +# pylint: enable=g-importing-member # Set up logger as soon as possible formatter = logging.Formatter('[%(levelname)s] %(message)s') @@ -76,7 +92,10 @@ def unwrap_kwarg_namespace(func): # When we move to python 3, getfullargspec so that we can tell the # difference between args and kwargs -- then this could be used for functions # that have both args and kwargs - argspec = inspect.getargspec(func) + if 'getfullargspec' in dir(inspect): + argspec = inspect.getfullargspec(func) + else: + argspec = inspect.getargspec(func) # Python 2 compatibility. def wrapped(argparse_namespace=None, **kwargs): """Take a Namespace object and map it to kwargs. @@ -134,7 +153,7 @@ class NetworkRequest(object): def __init__(self, url, method, headers, body, timeout): self.url = url.lower() - self.parsed_url = urlparse.urlparse(self.url) + self.parsed_url = urlparse(self.url) self.method = method self.headers = headers self.body = body @@ -148,9 +167,9 @@ def execute_request(self): an HttpResponse object from httplib """ if self.is_secure_connection: - conn = httplib.HTTPSConnection(self.get_hostname(), timeout=self.timeout) + conn = HTTPSConnection(self.get_hostname(), timeout=self.timeout) else: - conn = httplib.HTTPConnection(self.get_hostname(), timeout=self.timeout) + conn = HTTPConnection(self.get_hostname(), timeout=self.timeout) conn.request(self.method, self.url, self.body, self.headers) response = conn.getresponse() @@ -234,7 +253,7 @@ def make_request(request): 'Timed out post request to %s in %d seconds for request body: %s', request.url, request.timeout, request.body) return EXIT_CODE_HTTP_TIMEOUT - except (httplib.HTTPException, socket.error): + except (HTTPException, socket.error): logger.exception( 'Encountered generic exception in posting to %s with request body %s', request.url, request.body) diff --git a/Assets/Firebase/Editor/network_request.py.meta b/Assets/Firebase/Editor/network_request.py.meta index 35a8c14..7440ebb 100644 --- a/Assets/Firebase/Editor/network_request.py.meta +++ b/Assets/Firebase/Editor/network_request.py.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: e6e32fecbfd44fab946fa160e4861924 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Editor/network_request.py timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/Editor/readme.md b/Assets/Firebase/Editor/readme.md deleted file mode 100755 index 85131e3..0000000 --- a/Assets/Firebase/Editor/readme.md +++ /dev/null @@ -1,1194 +0,0 @@ -Firebase Unity SDK -================== - -The Firebase Unity SDK provides Unity packages for the following Firebase -features on *iOS* and *Android*: - -| Feature | Unity Package | -|:----------------------------------:|:---------------------------------:| -| Firebase Analytics | FirebaseAnalytics.unitypackage | -| Firebase Authentication | FirebaseAuth.unitypackage | -| Firebase Crashlytics | FirebaseCrashlytics.unitypackage | -| Firebase Realtime Database | FirebaseDatabase.unitypackage | -| Firebase Dynamic Links | FirebaseDynamicLinks.unitypackage | -| Firebase Functions | FirebaseFunctions.unitypackage | -| Firebase Instance ID | FirebaseInstanceId.unitypackage | -| Firebase Messaging | FirebaseMessaging.unitypackage | -| Firebase Realtime Database | FirebaseDatabase.unitypackage | -| Firebase Remote Config | FirebaseRemoteConfig.unitypackage | -| Firebase Storage | FirebaseStorage.unitypackage | - -The SDK provides .NET 3.x and .NET 4.x compatible packages in the `dotnet3` and -`dotnet4` directories of the SDK: - -* Unity 5.x and earlier use the .NET 3.x framework, so you need to import - packages from the `dotnet3` directory. -* Unity 2017.x and newer allow the use of the .NET 4.x framework. If your - project is configured to use .NET 4.x, import packages from the - `dotnet4` directory. - -## Desktop Workflow Implementations - -The Firebase Unity SDK includes desktop workflow support for the following -Firebase features, enabling their use in the Unity editor and in standalone -desktop builds on Windows, OS X, and Linux: - -| Feature | Unity Package | -|:----------------------------------:|:---------------------------------:| -| Firebase Authentication | FirebaseAuth.unitypackage | -| Firebase Realtime Database* | FirebaseDatabase.unitypackage | -| Firebase Functions | FirebaseFunctions.unitypackage | -| Firebase Remote Config | FirebaseRemoteConfig.unitypackage | -| Firebase Storage | FirebaseStorage.unitypackage | - -(* See Known Issues in the Release Notes below.) - -This is a Beta feature, and is intended for workflow use only during the -development of your app, not for publicly shipping code. - -## Stub Implementations - -Stub (non-functional) implementations of the remaining libraries are provided -for convenience when building for Windows, OS X, and Linux, so that you don't -need to conditionally compile code when also targeting the desktop. - -## AdMob - -The AdMob Unity plugin is distributed separately and is available from the -[AdMob Get Started](https://firebase.google.com/docs/admob/unity/start) guide. - -## Known Issues - -### .NET 4.x compatibility when using Unity 2017.x and newer. - -.NET 4.x support is available as a build option in Unity 2017 and newer. -Firebase plugins use components of the -[Parse SDK](https://github.com/parse-community/Parse-SDK-dotNET) to provide some -.NET 4.x classes in earlier versions of .NET. Therefore, versions `5.4.0` and -newer of the {{unity_sdk}} provide plugins that are compatible with either -.NET 3.x or .NET 4.x in `dotnet3` and `dotnet4` directories of the -{{unity_sdk_link}}. - -If you import a Firebase plugin that is incompatible with the .NET version -enabled in your project, you'll see compile errors from some types in the -.NET framework that are implemented by the Parse SDK. - -To resolve the compilation error, if you're using .NET 3.x: - -1. Remove or disable the following DLLs for all platforms: - - `Parse/Plugins/dotNet45/Unity.Compat.dll` - - `Parse/Plugins/dotNet45/Unity.Tasks.dll` -1. Enable the following DLLs for all platforms: - - `Parse/Plugins/Unity.Compat.dll` - - `Parse/Plugins/Unity.Tasks.dll` - -To resolve the compilation error, if you're using .NET 4.x: - -1. Remove or disable the following DLLs for all platforms: - - `Parse/Plugins/Unity.Compat.dll` - - `Parse/Plugins/Unity.Tasks.dll` -1. Enable the following DLLs for all platforms: - - `Parse/Plugins/dotNet45/Unity.Compat.dll` - - `Parse/Plugins/dotNet45/Unity.Tasks.dll` - -If you import another Firebase plugin: - -- Select the menu item - `Assets > Play Services Resolver > Version Handler > Update` - to enable the correct DLLs for your project. - -### Unity 2017.2 Networking - -Realtime Database creates TLS network connections using the .NET networking -stack. TLS functionality is broken in Unity 2017.2 when using .NET 4.6 causing -the Realtime Database plugin to fail in editor and on desktop. There is no -workaround for this issue, you have to use a different version of Unity, for -example 2017.1 or 2017.3. - - -### Unity 4 workarounds - -Firebase plugins are not officially supported in Unity 4. However, we do -make an effort to ensure the plugins can work with some manual setup. - -A couple of components do not work in Unity 4: - - - [Version Handler](https://github.com/googlesamples/unity-jar-resolver#unity-plugin-version-management) - does not work due to no PluginImporter and no clean way to prevent managed - DLLs from being loaded by Unity 4. - - This means it's not possible for plugins to automatically enable the most - recent version of shared components (e.g Firebase, AdMob, Facebook etc. - may share a common component). - - DLLs that target a specific .NET version (e.g .NET 4.x) are not disabled. - - Managed (C#) DLLs cannot be targeted to a specific platform which breaks - our plugin where we have platform specific C# DLLs for some components. - -To use in Unity 4 you will need to: - - - Resolve any dependencies that are shared between multiple plugins. - For example, Firebase and AdMob use the - [Play Services Resolver](https://github.com/googlesamples/unity-jar-resolver) - which contains DLLs that encode the version in their filename under the - folder `PlayServicesResolver/Editor`. For each versioned DLL under the - folder `PlayServicesResolver/Editor` delete the oldest version of each DLL. - - Remove .NET 4.x DLLs from `Parse/Plugins/dotNet45`. - - Remove / rename platform specific DLLs. - Firebase plugins contain iOS specific DLLs under the folder - `Firebase/Plugins/iOS`. - - When *not* building for iOS: - - Change the extension of files under the `Firebase/Plugins/iOS` folder - from `.dll` to `.dlldisabled` - - When building for iOS: - - Change the extension of files under the `Firebase/Plugins/iOS` folder - from `.dlldisabled` to `.dll` - - For each file in `Firebase/Plugins/iOS` change the file extension of - the same name under `Firebase/Plugins` from `.dll` to `.dlldisabled`. - For example, `Firebase/Plugins/iOS/Firebase.App.dll` and - `Firebase/Plugins/Firebase.App.dlldisabled`. - -Setup ------ - -You need to follow the -[SDK setup instructions](https://firebase.google.com/docs/unity/setup). -Each Firebase package requires configuration in the -[Firebase Console](https://firebase.google.com/console). If you fail to -configure your project your app's initialization will fail. - -Support -------- - -[Firebase Support](http://firebase.google.com/support/) - -Release Notes -------------- -### 6.7.0 - - Overview - - Updated dependencies, fixed issues in Analytics, Database, Dynamic Links, - Crashlytics, and Storage. - - Changes - - Storage (iOS/Android): Fixed an issue where - FirebaseStorage.GetReferenceFromUrl would return an invalid - StorageReference. - - Dynamic Links: Fixed an issue where removing delegate from - DynamicLinks.DynamicLinkReceived does not stop the delegate from being - called. - - Database: Fixed an issue causing timestamps to not be populated correctly - when using DatabaseReference.UpdateChildren(). - - Database (Desktop): Fixed an issue preventing listener events from being - triggered after DatabaseReference.UpdateChildren() is called. - - Database (Desktop): Functions that take string parameters will now - fail gracefully if passed a null pointer. - - Database (Desktop): Fixed an issue that could result in an incorrect - snapshot being passed to listeners under specific circumstances. - - Database (Desktop): Fixed an issue causing - DatabaseReference.RunTransaction() to fail due to datastale when the - location previously stored a list with more than 10 items or a dictionary - with integer keys. - - Crashlytics: Fixed an [issue](https://github.com/firebase/quickstart-unity/issues/493) - on iOS with Unity 2019.3 beta where the plugin fails to create a XCode run - script to upload symbols. - - Analytics (iOS): Fixed the racy behavior of - `FirebaseAnalytics.GetAnalyticsInstanceId()` after calling - `FirebaseAnalytics.ResetAnalyticsData()`. - -### 6.6.0 - - Overview - - Updated dependencies, fixed issues in Auth & Database. - - Changes - - Auth (Desktop): Fixed not loading provider list from cached user data. - - Database (Desktop): Fixed a crash that could occur when trying to keep a - location in the database synced when you do not have permission. - - Database (Desktop): Queries on locations in the database with query rules - now function properly, instead of always returning "Permission denied". - - Database (Desktop): Fixed the map-to-vector conversion when firing events - that have maps containing enitrely integer keys. - -### 6.5.0 - - Overview - - Updated dependencies, improved logging for Auth and Database, and fixed - the freeze in the editor. - - Changes - - General: The instance of FirebaseApp, FirebaseAuth, FirebaseDatabase, - FirebaseFunctions, FirebaseInstanceId and FirebaseStorage will be kept - alive after creation until explicitly disposed. - - Auth (Linux): Improved error logging if libsecret (required for login - persistence) is not installed on Linux. - - Database: The database now supports setting the log level independently of - the system level logger. - - Auth/Database (Desktop): Fixed the freeze when playing in the editor for - the more than once or when closing the editor, when keeping a static - reference to either FirebaseAuth or FirebaseDatabase instances. - -### 6.4.0 - - Overview - - Updated dependencies, improved error handling in the iOS build logic, - improved error handling with deleted objects, fixed an issue with Auth - persistence, and fixed a crash in Database. - - Changes - - General: Added more underlying null checks when accessing objects that can - potentially be deleted, throwing exceptions instead of crashing. - - General (iOS): Handle malformed Info.plist files when patching Xcode - projects. - - Auth (Desktop): Fixed an issue with updated user info not being persisted. - - Database (Desktop): Fixed a crash with saving a ServerTimestamp during - a transaction. - -### 6.3.0 - - Overview - - Auth (iOS): Fixed an exception in Firebase.AuthVerifyPhoneNumber. - - Changes - - General (Editor): Fixed spurious errors about missing google-services.json - file. - - General (iOS/Android): Fixed a bug that allows custom FirebaseApp - instances to be created after the app has been restarted - - Auth (Desktop): Changed destruction behavior. Instead of waiting for all - async operations to finish, now Auth will cancel all async operations and - quit. For callbacks that are already running, this will protect against - cases where auth instances might not exist anymore. - - Auth (iOS): Fixed an exception in PhoneAuthProvider.verifyPhoneNumber. - - Auth (iOS): Stopped Auth from hanging on destruction if any local tasks - remain in scope. - - Database (Desktop): Fixed an issue that could cause a crash when updating - the descendant of a location with a listener attached. - -### 6.2.2 - - Overview - - Bug fixes. - - Changes - - General (Editor): Worked around regression in Unity 2019.2 and 2019.3 - which caused DllNotFoundException. - - General (Editor, macOS): Add support for macOS 10.11.x. - - Auth (Editor): After loading a persisted user data, ensure token is - not expired. - - Auth (desktop): Ensure Database, Storage and Functions do not use an - expired token after it's loaded from persistent storage. - - Database (Editor): Fixed a crash when calling UpdateChildrenAsync. - - Database (Editor): Deprecated service account authentication. - - Database (Editor): Fixed DatabaseReference.RunTransaction() sending - invalid data to the server which causes error message "Error on - incoming message" and freeze. - - Known Issues - - Database/Storage/Functions may fail to send authentication token to server - if FirebaseAuth is garbage-collected. If you are unable to access to - the server due to "Permission Denied", please try to keep FirebaseAuth - alive. - -### 6.2.1 - - Overview - - Fixed Crashlytics on Android not working correctly. - - Changes - - Crashlytics (Android): Fixed an issue causing Crashlytics to believe it - was shut down, blocking all functionality. - -### 6.2.0 - - Overview - - Moved Realtime Database to a C++ implementation on desktop, added support - for custom domains to Dynamic Links, and fixed issues in Database, - Instance ID, and Crashlytics. - - Changes - - General (Editor): Fixed an issue that could cause errors when trying to - read a google-services.json file with unicode characters in its path. - - General (Editor, iOS): Added support for patching Xcode projects in - Unity 2019.3+. - - General: Fixed a race that could lead to a crash when gabarge collecting - FirebaseApp objects. - - General: Updated Play Services Resolver from 1.2.116 to 1.2.121 - For more information, see [this document](https://github.com/googlesamples/unity-jar-resolver/blob/master/CHANGELOG.md#version-12121---jun-27-2019). - Added support for the [Jetpack Jetifier](https://developer.android.com/studio/command-line/jetifier) - , this allows the use of legacy Android support libraries with the latest - release of Google Play Services that uses AndroidX. - - Crashlytics (Android): Fixed a crash when logging large call stacks. - - Crashlytics (Android): Fixed a crash in exception logging when the - application is shutting down. - - Instance ID (Android): Fixed a crash when destroying InstanceID objects. - - Instance ID: Fixed a crash if multiple Instance ID objects are created and - destroyed quickly. - - Dynamic Links: Added support for custom domains. - - Database (Editor): Moved Realtime Database to a C++ implementation on - desktop to improve reliability across different Unity versions. - - Database (Editor): Moved transaction callbacks to the main thread to - mirror Android and iOS. - - Database: Added a way to configure log verbosity of Realtime Database - instances. - -### 6.1.1 - - Overview - - Fixed an issue when generating Firebase config files on Windows. - - Changes - - General (Editor): Fixed an issue when generating Firebase config files on - Windows. - - General (Editor): Upgraded Play Services Resolver to from 1.2.115 to - 1.2.116. For more information see [this - document](https://github.com/googlesamples/unity-jar-resolver/blob/master/CHANGELOG.md#version-12115---jun-7-2019). - -### 6.1.0 - - Overview - - Added Auth credential persistence on Desktop, fixed and cleaned up some - documentation, converted testapps to use ContinueOnMainThread(), fixed - issues in Auth and Database, and added additional information to - Messaging notifications. - - Changes - - General (Editor): Removed Firebase Invites documentation from the - in-editor documentation. - - General (Editor): Fixed an issue with resource generation when Firebase - plugin files have been moved from their default locations. - - General (iOS): Fixed an issue where connections via NSURLSession - (used internally by the iOS SDK) can be prematurely closed by the client - if NSAppTransportSecurity is set to YES in the Info.plist and - NSAllowsArbitraryLoadsInWebContent is not set. This can be fixed by - setting NSAllowsArbitraryLoadsInWebContent to the same value as - NSAppTransportSecurity. - - General (Editor): Upgraded Play Services Resolver to from 1.2.109 to - 1.2.115. For more information see [this - document](https://github.com/googlesamples/unity-jar-resolver/blob/master/CHANGELOG.md#version-12115---may-28-2019). - - Auth (Desktop): User's credentials will now persist between sessions. See - the [documentation](http://firebase.google.com/docs/auth/unity/manage-users#persist_a_users_credential) - for more information. - - Auth (Desktop): As part of the above change, if you access CurrentUser - immediately after creating the FirebaseAuth instance, it will block until - the saved user's state is finished loading. - - Auth (Desktop): Fixed an issue where Database/Functions/Storage might not - use the latest auth token immediately after sign-in. - - Auth (Android): Fixed an issue where an error code could get reported - incorrectly on Android. - - Crashlytics, Functions: Fixed an issue that could cause a crash during - shutdown due to the destruction order of plugins being nondeterministic. - - Database (iOS): Fixed a race condition that could cause a crash - when cleaning up database listeners on iOS. - - Database (iOS): Fixed an issue where long (64-bit) values could get - written to the database incorrectly (truncated to 32-bits) on 32-bit - devices. - - Messaging (Android): Added channel_id to Messaging notifications. - -### 6.0.0 - - Overview - - Released - [Crashlytics](https://firebase.google.com/docs/crashlytics/get-started?platform=unity) - as generally available (GA); added Task.ContinueWithOnMainThread(); fixed - issues in the Android Resolver, iOS Resolver, Auth, Database, Messaging, - and Remote Config; removed Firebase Invites, removed deprecated methods in - Firebase Remote Config, and deprecated a method in Firebase Analytics. - - Changes - - Updated [Firebase - iOS](https://firebase.google.com/support/release-notes/ios#6.0.0) and - [Firebase - Android](https://firebase.google.com/support/release-notes/ios#2019-05-07) - dependencies. - - Crashlytics (iOS/Android): [Crashlytics for - Unity](https://firebase.google.com/docs/crashlytics/get-started?platform=unity) - is now generally available (GA). Get the next evolution with BigQuery - exports, Jira integration, and more. To migrate from Fabric Crashlytics - for Unity to Firebase Crashlytics, follow the [migration - guide](https://firebase.google.com/docs/crashlytics/migrate-from-fabric). - - Added an extension method, `Task.ContinueWithOnMainThread()`, which - forces the continuation of asynchronous operations to occur in the Unity - main thread rather than in a background thread. - - General: Upgraded Play Services Resolver to from 1.2.104 to 1.2.109. For - more information see [this - document](https://github.com/googlesamples/unity-jar-resolver/blob/master/CHANGELOG.md#version-12109---may-6-2019). - - General (Android): Added support for Android SDK installed directly in - Unity 2019. - - General (iOS): Fixed issues generating projects without using Cocoapods. - - Database (iOS/Android): Fixed an issue where integrating the SDK greatly - increased the size of your app. - - Database: Fixed exception handling during listener events. - - Remote Config: Fixed an issue parsing boolean values. - - Auth (Desktop): Fixed a crash when attempting to call Game Center - authentication methods from the Unity editor. - - Messaging (iOS/Android): Fix an issue where Subscribe and Unsubscribe - never returned if the API was configured not to receive a registration - token. - - Invites: Removed Firebase Invites, as it is no longer supported. - - Remote Config: Removed functions using config namespaces. - - Analytics: Deprecated SetMinimumSessionDuration. - -### 5.7.0 - - Overview - - Fixed an issue with escape characters in Auth, deprecated functions - in Remote Config, and fixed an issue in the Android Resolver. - - Changes - - Auth: Fixed UserProfile.PhotoUrl removing percent encoded characters when - being set. - - Remote Config: Config namespaces are now deprecated. You'll need to switch - to methods that use the default namespace. - - General (Android): Fixed an exception on resolution in some versions of - Unity 2017.4 by changing how Android ABI selection is handled. - -### 5.6.1 - - Overview - - Fixed race condition on iOS SDK startup and fixed some issues in the - Android Resolver. - - Changes - - General (iOS): Updated to the latest iOS SDK to fix a crash on - firebase::App creation caused by a race condition. The crash could occur - when accessing the [FIRApp firebaseUserAgent] property of the iOS FIRApp. - - General (Android): Fixed Java version check in Android resolver when using - Java SE 12 and above. - - General (Android): Whitelisted Unity 2017.4 and above for ARM64 builds. - Previously required ARM64 libraries would be stripped from all Unity 2017 - builds resulting in a DllNotFoundException. - -### 5.6.0 - - Overview - - Added Game Center sign-in to Auth and fixed intermittent crashes due to - garbage collection. - - Changes - - Auth (iOS): Added Game Center authentication. - - General: Fixed intermittent crashes caused when multiple native objects - were garbage-collected at the same time. - -### 5.5.0 - - Overview - - Added support for - [Crashlytics](https://firebase.google.com/docs/crashlytics/get-started#unity) - as a Beta release, deprecated Firebase Invites, and updated the Android - Resolver. - - Changes - - Crashlytics: - [Crashlytics for Unity](https://firebase.google.com/docs/crashlytics/get-started#unity) - is now available as a Beta release. Get the next evolution with BigQuery - exports, Jira integration, and more. To migrate from Fabric Crashlytics - for Unity to Firebase Crashlytics, follow the - [migration guide](https://firebase.google.com/docs/crashlytics/migrate-from-fabric). - - General (Android): Updated to using version 1.2.101 of the Android - Resolver. Prompt the user before the resolver runs for the - first time and allow the user to elect to disable from the prompt. - - Invites: Firebase Invites is deprecated. Please refer to - https://firebase.google.com/docs/invites for details. - -### 5.4.4 - - Overview - - Fixed bugs in iOS/Android Resolver components, Realtime Database on - mobile, and Cloud Functions on Android; fixed a general iOS bug; and fixed - issues with Unity 5.6 and Unity 2018.3 and newer. - - Changes - - General (Android): Fixed packaging of AARs in the Android Resolver when - using Unity 2018 and a recent version of Gradle. - - General: Reduced auto-resolution frequency in iOS and Android Resolvers, - speeding up builds and reducing memory footprint. - - General: Fixed an issue with version number handling in iOS and Android - Resolvers. - - General (iOS): Fixed an issue that caused apps to crash when exiting the - app. - - General: Fixed parsing of Unity 5.6 metadata. - - General: Workaround for Unity 2018.3 and newer ignoring the "Any" - platform. - - Realtime Database (mobile): Fixed an issue where certain DataSnapshots - were missing data. - - Cloud Functions (Android): Fixed an issue with error handling. - - Known Issues - - The garbage collection race condition mentioned in version 5.4.2 still - occurs in Firebase Auth, Database, Storage, and Instance ID. To work - around the issue until a fixed is released, keep a reference to the - Firebase object instance (for example, FirebaseAuth.DefaultInstance) to - prevent garbage collection. - -### 5.4.3 - - Overview - - Bug fix for Firebase Storage on iOS. - - Changes - - Storage (iOS): Fixed an issue when downloading files with `GetBytesAsync`. - -### 5.4.2 - - Overview - - Updated iOS and Android dependency versions, and fixed issues in the - Android Resolver, FirebaseApp, Auth on Android, Database, and Dynamic - Links on iOS. - - Changes - - General (Android): Fixed an infinite loop in Android Resolver when using - auto-resolution. - - App: Fixed a race condition causing an occasional crash when FirebaseApp - is garbage collected. - - Auth (Android): Removed an irrelevant error about the Java class - FirebaseAuthWebException. - - Database: Fixed a race condition causing an occasional crash when - FirebaseDatabase is garbage collected. - - Dynamic Links (iOS): Fixed Dynamic Links iOS when using Unity Cloud - builds. - - Known Issues - - The garbage collection race condition mentioned above still occurs in - Firebase Auth, Storage, and Instance ID. To work around the issue until a - fixed is released, keep a reference to the Firebase object instance (for - example, FirebaseAuth.DefaultInstance) to prevent garbage collection. - -### 5.4.1 - - Overview - - Fix for Google Analytics iOS dependency. - - Changes - - Analytics (iOS): Fixed issue with Google Analytics and Google App - Measurement mismatch. - -### 5.4.0 - - Overview - - Improved support for .NET 4.x Unity projects, exposed method to enable - Realtime Database peristence, bug fix for link shortening in - Dynamic Links. - - Changes - - General: Added plugins that are pre-configured for import into .NET 4.x - Unity projects. - - Realtime Database: Exposed method to enable persistence on mobile - platforms. - - Dynamic Links (Android): Fixed short link generation failing with - "error 8". - -### 5.3.1 - - Overview - - Updated iOS and Android dependency versions, bug fix for Invites, - improved Android module initialization, fixed issue with Unity 2018.3 - beta, added C# symbols and upgraded the Play Services Resolver. - - Changes - - General: Added symbols for all C# assemblies. - - General (Android): Improved module initialization so that the Unity SDK - does not attempt to use Android libraries unless the C# assembly is - included. For example, this allows users of the Firebase Analytics plugin - to use the `firebase-messaging` Android library without the Firebase Unity - Messaging component. - - General (Editor): Fixed loading of the Firebase.Editor.dll component in - Unity 2018.3.0b2 - - General (Editor): Updated the Play Services Resolver from version 1.2.88 - to 1.2.91, see the - [GitHub changelog](https://github.com/googlesamples/unity-jar-resolver/blob/master/CHANGELOG.md) - for details. - - General (Editor): Fixed the Android "Open in Console" button of the - Firebase window (accessible under the **Window > Firebase** menu option) - to correctly open the Firebase console in a web browser when the selected - target platform is not Android in Unity 5.6 and above. - - Invites (Android): Fixed an exception when the Android Minimum Version - code option is used on the Android. - -### 5.3.0 - - Overview - - Fixed bugs in Database, Functions, Storage, and the Android Resolver; - changed minimum Xcode version to 9.4.1. - - Changes - - General (iOS): Minimum Xcode version is now 9.4.1. - - General (Android): Fixed an issue resolving additional types of version - conflicts in the Android Resolver. - - General (Android): Fixed a hang in Unity 5.6. - - Database (Desktop): Fixed issues in ChildListener. - - Database (Desktop): Fixed a crash related to objects being garbage - - Functions (Android): Fixed an issue when a function returns an array. - - Storage: Fixed issues when transactions are canceled in .NET 4.6. - - Known Issues - - Dynamic Links (Android): Shortening dynamic links fails with "Error 8". - -### 5.2.1 - - Overview - - Updated Android and iOS dependency versions, and fixed bugs in App, Auth, - Database, and the Android Resolver. - - Changes - - General (Android): Fixed an issue resolving certain types of version - conflicts in the Android Resolver. - - App: Now throws an exception if any Firebase libraries are initialized - while `CheckAndFixDependenciesAsync()` is still in progress. - - Auth, Database: Fixed a race condition returning Tasks when calling - the same method twice in quick succession. - - Database (iOS/Android): Fixed a crash in DatabaseReference/Query during - garbage collection (and other times). - -### 5.2.0 - - Overview - - Fixed bugs in Auth, changes to Functions, Messaging and Android builds. - - Changes - - Auth: Fixed per-frame allocation in the token refresh logic. - - Auth (Android): Fixed a crash in - `FirebaseUser.UpdatePhoneNumberCredentialAsync()`. - - Functions: Added a way to specify which region to run the function in. - - Messaging: Added `SubscribeAsync` and `UnsubscribeAsync`, which return - Tasks, and deprecated `Subscribe` and `Unsubscribe`. - - General (Android): Fixed a null reference in the Google Play Services - availability checker. - - General (Android): Fixed Android problems merging Android library - manifests in Unity 2018. - - General (Android): Added arm64-v8a build support. - -### 5.1.1 - - Overview - - Updated Android and iOS dependency versions only. - -### 5.1.0 - - Overview - - Changes to Analytics, Auth, and Database; and added Cloud Functions for - Firebase. - - Changes - - Android (General): Fixed build issues due to the broken AndroidManifest - merger in Unity 2018.x. - - Android (General): Improved compatibility with plugins that use Google - Play services versions older than 15.0.0. - - Android (General): Improved dependency resolution when the Android SDK - path is not configured. - - Analytics: Added `ResetAnalyticsData()` to clear all analytics data - for an app from the device. - - Analytics: Added `GetAnalyticsInstanceIdAsync()` which allows developers - to retrieve the current app's analytics instance ID. - - Auth: Linking a credential with a provider that has already been linked - now produces an error. - - Auth (iOS): Fixed crashes in - `FirebaseUser.LinkAndRetrieveDataWithCredential()` and - `FirebaseUser.ReauthenticateAndRetrieveData()`. - - Auth (iOS): Fixed photo URL never returning a value on iOS. - - Auth (Android): Fixed setting the profile photo URL with - `FirebaseUser.UpdateUserProfile()`. - - Database: Added support for ServerValues in SetPriority methods. - - Database (iOS / Android): Now implemented as a wrapper around Firebase iOS - and Android SDKs, to add offline support and increase reliability and - performance. - - Functions: Added support for Cloud Functions for Firebase on iOS, Android, - and desktop. - -### 5.0.0 - - Overview - - Renamed the static libraries to include firebase in their name, - removed deprecated methods in App, Auth, and Storage, - and exposed new APIs in Dynamic Links and Invites. - - Changes - - General: Library names that previously did not mention Firebase now have - a "FirebaseCpp" prefix. For example, Auth.dll is now FirebaseCppAuth.dll. - - General (Android): Improved error handling when device is out of space. - - App: Removed deprecated method SetLogLevel. - - Auth: Removed deprecated properties PhotoUri and RefreshToken. - - Dynamic Links: Added MatchStrength to ReceivedDynamicLink, that describes - the strength of the match for the received link. - - Invites: Added MatchStrength to InvitesReceivedEventArgs, that describes - the strength of the match for the received invite. - - Storage: Deprecated StorageMetadata.DownloadUrl and - StorageMetadata.DownloadUrls. - Please use StorageReference.GetDownloadUrlAsync() instead. - - Messaging: Added an optional initialization options struct. This can be - used to suppress the prompt on iOS that requests permission to receive - notifications at start up. Permission can be requested manually using the - function `FirebaseMessaging.RequestPermissionAsync()`. - -### 4.5.2 - - Overview - - Fixed a build issue, and bugs in FirebaseApp, Auth and Linux Desktop. - - Changes - - Common: Updated Parse .NET 4.6 forwarding DLLs to fix build issues when - using IL2CPP with the .NET 4.6 framework. The update works with IL2CPP in - Unity 2017.2 and beyond. IL2CPP builds still fail in Unity 2017.1 - as the IL2CPP distribution bundled with Unity 2017.1 does not correctly - support type forwarding DLLs. - - Common: Root cert installation is now *only* performed in plugins that - use the .NET network stack (currently only the Realtime Database). This - should resolve exceptions on initialization that reference - `/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation`. - - Common (Desktop): Fixed crash when using Firebase Auth, Storage, - Realtime Database and Remote Config on Linux. - - Common (Android): Loading default AppOptions is now more robust on Android - resulting in errors reported for missing fields rather than exiting the - application with an error in the native library. - - Auth: Fixed regression in release 4.5.0 which led to an unhandled - exception on auth token refresh. - - Known Issues - - IL2CPP builds will fail in Unity 2017.1 as the IL2CPP distribution bundled - with Unity 2017.1 does not correctly support type forwarding DLLs. - -### 4.5.1 - - Overview - - Fixed some build issues, fixed bugs in Database, Dynamic Links, - Invites, Remote Config, and Storage, and exposed new APIs in Auth on - Desktop and Analytics. - - Changes - - Auth (Desktop): Added support for accessing user metadata. - - Analytics: Added SetMinimumSessionDuration() and - SetSessionTimeoutDuration(). - - Desktop: Fixed a bug when using iOS GoogleServicesInfo.plist config - settings on desktop, which prevented "play in editor" mode from loading - the correct project settings. (Only affected users who developed for iOS - and not Android, who were using Desktop). - - Dynamic Links and Invites (Android): Fixed an issue with Dynamic Links - getting lost when calling CheckAndFixDependenciesAsync. - - Messaging: Added TokenRegistrationOnInitEnabled property to enable or - disable auto-token generation. - - Remote Config: Fixed a bug causing incorrect reporting of success or - failure during a Fetch(). - - Storage: Fixed a bug in Storage that was unescaping '/' characters in - URL returned by StorageReference.GetDownloadUrlAsync(). This caused an - "Invalid HTTP method/URL pair" error when attempting to download using the - URL. - - General (Android): Fixed a bug causing Unity to hang due to FirebaseApp - initializing on the wrong thread, when building in -batchmode. - -### 4.5.0 - - Overview - - Desktop workflow support for some features, Google Play Games - authentication on Android, improved editor support, and changes to Auth, - Instance ID and Storage. - - Changes - - General: Added support for plugins within the Unity Editor context. - - Auth, Remote Config: Stub implementations have been replaced with - functional desktop implementations on Windows, OS X and Linux. - - Auth (Android): Added support for Google Play Games authentication. - - Auth, Instance ID: Fixed issues when destroying/finalizing Firebase - objects. - - Storage: Added Md5Hash to StorageMetadata. - - Storage (iOS / Android): Now implemented as wrapper around Firebase iOS - and Android SDKs, to increase reliability and performance. - - Known Issues - - On Windows and Mac OS, only 64-bit builds are supported (x86_64), not - 32-bit. - -### 4.4.3 - - Overview - - Bug fixes in Dynamic Links, Invites, Remote Config and Storage. - - Changes - - Dynamic Links (iOS): Now fetches the invite ID when using universal links. - - Dynamic Links (iOS): Fixed crash on failure of dynamic link completion. - - Dynamic Links (iOS): Fixed an issue where some errors weren't correctly - reported. - - Invites (Editor): Fixed SendInvite never completing. - - Remote Config (iOS): Fixed an issue where some errors weren't correctly - reported. - - Storage: Fixed Metadata::content_language returning the wrong data. - - Storage (iOS): Reference paths formats are now consistent with other - platforms. - - Storage (iOS): Fixed an issue where trying to upload to a non-existent - path would not complete the Task. - - Storage (iOS): Fixed a crash when a download fails. - - Editor: Fixed a crash in the editor when using .NET 4.6 with certain - versions of Unity 2017. - - General (Android): Fixed an issue when Google Play Services was out of - date and would hang after returning from the update workflow. - -### 4.4.2 - - Overview - - Updated Firebase iOS dependency version. - - Changes - - General (iOS): Updated Firebase iOS Cocoapod dependency version. - -### 4.4.1 - - Overview - - Bug fixes for .Net 4.x, Storage, Realtime Database, and Instance ID on - iOS. - - Changes - - Instance ID (iOS): GetTokenAsync no longer fails without an APNS - certificate, and no longer forces registering for notifications. - - Storage: Added support for a progress listener and cancellation - token to `GetBytesAsync`. - - Storage: Fixed an issue where the auth token was not refreshed when the - application is started. - - Realtime Database: Fixed an issue where the auth token was not refreshed - when the application is started. - - General (Android): Fixed a bug with handling transitive dependencies in - the Android Resolver, where there was a common dependency name from - different sources. - - General (Android): Fixed Android Resolver reporting non-existent - conflicts. - - General: Fixed 'get_realtimeSinceStartup' Assert in development builds. - - General: Fixed issues when using types added in .NET 4.x such as Tuple. - This requires switching to the appropriate Unity.Compat.dll when using - .NET 4.x (see Known Issues). - -### 4.4.0 - - Overview - - Support for Instance ID, and an Auth fix. - - Changes - - Instance ID: Added Instance ID library. - - Auth: Fixed user metadata property names. - -### 4.3.0 - - Overview - - General threading / callback and other bug fixes and new features in Auth. - - Changes - - General: Fixed some invalid calls to Unity APIs from threads. - - General (Editor): Changed Firebase settings window to work with Unity 4.x - - General (Editor): Fixed GoogleServices-Info.plist not being read in batch - mode. - - Auth: Fixed a bug due to a race condition fetching the authentication - token which could cause Database and Storage operations to hang. - - Auth: Added support for accessing user metadata. - - Remote Config (Android): Fixed a bug where remote config values retrieved - were misclassified as coming from a default config vs an active config. - - Database: Fixed hang when Time.timeScale is 0. - - Storage: Fixed hang when Time.timeScale is 0. - -### 4.2.1 - - Overview - - Bug fixes for Real-Time Database, Storage, API initialization in .NET 4.x, - and improvements to the iOS and Android Resolver components. - - Changes - - General (Android): Fixed Android resolution when a project path contains - apostrophes. - - General (iOS): Increased speed of iOS resolver dependency loading. - - General (Android): Removed legacy resolution method from Android Resolver. - It is now only possible to use the Gradle or Gradle prebuild resolution - methods. - - General (Android): Fixed Android Resolution issues with OpenJDK by - updating the Gradle wrapper to 4.2.1. - - General (Android): Android resolution now also uses - gradle.properties to pass parameters to Gradle in an attempt to workaround - problems with command line argument parsing on Windows 10. - - General: Fixed some invalid calls to Unity APIs from threads, when using - .NET 4.x which is added in Unity 2017. - - Database: Fixed hang in Real-Time Database when Time.timeScale is 0 in - Unity 2017. - - Storage: Fixed hang in Storage when Time.timeScale is 0 in Unity 2017. - - Storage: Fixed file download in Unity 2017.2. - -### 4.2.0 - - Overview - - Added URL support in Messaging, improved the initialization process on - Android and fixed bugs in the iOS and Android build systems, Analytics, - Auth, Database and Messaging. - - Changes - - Messaging: Messages sent to users can now contain a link URL. - - Auth: Added more specific error codes for failed operations. - - Auth (iOS): Phone Authentication no longer requires push notifications. - When push notifications aren't available, reCAPTCHA verification is used - instead. - - Analytics (iOS): Fixed bug which prevented the user ID and user - properties being cleared. - - Database: Fixed issue where user authentication tokens are ignored if - the application uses the database API before initializing authentication. - - Messaging (Android): Fixed a bug which prevented the message ID field - being set. - - General (iOS): Fixed incorrect processing of framework modulemap files - which resulted in the wrong link flags being generated when Cocoapod - project integration is enabled. - - General (Android): Added support for Google Play services dependency - resolution when including multiple plugins (e.g AdMob, Google Play Games - services) that require different versions of Google Play services. - - General (Android): Fixed Android dependency resolution when local - project paths contain spaces. - - General (Android): Fixed race condition in Android Resolver which could - cause a hang when running auto-resolution. - - General (Android): Forced Android Gradle resolution process to not use - the Gradle daemon to improve reliability of the process. - - General (Android): Added a check for at least JDK 8 when running Android - dependency resolution. - - General: Fixed MonoPInvokeCallbackAttribute incorrectly being added to - the root namespace causing incompatibility with plugins like slua. - - Known Issues - - General (Android): Unity (not the Firebase SDK) has a bug that causes - applications to crash after running the Google Play services update on - Android 8.0 Oreo devices. - -### 4.1.0 - - Overview - - Bug fixes for the iOS build system, Auth, Messaging, and Remote Config. - - Changes - - General (iOS): Fixed spurious errors on initialization of FirebaseApp. - - General (iOS): Fixed iOS build with Cocoapod Project integration enabled. - This affected all iOS builds when using Unity 5.5 or below or when using - Unity Cloud Build. - - General (iOS): Fixed issue which prevented the use of Unity Cloud Build - with Unity 5.6 and above. Unity Cloud Build does not open generated - Xcode workspaces so we force Cocoapod Project integration in the - Unity Cloud Build environment. - - Auth (Android): Now throws an exception if you call GetCredential without - an Auth instance created. - - Messaging (Android): Fixed a bug resulting in FirebaseMessages not having - their MessageType field populated. - - Messaging (iOS): Fixed a race condition if a message is received before - Firebase Cloud Messaging is initialized. - - Messaging (iOS): Fixed a bug detecting whether the notification was opened - if the app was running in the background. - - Remote Config: When listing keys, the list now includes keys with defaults - set, even if they were not present in the fetched config. - -### 4.0.3 - - Overview - - Bug fixes for Database, Dynamic Links, Messaging, iOS SDK compatibility, - .NET 4.x compatibility. - - Changes - - General: Added support for .NET 4.x in the System.Task implementation - used by the SDK. The VersionHandler editor plugin is now used to switch - Task implementations based upon the selected .NET version. - - General: Fixed root cert installation failure if Firebase is initialized - after other network operations are performed by an application. - - General: Improved native shared library name mangling when targeting - Linux. - - General (iOS): Fixed an issue which resulted in custom options not being - applied to FirebaseApp instances. - - General (iOS): Fixed a bug which caused method implementation look ups - to fail when other iOS SDKs rename the selectors of swizzled methods. - This could result in a hang on startup when using some iOS SDKs. - - Dynamic Links (Android): Fixed task completion if short link - creation fails. - - Database: Fixed a bug that caused database connections to fail when - using the .NET 4.x framework in Unity 2017 on OSX. - - Database: Fixed a bug where large data updates could be ignored. - - Messaging (iOS): Fixed message handling when messages they are received - via the direct channel to the FCM backend (i.e not via APNS). - -### 4.0.2 - - Overview - - Bug fixes for Analytics, Auth, Dynamic Links, and Messaging; - added support for Android SDK 25. - - Changes - - General (Android): Fixed a manifest issue with Android SDK tools and - support library >= 25.x. - - General (Android): Fixed an issue which caused Analytics to not be - enabled in all plugins. - - General (Android): Fixed native libraries not being included in built - APKs when using the internal build system in Unity 2017. - - Analytics (Android): Fix SetCurrentScreen to work from any thread. - - Auth (iOS): Fixed user being invalidated when linking a credential fails. - - Dynamic Links: Fixed an issue which caused an app to crash or not receive - a Dynamic Link if the link is opened when the app is installed and not - running. - - Messaging (iOS): Fixed a crash when no notification event is registered. - - Messaging: Fixed token notification event occasionally being raised twice - with the same token. - -## 4.0.1 - - Overview: - - Bug fixes for Dynamic links and Invites on iOS, the Google Play - services updater when using Cloud Messaging and Cloud Messaging on iOS. - - Changes: - - Cloud Messaging (Android): Fixed crash when updating Google Play services - in projects that include the Cloud Messaging functionality. - - Cloud Messaging (iOS): Fixed an issue where library would crash on start - up if there was no registration token. - - Dynamic Links & Invites (iOS): Fixed an issue that resulted in apps not - receiving a link when opening a link if the app is installed and not - running. - -## 4.0.0 - - Overview - - Added support for phone number authentication, access to user metadata, - a standalone dynamic links plugin and bug fixes. - - Changes - - Auth: Added support for phone number authentication. - - Auth: Added the ability to retrieve user metadata. - - Auth: Moved token notification into a separate token change event. - - Dynamic Links: Added a standalone Unity plugin separate from Invites. - - Invites (iOS): Fixed an issue in the analytics SDK's method swizzling - which resulted in dynamic links / invites not being sent to the - application. - - Messaging (Android): Fixed a regression introduced in 3.0.3 which caused - a crash when opening up a notification when the app is running in the - background. - - Messaging (iOS): Fixed interoperation with other users of local - notifications. - - General (Android): Fixed crash in some circumstances after resolving - dependencies by updating Google Play services. - - General (Editor): Fixed iOS resolver and Jar resolver plugins getting - disabled when importing multiple Firebase, Google Play Games or AdMob - plugins into a project. - - General (iOS): Added support for Cocoapod builds that use Xcode - workspaces in Unity 5.6 and above. - - General (iOS): Fixed Cocoapod version pinning which was broken in 3.0.3 - causing the SDK to pull in the most recent Firebase iOS SDK rather than - the correct version for the current Unity SDK release. - -## 3.0.3 - - Overview - - Bug fixes for Auth. - - Changes - - Auth: Fixed a crash caused by a stale memory reference when a - firebase::auth::Auth object is destroyed and then recreated for the same - App object. - - Auth: Fixed potential memory corruption when AuthStateListener is - destroyed. - - Auth: Fixed occasional crash in Unity editor when using Auth sign-in - methods. -## 3.0.2 - - Overview - - Bug fixes for Auth, Database, Invites, Messaging, Storage, and a general - fix, plus improved compatibility with Unity 5.6 when using the GoogleVR - SDK. - - Changes - - General (Android): Fixed unhandled exception if FirebaseApp creation - fails due to an out of date Google Play services. - - General (Android): Fixed Google Play Services updater crash when clicking - outside of the dialog on Android 4.x devices. - - Auth: Fixed user being invalidated when linking a credential fails. - - Auth: Fixed an occasional crash when events are fired. This could - manifest in a crash when signing in. - - Auth: Deprecated FirebaseUser.RefreshToken. - - Database: Fixed an issue which caused the application to manually - refresh the auth token. - - Messaging: Fixed incorrectly notifying the app of a message when a - notification is received while the app is in the background and the app - is then opened by via the app icon rather than the notification. - - Invites (iOS): Fixed an issue which resulted in the app delegate method - application:openURL:sourceApplication:annotation: not being called - when linking the invites library. This caused the Facebook SDK login - flow to fail. - - Storage: Fixed a bug that prevented the construction of Metadata without - a storage reference. - - Editor (Android): Fixed referenced Android dependencies in maven - where the POM references a specific version e.g '[1.2.3]'. - - Editor (iOS): Improved compatibility with Unity 5.6's Cocoapods support - required to use the GoogleVR SDK. - - Editor (Android): Fixed Android dependency resolution when the bundle ID - is modified. - -## 3.0.1 - - Overview - - Fixed Google Play Services checker on Android and improved Android - build configuration checks. - - Changes - - (Android): Fixed Google Play Services checker on Android. Previously - when Google Play Services was out of date, - FirebaseApp.CheckDependencies() incorrectly returned - DependencyStatus.Available. - - Editor (Android): Added check for auto-resolution being enabled in the - Android Resolver. - If auto-resolution is disabled by the user or by another plugin - (e.g Google Play Games), the user is warned about the configuration - problem and given the opportunity to fix it. - - (Android) Fixed single architecture builds when using Gradle. - - (Android) Resolved an issue which caused the READ_PHONE_STATE - permission to be requested. - -## 3.0.0 - - Overview - - Streamlined editor integration, build support and some bug fixes for - Auth, Database, Messaging, Invites and Storage. - - Changes - - Added link.xml files to allow byte stripping to be enabled. - - Fixed issues with Android builds when targeting a single ABI. - - Auth: Fixed race condition when accessing user properties. - - Auth: Added SetCurrentScreen() method. - - Database: Resolved issue where large queries resulted in empty results. - - Database: Fixed an issue which prevented saving boolean values. - - Mesaging: Fixed issue with initialization on iOS that caused problems - with other SDKs. - - Invites: Fixed issue with initialization on iOS that caused problems - with other SDKs. - - Storage: Fixed a bug which prevented download URLs from containing - slashes. - - Storage: Fixed a bug on iOS which caused networking to fail when the - full .NET 2.0 is used. - - Editor: Added process of cleaning stale / moved files when upgrading - to a newer plugin version. - - Editor: Automated Cocoapod tool installation and improved Pod tool - detection when using RVM. This enables iOS projects to build with - Unity Cloud Build. - - Editor: Added support for pods that reference static libraries. - - Editor: Bundle ID selection dialog for iOS and Android is now displayed - when the project bundle ID doesn't match the Firebase configuration. - - Editor: Added experimental support for building with Proguard stripping - enabled. - - Editor: Fixed Android package (AAR) synchronization when the project - bundle ID is modified. - - Editor: Fixed clean up of stale AAR dependencies when users change - Android SDK versions. - - Editor: Android Jar Resolver now remembers - for the editor session - - which AARs to keep when new AARs are available compared to what is - included in a project. - - Editor: Added support for projects that use Google Play Services at - different versions. - - Editor: Fixed minor issue with the Firebase window not being repainted as - Firebase configuration files are added to or removed from a project. - - Desktop: Added fake - but valid - JWT in the Authentication mock. - - -## 1.1.2 - - Overview - - Fix for a major bug causing Auth to hang, as well as other bug fixes. - - Changes - - Auth: Fixed a potential deadlock when running callbacks registered via - Task.ContinueWith() - - Auth: (Android) Fixed an error in `Firebase.Auth.FirebaseUser.PhotoUrl`. - - Messaging: (iOS) Removed hard dependency on Xcode 8. - - Messaging: (Android) Fixed an issue where the application would receive an - empty message on startup. - -## 1.1.1 - - Overview - - Bug fixes for the editor plugin, Firebase Authentication, Messaging, - Invites, Real-Time Database and Storage. - - Changes - - Fixed an issue in the editor plugin that caused an exception to be - thrown when the project bundle ID didn't match a bundle ID in the Android - configuration file (google-services.json). - - Fixed a bug in the editor plugin that caused a stack overflow when - multiple iOS configuration files (GoogleServices-Info.plist) are - present in a project. - - Auth: (Android) Fixed an issue that caused a Task to never complete - when signing in while a user is already signed in. - - Auth: Renamed the Auth.UserProfile.ProtoUri property to - Auth.UserProfile.ProtoUrl in order to be consistent with the other URL - properties across the SDK. - - Messaging / Invites: Fixed an issue with method swizzling that caused - some of the application's UIApplicationDelegate methods to not be called. - - Storage: The Storage plugin was using a Unity API that is only - present in Unity 5.4. We have modified the component so that it is now - backwards compatible with previous versions of Unity. - - Real-Time Database: Fixed an issue that prevented saving floating point - values. - -## 1.1.0 - - Overview - - Added support for Firebase Storage and bug fixes. - - Changes - - Added support for Firebase Storage. - - Fixed crash in Firebase Analytics when logging arrays of parameters. - - Fixed crash in Firebase Messaging when receiving messages with empty - payloads on Android. - - Fixed random hang when initializing Firebase Messaging on iOS. - - Fixed topic subscriptions in Firebase Messaging. - - Fixed an issue that resulted in a missing app icon when using Firebase - Messaging on Android. - - Fixed exception in error message construction when FirebaseApp - initialization fails. - - Fixed reporting of null events in the Firebase Realtime Database. - - Fixed unsubscribe for complex queries in the Firebase Realtime Database. - - Fixed service account authentication in the Firebase Realtime Database. - - Fixed Firebase.Database.Unity being stripped from iOS builds. - - Fixed support for building with Firebase plugins in Microsoft - Visual Studio. - - Fixed scene transitions causing event routing to break across all - components. - - Changed editor plugins for Firebase Authentication and Invites to - return success for all operations instead of raising exceptions. - - Changed editor plugin to read JAVA_HOME from the Unity editor - preferences. - - Changed editor plugin to scan all google-services.json and - GoogleService-Info.plist files in the project and select the config file - matching the project's current bundle ID. - - Improved the performance of AAR / JAR resolution when the Android config - is selected and auto-resolution is enabled. - - Improved error messages in the editor plugin. - - Known Issues - - Proguard is not integrated into Android builds. We have distributed - proguard files that can be manually integrated into Android builds - within AAR files matching the following pattern in each - Unity package: - `Firebase/m2repository/com/google/firebase/firebase-*-unity/*firebase-*.srcaar` - - Incompatible AARs are not resolved correctly when building for Android. - This can require manual intervention when using multiple plugins - (e.g Firebase + AdMob + Google Play Games). A workaround is documented - on the - [AdMob Unity plugin issue tracker](https://github.com/googleads/googleads-mobile-unity/issues/314). - -## 1.0.1 - - Overview - - Bug fixes. - - Changes - - Fixed Realtime Database restricted access from the Unity Editor on - Windows. - - Fixed load and build errors when iOS support is not installed. - - Fixed an issue that prevented the creation of multiple FirebaseApp - instances and customization of the default instance on iOS. - - Removed all dependencies on Python for Android resource generation on - Windows. - - Fixed an issue with pod tool discovery when the Ruby Gem binary directory - is modified from the default location. - - Fixed problems when building for Android with the IL2CPP scripting - backend. - - Known Issues - - Proguard is not integrated into Android builds. We have distributed - proguard files that can be manually integrated into Android builds - within AAR files matching the following pattern in each - Unity package: - `Firebase/m2repository/com/google/firebase/firebase-*-unity/*firebase-*.srcaar` - -## 1.0.0 - - Overview - - First public release with support for Firebase Analytics, - Authentication, Real-time Database, Invites, Dynamic Links and - Remote Config. - See our - [setup guide](https://firebase.google.com/docs/unity/setup) to - get started. - - Known Issues - - Proguard is not integrated into Android builds. We have distributed - proguard files that can be manually integrated into Android builds - within AAR files matching the following pattern in each - Unity package: - `Firebase/m2repository/com/google/firebase/firebase-*-unity/*firebase-*.srcaar` diff --git a/Assets/Firebase/Editor/readme.md.meta b/Assets/Firebase/Editor/readme.md.meta deleted file mode 100644 index 5580fac..0000000 --- a/Assets/Firebase/Editor/readme.md.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b3c94f797bf54952a742451759882b79 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Crashlytics/link.xml b/Assets/Firebase/Plugins/Crashlytics/link.xml deleted file mode 100755 index 63dde2f..0000000 --- a/Assets/Firebase/Plugins/Crashlytics/link.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Assets/Firebase/Plugins/Crashlytics/link.xml.meta b/Assets/Firebase/Plugins/Crashlytics/link.xml.meta deleted file mode 100644 index 52d16be..0000000 --- a/Assets/Firebase/Plugins/Crashlytics/link.xml.meta +++ /dev/null @@ -1,75 +0,0 @@ -fileFormatVersion: 2 -guid: dfba8b6966eb4740bd7795fc7eb936aa -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 1 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: x86 - OSXIntel64: - enabled: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - Web: - enabled: 0 - settings: {} - WebStreamed: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: - CPU: x86 - Win64: - enabled: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.Analytics.dll b/Assets/Firebase/Plugins/Firebase.Analytics.dll deleted file mode 100755 index 62f0f9d..0000000 Binary files a/Assets/Firebase/Plugins/Firebase.Analytics.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/Firebase.App.dll b/Assets/Firebase/Plugins/Firebase.App.dll index ab703f5..2554087 100755 Binary files a/Assets/Firebase/Plugins/Firebase.App.dll and b/Assets/Firebase/Plugins/Firebase.App.dll differ diff --git a/Assets/Firebase/Plugins/Firebase.App.dll.meta b/Assets/Firebase/Plugins/Firebase.App.dll.meta index 5bff93c..af7347d 100644 --- a/Assets/Firebase/Plugins/Firebase.App.dll.meta +++ b/Assets/Firebase/Plugins/Firebase.App.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 7311924048bd457bac6d713576c952da labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Firebase.App.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.Auth.dll b/Assets/Firebase/Plugins/Firebase.Auth.dll index fe13d05..bc7e30a 100755 Binary files a/Assets/Firebase/Plugins/Firebase.Auth.dll and b/Assets/Firebase/Plugins/Firebase.Auth.dll differ diff --git a/Assets/Firebase/Plugins/Firebase.Auth.dll.meta b/Assets/Firebase/Plugins/Firebase.Auth.dll.meta index d240024..be4f5b6 100644 --- a/Assets/Firebase/Plugins/Firebase.Auth.dll.meta +++ b/Assets/Firebase/Plugins/Firebase.Auth.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 275bd6b96a28470986154b9a995e191c labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Firebase.Auth.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.Crashlytics.dll b/Assets/Firebase/Plugins/Firebase.Crashlytics.dll deleted file mode 100755 index 63a6316..0000000 Binary files a/Assets/Firebase/Plugins/Firebase.Crashlytics.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/Firebase.Crashlytics.dll.meta b/Assets/Firebase/Plugins/Firebase.Crashlytics.dll.meta deleted file mode 100644 index 5666118..0000000 --- a/Assets/Firebase/Plugins/Firebase.Crashlytics.dll.meta +++ /dev/null @@ -1,75 +0,0 @@ -fileFormatVersion: 2 -guid: 4a712f6ef12f441e9d8b053a3c30ad55 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 1 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: x86 - OSXIntel64: - enabled: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - Web: - enabled: 0 - settings: {} - WebStreamed: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: - CPU: x86 - Win64: - enabled: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.Database.dll b/Assets/Firebase/Plugins/Firebase.Database.dll index efc61d0..6d23313 100755 Binary files a/Assets/Firebase/Plugins/Firebase.Database.dll and b/Assets/Firebase/Plugins/Firebase.Database.dll differ diff --git a/Assets/Firebase/Plugins/Firebase.Database.dll.meta b/Assets/Firebase/Plugins/Firebase.Database.dll.meta index 9dd87c1..1cc12d1 100644 --- a/Assets/Firebase/Plugins/Firebase.Database.dll.meta +++ b/Assets/Firebase/Plugins/Firebase.Database.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: e83b244ec0d14450bf6ed3af79ba515c labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Firebase.Database.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.Functions.dll b/Assets/Firebase/Plugins/Firebase.Functions.dll new file mode 100755 index 0000000..79ca36b Binary files /dev/null and b/Assets/Firebase/Plugins/Firebase.Functions.dll differ diff --git a/Assets/Firebase/Plugins/Firebase.Analytics.dll.meta b/Assets/Firebase/Plugins/Firebase.Functions.dll.meta similarity index 85% rename from Assets/Firebase/Plugins/Firebase.Analytics.dll.meta rename to Assets/Firebase/Plugins/Firebase.Functions.dll.meta index 9b451be..91950b4 100644 --- a/Assets/Firebase/Plugins/Firebase.Analytics.dll.meta +++ b/Assets/Firebase/Plugins/Firebase.Functions.dll.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 816270c2a2a348e59cb9b7b096a24f50 +guid: c33fafcba4234b47909b07eeb87b870d labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Firebase.Functions.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.Platform.dll b/Assets/Firebase/Plugins/Firebase.Platform.dll index f67eb85..f348ce6 100755 Binary files a/Assets/Firebase/Plugins/Firebase.Platform.dll and b/Assets/Firebase/Plugins/Firebase.Platform.dll differ diff --git a/Assets/Firebase/Plugins/Firebase.Platform.dll.meta b/Assets/Firebase/Plugins/Firebase.Platform.dll.meta index 1c03fc0..08c22a3 100644 --- a/Assets/Firebase/Plugins/Firebase.Platform.dll.meta +++ b/Assets/Firebase/Plugins/Firebase.Platform.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 7d3eec03d7e241a48941e038118c5e6a labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Firebase.Platform.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Firebase.TaskExtension.dll b/Assets/Firebase/Plugins/Firebase.TaskExtension.dll index c06eb06..9572380 100755 Binary files a/Assets/Firebase/Plugins/Firebase.TaskExtension.dll and b/Assets/Firebase/Plugins/Firebase.TaskExtension.dll differ diff --git a/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta b/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta index 5db19fe..0d4a592 100644 --- a/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta +++ b/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: f5d4069c578548ba9f199b46d61bf06d labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Firebase.TaskExtension.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Google.MiniJson.dll b/Assets/Firebase/Plugins/Google.MiniJson.dll index 72d655f..d9f7794 100755 Binary files a/Assets/Firebase/Plugins/Google.MiniJson.dll and b/Assets/Firebase/Plugins/Google.MiniJson.dll differ diff --git a/Assets/Firebase/Plugins/Google.MiniJson.dll.meta b/Assets/Firebase/Plugins/Google.MiniJson.dll.meta index ff2232e..56a4f3b 100644 --- a/Assets/Firebase/Plugins/Google.MiniJson.dll.meta +++ b/Assets/Firebase/Plugins/Google.MiniJson.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 3ebb289656f1477fa263e62d36c6e329 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/Google.MiniJson.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Google.Sharpen.dll b/Assets/Firebase/Plugins/Google.Sharpen.dll deleted file mode 100755 index 8b86efe..0000000 Binary files a/Assets/Firebase/Plugins/Google.Sharpen.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/Google.Sharpen.dll.meta b/Assets/Firebase/Plugins/Google.Sharpen.dll.meta deleted file mode 100644 index f911dcf..0000000 --- a/Assets/Firebase/Plugins/Google.Sharpen.dll.meta +++ /dev/null @@ -1,75 +0,0 @@ -fileFormatVersion: 2 -guid: cf50e4c476974744926b865bf8214363 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 1 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: x86 - OSXIntel64: - enabled: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - Web: - enabled: 0 - settings: {} - WebStreamed: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: - CPU: x86 - Win64: - enabled: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Plugins/Http/link.xml b/Assets/Firebase/Plugins/Http/link.xml deleted file mode 100644 index 7d55617..0000000 --- a/Assets/Firebase/Plugins/Http/link.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Assets/Firebase/Plugins/Http/link.xml.meta b/Assets/Firebase/Plugins/Http/link.xml.meta deleted file mode 100644 index 960496a..0000000 --- a/Assets/Firebase/Plugins/Http/link.xml.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: 03cbcc2e74b94663a240e4eafa216770 -labels: -- gvh -- gvh_rename_to_disable -- gvh_targets-linux -- gvh_targets-linux32 -- gvh_targets-linux64 -- gvh_targets-osx -- gvh_targets-osxintel -- gvh_targets-osxintel64 -- gvh_targets-windows -- gvh_targets-windows64 -- gvh_version-6.7.0 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll b/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll deleted file mode 100755 index acd8b06..0000000 Binary files a/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.App.dll b/Assets/Firebase/Plugins/iOS/Firebase.App.dll index 506a38f..f694751 100755 Binary files a/Assets/Firebase/Plugins/iOS/Firebase.App.dll and b/Assets/Firebase/Plugins/iOS/Firebase.App.dll differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta b/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta index 2ae70ce..c48583d 100644 --- a/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta +++ b/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 5f3feda1a91343759b7eb58a29b492b7 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/iOS/Firebase.App.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll b/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll index 1805f60..1465bdb 100755 Binary files a/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll and b/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll.meta b/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll.meta index 4fb9a43..8a19b9d 100644 --- a/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll.meta +++ b/Assets/Firebase/Plugins/iOS/Firebase.Auth.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: d98038090b9740a08a3877529f9ea69d labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/iOS/Firebase.Auth.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll b/Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll deleted file mode 100755 index 06b626a..0000000 Binary files a/Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Database.dll b/Assets/Firebase/Plugins/iOS/Firebase.Database.dll index 0e56443..958d095 100755 Binary files a/Assets/Firebase/Plugins/iOS/Firebase.Database.dll and b/Assets/Firebase/Plugins/iOS/Firebase.Database.dll differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Database.dll.meta b/Assets/Firebase/Plugins/iOS/Firebase.Database.dll.meta index 26f7dd0..b5f9b96 100644 --- a/Assets/Firebase/Plugins/iOS/Firebase.Database.dll.meta +++ b/Assets/Firebase/Plugins/iOS/Firebase.Database.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: bcd9c0a2d4de4621a440e58d3fdca550 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/iOS/Firebase.Database.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Functions.dll b/Assets/Firebase/Plugins/iOS/Firebase.Functions.dll new file mode 100755 index 0000000..8746513 Binary files /dev/null and b/Assets/Firebase/Plugins/iOS/Firebase.Functions.dll differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Functions.dll.meta b/Assets/Firebase/Plugins/iOS/Firebase.Functions.dll.meta new file mode 100644 index 0000000..6518dd0 --- /dev/null +++ b/Assets/Firebase/Plugins/iOS/Firebase.Functions.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 109a19a3a1124c448264f785e3dd51db +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/iOS/Firebase.Functions.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/Plugins/link.xml b/Assets/Firebase/Plugins/link.xml deleted file mode 100755 index 6e2ec38..0000000 --- a/Assets/Firebase/Plugins/link.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/Firebase/Plugins/link.xml.meta b/Assets/Firebase/Plugins/link.xml.meta deleted file mode 100644 index a6a77f2..0000000 --- a/Assets/Firebase/Plugins/link.xml.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: 30f4d0eb77704ba68bf8dede64390643 -labels: -- gvh -- gvh_rename_to_disable -- gvh_targets-linux -- gvh_targets-linux32 -- gvh_targets-linux64 -- gvh_targets-osx -- gvh_targets-osxintel -- gvh_targets-osxintel64 -- gvh_targets-windows -- gvh_targets-windows64 -- gvh_version-6.7.0 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle b/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle deleted file mode 100755 index 20a742b..0000000 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle and /dev/null differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll b/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll deleted file mode 100755 index aa38c90..0000000 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so b/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so deleted file mode 100755 index 08346db..0000000 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so and /dev/null differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle new file mode 100755 index 0000000..d75a42d --- /dev/null +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7d2fa564f03e994791e192e6e2ba3a4ab5970b70980dcbce4d5fbe3f1768d8c +size 144158393 diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle.meta similarity index 84% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so.meta rename to Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle.meta index b4ec296..7212a44 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 5d67d4009f0349129b9e366631e052b3 +guid: 99cd54d74cc1488f95742016fa58e0b0 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.bundle timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -28,25 +29,25 @@ PluginImporter: settings: CPU: None Linux64: - enabled: 1 + enabled: 0 settings: - CPU: x86_64 + CPU: None LinuxUniversal: - enabled: 1 + enabled: 0 settings: - CPU: AnyCPU + CPU: None OSXIntel: enabled: 0 settings: CPU: None OSXIntel64: - enabled: 0 + enabled: 1 settings: - CPU: None + CPU: x86_64 OSXUniversal: - enabled: 0 + enabled: 1 settings: - CPU: None + CPU: AnyCPU Web: enabled: 0 settings: {} @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll new file mode 100755 index 0000000..4af4ef0 Binary files /dev/null and b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll.meta similarity index 84% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll.meta rename to Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll.meta index 49ad764..2b122cd 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: c48626ae27ed478483ba85fd7c81c04b +guid: 79f863a70f9a4dc9b51058fe3e1324e4 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so similarity index 71% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so rename to Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so index 64cdc5a..5147eff 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.so and b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so.meta similarity index 84% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle.meta rename to Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so.meta index a2bcf29..68e0001 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 26a5817a839a4066a179249932f8b5c7 +guid: 566c89bae6ce4c85843fe691acf785c7 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-10_1_1.so timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -28,25 +29,25 @@ PluginImporter: settings: CPU: None Linux64: - enabled: 0 + enabled: 1 settings: - CPU: None + CPU: x86_64 LinuxUniversal: - enabled: 0 + enabled: 1 settings: - CPU: None + CPU: AnyCPU OSXIntel: enabled: 0 settings: CPU: None OSXIntel64: - enabled: 1 + enabled: 0 settings: - CPU: x86_64 + CPU: None OSXUniversal: - enabled: 1 + enabled: 0 settings: - CPU: AnyCPU + CPU: None Web: enabled: 0 settings: {} @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle deleted file mode 100755 index 98bb94d..0000000 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.bundle and /dev/null differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll b/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll deleted file mode 100755 index 86af79c..0000000 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll and /dev/null differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle index 3d1baf6..6346646 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle and b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle.meta index 68e2f7c..6a11438 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.bundle.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 5e37ea1972a64af9897f5fab651a5323 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppAuth.bundle timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll index 07b8997..599c25f 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll and b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll.meta index 135542d..1492d50 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.dll.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 05faff41310d42b1b623c09a22aa53ff labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppAuth.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so index 2745f9b..f3c72dd 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so and b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so.meta index e458f7c..e1b5013 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppAuth.so.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: a4d0f2c2a6ca44528c55eb26d36f25d6 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppAuth.so timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle index 24e5949..11ffe90 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle and b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle.meta index e4bdcd2..00a830f 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle.meta @@ -2,123 +2,80 @@ fileFormatVersion: 2 guid: 9ec52349a51f4191b990ac6c1f7ac130 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppDatabase.bundle +timeCreated: 1480838400 PluginImporter: - externalObjects: {} - serializedVersion: 2 + serializedVersion: 1 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - : Any - second: + Android: enabled: 0 settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 0 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - - first: - : Linux - second: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: enabled: 0 settings: CPU: None - - first: - : LinuxUniversal - second: + Linux64: enabled: 0 settings: CPU: None - - first: - : OSXIntel - second: + LinuxUniversal: enabled: 0 settings: CPU: None - - first: - : OSXIntel64 - second: + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: enabled: 1 settings: CPU: x86_64 - - first: - : Web - second: - enabled: 0 - settings: {} - - first: - : WebStreamed - second: - enabled: 0 - settings: {} - - first: - Android: Android - second: - enabled: 0 + OSXUniversal: + enabled: 1 settings: - CPU: ARMv7 - - first: - Any: - second: + CPU: AnyCPU + Web: enabled: 0 settings: {} - - first: - Editor: Editor - second: + WebStreamed: enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: + settings: {} + Win: enabled: 0 settings: CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: + Win64: enabled: 0 settings: CPU: None - - first: - Standalone: Win64 - second: + WindowsStoreApps: enabled: 0 settings: - CPU: None - - first: - Windows Store Apps: WindowsStoreApps - second: + CPU: AnyCPU + iOS: enabled: 0 settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: + CompileFlags: + FrameworkDependencies: + tvOS: enabled: 0 settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll index 9138891..d02fa2b 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll and b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll.meta index d0f995f..c3086c8 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.dll.meta @@ -2,123 +2,80 @@ fileFormatVersion: 2 guid: 91cff42aa8b64de8ab09a800422f650f labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppDatabase.dll +timeCreated: 1480838400 PluginImporter: - externalObjects: {} - serializedVersion: 2 + serializedVersion: 1 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - : Any - second: + Android: enabled: 0 settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 0 - Exclude iOS: 1 - - first: - : Linux - second: + CPU: AnyCPU + Any: enabled: 0 + settings: {} + Editor: + enabled: 1 settings: - CPU: None - - first: - : LinuxUniversal - second: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: enabled: 0 settings: CPU: None - - first: - : OSXIntel - second: + Linux64: enabled: 0 settings: CPU: None - - first: - : OSXIntel64 - second: + LinuxUniversal: enabled: 0 settings: CPU: None - - first: - : Web - second: - enabled: 0 - settings: {} - - first: - : WebStreamed - second: - enabled: 0 - settings: {} - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: + OSXIntel: enabled: 0 settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: + CPU: None + OSXIntel64: enabled: 0 settings: CPU: None - - first: - Standalone: OSXUniversal - second: + OSXUniversal: enabled: 0 settings: CPU: None - - first: - Standalone: Win - second: + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: enabled: 0 settings: CPU: None - - first: - Standalone: Win64 - second: + Win64: enabled: 1 settings: CPU: x86_64 - - first: - Windows Store Apps: WindowsStoreApps - second: + WindowsStoreApps: enabled: 0 settings: CPU: AnyCPU - - first: - iPhone: iOS - second: + iOS: enabled: 0 settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so index 0179c2e..6916f3c 100755 Binary files a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so and b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so.meta index 7d23a3e..e87eb16 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppDatabase.so.meta @@ -2,123 +2,80 @@ fileFormatVersion: 2 guid: 7e0d636394aa43cd80440641a013d37c labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppDatabase.so +timeCreated: 1480838400 PluginImporter: - externalObjects: {} - serializedVersion: 2 + serializedVersion: 1 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - : Any - second: + Android: enabled: 0 settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 0 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - - first: - : Linux - second: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: enabled: 0 settings: CPU: None - - first: - : LinuxUniversal - second: + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: enabled: 1 settings: CPU: AnyCPU - - first: - : OSXIntel - second: + OSXIntel: enabled: 0 settings: CPU: None - - first: - : OSXIntel64 - second: + OSXIntel64: enabled: 0 settings: CPU: None - - first: - : Web - second: - enabled: 0 - settings: {} - - first: - : WebStreamed - second: - enabled: 0 - settings: {} - - first: - Android: Android - second: + OSXUniversal: enabled: 0 settings: - CPU: ARMv7 - - first: - Any: - second: + CPU: None + Web: enabled: 0 settings: {} - - first: - Editor: Editor - second: + WebStreamed: enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: + settings: {} + Win: enabled: 0 settings: CPU: None - - first: - Standalone: Win - second: + Win64: enabled: 0 settings: CPU: None - - first: - Standalone: Win64 - second: + WindowsStoreApps: enabled: 0 settings: - CPU: None - - first: - Windows Store Apps: WindowsStoreApps - second: + CPU: AnyCPU + iOS: enabled: 0 settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: + CompileFlags: + FrameworkDependencies: + tvOS: enabled: 0 settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle new file mode 100755 index 0000000..6f54178 Binary files /dev/null and b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle.meta similarity index 84% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle.meta rename to Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle.meta index 5133a38..5e0cb84 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 35bfcced25264151bd76b628a1dfa989 +guid: 9e10d5a0daba45908bc28dc2d71e19a3 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppFunctions.bundle timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll new file mode 100755 index 0000000..a252af9 Binary files /dev/null and b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll.meta similarity index 84% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll.meta rename to Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll.meta index 82dc29e..fd24ed3 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-6_7_0.dll.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.dll.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 0ad8e75868eb4526938d2d6f06876da4 +guid: 2895d7b723af4b36b5dac0f73b4d86ce labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppFunctions.dll timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so new file mode 100755 index 0000000..6669797 Binary files /dev/null and b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so differ diff --git a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so.meta b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so.meta similarity index 84% rename from Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so.meta rename to Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so.meta index 0511a75..bb5c0f5 100644 --- a/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so.meta +++ b/Assets/Firebase/Plugins/x86_64/FirebaseCppFunctions.so.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 590090df30d142acba7e7be939fd2988 +guid: ae49e48252654010894d13cfc5896c3b labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppFunctions.so timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom.meta deleted file mode 100644 index f278702..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a953c190ed8c4b4ebf065c50fe2fdda8 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar deleted file mode 100755 index 5cb8149..0000000 Binary files a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar and /dev/null differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar.meta deleted file mode 100644 index 428f519..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.srcaar.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 828b9ff3ce0947cda7a4914e4eebc337 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml deleted file mode 100755 index eededa8..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - com.google.firebase - firebase-analytics-unity - - 6.7.0 - 6.7.0 - - - - diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml.meta deleted file mode 100644 index 59db184..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 291f81d8ae2745cf913a96d116f2e3f7 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1.meta similarity index 77% rename from Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity.meta rename to Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1.meta index 99e741c..d14d6fc 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 660be581a56f196cd92b1802c0bc00aa +guid: 746fa8753b61e4ea6ba722a169a19ada folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom similarity index 67% rename from Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom rename to Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom index ec2f73c..bae3a92 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom @@ -1,13 +1,13 @@ - - 4.0.0 - com.google.firebase - firebase-app-unity - 6.7.0 - aar - - - - - + + 4.0.0 + com.google.firebase + firebase-app-unity + 10.1.1 + aar + + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom.meta new file mode 100644 index 0000000..62becb2 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68ae9f2dc5154a6aa9e98a8ebcd0add0 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.pom +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar new file mode 100755 index 0000000..ccf93a1 Binary files /dev/null and b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar.meta new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1cd402452cf04f8f95061a3b873c50ff +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/10.1.1/firebase-app-unity-10.1.1.srcaar +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0.meta deleted file mode 100644 index 2eda867..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cf59bf700143d0ec6bdf6209e309b9d5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom.meta deleted file mode 100644 index 1239c8d..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.pom.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 32c4ab666f684dd988aedd0d0b3d09d1 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar deleted file mode 100755 index 3208b4d..0000000 Binary files a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar and /dev/null differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar.meta deleted file mode 100644 index e26cddd..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.7.0/firebase-app-unity-6.7.0.srcaar.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: df3f5be22ff04b09b6049f557f592c1e -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml index 9efe0a9..9894348 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml @@ -1,10 +1,9 @@ - - com.google.firebase - firebase-app-unity - - 6.7.0 - 6.7.0 - - - - + + com.google.firebase + firebase-app-unity + + 10.1.1 + 10.1.1 + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta index ff0263d..5cbba4c 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 96337775a7c941d88ea15f8026ad6f8e labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1.meta similarity index 77% rename from Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0.meta rename to Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1.meta index dc1720e..5fad035 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa38037403e8a5e0cb2c06327b5349f8 +guid: c881cce423dab4144815fafb3213392e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom similarity index 67% rename from Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom rename to Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom index 89c874d..73fc533 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom @@ -1,13 +1,13 @@ - - 4.0.0 - com.google.firebase - firebase-auth-unity - 6.7.0 - aar - - - - - + + 4.0.0 + com.google.firebase + firebase-auth-unity + 10.1.1 + aar + + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom.meta new file mode 100644 index 0000000..1f65b94 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d826ac4e070d417a91e7c50292d61f2e +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.pom +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar new file mode 100755 index 0000000..dd981e3 Binary files /dev/null and b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar.meta new file mode 100644 index 0000000..b01aa47 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 71646bbfe57741f7b13dcf92c434c10d +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-auth-unity/10.1.1/firebase-auth-unity-10.1.1.srcaar +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0.meta deleted file mode 100644 index c98fe11..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6accb6d30cec5531e8fe3c566ae1725b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom.meta deleted file mode 100644 index b19e78c..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.pom.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 17b5f055fbbc47219b800f9c6311ff97 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar deleted file mode 100755 index 3294e0c..0000000 Binary files a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar and /dev/null differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar.meta deleted file mode 100644 index 27b38c3..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.7.0/firebase-auth-unity-6.7.0.srcaar.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e97724e2fdbf4362902578849eeffac4 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml index 4b1853a..6d9e763 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml @@ -1,10 +1,9 @@ - - com.google.firebase - firebase-auth-unity - - 6.7.0 - 6.7.0 - - - - + + com.google.firebase + firebase-auth-unity + + 10.1.1 + 10.1.1 + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml.meta index 4d79b37..6089de6 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 397f194fd08a4159906375d8838517fc labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-auth-unity/maven-metadata.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity.meta deleted file mode 100644 index 2862a4e..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 221c65a918823edc0b4e9de6ab8c1276 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0.meta deleted file mode 100644 index bc55e54..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: daa425b4664c12f969f4c7e3b3431775 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom deleted file mode 100755 index 9e45371..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - com.google.firebase - firebase-crashlytics-unity - 6.7.0 - aar - - - - - diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom.meta deleted file mode 100644 index 0a40d92..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.pom.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 624f7711afbf45cd821173b3332f1634 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar deleted file mode 100755 index 1d3b18f..0000000 Binary files a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar and /dev/null differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar.meta deleted file mode 100644 index 6cb3cd6..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.7.0/firebase-crashlytics-unity-6.7.0.srcaar.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: eaa6387a75434b46943807aa0b7a1508 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml deleted file mode 100755 index fafd3ca..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - com.google.firebase - firebase-crashlytics-unity - - 6.7.0 - 6.7.0 - - - - diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml.meta deleted file mode 100644 index 39b611c..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/maven-metadata.xml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: eda65244fc1b407e8948b25b31c17991 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1.meta new file mode 100644 index 0000000..eb3ae5b --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 455c6884cc6cf4da28decb47f13b9ffb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom similarity index 67% rename from Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom rename to Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom index 23d875b..409e024 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom @@ -1,13 +1,13 @@ - - 4.0.0 - com.google.firebase - firebase-database-unity - 6.7.0 - aar - - - - - + + 4.0.0 + com.google.firebase + firebase-database-unity + 10.1.1 + aar + + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom.meta new file mode 100644 index 0000000..bca2438 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1044f49f29104b0d8f2945bbb4777a75 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.pom +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar new file mode 100755 index 0000000..6ac37b1 Binary files /dev/null and b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar.meta new file mode 100644 index 0000000..4c91f99 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2d77de538f854ef6aa955cd34eda6427 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-database-unity/10.1.1/firebase-database-unity-10.1.1.srcaar +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0.meta deleted file mode 100644 index a34d851..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 12cc04e871a018661b3ec44aa0d21dd8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom.meta deleted file mode 100644 index 14ffc1c..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.pom.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 0261fd99a8964a118c7a35ed6c97ac5d -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar deleted file mode 100755 index 68fd563..0000000 Binary files a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar and /dev/null differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar.meta deleted file mode 100644 index 6a9b64a..0000000 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.7.0/firebase-database-unity-6.7.0.srcaar.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 28b26ae30ef24d9caa3212848251f8f1 -labels: -- gvh -- gvh_version-6.7.0 -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml index c6f6e91..0361a6f 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml @@ -1,10 +1,9 @@ - - com.google.firebase - firebase-database-unity - - 6.7.0 - 6.7.0 - - - - + + com.google.firebase + firebase-database-unity + + 10.1.1 + 10.1.1 + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml.meta index 3a07a14..a395b0b 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: fd89c3e756de4b17a6bde12e1a74a089 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-database-unity/maven-metadata.xml timeCreated: 1480838400 DefaultImporter: userData: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity.meta new file mode 100644 index 0000000..d7faa87 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0f5e1c00aa1a446c98bf6991fe2b0fc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1.meta new file mode 100644 index 0000000..14e9d19 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c71b99f4e4f8a4c1f8accd401fafff21 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom similarity index 56% rename from Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom rename to Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom index 64bfed7..83d85c4 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.7.0/firebase-analytics-unity-6.7.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom @@ -1,13 +1,13 @@ - - 4.0.0 - com.google.firebase - firebase-analytics-unity - 6.7.0 - aar - - - - - + + 4.0.0 + com.google.firebase + firebase-functions-unity + 10.1.1 + aar + + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom.meta new file mode 100644 index 0000000..7ae589f --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ab32caa752349c48b19af4bb6334032 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.pom +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar new file mode 100755 index 0000000..4f3c772 Binary files /dev/null and b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar differ diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar.meta new file mode 100644 index 0000000..3b764f5 --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 650f3657113241008a500e754698add5 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-functions-unity/10.1.1/firebase-functions-unity-10.1.1.srcaar +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml new file mode 100755 index 0000000..b9539ae --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml @@ -0,0 +1,9 @@ + + com.google.firebase + firebase-functions-unity + + 10.1.1 + 10.1.1 + + + diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml.meta new file mode 100644 index 0000000..5c20fee --- /dev/null +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 50b6d0ff350f4969bf4e2f5fc7caa841 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-functions-unity/maven-metadata.xml +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parse.meta b/Assets/Parse.meta deleted file mode 100644 index d150b4b..0000000 --- a/Assets/Parse.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 184bd9d706a3f50db9907f986ef9cbb2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Parse/Plugins/Unity.Compat.dll b/Assets/Parse/Plugins/Unity.Compat.dll deleted file mode 100755 index 1b0c3a3..0000000 Binary files a/Assets/Parse/Plugins/Unity.Compat.dll and /dev/null differ diff --git a/Assets/Parse/Plugins/Unity.Compat.dll.meta b/Assets/Parse/Plugins/Unity.Compat.dll.meta deleted file mode 100644 index 1f367b2..0000000 --- a/Assets/Parse/Plugins/Unity.Compat.dll.meta +++ /dev/null @@ -1,24 +0,0 @@ -fileFormatVersion: 2 -guid: 015ef18e20f24535830f59eda9e70830 -labels: -- gvh -- gvh_dotnet-3.5 -- gvh_version-6.7.0 -timeCreated: 1500423342 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Parse/Plugins/Unity.Tasks.dll b/Assets/Parse/Plugins/Unity.Tasks.dll deleted file mode 100755 index dc28990..0000000 Binary files a/Assets/Parse/Plugins/Unity.Tasks.dll and /dev/null differ diff --git a/Assets/Parse/Plugins/Unity.Tasks.dll.meta b/Assets/Parse/Plugins/Unity.Tasks.dll.meta deleted file mode 100644 index b54e482..0000000 --- a/Assets/Parse/Plugins/Unity.Tasks.dll.meta +++ /dev/null @@ -1,24 +0,0 @@ -fileFormatVersion: 2 -guid: 93324a471a6d44bb8297d17d8b191e52 -labels: -- gvh -- gvh_dotnet-3.5 -- gvh_version-6.7.0 -timeCreated: 1500423342 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Parse/Plugins/dotNet45.meta b/Assets/Parse/Plugins/dotNet45.meta deleted file mode 100644 index e12a2c0..0000000 --- a/Assets/Parse/Plugins/dotNet45.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3319c4a8e1a5ec8d6bf700c70a76e0fb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Parse/Plugins/dotNet45/Unity.Compat.dll b/Assets/Parse/Plugins/dotNet45/Unity.Compat.dll deleted file mode 100755 index bb426a3..0000000 Binary files a/Assets/Parse/Plugins/dotNet45/Unity.Compat.dll and /dev/null differ diff --git a/Assets/Parse/Plugins/dotNet45/Unity.Compat.dll.meta b/Assets/Parse/Plugins/dotNet45/Unity.Compat.dll.meta deleted file mode 100644 index d79e3d2..0000000 --- a/Assets/Parse/Plugins/dotNet45/Unity.Compat.dll.meta +++ /dev/null @@ -1,75 +0,0 @@ -fileFormatVersion: 2 -guid: 3db0783b58c2429b9bc1f560ba323d05 -labels: -- gvh -- gvh_dotnet-4.5 -- gvh_version-6.7.0 -timeCreated: 1516145908 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 1 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - Android: - enabled: 1 - settings: - CPU: AnyCPU - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: x86 - OSXIntel64: - enabled: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - Web: - enabled: 1 - settings: {} - WebStreamed: - enabled: 1 - settings: {} - Win: - enabled: 1 - settings: - CPU: x86 - Win64: - enabled: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 1 - settings: - CPU: AnyCPU - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll b/Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll deleted file mode 100755 index 4957490..0000000 Binary files a/Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll and /dev/null differ diff --git a/Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll.meta b/Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll.meta deleted file mode 100644 index 0ebac16..0000000 --- a/Assets/Parse/Plugins/dotNet45/Unity.Tasks.dll.meta +++ /dev/null @@ -1,75 +0,0 @@ -fileFormatVersion: 2 -guid: bd18eee30834e4f71bded96fd14033a9 -labels: -- gvh -- gvh_dotnet-4.5 -- gvh_version-6.7.0 -timeCreated: 1500423342 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Any: - enabled: 1 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - Android: - enabled: 1 - settings: - CPU: AnyCPU - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: x86 - OSXIntel64: - enabled: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - Web: - enabled: 1 - settings: {} - WebStreamed: - enabled: 1 - settings: {} - Win: - enabled: 1 - settings: - CPU: x86 - Win64: - enabled: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 1 - settings: - CPU: AnyCPU - iOS: - enabled: 1 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver.meta b/Assets/PlayServicesResolver.meta deleted file mode 100644 index 37fdd28..0000000 --- a/Assets/PlayServicesResolver.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: caf151bb49eb0b29884c833a6ec34bc6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll b/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll deleted file mode 100755 index 7dd8124..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll b/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll deleted file mode 100755 index e974e5b..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll b/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll deleted file mode 100755 index 8720de1..0000000 Binary files a/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll and /dev/null differ diff --git a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.135.0.txt b/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.135.0.txt deleted file mode 100755 index 1c0fccd..0000000 --- a/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.135.0.txt +++ /dev/null @@ -1,8 +0,0 @@ -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.135.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.135.0.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.135.0.dll.mdb diff --git a/Assets/Parse/Plugins.meta b/Assets/Plugins.meta similarity index 77% rename from Assets/Parse/Plugins.meta rename to Assets/Plugins.meta index 34dfdfd..bce3f98 100644 --- a/Assets/Parse/Plugins.meta +++ b/Assets/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d35d5e7e6a730945ac798feccabb1e1 +guid: ecc05c73aebe5468bab6df09a14fecf8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/iOS.meta b/Assets/Plugins/iOS.meta new file mode 100644 index 0000000..0a87ad1 --- /dev/null +++ b/Assets/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca4c1b3730d134e148a258eda950d026 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/iOS/Firebase.meta b/Assets/Plugins/iOS/Firebase.meta new file mode 100644 index 0000000..db0e863 --- /dev/null +++ b/Assets/Plugins/iOS/Firebase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 257242cc4025a4e91819e959c8eb637f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a b/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a new file mode 100755 index 0000000..ab8159e Binary files /dev/null and b/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.meta b/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta similarity index 85% rename from Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.meta rename to Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta index ff1e68a..ef6e0a8 100644 --- a/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.meta +++ b/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 52718a3a80d44aacb368bcc9d62dd804 +guid: 601e8e1d2d2744929ede33676cbeccc0 labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppApp.a timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a b/Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a new file mode 100755 index 0000000..ac220ae Binary files /dev/null and b/Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a differ diff --git a/Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll.meta b/Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a.meta similarity index 85% rename from Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll.meta rename to Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a.meta index f972855..fc904c7 100644 --- a/Assets/Firebase/Plugins/iOS/Firebase.Crashlytics.dll.meta +++ b/Assets/Plugins/iOS/Firebase/libFirebaseCppAuth.a.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 -guid: 3c83c9a9845245cfbbab5a52932b5045 +guid: 44a214618eb6473db34d3808eb040cfb labels: - gvh -- gvh_version-6.7.0 +- gvh_version-10.1.1 +- gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppAuth.a timeCreated: 1480838400 PluginImporter: serializedVersion: 1 @@ -70,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a b/Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a new file mode 100755 index 0000000..c76a6cd Binary files /dev/null and b/Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a differ diff --git a/Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a.meta b/Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a.meta new file mode 100644 index 0000000..fea5a47 --- /dev/null +++ b/Assets/Plugins/iOS/Firebase/libFirebaseCppDatabase.a.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 5a0e503a787b4bd2a2636712f2fb7dc0 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppDatabase.a +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a b/Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a new file mode 100755 index 0000000..93ad31e Binary files /dev/null and b/Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a differ diff --git a/Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a.meta b/Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a.meta new file mode 100644 index 0000000..1f1a1ec --- /dev/null +++ b/Assets/Plugins/iOS/Firebase/libFirebaseCppFunctions.a.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: bc60cdbc9ece4a45a20ade398bd76cf3 +labels: +- gvh +- gvh_version-10.1.1 +- gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppFunctions.a +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 2716ba1..bae061e 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,5 +1,174 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4181619367902868751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1188924519197032984} + - component: {fileID: 8487691037808935868} + - component: {fileID: 1732467806404250193} + m_Layer: 0 + m_Name: PlayerName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1188924519197032984 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4181619367902868751} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4865924007083798949} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &8487691037808935868 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4181619367902868751} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &1732467806404250193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4181619367902868751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3 + m_fontSizeBase: 3 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 3 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8487691037808935868} + m_maskType: 0 + _SortingLayerID: 0 + _SortingOrder: 0 --- !u!1 &4865924007083798947 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +197,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1188924519197032984} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -47,6 +217,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -94,6 +265,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0837daefc826041a2b6e4e297f93b0cc, type: 3} m_Name: m_EditorClassIdentifier: - playerId: + nameText: {fileID: 1732467806404250193} + playerInfo: + id: + name: localPlayer: 0 isLocalPlayerTurn: 0 + yourTurnText: {fileID: 0} diff --git a/Assets/Scenes/LoginScene.unity b/Assets/Scenes/LoginScene.unity new file mode 100644 index 0000000..0a30755 --- /dev/null +++ b/Assets/Scenes/LoginScene.unity @@ -0,0 +1,2083 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: dba2479f7ae664a7a8c9ebfbeb637d9f, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &117488208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 117488209} + - component: {fileID: 117488211} + - component: {fileID: 117488210} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &117488209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117488208} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1504386884} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &117488210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117488208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sign In + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &117488211 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117488208} + m_CullTransparentMesh: 0 +--- !u!1 &151458380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 151458381} + - component: {fileID: 151458383} + - component: {fileID: 151458382} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &151458381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151458380} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 844480311} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &151458382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151458380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &151458383 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151458380} + m_CullTransparentMesh: 0 +--- !u!1 &194915722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 194915723} + - component: {fileID: 194915725} + - component: {fileID: 194915724} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &194915723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 194915722} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 794184053} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &194915724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 194915722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sign Up + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &194915725 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 194915722} + m_CullTransparentMesh: 0 +--- !u!1 &239227453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239227454} + - component: {fileID: 239227456} + - component: {fileID: 239227455} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &239227454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239227453} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1373789022} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &239227455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239227453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Email... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2150773298 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &239227456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239227453} + m_CullTransparentMesh: 0 +--- !u!1 &268850450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 268850454} + - component: {fileID: 268850453} + - component: {fileID: 268850452} + - component: {fileID: 268850451} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &268850451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268850450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &268850452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268850450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &268850453 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268850450} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &268850454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268850450} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 794184053} + - {fileID: 1504386884} + - {fileID: 1587779935} + - {fileID: 294179393} + - {fileID: 1613510304} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &294179392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 294179393} + - component: {fileID: 294179396} + - component: {fileID: 294179395} + - component: {fileID: 294179394} + m_Layer: 5 + m_Name: PasswordIF + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &294179393 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294179392} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 844480311} + m_Father: {fileID: 268850454} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 250, y: 50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &294179394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294179392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 294179395} + m_TextViewport: {fileID: 844480311} + m_TextComponent: {fileID: 151458382} + m_Placeholder: {fileID: 1888189397} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 7 + m_InputType: 2 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!114 &294179395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294179392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &294179396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294179392} + m_CullTransparentMesh: 0 +--- !u!1 &350205299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 350205300} + - component: {fileID: 350205302} + - component: {fileID: 350205301} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &350205300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350205299} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1373789022} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &350205301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350205299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &350205302 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 350205299} + m_CullTransparentMesh: 0 +--- !u!1 &601302181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 601302182} + - component: {fileID: 601302183} + m_Layer: 0 + m_Name: Handlers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &601302182 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601302181} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.15166837, y: -0.15501565, z: -0.39343435} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &601302183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601302181} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87cd632cef2345f1ae31e850a7819db7, type: 3} + m_Name: + m_EditorClassIdentifier: + emailIF: {fileID: 1587779936} + passwordIF: {fileID: 294179394} + errorText: {fileID: 1613510305} +--- !u!1 &794184052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 794184053} + - component: {fileID: 794184056} + - component: {fileID: 794184055} + - component: {fileID: 794184054} + m_Layer: 5 + m_Name: SignUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &794184053 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794184052} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 194915723} + m_Father: {fileID: 268850454} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -250, y: -50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &794184054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794184052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 794184055} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 601302183} + m_TargetAssemblyTypeName: Handlers.LoginSceneHandler, Assembly-CSharp + m_MethodName: SignUp + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &794184055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794184052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &794184056 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 794184052} + m_CullTransparentMesh: 0 +--- !u!1 &844480310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 844480311} + - component: {fileID: 844480312} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &844480311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844480310} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1888189396} + - {fileID: 151458381} + m_Father: {fileID: 294179393} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &844480312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844480310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!1 &1373789021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1373789022} + - component: {fileID: 1373789023} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1373789022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373789021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 239227454} + - {fileID: 350205300} + m_Father: {fileID: 1587779935} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1373789023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373789021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!1 &1389442322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1389442325} + - component: {fileID: 1389442324} + - component: {fileID: 1389442323} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1389442323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389442322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1389442324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389442322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1389442325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389442322} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1504386883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1504386884} + - component: {fileID: 1504386887} + - component: {fileID: 1504386886} + - component: {fileID: 1504386885} + m_Layer: 5 + m_Name: SignIn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1504386884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504386883} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 117488209} + m_Father: {fileID: 268850454} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 250, y: -50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1504386885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504386883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1504386886} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 601302183} + m_TargetAssemblyTypeName: Handlers.LoginSceneHandler, Assembly-CSharp + m_MethodName: SignIn + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1504386886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504386883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1504386887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504386883} + m_CullTransparentMesh: 0 +--- !u!1 &1587779934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1587779935} + - component: {fileID: 1587779938} + - component: {fileID: 1587779937} + - component: {fileID: 1587779936} + m_Layer: 5 + m_Name: EmailIF + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1587779935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587779934} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1373789022} + m_Father: {fileID: 268850454} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -250, y: 50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1587779936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587779934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1587779937} + m_TextViewport: {fileID: 1373789022} + m_TextComponent: {fileID: 350205301} + m_Placeholder: {fileID: 239227455} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 6 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 7 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 7 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!114 &1587779937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587779934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1587779938 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587779934} + m_CullTransparentMesh: 0 +--- !u!1 &1613510303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1613510304} + - component: {fileID: 1613510306} + - component: {fileID: 1613510305} + m_Layer: 5 + m_Name: ErrorText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1613510304 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613510303} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 268850454} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 105} + m_SizeDelta: {x: -1, y: 210} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1613510305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613510303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 10, y: 10, z: 10, w: 10} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1613510306 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613510303} + m_CullTransparentMesh: 1 +--- !u!1 &1818408183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1818408186} + - component: {fileID: 1818408185} + - component: {fileID: 1818408184} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1818408184 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818408183} + m_Enabled: 1 +--- !u!20 &1818408185 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818408183} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1818408186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818408183} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1888189395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1888189396} + - component: {fileID: 1888189398} + - component: {fileID: 1888189397} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1888189396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888189395} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 844480311} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1888189397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888189395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Password... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2150773298 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1888189398 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888189395} + m_CullTransparentMesh: 0 diff --git a/Assets/Scenes/LoginScene.unity.meta b/Assets/Scenes/LoginScene.unity.meta new file mode 100644 index 0000000..35a6599 --- /dev/null +++ b/Assets/Scenes/LoginScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bc1198a1481d24c26900649de0a6a499 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LoginSceneSettings.lighting b/Assets/Scenes/LoginSceneSettings.lighting new file mode 100644 index 0000000..3755358 --- /dev/null +++ b/Assets/Scenes/LoginSceneSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LoginSceneSettings + serializedVersion: 3 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/Assets/Scenes/LoginSceneSettings.lighting.meta b/Assets/Scenes/LoginSceneSettings.lighting.meta new file mode 100644 index 0000000..f96f449 --- /dev/null +++ b/Assets/Scenes/LoginSceneSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dba2479f7ae664a7a8c9ebfbeb637d9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index ea3e91a..12e8af2 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 3aa72e6ba34d44b8a94f20b91ad0d857, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -173,6 +176,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -198,13 +202,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 24 m_fontSizeBase: 24 m_fontWeight: 400 @@ -212,7 +215,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -222,10 +227,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -233,40 +236,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 194915724} - characterCount: 4 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &194915725 @@ -329,11 +310,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Player Id... + m_text: Player Name... m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -354,13 +336,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 14 m_fontSizeBase: 14 m_fontWeight: 400 @@ -368,7 +349,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 2 - m_textAlignment: 257 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -378,10 +361,8 @@ MonoBehaviour: m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 1 checkPaddingRequired: 0 @@ -389,40 +370,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 239227455} - characterCount: 12 - spriteCount: 0 - spaceCount: 1 - wordCount: 2 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &239227456 @@ -491,6 +450,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &268850453 Canvas: m_ObjectHideFlags: 0 @@ -525,6 +485,7 @@ RectTransform: m_Children: - {fileID: 794184053} - {fileID: 1587779935} + - {fileID: 270822452} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -533,6 +494,139 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &270822451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 270822452} + - component: {fileID: 270822455} + - component: {fileID: 270822454} + - component: {fileID: 270822453} + m_Layer: 5 + m_Name: SignOut + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &270822452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270822451} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 745996793} + m_Father: {fileID: 268850454} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -80.5, y: 15} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &270822453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270822451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 270822454} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 601302183} + m_TargetAssemblyTypeName: Handlers.MenuSceneHandler, Assembly-CSharp + m_MethodName: SignOut + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &270822454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270822451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &270822455 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270822451} + m_CullTransparentMesh: 0 --- !u!1 &350205299 GameObject: m_ObjectHideFlags: 0 @@ -585,6 +679,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -610,13 +705,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 14 m_fontSizeBase: 14 m_fontWeight: 400 @@ -624,7 +718,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 257 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -634,10 +730,8 @@ MonoBehaviour: m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 1 checkPaddingRequired: 0 @@ -645,40 +739,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 350205301} - characterCount: 1 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &350205302 @@ -733,6 +805,140 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerNameIF: {fileID: 1587779936} +--- !u!1 &745996792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 745996793} + - component: {fileID: 745996795} + - component: {fileID: 745996794} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &745996793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745996792} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 270822452} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &745996794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745996792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sign Out + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &745996795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745996792} + m_CullTransparentMesh: 0 --- !u!1 &794184052 GameObject: m_ObjectHideFlags: 0 @@ -746,7 +952,7 @@ GameObject: - component: {fileID: 794184055} - component: {fileID: 794184054} m_Layer: 5 - m_Name: Button + m_Name: Play m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -786,6 +992,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -816,6 +1023,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 601302183} + m_TargetAssemblyTypeName: m_MethodName: Play m_Mode: 1 m_Arguments: @@ -841,6 +1049,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -913,6 +1122,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Name: m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &1389442322 GameObject: m_ObjectHideFlags: 0 @@ -992,7 +1203,7 @@ GameObject: - component: {fileID: 1587779937} - component: {fileID: 1587779936} m_Layer: 5 - m_Name: InputField (TMP) + m_Name: PlayNameIF m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1032,6 +1243,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1063,6 +1275,7 @@ MonoBehaviour: m_Placeholder: {fileID: 239227455} m_VerticalScrollbar: {fileID: 0} m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} m_ScrollSensitivity: 1 m_ContentType: 0 m_InputType: 0 @@ -1129,6 +1342,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Scenes/MenuSceneSettings.lighting b/Assets/Scenes/MenuSceneSettings.lighting new file mode 100644 index 0000000..33f06b3 --- /dev/null +++ b/Assets/Scenes/MenuSceneSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MenuSceneSettings + serializedVersion: 3 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentMIS: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 diff --git a/Assets/Scenes/MenuSceneSettings.lighting.meta b/Assets/Scenes/MenuSceneSettings.lighting.meta new file mode 100644 index 0000000..af4c806 --- /dev/null +++ b/Assets/Scenes/MenuSceneSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3aa72e6ba34d44b8a94f20b91ad0d857 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/APIs/AuthAPI.cs b/Assets/Scripts/APIs/AuthAPI.cs new file mode 100644 index 0000000..9330542 --- /dev/null +++ b/Assets/Scripts/APIs/AuthAPI.cs @@ -0,0 +1,43 @@ +using System; +using System.Threading.Tasks; +using Firebase.Auth; +using Serializables; + +namespace APIs +{ + public static class AuthAPI + { + private static readonly FirebaseAuth auth = FirebaseAuth.DefaultInstance; + + public static async Task SignUp(string email, string password) => + await auth.CreateUserWithEmailAndPasswordAsync(email, password).ContinueWith(task => + { + if (task.IsCanceled) + return new RequestState().MakeFaulted("New user creation was canceled."); + + if (task.IsFaulted) + return new RequestState().MakeFaulted(task.Exception?.GetBaseException().Message); + + return new RequestState(); + }); + + public static async Task SignIn(string email, string password) => + await auth.SignInWithEmailAndPasswordAsync(email, password).ContinueWith(task => + { + if (task.IsCanceled) + return new RequestState().MakeFaulted("Sign in was canceled."); + + if (task.IsFaulted) + return new RequestState().MakeFaulted(task.Exception?.GetBaseException().Message); + + return new RequestState(); + }); + + public static bool IsSignedIn() => auth.CurrentUser != null; + + public static string GetUserId() => auth.CurrentUser.UserId; + + public static void SignOut() => auth.SignOut(); + + } +} \ No newline at end of file diff --git a/Assets/Scripts/APIs/AuthAPI.cs.meta b/Assets/Scripts/APIs/AuthAPI.cs.meta new file mode 100644 index 0000000..a2ec3e6 --- /dev/null +++ b/Assets/Scripts/APIs/AuthAPI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: db078f2f7986438b886b923abf7db419 +timeCreated: 1668872243 \ No newline at end of file diff --git a/Assets/Scripts/APIs/ExceptionUtils.cs b/Assets/Scripts/APIs/ExceptionUtils.cs new file mode 100644 index 0000000..a09fcce --- /dev/null +++ b/Assets/Scripts/APIs/ExceptionUtils.cs @@ -0,0 +1,16 @@ +using System; + +namespace APIs +{ + public static class ExceptionUtils + { + private static Exception GetInnerException(this Exception exception) + { + while (true) + { + if (exception.InnerException == null) return exception; + exception = exception.InnerException; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/APIs/ExceptionUtils.cs.meta b/Assets/Scripts/APIs/ExceptionUtils.cs.meta new file mode 100644 index 0000000..b9760b1 --- /dev/null +++ b/Assets/Scripts/APIs/ExceptionUtils.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 04939ad1989e473cb99cb979efe924ef +timeCreated: 1668965490 \ No newline at end of file diff --git a/Assets/Scripts/APIs/FunctionsAPI.cs b/Assets/Scripts/APIs/FunctionsAPI.cs new file mode 100644 index 0000000..2f896a1 --- /dev/null +++ b/Assets/Scripts/APIs/FunctionsAPI.cs @@ -0,0 +1,39 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Firebase.Functions; +using Serializables; + +namespace APIs +{ + public static class FunctionsAPI + { + private static readonly FirebaseFunctions Functions = FirebaseFunctions.DefaultInstance; + + public static async Task CallJoinQueueFunction(string playerName) => + await CallFunction("joinQueue", playerName); + + public static async Task CallLeaveQueueFunction() => + await CallFunction("leaveQueue"); + + public static async Task CallSetReadyFunction() => + await CallFunction("setReady"); + + public static async Task CallMakeMoveFunction(Move move) => + await CallFunction("makeMove", move.ConvertToArray()); + + private static async Task> CallFunction(string name, object data = null) + { + var function = Functions.GetHttpsCallable(name); + return await function.CallAsync(data).ContinueWith(task => + { + if (task.IsCanceled) + return new RequestResponse(default).MakeFaulted("Function call was canceled."); + + if (task.IsFaulted) + return new RequestResponse(default).MakeFaulted(task.Exception?.GetBaseException().Message); + + return RequestResponse.FromDictionary(task.Result.Data as Dictionary); + }); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/APIs/FunctionsAPI.cs.meta b/Assets/Scripts/APIs/FunctionsAPI.cs.meta new file mode 100644 index 0000000..1fc3444 --- /dev/null +++ b/Assets/Scripts/APIs/FunctionsAPI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f45be27c4934a4d9c856c2f2604ed59b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Handlers/GameSceneHandler.cs b/Assets/Scripts/Handlers/GameSceneHandler.cs index a6ff7dc..4c62ea7 100644 --- a/Assets/Scripts/Handlers/GameSceneHandler.cs +++ b/Assets/Scripts/Handlers/GameSceneHandler.cs @@ -1,4 +1,6 @@ -using System.Linq; +using System; +using System.Linq; +using APIs; using Managers; using UnityEngine; using UnityEngine.SceneManagement; @@ -12,25 +14,20 @@ public class GameSceneHandler : MonoBehaviour private void Start() { - var players = MainManager.Instance.gameManager.currentGameInfo.playersIds; + var players = MainManager.Instance.gameManager.currentGameInfo.playersInfo; foreach (var player in players) { var newPlayer = Instantiate(playerPrefab, Vector3.zero, Quaternion.identity); var newPlayerHandler = newPlayer.GetComponent(); - newPlayerHandler.playerId = player; - newPlayerHandler.localPlayer = player == MainManager.Instance.currentLocalPlayerId; + newPlayerHandler.playerInfo = player.Value; + newPlayerHandler.localPlayer = player.Key == AuthAPI.GetUserId(); newPlayerHandler.yourTurnText = yourTurnText; } } - public void Leave() - { - MainManager.Instance.gameManager.StopListeningForLocalPlayerTurn(); - var players = MainManager.Instance.gameManager.currentGameInfo.playersIds; - foreach (var player in players.Where(p => p != MainManager.Instance.currentLocalPlayerId)) - MainManager.Instance.gameManager.StopListeningForMoves(player); - SceneManager.LoadScene("MenuScene"); - } + public void Leave() => SceneManager.LoadScene("MenuScene"); + + private void OnDestroy() => MainManager.Instance.gameManager.LeaveGame(); } } \ No newline at end of file diff --git a/Assets/Scripts/Handlers/LoadingSceneHandler.cs b/Assets/Scripts/Handlers/LoadingSceneHandler.cs index fb16450..c0531a5 100644 --- a/Assets/Scripts/Handlers/LoadingSceneHandler.cs +++ b/Assets/Scripts/Handlers/LoadingSceneHandler.cs @@ -10,7 +10,7 @@ public class LoadingSceneHandler : MonoBehaviour private void Start() { DatabaseAPI.InitializeDatabase(); - SceneManager.LoadScene("MenuScene"); + SceneManager.LoadScene(AuthAPI.IsSignedIn() ? "MenuScene" : "LoginScene"); } } } diff --git a/Assets/Scripts/Handlers/LoginSceneHandler.cs b/Assets/Scripts/Handlers/LoginSceneHandler.cs new file mode 100644 index 0000000..151f709 --- /dev/null +++ b/Assets/Scripts/Handlers/LoginSceneHandler.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections; +using APIs; +using Managers; +using Serializables; +using TMPro; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Handlers +{ + public class LoginSceneHandler : MonoBehaviour + { + public TMP_InputField emailIF; + public TMP_InputField passwordIF; + public TextMeshProUGUI errorText; + + public void SignUp() => StartCoroutine(SignUpCoroutine()); + + public void SignIn() => StartCoroutine(SignInCoroutine()); + + private IEnumerator SignUpCoroutine() + { + var authTask = AuthAPI.SignUp(emailIF.text, passwordIF.text); + yield return authTask.WaitForTask(); + + var authResult = authTask.Result; + + if (authResult.isFaulted) HandleError(authResult.error); + else HandleSuccess(); + } + + private IEnumerator SignInCoroutine() + { + var authTask = AuthAPI.SignIn(emailIF.text, passwordIF.text); + yield return authTask.WaitForTask(); + + var authResult = authTask.Result; + + if (authResult.isFaulted) HandleError(authResult.error); + else HandleSuccess(); + } + + private void HandleError(RequestError error) => errorText.text = error.readableMessage; + + private void HandleSuccess() + { + errorText.text = "Success!"; + SceneManager.LoadScene("MenuScene"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Handlers/LoginSceneHandler.cs.meta b/Assets/Scripts/Handlers/LoginSceneHandler.cs.meta new file mode 100644 index 0000000..026d7b2 --- /dev/null +++ b/Assets/Scripts/Handlers/LoginSceneHandler.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 87cd632cef2345f1ae31e850a7819db7 +timeCreated: 1668873672 \ No newline at end of file diff --git a/Assets/Scripts/Handlers/MatchmakingSceneHandler.cs b/Assets/Scripts/Handlers/MatchmakingSceneHandler.cs index efafebe..c470b4c 100644 --- a/Assets/Scripts/Handlers/MatchmakingSceneHandler.cs +++ b/Assets/Scripts/Handlers/MatchmakingSceneHandler.cs @@ -1,6 +1,8 @@ using System; +using System.Collections; using APIs; using Managers; +using Serializables; using UnityEngine; using UnityEngine.SceneManagement; @@ -17,13 +19,21 @@ public class MatchmakingSceneHandler : MonoBehaviour private void Start() => JoinQueue(); - private void JoinQueue() => - MainManager.Instance.matchmakingManager.JoinQueue(MainManager.Instance.currentLocalPlayerId, gameId => - { - this.gameId = gameId; - gameFound = true; - }, - Debug.Log); + private void JoinQueue() => StartCoroutine(JoinQueueCoroutine()); + + private IEnumerator JoinQueueCoroutine() + { + var playerName = MainManager.Instance.currentLocalPlayerName; + var joinQueueTask = MainManager.Instance.matchmakingManager.JoinQueue(playerName, gameId => + { + this.gameId = gameId; + gameFound = true; + }, Debug.Log); + + yield return joinQueueTask.WaitForTask(); + + if (joinQueueTask.Result.isFaulted) Debug.LogError(joinQueueTask.Result.error.readableMessage); + } private void Update() { @@ -34,12 +44,12 @@ private void Update() private void GameFound() { - MainManager.Instance.gameManager.GetCurrentGameInfo(gameId, MainManager.Instance.currentLocalPlayerId, + MainManager.Instance.gameManager.GetCurrentGameInfo(gameId, AuthAPI.GetUserId(), gameInfo => { Debug.Log("Game found. Ready-up!"); gameFound = true; - MainManager.Instance.gameManager.ListenForAllPlayersReady(gameInfo.playersIds, + MainManager.Instance.gameManager.ListenForAllPlayersReady(gameInfo.playersInfo.Keys, playerId => Debug.Log(playerId + " is ready!"), () => { Debug.Log("All players are ready!"); @@ -54,13 +64,19 @@ private void GameFound() public void LeaveQueue() { if (gameFound) MainManager.Instance.gameManager.StopListeningForAllPlayersReady(); - else - MainManager.Instance.matchmakingManager.LeaveQueue(MainManager.Instance.currentLocalPlayerId, - () => Debug.Log("Left queue successfully"), Debug.Log); + MainManager.Instance.matchmakingManager.LeaveQueue(); SceneManager.LoadScene("MenuScene"); } - public void Ready() => - MainManager.Instance.gameManager.SetLocalPlayerReady(() => Debug.Log("You are now ready!"), Debug.Log); + public void Ready() => StartCoroutine(ReadyCoroutine()); + + private IEnumerator ReadyCoroutine() + { + var readyUpTask = MainManager.Instance.gameManager.SetLocalPlayerReady(); + yield return readyUpTask.WaitForTask(); + + if (readyUpTask.Result.isFaulted) Debug.LogError(readyUpTask.Result.error.readableMessage); + else Debug.Log("You are now ready!"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Handlers/MenuSceneHandler.cs b/Assets/Scripts/Handlers/MenuSceneHandler.cs index 7dcc0f5..f857ded 100644 --- a/Assets/Scripts/Handlers/MenuSceneHandler.cs +++ b/Assets/Scripts/Handlers/MenuSceneHandler.cs @@ -1,4 +1,6 @@ -using Managers; +using System; +using APIs; +using Managers; using TMPro; using UnityEngine; using UnityEngine.SceneManagement; @@ -8,11 +10,18 @@ namespace Handlers public class MenuSceneHandler : MonoBehaviour { public TMP_InputField playerNameIF; - + + public void Play() { - MainManager.Instance.currentLocalPlayerId = playerNameIF.text; + MainManager.Instance.currentLocalPlayerName = playerNameIF.text; SceneManager.LoadScene("MatchmakingScene"); } + + public void SignOut() + { + AuthAPI.SignOut(); + SceneManager.LoadScene("LoginScene"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Handlers/PlayerHandler.cs b/Assets/Scripts/Handlers/PlayerHandler.cs index e86904b..42d803b 100644 --- a/Assets/Scripts/Handlers/PlayerHandler.cs +++ b/Assets/Scripts/Handlers/PlayerHandler.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using Managers; using Serializables; using TMPro; @@ -8,7 +9,9 @@ namespace Handlers { public class PlayerHandler : MonoBehaviour { - public string playerId; + [SerializeField] private TextMeshPro nameText; + + public PlayerInfo playerInfo; public bool localPlayer; public bool isLocalPlayerTurn; @@ -30,20 +33,21 @@ private void Start() }, Debug.Log); } else - { GetComponent().color = Color.blue; - MainManager.Instance.gameManager.ListenForMoves(playerId, ExecuteMove, Debug.Log); - } + + nameText.text = playerInfo.name; + + MainManager.Instance.gameManager.ListenForMoves(playerInfo.id, ExecuteMove, Debug.Log); } private void Update() { if (executeMove) { - transform.position += (Vector3) moveToExecute.direction; + transform.position += (Vector3)moveToExecute.direction; executeMove = false; } - + if (!localPlayer) return; yourTurnText.SetActive(isLocalPlayerTurn); if (!isLocalPlayerTurn) return; @@ -54,17 +58,24 @@ private void Update() if (Math.Abs(x) < 0.01f && Math.Abs(y) < 0.01f) return; var move = new Move(new Vector2(x, y)); - MainManager.Instance.gameManager.SendMove(move, - () => MainManager.Instance.gameManager.SetTurnToOtherPlayer(playerId, () => ExecuteMove(move), - Debug.Log), error => - { - Debug.Log(error); - isLocalPlayerTurn = true; - }); + StartCoroutine(SendMoveCoroutine(move)); isLocalPlayerTurn = false; } + private IEnumerator SendMoveCoroutine(Move move) + { + var sendMoveTask = MainManager.Instance.gameManager.SendMove(move); + yield return sendMoveTask.WaitForTask(); + + if (sendMoveTask.Result.isFaulted) + { + Debug.Log(sendMoveTask.Result.error.readableMessage); + isLocalPlayerTurn = true; + } + else Debug.Log("Move sent!"); + } + private void ExecuteMove(Move move) { moveToExecute = move; diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index f108f9b..f060ef0 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using APIs; using Firebase.Database; using Serializables; @@ -39,12 +40,7 @@ public void GetCurrentGameInfo(string gameId, string localPlayerId, Action fallback) - { - DatabaseAPI.PostObject($"games/{currentGameInfo.gameId}/ready/{currentGameInfo.localPlayerId}", true, - callback, - fallback); - } + public async Task SetLocalPlayerReady() => await FunctionsAPI.CallSetReadyFunction(); public void ListenForAllPlayersReady(IEnumerable playersId, Action onNewPlayerReady, Action onAllPlayersReady, @@ -63,15 +59,7 @@ public void ListenForAllPlayersReady(IEnumerable playersId, Action DatabaseAPI.StopListeningForChildAdded(readyListener); - public void SendMove(Move move, Action callback, Action fallback) - { - DatabaseAPI.PushObject($"games/{currentGameInfo.gameId}/{currentGameInfo.localPlayerId}/moves/", move, - () => - { - Debug.Log("Moved sent successfully!"); - callback(); - }, fallback); - } + public async Task SendMove(Move move) => await FunctionsAPI.CallMakeMoveFunction(move); public void ListenForLocalPlayerTurn(Action onLocalPlayerTurn, Action fallback) { @@ -91,8 +79,12 @@ public void ListenForMoves(string playerId, Action onNewMove, Action onNewMove( - StringSerializationAPI.Deserialize(typeof(Move), args.Snapshot.GetRawJsonValue()) as Move), + args => + { + var rawMove = + StringSerializationAPI.Deserialize(typeof(int[]), args.Snapshot.GetRawJsonValue()) as int[]; + onNewMove(new Move(rawMove)); + }, fallback)); } @@ -104,9 +96,17 @@ public void StopListeningForMoves(string playerId) public void SetTurnToOtherPlayer(string currentPlayerId, Action callback, Action fallback) { - var otherPlayerId = currentGameInfo.playersIds.First(p => p != currentPlayerId); + var otherPlayerId = currentGameInfo.playersInfo.Keys.First(p => p != currentPlayerId); DatabaseAPI.PostObject( $"games/{currentGameInfo.gameId}/turn", otherPlayerId, callback, fallback); } + + public void LeaveGame() + { + StopListeningForLocalPlayerTurn(); + var players = currentGameInfo.playersInfo.Keys; + foreach (var player in players) StopListeningForMoves(player); + MainManager.Instance.matchmakingManager.LeaveQueue(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/MainManager.cs b/Assets/Scripts/Managers/MainManager.cs index c371d30..7a40584 100644 --- a/Assets/Scripts/Managers/MainManager.cs +++ b/Assets/Scripts/Managers/MainManager.cs @@ -1,4 +1,6 @@ -using Serializables; +using System.Collections; +using System.Threading.Tasks; +using Serializables; using UnityEngine; namespace Managers @@ -10,14 +12,33 @@ public class MainManager : MonoBehaviour public MatchmakingManager matchmakingManager; public GameManager gameManager; - public string currentLocalPlayerId; // You can use Firebase Auth to turn this into a userId. Just using the player name for a player id as an example for now! + public string currentLocalPlayerName; - private void Awake() => Instance = this; + private void Awake() + { + Instance = this; + DontDestroyOnLoad(gameObject); + } private void Start() { matchmakingManager = GetComponent(); gameManager = GetComponent(); } + + public IEnumerator WaitForTask(Task task) + { + yield return new WaitUntil(() => task.IsCompleted); + } + + public async Task WaitForTaskAsync(Task task) + { + await Task.Run(async () => + { + while (task.IsCompleted) await Task.Delay(100); + }); + + return task; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/MatchmakingManager.cs b/Assets/Scripts/Managers/MatchmakingManager.cs index 39cd8b3..d84c59b 100644 --- a/Assets/Scripts/Managers/MatchmakingManager.cs +++ b/Assets/Scripts/Managers/MatchmakingManager.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; using APIs; using Firebase.Database; +using Serializables; using UnityEngine; namespace Managers @@ -10,23 +12,36 @@ public class MatchmakingManager : MonoBehaviour { private KeyValuePair> queueListener; - public void JoinQueue(string playerId, Action onGameFound, Action fallback) => - DatabaseAPI.PostObject($"matchmaking/{playerId}", "placeholder", - () => queueListener = DatabaseAPI.ListenForValueChanged($"matchmaking/{playerId}", - args => - { - var gameId = - StringSerializationAPI.Deserialize(typeof(string), args.Snapshot.GetRawJsonValue()) as - string; - if (gameId == "placeholder") return; - LeaveQueue(playerId, () => onGameFound( - gameId), fallback); - }, fallback), fallback); - - public void LeaveQueue(string playerId, Action callback, Action fallback) + public async Task JoinQueue(string playerName, Action onGameFound, Action fallback) { + var joinQueueResult = await FunctionsAPI.CallJoinQueueFunction(playerName); + + if (joinQueueResult.isFaulted) + return joinQueueResult; + + async void OnValueChanged(ValueChangedEventArgs args) + { + var gameId = StringSerializationAPI.Deserialize(typeof(string), args.Snapshot.GetRawJsonValue()) as string; + if (gameId == null) return; + onGameFound(gameId); + } + + queueListener = DatabaseAPI.ListenForValueChanged($"matchmaking/{AuthAPI.GetUserId()}/gameId", + OnValueChanged, fallback); + + return new RequestState(); + } + + public async Task LeaveQueue() + { + var leaveQueueResult = await FunctionsAPI.CallLeaveQueueFunction(); + + if (leaveQueueResult.isFaulted) + return leaveQueueResult; + DatabaseAPI.StopListeningForValueChanged(queueListener); - DatabaseAPI.PostJSON($"matchmaking/{playerId}", "null", callback, fallback); + + return new RequestState(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Serializables/GameInfo.cs b/Assets/Scripts/Serializables/GameInfo.cs index b8a3862..68c69c3 100644 --- a/Assets/Scripts/Serializables/GameInfo.cs +++ b/Assets/Scripts/Serializables/GameInfo.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace Serializables { @@ -6,7 +7,7 @@ namespace Serializables public class GameInfo { public string gameId; - public string[] playersIds; + public Dictionary playersInfo; public string localPlayerId; } } diff --git a/Assets/Scripts/Serializables/Move.cs b/Assets/Scripts/Serializables/Move.cs index 8bd51d8..7c218dd 100644 --- a/Assets/Scripts/Serializables/Move.cs +++ b/Assets/Scripts/Serializables/Move.cs @@ -9,5 +9,9 @@ public class Move public Vector2 direction; public Move(Vector2 direction) => this.direction = direction; + + public Move(int[] direction) => this.direction = new Vector2(direction[0], direction[1]); + + public int[] ConvertToArray() => new int[] { (int) direction.x, (int) direction.y }; } } \ No newline at end of file diff --git a/Assets/Scripts/Serializables/PlayerInfo.cs b/Assets/Scripts/Serializables/PlayerInfo.cs new file mode 100644 index 0000000..493d1aa --- /dev/null +++ b/Assets/Scripts/Serializables/PlayerInfo.cs @@ -0,0 +1,11 @@ +using System; + +namespace Serializables +{ + [Serializable] + public class PlayerInfo + { + public string id; + public string name; + } +} diff --git a/Assets/Scripts/Serializables/PlayerInfo.cs.meta b/Assets/Scripts/Serializables/PlayerInfo.cs.meta new file mode 100644 index 0000000..88b2f86 --- /dev/null +++ b/Assets/Scripts/Serializables/PlayerInfo.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2139e366e6294edda9f47753e895eb03 +timeCreated: 1669496765 \ No newline at end of file diff --git a/Assets/Scripts/Serializables/RequestState.cs b/Assets/Scripts/Serializables/RequestState.cs new file mode 100644 index 0000000..b2c1bfd --- /dev/null +++ b/Assets/Scripts/Serializables/RequestState.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Threading.Tasks; +using Managers; + +namespace Serializables +{ + [Serializable] + public class RequestResponse : RequestState + { + public T data; + + public static bool operator ==(RequestResponse wrapper, T type) => + wrapper != null && EqualityComparer.Default.Equals(wrapper.data, type); + + public static bool operator !=(RequestResponse wrapper, T type) => !(wrapper == type); + + public RequestResponse(T data) => this.data = data; + + protected bool Equals(RequestResponse other) + { + return isFaulted == other.isFaulted && error == other.error && + EqualityComparer.Default.Equals(data, other.data); + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + if (obj.GetType() != this.GetType()) return false; + return Equals((RequestResponse)obj); + } + + public override int GetHashCode() + { + unchecked + { + var hashCode = isFaulted.GetHashCode(); + hashCode = (hashCode * 397) ^ (error != null ? error.GetHashCode() : 0); + hashCode = (hashCode * 397) ^ EqualityComparer.Default.GetHashCode(data); + return hashCode; + } + } + + public static RequestResponse FromDictionary(Dictionary dictionary) + { + var isFaulted = false; + if (dictionary.ContainsKey("isFaulted")) isFaulted = (bool) dictionary["isFaulted"]; + + if (isFaulted) + { + var error = ""; + if (dictionary.ContainsKey("error")) error = (string) dictionary["error"]; + return new RequestResponse(default).MakeFaulted(error); + } + + T data = default; + if (dictionary.ContainsKey("data")) data = (T) dictionary["data"]; + return new RequestResponse(data); + } + } + + [Serializable] + public class RequestState + { + public bool isFaulted; + public RequestError error; + } + + [Serializable] + public class RequestError + { + public enum ErrorType + { + Exception, + Message + } + + public Exception rawException; + public string readableMessage; + public ErrorType errorType; + + public void SetReadableMessage(string message) => readableMessage = message; + } + + public static class RequestExtensions + { + public static T MakeFaulted(this T authObject, string error) where T : RequestState + { + authObject.isFaulted = true; + authObject.error = new RequestError + { + rawException = new Exception(error), + readableMessage = error, + errorType = RequestError.ErrorType.Message + }; + return authObject; + } + + public static T MakeFaulted(this T authObject, Exception error) where T : RequestState + { + authObject.isFaulted = true; + authObject.error = new RequestError + { + rawException = error, + readableMessage = error.Message, + errorType = RequestError.ErrorType.Exception + }; + return authObject; + } + + public static T MakeFaulted(this T authObject, RequestError error) where T : RequestState + { + authObject.isFaulted = true; + authObject.error = error; + return authObject; + } + + public static IEnumerator WaitForTask(this Task task) => MainManager.Instance.WaitForTask(task); + + public static async Task WaitForTaskAsync(this Task task) => + await MainManager.Instance.WaitForTaskAsync(task); + + public static void ExecuteCoroutineGlobally(this IEnumerator coroutine) + { + if (MainManager.Instance != null) MainManager.Instance.StartCoroutine(coroutine); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Serializables/RequestState.cs.meta b/Assets/Scripts/Serializables/RequestState.cs.meta new file mode 100644 index 0000000..dcea1e1 --- /dev/null +++ b/Assets/Scripts/Serializables/RequestState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e9f26e62fccf4e8bade2b44caaa7d2c5 +timeCreated: 1668872552 \ No newline at end of file diff --git a/Assets/database.rules.json b/Assets/database.rules.json new file mode 100644 index 0000000..46070c3 --- /dev/null +++ b/Assets/database.rules.json @@ -0,0 +1,14 @@ +{ + "rules": { + "matchmaking": { + "$uid": { + ".read": "$uid === auth.uid" + } + }, + "games": { + "$game": { + ".read": "root.child('matchmaking').child(auth.uid).child('gameId').val() === $game" + } + } + } +} diff --git a/Assets/database.rules.json.meta b/Assets/database.rules.json.meta new file mode 100644 index 0000000..7070865 --- /dev/null +++ b/Assets/database.rules.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d16a6e22c6dcd42cc94cab00005d2c13 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/index.js b/Assets/index.js index 7614415..8418ecd 100644 --- a/Assets/index.js +++ b/Assets/index.js @@ -1,68 +1,205 @@ -const functions = require('firebase-functions'); -const admin = require('firebase-admin'); -admin.initializeApp(functions.config().firebase); - -var database = admin.database(); - -exports.matchmaker = functions.database.ref('matchmaking/{playerId}') - .onCreate((snap, context) => { - - var gameId = generateGameId(); +/* eslint-disable max-len */ +/* eslint-disable require-jsdoc */ - database.ref('matchmaking').once('value').then(players => { - var secondPlayer = null; - players.forEach(player => { - if (player.val() === "placeholder" && player.key !== context.params.playerId) { - secondPlayer = player; - } - }); - - if (secondPlayer === null) return null; - - database.ref("matchmaking").transaction(function (matchmaking) { - - // If any of the players gets into another game during the transaction, abort the operation - if (matchmaking === null || matchmaking[context.params.playerId] !== "placeholder" || matchmaking[secondPlayer.key] !== "placeholder") return matchmaking; +const functions = require("firebase-functions"); +const admin = require("firebase-admin"); +admin.initializeApp(functions.config().firebase); - matchmaking[context.params.playerId] = gameId; - matchmaking[secondPlayer.key] = gameId; - return matchmaking; +const database = admin.database(); - }).then(result => { +exports.joinQueue = functions.https.onCall((data, context) => { + try { + assertAuth(context); - if (result.snapshot.child(context.params.playerId).val() !== gameId) return; + const playerName = data; + const playerId = context.auth.uid; - var game = { - gameInfo: { - gameId: gameId, - playersIds: [context.params.playerId, secondPlayer.key] - }, - turn: context.params.playerId - } + const queueRef = database.ref("matchmaking/" + playerId); + return queueRef.set({ + name: playerName, + }).then(() => { + return successfulRequest(null); + }).catch((error) => { + return failedRequest(error); + }); + } catch (error) { + console.log("ERROR:" + error); + return failedRequest(error); + } +}); + +exports.leaveQueue = functions.https.onCall((data, context) => { + try { + assertAuth(context); + + const playerId = context.auth.uid; + + const queueRef = database.ref("matchmaking/" + playerId); + return queueRef.remove().then(() => { + return successfulRequest(null); + }).catch((error) => { + return failedRequest(error); + }); + } catch (error) { + console.log("ERROR:" + error); + return failedRequest(error); + } +}); - database.ref("games/" + gameId).set(game).then(snapshot => { +exports.matchmaker = functions.database.ref("matchmaking/{playerId}") + .onCreate((snap, context) => { + const gameId = generateGameId(); + + database.ref("matchmaking").once("value").then((players) => { + let secondPlayer = null; + players.forEach((player) => { + if (!player.child("gameId").exists() && player.key !== context.params.playerId) { + secondPlayer = player; + } + }); - console.log("Game created successfully!") - return null; - }).catch(error => { - console.log(error); - }); + if (secondPlayer === null) return null; + + database.ref("matchmaking").transaction(function(matchmaking) { + // If any of the players gets into another game during the transaction, abort the operation + if (matchmaking === null || matchmaking[context.params.playerId]["gameId"] !== undefined || matchmaking[secondPlayer.key]["gameId"] !== undefined) return matchmaking; + + matchmaking[context.params.playerId]["gameId"] = gameId; + matchmaking[secondPlayer.key]["gameId"] = gameId; + return matchmaking; + }).then((result) => { + if (result.snapshot.child(context.params.playerId + "/gameId").val() !== gameId) return; + + const game = { + gameInfo: { + gameId: gameId, + playersInfo: { + [context.params.playerId]: { + id: context.params.playerId, + name: result.snapshot.child(context.params.playerId + "/name").val(), + }, + [secondPlayer.key]: { + id: secondPlayer.key, + name: result.snapshot.child(secondPlayer.key + "/name").val(), + }, + }, + }, + turn: context.params.playerId, + }; + + database.ref("games/" + gameId).set(game).then((snapshot) => { + console.log("Game created successfully!"); + return null; + }).catch((error) => { + console.log(error); + }); - return null; + return null; + }).catch((error) => { + console.log(error); + }); - }).catch(error => { - console.log(error); - }); + return null; + }).catch((error) => { + console.log(error); + }); + }); - return null; - }).catch(error => { - console.log(error); +exports.setReady = functions.https.onCall((data, context) => { + try { + assertAuth(context); + + const playerId = context.auth.uid; + + return database.ref("matchmaking/" + playerId + "/gameId").once("value").then((gameId) => { + if (gameId.val() === null) return failedRequest("Player is not in a game"); + const readyRef = database.ref("games/" + gameId.val() + "/ready/" + playerId); + return readyRef.set(true).then(() => { + return successfulRequest(null); + }).catch((error) => { + return failedRequest(error); + }); + }).catch((error) => { + return failedRequest(error); + }); + } catch (error) { + console.log("ERROR:" + error); + return failedRequest(error); + } +}); + +exports.makeMove = functions.https.onCall((data, context) => { + try { + assertAuth(context); + + const playerId = context.auth.uid; + const move = data; + + assertValidMove(move); + + return database.ref("matchmaking/" + playerId + "/gameId").once("value").then((gameId) => { + if (gameId.val() === null) return failedRequest("Player is not in a game"); + const gameRef = database.ref("games/" + gameId.val()); + const movesRef = gameRef.child(playerId + "/moves"); + const turnRef = gameRef.child("turn"); + + return gameRef.once("value").then((game) => { + if (game.child("turn").val() !== playerId) return failedRequest("It's not your turn"); + + return movesRef.push().set(move).then(() => { + turnRef.set(Object.keys(game.child("gameInfo/playersInfo").val()).filter((id) => id !== playerId)[0]); + return successfulRequest(null); + }).catch((error) => { + throw error; }); + }).catch((error) => { + throw error; + }); + }).catch((error) => { + throw error; }); + } catch (error) { + console.log("ERROR:" + error); + return failedRequest(error.message); + } +}); function generateGameId() { - var possibleChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - var gameId = ""; - for (var j = 0; j < 20; j++) gameId += possibleChars.charAt(Math.floor(Math.random() * possibleChars.length)); - return gameId; -} \ No newline at end of file + const possibleChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + let gameId = ""; + for (let j = 0; j < 20; j++) gameId += possibleChars.charAt(Math.floor(Math.random() * possibleChars.length)); + return gameId; +} + +function successfulRequest(data) { + return { + isFaulted: false, + data: data, + }; +} + +function failedRequest(errorMessage) { + return { + isFaulted: true, + error: errorMessage, + }; +} + +function assertAuth(context) { + const auth = context.auth; + + if (!auth) { + throw new functions.https.HttpsError("unauthenticated", "User is not authenticated"); + } +} + +function assertValidMove(move) { + if (move === undefined || + !Array.isArray(move) || + move.length !== 2 || + move[0] == 0 && move[1] == 0 || + Math.abs(move[0]) != 1 && move[0] != 0 || + Math.abs(move[1]) != 1 && move[1] != 0) { + throw new functions.https.HttpsError("invalid-argument", "Move is not valid"); + } +} diff --git a/Assets/index.js.meta b/Assets/index.js.meta index 8ebc6b2..d0b9226 100644 --- a/Assets/index.js.meta +++ b/Assets/index.js.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fbf234fd2a339607ca318a90c107e023 +guid: 2bb4991ed0d534bd2ba3613b3b86f939 TextScriptImporter: externalObjects: {} userData: diff --git a/Packages/manifest.json b/Packages/manifest.json index 27a4f85..db4550a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,17 +1,18 @@ { "dependencies": { - "com.unity.2d.animation": "3.2.3", - "com.unity.2d.pixel-perfect": "2.0.4", - "com.unity.2d.psdimporter": "2.1.4", + "com.unity.2d.animation": "5.0.4", + "com.unity.2d.pixel-perfect": "4.0.1", + "com.unity.2d.psdimporter": "4.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "3.0.12", + "com.unity.2d.spriteshape": "5.1.1", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.1", - "com.unity.test-framework": "1.1.14", - "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.15", + "com.unity.collab-proxy": "1.3.9", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.7", + "com.unity.ide.vscode": "1.2.3", + "com.unity.test-framework": "1.1.22", + "com.unity.textmeshpro": "3.0.1", + "com.unity.timeline": "1.4.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e53a081..7c02de5 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,46 +1,49 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "3.2.3", + "version": "5.0.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "2.0.2", + "com.unity.2d.common": "4.0.3", "com.unity.mathematics": "1.1.0", - "com.unity.2d.sprite": "1.0.0" + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "2.0.2", + "version": "4.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.sprite": "1.0.0" + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.path": { - "version": "2.0.5", + "version": "4.0.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { - "version": "2.0.4", + "version": "4.0.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "2.1.4", + "version": "4.0.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "2.0.2", - "com.unity.2d.animation": "3.2.2", + "com.unity.2d.common": "4.0.2", + "com.unity.2d.animation": "5.0.2", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -52,13 +55,14 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "3.0.12", + "version": "5.1.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "2.0.2", - "com.unity.2d.path": "2.0.5" + "com.unity.2d.common": "4.0.3", + "com.unity.2d.path": "4.0.1", + "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -69,21 +73,21 @@ "dependencies": {} }, "com.unity.collab-proxy": { - "version": "1.2.16", + "version": "1.3.9", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -91,8 +95,17 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.visualstudio": { + "version": "2.0.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.vscode": { - "version": "1.2.1", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -106,18 +119,18 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.14", + "version": "1.1.22", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.0.1", + "version": "3.0.1", "depth": 0, "source": "registry", "dependencies": { @@ -126,10 +139,15 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.15", + "version": "1.4.6", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ugui": { @@ -137,7 +155,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0" + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" } }, "com.unity.modules.ai": { @@ -273,6 +292,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d000d8c..d081589 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -17,4 +17,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/GameScene.unity guid: 9dcc69b842553997ba3434226b7d6ccd + - enabled: 1 + path: Assets/Scenes/LoginScene.unity + guid: bc1198a1481d24c26900649de0a6a499 m_configObjects: {} diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml index 124e0ad..47fce63 100644 --- a/ProjectSettings/GvhProjectSettings.xml +++ b/ProjectSettings/GvhProjectSettings.xml @@ -1,4 +1,6 @@ + + \ No newline at end of file diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..be4a797 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Capabilities: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4b6255b..6830e2a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.3f1 -m_EditorVersionWithRevision: 2019.4.3f1 (f880dceab6fe) +m_EditorVersion: 2020.3.1f1 +m_EditorVersionWithRevision: 2020.3.1f1 (77a89f25062f) diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..dca2881 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/README.md b/README.md index c5bfc78..acf0feb 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,8 @@ This is an example of a simple turn game created in Unity using the Firebase SDK In order to implement this for your Firebase project follow these steps: - Download the google-services file for your Unity project (if you need to build your App for Android or MacOS). More info [here](https://firebase.google.com/docs/unity/setup) - Set up cloud functions for your Firebase project (firebase init) and then copy the contents of the index.js file in this repository's assets folder and paste it in your own project index.js file. Finally deploy the changes (firebase deploy). More info [here](https://firebase.google.com/docs/functions) + +## v2 branch +- The v2 branch is an improvement of the Multiplayer system showcased in the [old tutorial video](youtu.be/wBvWaTTxfmo), which allows for a secure multiplayer example. This is done by disallowing the client from writing to the database completely and instead validating all requests through cloud functions. +- Additionally, Realtime Rules have been added to make it so the client can only read their own matchmaking and game data (database.rules.json) +- You can watch the updated video that showcases the v2 branch [here](https://youtu.be/pjOlGwxYNXs)