diff --git a/.gitignore b/.gitignore index 77926fd7..4b47e4ec 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ NetmeraiOS/ NetmeraUnity/Temp NetmeraUnity/Assets/Netmera-Info.plist.meta -NetmeraUnity/Assets/Netmera-Info.plist \ No newline at end of file +NetmeraUnity/Assets/Netmera-Info.plist +NetmeraUnity/Assets/Firebase/** \ No newline at end of file diff --git a/NetmeraPackages/FirebaseMessaging_10.0.0.unitypackage b/NetmeraPackages/FirebaseMessaging_10.0.0.unitypackage new file mode 100644 index 00000000..9d26c17e Binary files /dev/null and b/NetmeraPackages/FirebaseMessaging_10.0.0.unitypackage differ diff --git a/NetmeraPackages/netmera-unity-1.2.1.noads.unitypackage b/NetmeraPackages/netmera-unity-1.2.1.noads.unitypackage new file mode 100644 index 00000000..1118cfe9 Binary files /dev/null and b/NetmeraPackages/netmera-unity-1.2.1.noads.unitypackage differ diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta index e48ff973..b9618eae 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: dc218b335b1d14cd5ae532f65042d829 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_analytics.png timeCreated: 1473376337 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta index ed0b8f5c..ad3c7b4b 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 9fe4b3bd3b7d2477dac92fb7429d1d1b labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_analytics_dark.png timeCreated: 1472679008 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth.png.meta index 92dfcdc8..e6594206 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 394b3ec4d60c24476a12e4ba696d9e5d labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_auth.png timeCreated: 1473376335 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta index 1b79381d..f53f5363 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 3a9e1ef6287664c389bb09e2ac1b23b7 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_auth_dark.png timeCreated: 1472679008 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta index 87b85299..4106ea3b 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 837e8e1f35e334e81931d0857680cebf labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_cloud_messaging.png timeCreated: 1473376336 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta index abfb89b1..0c50d3e3 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 20c5b8a1f82cb4aadb77ca20683d2a6e labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_cloud_messaging_dark.png timeCreated: 1472679008 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config.png.meta index 15e73ff3..add1e135 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 415eaec414af14d11955222a282aca08 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_config.png timeCreated: 1473376335 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta index 41c15e59..8480845d 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 0ad9ef5fff5524355a9670c90a99cbba labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_config_dark.png timeCreated: 1472679008 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta index 0631016f..9d9793f7 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 008a5e76206e49f9b06d8ba144aabb38 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_crashlytics.png timeCreated: 1473376335 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta index 37066d99..63ad36c9 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 214009068900439da4a9cded17d58090 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_crashlytics_dark.png timeCreated: 1472679008 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database.png.meta index 275e3faa..8212eb42 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 3eea7b558c67b48e18acf3c278392e3d labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_database.png timeCreated: 1476203961 licenseType: Free diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta index 3a2548ba..e7ce0ebb 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 9f6bfa9d8aefb40dc92461c372c73b0f labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_database_dark.png timeCreated: 1476203949 licenseType: Free diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta index fe6ebe93..360357ae 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: df6f219c396f4ad9b5048bae6944cb8e labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_dynamic_links.png timeCreated: 1473376335 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta index 911dc491..9dbee2b0 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 9355a4671cfe4eef90879863318d1a4b labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_dynamic_links_dark.png timeCreated: 1472679009 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions.png.meta index b55ca83c..0ee043a4 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 953367231f9e3e22e70e5d1c91a40fe5 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_functions.png timeCreated: 1473376335 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta index 17a5cce4..8048d563 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: b5aa3e4f7432e1c5698417cc13f85271 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_functions_dark.png timeCreated: 1472679008 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites.png new file mode 100755 index 00000000..be9a9b96 Binary files /dev/null and b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites.png differ diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites.png.meta new file mode 100644 index 00000000..c063fee3 --- /dev/null +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 741b269777f30488482ef4937b456b28 +labels: +- gvh +- gvh_version-10.0.0 +- 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/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites_dark.png new file mode 100755 index 00000000..1bd1a904 Binary files /dev/null and b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites_dark.png differ diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta new file mode 100644 index 00000000..f9dcbdb0 --- /dev/null +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: a734ad7414926404e90f8b5be37b7e23 +labels: +- gvh +- gvh_version-10.0.0 +- 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/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage.png.meta index 601b83a6..f7a85542 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 573eb851c99f948f4bf2de49322bfd53 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_storage.png timeCreated: 1481243899 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta index 67704d36..09ae0970 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 2955864b938094f579ea9902b65ac10c labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/fb_storage_dark.png timeCreated: 1481243898 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta index 86e8121c..7453d6cf 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 9f058f25e8e2d47cfb894951d4d7e48a labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/firebase_lockup.png timeCreated: 1473376336 licenseType: Pro diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png b/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta b/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta index 3fd86a70..7d3fc587 100644 --- a/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta +++ b/NetmeraUnity/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: b93330fc8ea08407dbc514b5101afa14 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Editor Default Resources/Firebase/firebase_lockup_dark.png timeCreated: 1472601251 licenseType: Pro diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174.meta similarity index 77% rename from NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0.meta rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174.meta index 63c8564e..fdf87dcf 100644 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d58a56f99331d2241a5d1bc6edd1d3a1 +guid: be3bcf7d14657474e9cfde0f6862538d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll new file mode 100755 index 00000000..5bbf5c1d Binary files /dev/null and b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.meta similarity index 81% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll.meta rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.meta index a0c53656..23485c23 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 647b93e17f6d492e8848ff790487006c +guid: 83ff4764cfaa404ab9546c5a00b1b54f labels: - gvh -- gvh_version-1.2.164 -- gvhp_exportpath-ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll +- gvh_version-10.0.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.IOSResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll old mode 100644 new mode 100755 similarity index 67% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll index ddc7169f..a722d92f Binary files a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll and b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.meta similarity index 81% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll.meta rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.meta index 831f6e14..bab470ea 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: f5303253df204c158859485eb7d9f524 +guid: d9cf2414188e40c9a9f7a254a5436601 labels: - gvh -- gvh_version-1.2.164 -- gvhp_exportpath-ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll +- gvh_version-10.0.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.JarResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll old mode 100644 new mode 100755 similarity index 98% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll index 28852997..45d0f06b Binary files a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll and b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.meta similarity index 80% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll.meta rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.meta index 828bb951..c38af02d 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 4f5271f6b1ee4144b4247be99763cec3 +guid: 789ffd788f924bd0bdb33e26b367ad70 labels: - gvh -- gvh_version-1.2.164 -- gvhp_exportpath-ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll +- gvh_version-10.0.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.PackageManagerResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll new file mode 100755 index 00000000..b84bff05 Binary files /dev/null and b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.meta similarity index 80% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll.meta rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.meta index 762b803a..93b43664 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: c260ec63954e4c0c8a54d0c24c82db68 +guid: 149319a041c7420b94473745b1919576 labels: - gvh -- gvh_version-1.2.164 -- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll +- gvh_version-10.0.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.174/Google.VersionHandlerImpl.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md old mode 100644 new mode 100755 index 93580bfc..5dce1c73 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,3 +1,73 @@ +# 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 diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 615d18d6..0d62ff9d 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,12 +1,11 @@ fileFormatVersion: 2 -guid: d67e36cf70144eeeb62948707545ecfd +guid: 3d9f779dd5e74fcc9e05e0c450716999 labels: - gvh -- gvh_version-1.2.164 +- gvh_version-10.0.0 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md -timeCreated: 1584567712 -licenseType: Pro TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll deleted file mode 100644 index 3db1838d..00000000 Binary files a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll and /dev/null differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll old mode 100644 new mode 100755 index 6e0ccf14..51d6b7ba Binary files a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 730b80d4..67e0d1ff 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,21 +1,23 @@ fileFormatVersion: 2 -guid: bb6999c8a5ce4ba99688ec579babe5b7 +guid: 2010dfbbc3ff4f499e6892f6681a37df labels: - gvh -- gvh_version-1.2.164 +- gvh_version-10.0.0 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor -timeCreated: 1480838400 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - Any: + Any: second: enabled: 0 settings: {} @@ -31,6 +33,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll deleted file mode 100644 index 021473d3..00000000 Binary files a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll and /dev/null differ diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/LICENSE b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/LICENSE old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/LICENSE.meta index b3f7efbc..d1688d5e 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,12 +1,11 @@ fileFormatVersion: 2 -guid: 35a6726adf03479eb04b8c082346d551 +guid: b5a2636858c0483bab69644a94d03b42 labels: - gvh -- gvh_version-1.2.164 +- gvh_version-10.0.0 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE -timeCreated: 1584567712 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md old mode 100644 new mode 100755 index cbc98e19..b49cf1e2 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md @@ -26,7 +26,7 @@ This causes the following problems: Unity project can be complex and a burden on a Unity plugin maintainer. * The process of resolving conflicting dependencies on platform specific libraries is pushed to the developer attempting to use a Unity plugin. - The developer trying to use you plugin is very likely to give up when + 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 diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md.meta index d6b7cee6..c8bc211e 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,12 +1,11 @@ fileFormatVersion: 2 -guid: 11eb52f780284fd69194951ac46cb538 +guid: 8899dd41fdfd4ebc88ca6ef5951c6eb1 labels: - gvh -- gvh_version-1.2.164 +- gvh_version-10.0.0 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md -timeCreated: 1584567712 -licenseType: Pro TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt deleted file mode 100644 index 9ced6bc8..00000000 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt new file mode 100755 index 00000000..5539d779 --- /dev/null +++ b/NetmeraUnity/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/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt.meta b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt.meta similarity index 53% rename from NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt.meta rename to NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt.meta index 8aef090d..f8ea878a 100644 --- a/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt.meta +++ b/NetmeraUnity/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.174_manifest.txt.meta @@ -1,15 +1,14 @@ fileFormatVersion: 2 -guid: 3f3ad9fc3d0545b9b500a544faab1ca4 +guid: a9e2518b6d1442f1862700fa1481a623 labels: - gvh - gvh_manifest -- gvh_version-1.2.164 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt +- 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 -timeCreated: 1474401009 -licenseType: Pro TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml b/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml old mode 100644 new mode 100755 index 9c1c7c57..2bf62d1c --- a/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml +++ b/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml @@ -1,25 +1,24 @@ - - - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - + + + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml.meta b/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml.meta index a7de035e..2c18cab6 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/AppDependencies.xml.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 9b63af95d9364af4a3d8ce58738b6223 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/AppDependencies.xml timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll old mode 100644 new mode 100755 index 7cd95a39..468a5d4f Binary files a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll and b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll.meta b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll.meta index 5a885b0e..721ed1c6 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Editor.dll.meta @@ -3,7 +3,7 @@ guid: 9f2edbf81053418f879076c05f816dc2 labels: - gvh - gvh_targets-editor -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/Firebase.Editor.dll PluginImporter: externalObjects: {} @@ -16,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: @@ -26,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/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll old mode 100644 new mode 100755 index 98bd21a7..2765d342 Binary files a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll and b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta index 8ffa2ee6..8c0d71f6 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta @@ -3,7 +3,7 @@ guid: 9555198c219241e0b850872f8732192f labels: - gvh - gvh_targets-editor -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/Firebase.Messaging.Editor.dll PluginImporter: externalObjects: {} @@ -106,6 +106,13 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt b/NetmeraUnity/Assets/Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt deleted file mode 100644 index 896e3fac..00000000 --- a/NetmeraUnity/Assets/Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt +++ /dev/null @@ -1,75 +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/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb -Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.164.dll.mdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md -Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.164_manifest.txt -Assets/Firebase/Editor/AppDependencies.xml -Assets/Firebase/Editor/Firebase.Editor.dll -Assets/Firebase/Editor/Firebase.Editor.dll.mdb -Assets/Firebase/Editor/Firebase.Messaging.Editor.dll -Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.mdb -Assets/Firebase/Editor/MessagingDependencies.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.dll.mdb -Assets/Firebase/Plugins/Firebase.Messaging.dll -Assets/Firebase/Plugins/Firebase.Messaging.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.Messaging.dll -Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll.mdb -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.so -Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-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/Plugins/iOS/Firebase/libFirebaseCppApp.a -Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a diff --git a/NetmeraUnity/Assets/Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt.meta b/NetmeraUnity/Assets/Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt.meta deleted file mode 100644 index 2c9d1ae1..00000000 --- a/NetmeraUnity/Assets/Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 90282ae6bbad4cf2ab4932e660584095 -labels: -- gvh -- gvh_manifest -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/Editor/FirebaseMessaging_version-7.1.0_manifest.txt -- gvhp_manifestname-0Firebase Cloud Messaging -- gvhp_manifestname-1FirebaseMessaging -timeCreated: 0 diff --git a/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml b/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml old mode 100644 new mode 100755 index eecd8c11..8439eeec --- a/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml +++ b/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml @@ -1,23 +1,24 @@ - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - - + + + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml.meta b/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml.meta index 515a21e3..b172c817 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/MessagingDependencies.xml.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 992fedef98ac42209a9d26d5bf364adf labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/MessagingDependencies.xml timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe old mode 100644 new mode 100755 index bbb434e6..3d264978 Binary files a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe and b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe differ diff --git a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta index d13af85e..3a743474 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: ae88c0972b7448b5b36def1716f1d711 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/generate_xml_from_google_services_json.exe timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py old mode 100644 new mode 100755 index fbe91c6c..88dbb161 --- a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py +++ b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py @@ -108,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. @@ -117,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'], diff --git a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta index c041f3b7..f20fa05b 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 8f18ed76c0f04ce0a65736104f913ef8 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/generate_xml_from_google_services_json.py timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/Editor/network_request.exe b/NetmeraUnity/Assets/Firebase/Editor/network_request.exe old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Firebase/Editor/network_request.exe.meta b/NetmeraUnity/Assets/Firebase/Editor/network_request.exe.meta index 349c5ca1..a0e4e561 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/network_request.exe.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/network_request.exe.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: d3cd5d0a941c4cdc8ab4b1b684b05191 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/network_request.exe timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/Editor/network_request.py b/NetmeraUnity/Assets/Firebase/Editor/network_request.py old mode 100644 new mode 100755 diff --git a/NetmeraUnity/Assets/Firebase/Editor/network_request.py.meta b/NetmeraUnity/Assets/Firebase/Editor/network_request.py.meta index 5cc7e339..a196db04 100644 --- a/NetmeraUnity/Assets/Firebase/Editor/network_request.py.meta +++ b/NetmeraUnity/Assets/Firebase/Editor/network_request.py.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: e6e32fecbfd44fab946fa160e4861924 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Editor/network_request.py timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll old mode 100644 new mode 100755 index e153f6b3..6aa1b54d Binary files a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll and b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll.meta index 1f691f7a..26042400 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.App.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 7311924048bd457bac6d713576c952da labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/Firebase.App.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll old mode 100644 new mode 100755 index 40bd7afd..a332ab68 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll and b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll.meta index 837fa9e5..09f5fefb 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Messaging.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 0177f1334f3944ac8ca3df55e1d98660 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/Firebase.Messaging.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll old mode 100644 new mode 100755 index 9c0c179e..e1a3dfd4 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll and b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll.meta index 49a5cfd7..0dd2aa8c 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.Platform.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 7d3eec03d7e241a48941e038118c5e6a labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/Firebase.Platform.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll old mode 100644 new mode 100755 index fdb08844..1b05e441 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll and b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta index 14afc9e7..9452fb31 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: f5d4069c578548ba9f199b46d61bf06d labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/Firebase.TaskExtension.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll b/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll old mode 100644 new mode 100755 index 48b7770c..f0adf84a Binary files a/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll and b/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll.meta index cab10f81..108e40cf 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/Google.MiniJson.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 3ebb289656f1477fa263e62d36c6e329 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/Google.MiniJson.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll old mode 100644 new mode 100755 index 702bc8f5..47b3a601 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll and b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta index 508f5fa8..2fe4b4f5 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta @@ -2,109 +2,80 @@ fileFormatVersion: 2 guid: 5f3feda1a91343759b7eb58a29b492b7 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/iOS/Firebase.App.dll +timeCreated: 1480838400 PluginImporter: - externalObjects: {} - serializedVersion: 2 + serializedVersion: 1 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - : Linux - second: + Android: enabled: 0 settings: - CPU: None - - first: - : LinuxUniversal - second: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: enabled: 0 settings: - CPU: None - - first: - : OSXIntel - second: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: enabled: 0 settings: CPU: None - - first: - : OSXIntel64 - second: + Linux64: enabled: 0 settings: CPU: None - - first: - : Web - second: - enabled: 0 - settings: {} - - first: - : WebStreamed - second: - enabled: 0 - settings: {} - - first: - Android: Android - second: + LinuxUniversal: enabled: 0 settings: - CPU: AnyCPU - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: + CPU: None + 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: 0 settings: CPU: None - - first: - Windows Store Apps: WindowsStoreApps - second: + WindowsStoreApps: enabled: 0 settings: CPU: AnyCPU - - first: - iPhone: iOS - second: + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: enabled: 1 settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll old mode 100644 new mode 100755 index d4c4fcb1..7c9229c8 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll and b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll.meta index a1a133e4..0362f0e2 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 104bd79795964dd3a77a6fa53e729421 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/iOS/Firebase.Messaging.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle.meta b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle.meta deleted file mode 100644 index 3e86d52a..00000000 --- a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle.meta +++ /dev/null @@ -1,76 +0,0 @@ -fileFormatVersion: 2 -guid: 4c0df1fca7564f5db9c26950f6a196e9 -labels: -- gvh -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle -timeCreated: 1480838400 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - 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: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - 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: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll deleted file mode 100644 index fe17e4b9..00000000 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll and /dev/null differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll.meta deleted file mode 100644 index 3f452be4..00000000 --- a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll.meta +++ /dev/null @@ -1,76 +0,0 @@ -fileFormatVersion: 2 -guid: 08d03e05cf5f4f8691fb34509f14359b -labels: -- gvh -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.dll -timeCreated: 1480838400 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - 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: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle old mode 100644 new mode 100755 index b6852c84..7df5e530 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle and b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle.meta b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle.meta index c9b0764c..8a56851e 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 5d46f3be89af4272b9f8990f26048598 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll old mode 100644 new mode 100755 index b316070b..14384926 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll and b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll differ diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll.meta b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll.meta index 8ed20721..1f946a78 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 25030b1944ee412881e89b8967a05294 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppMessaging.dll timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so old mode 100644 new mode 100755 index 1944bc6a..5ae7ac90 --- a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so +++ b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05abc861d34e63a4b0729c4e3c249726fbc8339fd34114575fb3e7e72d9dcb46 -size 69632 +oid sha256:542cc08da15e897cf278bd20614905c742a9ee1f8a4ad40996875e751d1d5c52 +size 342384 diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so.meta b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so.meta index 292b00f6..fc6d2b2e 100644 --- a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so.meta +++ b/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 0625d28dbdd6464a9915e074cb465acf labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppMessaging.so timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom deleted file mode 100644 index efdddc0e..00000000 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-app-unity - 7.1.0 - srcaar - - \ No newline at end of file diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom.meta b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom.meta deleted file mode 100644 index a81e87b7..00000000 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e5fcb9ef5df4acab9afc3ed706c9d2d -labels: -- gvh -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar deleted file mode 100644 index 935719c4..00000000 Binary files a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar and /dev/null differ diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar.meta b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar.meta deleted file mode 100644 index 745798ac..00000000 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9235692dc94045638ebd69b08ccc24a0 -labels: -- gvh -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.srcaar -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml old mode 100644 new mode 100755 index 69ab53ff..8489551d --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml +++ b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml @@ -1,10 +1,9 @@ - - com.google.firebase - firebase-app-unity - - 7.1.0 - 7.1.0 - - - - + + com.google.firebase + firebase-app-unity + + 10.0.0 + 10.0.0 + + + diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta index fff10bb7..fa8b6161 100644 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta +++ b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 96337775a7c941d88ea15f8026ad6f8e labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom deleted file mode 100644 index 7ae36dde..00000000 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-messaging-unity - 7.1.0 - srcaar - - - androidx.core - core - 1.0.1 - compile - aar - - - \ No newline at end of file diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom.meta b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom.meta deleted file mode 100644 index b5495f87..00000000 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a27c26434a5e459bba61785238642822 -labels: -- gvh -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar deleted file mode 100644 index 94c03f45..00000000 Binary files a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar and /dev/null differ diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar.meta b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar.meta deleted file mode 100644 index fa1158c0..00000000 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 33f2ad3f7c18455fb125be0aabd0cedd -labels: -- gvh -- gvh_version-7.1.0 -- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.srcaar -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml old mode 100644 new mode 100755 index 4c473a1c..0b5873b4 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml +++ b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml @@ -1,10 +1,9 @@ - - com.google.firebase - firebase-messaging-unity - - 7.1.0 - 7.1.0 - - - - + + com.google.firebase + firebase-messaging-unity + + 10.0.0 + 10.0.0 + + + diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml.meta b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml.meta index b68889a4..11b3f1f1 100644 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml.meta +++ b/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: f6a5eb4df3694f6dac9ddc5451ac17db labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml timeCreated: 1480838400 DefaultImporter: diff --git a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0.meta b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0.meta similarity index 77% rename from NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0.meta rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0.meta index f2e82e6f..16120f8a 100644 --- a/NetmeraUnity/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0.meta +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf61553c0ff854548a7ff0cb9ec473c1 +guid: f09e4f0c1013c4708abed39500c7a466 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar old mode 100644 new mode 100755 similarity index 57% rename from NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar index f356cf1f..575d14f9 Binary files a/NetmeraUnity/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-7_1_0.bundle and b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar differ diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar.meta b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar.meta similarity index 93% rename from NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar.meta rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar.meta index 489439bf..51b3e47e 100644 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar.meta +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b71b4938f8eb24847901d6f9f8537639 +guid: 21e23c5ca640847a8ade4a7d797f39ed labels: - gpsr PluginImporter: diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom new file mode 100755 index 00000000..2294cd1e --- /dev/null +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom @@ -0,0 +1,13 @@ + + 4.0.0 + com.google.firebase + firebase-app-unity + 10.0.0 + aar + + + + diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom.meta b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom.meta similarity index 77% rename from NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom.meta rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom.meta index b8bb77aa..1e8f4278 100644 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom.meta +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 97d5bf53a9f91c24e95f033e305719b6 +guid: 779660b1d7519484585e22c6e6b20b0f labels: - gpsr DefaultImporter: diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar deleted file mode 100644 index 935719c4..00000000 Binary files a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar and /dev/null differ diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom deleted file mode 100644 index 66943123..00000000 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-app-unity - 7.1.0 - aar - - \ No newline at end of file diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0.meta b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0.meta similarity index 77% rename from NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0.meta rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0.meta index 4aa103b7..978d4ead 100644 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0.meta +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fbc7e54ce12c7164bb599ee37567c49e +guid: ba51dcd575d294247b776318c2a6720b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar new file mode 100755 index 00000000..e841d12f Binary files /dev/null and b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar differ diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar.meta b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar.meta similarity index 93% rename from NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar.meta rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar.meta index e9efd6e2..796e4c94 100644 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar.meta +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ea0a55d598992846884a73a621da0e0 +guid: 6bee08fd9941f4d7598afbe598f5ac59 labels: - gpsr PluginImporter: diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom new file mode 100755 index 00000000..b908f782 --- /dev/null +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom @@ -0,0 +1,13 @@ + + 4.0.0 + com.google.firebase + firebase-messaging-unity + 10.0.0 + aar + + + + diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom.meta b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom.meta similarity index 77% rename from NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom.meta rename to NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom.meta index 8bcf8fef..a5dd02fd 100644 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom.meta +++ b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be15dd618abc8cd4aaffe5a1897f6794 +guid: bebaf3c23ad3943fb856759ee6e7635a labels: - gpsr DefaultImporter: diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar deleted file mode 100644 index 94c03f45..00000000 Binary files a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar and /dev/null differ diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom b/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom deleted file mode 100644 index c576ec3d..00000000 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-messaging-unity - 7.1.0 - aar - - - androidx.core - core - 1.0.1 - compile - aar - - - \ No newline at end of file diff --git a/NetmeraUnity/Assets/Netmera/Editor/NetmeraDependencies.xml b/NetmeraUnity/Assets/Netmera/Editor/NetmeraDependencies.xml index 4b131e97..e932ee14 100644 --- a/NetmeraUnity/Assets/Netmera/Editor/NetmeraDependencies.xml +++ b/NetmeraUnity/Assets/Netmera/Editor/NetmeraDependencies.xml @@ -16,14 +16,12 @@ - - - http://release.netmera.com/release/android + https://release.netmera.com/release/android https://maven.google.com - http://developer.huawei.com/repo + https://developer.huawei.com/repo diff --git a/NetmeraUnity/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml b/NetmeraUnity/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml index c83c1976..0032d076 100644 --- a/NetmeraUnity/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml +++ b/NetmeraUnity/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml @@ -1,5 +1,5 @@ - + 675460424491 netmeracrossplatforms.appspot.com netmeracrossplatforms diff --git a/NetmeraUnity/Assets/Plugins/Android/baseProjectTemplate.gradle b/NetmeraUnity/Assets/Plugins/Android/baseProjectTemplate.gradle new file mode 100644 index 00000000..cb1e1021 --- /dev/null +++ b/NetmeraUnity/Assets/Plugins/Android/baseProjectTemplate.gradle @@ -0,0 +1,13 @@ +plugins { + // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity + // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html + // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle + // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version + id 'com.android.application' version '7.1.2' apply false + id 'com.android.library' version '7.1.2' apply false + **BUILD_SCRIPT_DEPS** +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0.meta b/NetmeraUnity/Assets/Plugins/Android/baseProjectTemplate.gradle.meta similarity index 67% rename from NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0.meta rename to NetmeraUnity/Assets/Plugins/Android/baseProjectTemplate.gradle.meta index 9f448608..a7097cf2 100644 --- a/NetmeraUnity/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0.meta +++ b/NetmeraUnity/Assets/Plugins/Android/baseProjectTemplate.gradle.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 44c9885364d5a4744b44a2d67ac29700 -folderAsset: yes +guid: 43aadece73aff4a0a9eb43cbb2c7b36e DefaultImporter: externalObjects: {} userData: diff --git a/NetmeraUnity/Assets/Plugins/Android/gradleTemplate.properties b/NetmeraUnity/Assets/Plugins/Android/gradleTemplate.properties index 73da15df..5c1f157d 100644 --- a/NetmeraUnity/Assets/Plugins/Android/gradleTemplate.properties +++ b/NetmeraUnity/Assets/Plugins/Android/gradleTemplate.properties @@ -4,6 +4,4 @@ unityStreamingAssets=.unity3d**STREAMING_ASSETS** # Android Resolver Properties Start android.useAndroidX=true android.enableJetifier=true -# Android Resolver Properties End - -android.enableR8=**MINIFY_WITH_R_EIGHT** \ No newline at end of file +# Android Resolver Properties End \ No newline at end of file diff --git a/NetmeraUnity/Assets/Plugins/Android/mainTemplate.gradle b/NetmeraUnity/Assets/Plugins/Android/mainTemplate.gradle index 60228501..d59da610 100644 --- a/NetmeraUnity/Assets/Plugins/Android/mainTemplate.gradle +++ b/NetmeraUnity/Assets/Plugins/Android/mainTemplate.gradle @@ -8,19 +8,18 @@ url "https://maven.google.com" } maven { - url "http://release.netmera.com/release/android" // Assets/Netmera/Editor/NetmeraDependencies.xml:27 + url "https://release.netmera.com/release/android" // Assets/Netmera/Editor/NetmeraDependencies.xml:25 } maven { - url "https://maven.google.com" // Assets/Netmera/Editor/NetmeraDependencies.xml:27 + url "https://maven.google.com" // Assets/Netmera/Editor/NetmeraDependencies.xml:25 } maven { - url "http://developer.huawei.com/repo" // Assets/Netmera/Editor/NetmeraDependencies.xml:27 + url "https://developer.huawei.com/repo" // Assets/Netmera/Editor/NetmeraDependencies.xml:25 } maven { - url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/MessagingDependencies.xml:20 + url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/MessagingDependencies.xml:22 } mavenLocal() - jcenter() mavenCentral() } } @@ -32,27 +31,17 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start implementation 'androidx.core:core:1.1.0' // Assets/Netmera/Editor/NetmeraDependencies.xml:18 - implementation 'com.google.android.gms:play-services-base:17.6.0' // Assets/Firebase/Editor/AppDependencies.xml:17 - implementation 'com.google.firebase:firebase-analytics:18.0.2' // Assets/Firebase/Editor/MessagingDependencies.xml:15 - implementation 'com.google.firebase:firebase-app-unity:7.1.0' // Assets/Firebase/Editor/AppDependencies.xml:22 - implementation 'com.google.firebase:firebase-common:19.5.0' // Assets/Firebase/Editor/AppDependencies.xml:13 - implementation 'com.google.firebase:firebase-messaging:21.0.1' // Assets/Netmera/Editor/NetmeraDependencies.xml:20 - implementation 'com.google.firebase:firebase-messaging-unity:7.1.0' // Assets/Firebase/Editor/MessagingDependencies.xml:20 - implementation 'com.huawei.agconnect:agconnect-core:1.5.2.300' // Assets/Netmera/Editor/NetmeraDependencies.xml:21 + implementation 'com.google.android.gms:play-services-base:18.1.0' // Assets/Firebase/Editor/AppDependencies.xml:17 + implementation 'com.google.firebase:firebase-analytics:21.2.0' // Assets/Firebase/Editor/MessagingDependencies.xml:15 + implementation 'com.google.firebase:firebase-app-unity:10.0.0' // Assets/Firebase/Editor/AppDependencies.xml:22 + implementation 'com.google.firebase:firebase-common:20.2.0' // Assets/Firebase/Editor/AppDependencies.xml:13 + implementation 'com.google.firebase:firebase-iid:21.1.0' // Assets/Firebase/Editor/MessagingDependencies.xml:17 + implementation 'com.google.firebase:firebase-messaging:23.1.0' // Assets/Firebase/Editor/MessagingDependencies.xml:13 + implementation 'com.google.firebase:firebase-messaging-unity:10.0.0' // Assets/Firebase/Editor/MessagingDependencies.xml:22 + implementation 'com.huawei.agconnect:agconnect-core:1.5.2.300' // Assets/Netmera/Editor/NetmeraDependencies.xml:19 implementation 'com.netmera:nmcore:3.13.0-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:15 implementation 'com.netmera:nmfcm:3.13.0-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:16 implementation 'com.netmera:nmhms:3.13.0-noads' // Assets/Netmera/Editor/NetmeraDependencies.xml:17 - implementation("androidx.appcompat:appcompat:1.3.1") { - version { - strictly '1.3.1' - } - } - implementation("com.google.android.material:material:1.4.0'") { - version { - strictly '1.4.0' - } - } - // Android Resolver Dependencies End **DEPS** diff --git a/NetmeraUnity/Assets/Plugins/Android/netmerasdk_unity_1.0.0.aar b/NetmeraUnity/Assets/Plugins/Android/netmerasdk_unity_1.0.0.aar index 1619b375..ac1a2aeb 100644 Binary files a/NetmeraUnity/Assets/Plugins/Android/netmerasdk_unity_1.0.0.aar and b/NetmeraUnity/Assets/Plugins/Android/netmerasdk_unity_1.0.0.aar differ diff --git a/NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle b/NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle new file mode 100644 index 00000000..e03aecbc --- /dev/null +++ b/NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle @@ -0,0 +1,39 @@ +pluginManagement { + repositories { + **ARTIFACTORYREPOSITORY** + gradlePluginPortal() + google() + mavenCentral() + } +} + +include ':launcher', ':unityLibrary' +**INCLUDES** + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) + repositories { + **ARTIFACTORYREPOSITORY** +// Android Resolver Repos Start + def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") + maven { + url "https://release.netmera.com/release/android" // Assets/Netmera/Editor/NetmeraDependencies.xml:27 + } + maven { + url "https://maven.google.com" // Assets/Netmera/Editor/NetmeraDependencies.xml:27 + } + maven { + url "https://developer.huawei.com/repo" // Assets/Netmera/Editor/NetmeraDependencies.xml:27 + } + maven { + url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/MessagingDependencies.xml:24 + } + mavenLocal() +// Android Resolver Repos End + google() + mavenCentral() + flatDir { + dirs "${project(':unityLibrary').projectDir}/libs" + } + } +} diff --git a/NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle.meta b/NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle.meta new file mode 100644 index 00000000..ba74d1d8 --- /dev/null +++ b/NetmeraUnity/Assets/Plugins/Android/settingsTemplate.gradle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 61cdcd23533ec40d98f8b03ad6dc46fa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a old mode 100644 new mode 100755 index 5fc1e6b9..e2ff26c6 Binary files a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a and b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a differ diff --git a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta index b69e9346..c3dce06c 100644 --- a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta +++ b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 601e8e1d2d2744929ede33676cbeccc0 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppApp.a timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a old mode 100644 new mode 100755 index 67b675f5..c2f9577a Binary files a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a and b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a differ diff --git a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a.meta b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a.meta index 44a3dd4d..e4655d3a 100644 --- a/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a.meta +++ b/NetmeraUnity/Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 33ee8d6580a8412d811e9c6eab8c2cb9 labels: - gvh -- gvh_version-7.1.0 +- gvh_version-10.0.0 - gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppMessaging.a timeCreated: 1480838400 PluginImporter: @@ -71,6 +71,11 @@ PluginImporter: settings: CompileFlags: FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/NetmeraUnity/Assets/StreamingAssets/google-services-desktop.json.meta b/NetmeraUnity/Assets/StreamingAssets/google-services-desktop.json.meta index d4e6d9dc..ad25368d 100644 --- a/NetmeraUnity/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/NetmeraUnity/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6bde0e99114d54bebbc5f2009f1d0b05 +guid: 15a09f1318b84421381aa77bd2697067 TextScriptImporter: externalObjects: {} userData: diff --git a/NetmeraUnity/Packages/manifest.json b/NetmeraUnity/Packages/manifest.json index ab2bec1e..c229afa4 100644 --- a/NetmeraUnity/Packages/manifest.json +++ b/NetmeraUnity/Packages/manifest.json @@ -1,12 +1,13 @@ { "dependencies": { - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.11", - "com.unity.ide.vscode": "1.2.3", - "com.unity.mobile.android-logcat": "1.2.3", - "com.unity.test-framework": "1.1.29", + "com.unity.ai.navigation": "1.1.5", + "com.unity.ide.rider": "3.0.28", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.vscode": "1.2.5", + "com.unity.mobile.android-logcat": "1.4.2", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/NetmeraUnity/Packages/packages-lock.json b/NetmeraUnity/Packages/packages-lock.json index 77a5288d..6e92ad78 100644 --- a/NetmeraUnity/Packages/packages-lock.json +++ b/NetmeraUnity/Packages/packages-lock.json @@ -1,5 +1,14 @@ { "dependencies": { + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -8,16 +17,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.11", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -26,21 +35,21 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.mobile.android-logcat": { - "version": "1.2.3", + "version": "1.4.2", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -60,7 +69,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -212,17 +221,6 @@ "version": "1.0.0", "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", diff --git a/NetmeraUnity/ProjectSettings/AndroidResolverDependencies.xml b/NetmeraUnity/ProjectSettings/AndroidResolverDependencies.xml index 6c27cad1..6766c5b6 100644 --- a/NetmeraUnity/ProjectSettings/AndroidResolverDependencies.xml +++ b/NetmeraUnity/ProjectSettings/AndroidResolverDependencies.xml @@ -1,23 +1,23 @@ androidx.core:core:1.1.0 - com.google.android.gms:play-services-base:17.6.0 - com.google.android.material:material:1.4.0 - com.google.firebase:firebase-analytics:18.0.2 - com.google.firebase:firebase-app-unity:7.1.0 - com.google.firebase:firebase-common:19.5.0 - com.google.firebase:firebase-messaging:21.0.1 - com.google.firebase:firebase-messaging-unity:7.1.0 + com.google.android.gms:play-services-base:18.1.0 + com.google.firebase:firebase-analytics:21.2.0 + com.google.firebase:firebase-app-unity:10.0.0 + com.google.firebase:firebase-common:20.2.0 + com.google.firebase:firebase-iid:21.1.0 + com.google.firebase:firebase-messaging:23.1.0 + com.google.firebase:firebase-messaging-unity:10.0.0 com.huawei.agconnect:agconnect-core:1.5.2.300 com.netmera:nmcore:3.13.0-noads com.netmera:nmfcm:3.13.0-noads com.netmera:nmhms:3.13.0-noads - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.aar - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.aar - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.1.0/firebase-messaging-unity-7.1.0.pom + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.aar + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/10.0.0/firebase-app-unity-10.0.0.pom + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.aar + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/10.0.0/firebase-messaging-unity-10.0.0.pom diff --git a/NetmeraUnity/ProjectSettings/GvhProjectSettings.xml b/NetmeraUnity/ProjectSettings/GvhProjectSettings.xml index 64c6d5cc..a93c161d 100644 --- a/NetmeraUnity/ProjectSettings/GvhProjectSettings.xml +++ b/NetmeraUnity/ProjectSettings/GvhProjectSettings.xml @@ -1,4 +1,4 @@ - + diff --git a/NetmeraUnity/ProjectSettings/MemorySettings.asset b/NetmeraUnity/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/NetmeraUnity/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/NetmeraUnity/ProjectSettings/ProjectSettings.asset b/NetmeraUnity/ProjectSettings/ProjectSettings.asset index 7ffa2c5e..c1aff947 100644 --- a/NetmeraUnity/ProjectSettings/ProjectSettings.asset +++ b/NetmeraUnity/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 26 productGUID: c3f7478ff03c323429b957a6b796a653 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,16 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -74,6 +76,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 @@ -85,6 +88,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -119,8 +123,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +136,9 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 @@ -145,11 +150,14 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -157,12 +165,13 @@ PlayerSettings: iPhone: com.test.netmera.unity buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 1 tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 21 - AndroidTargetSdkVersion: 0 + AndroidMinSdkVersion: 22 + AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -174,12 +183,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 iOSTargetOSVersionString: 14.1 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -217,17 +229,21 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 0 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: 95N24W2PH8 iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -240,8 +256,9 @@ PlayerSettings: useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 1 useCustomLauncherGradleManifest: 0 - useCustomBaseGradleTemplate: 0 + useCustomBaseGradleTemplate: 1 useCustomGradlePropertiesTemplate: 1 + useCustomGradleSettingsTemplate: 1 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -249,20 +266,20 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: /Users/yunusdilber/Documents/netmera-unity/key_unity.keystore AndroidKeyaliasName: key0 + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 1 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -459,6 +476,7 @@ PlayerSettings: m_Kind: 4 m_SubKind: App Store m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -490,11 +508,13 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -504,8 +524,11 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -516,6 +539,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -523,9 +547,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -599,7 +625,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -641,6 +666,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -651,10 +677,12 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -738,6 +766,7 @@ PlayerSettings: webGLMemorySize: 32 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -750,6 +779,13 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -757,17 +793,30 @@ PlayerSettings: Android: 1 il2cppCompilerConfiguration: Android: 0 - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + Android: 1 + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -793,11 +842,13 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -838,8 +889,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -847,4 +904,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/NetmeraUnity/ProjectSettings/ProjectVersion.txt b/NetmeraUnity/ProjectSettings/ProjectVersion.txt index 56502515..9b596327 100644 --- a/NetmeraUnity/ProjectSettings/ProjectVersion.txt +++ b/NetmeraUnity/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.18f1 -m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c) +m_EditorVersion: 2022.3.34f1 +m_EditorVersionWithRevision: 2022.3.34f1 (4886f5360533) diff --git a/NetmeraUnity/UserSettings/Layouts/default-2022.dwlt b/NetmeraUnity/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 00000000..54d492bc --- /dev/null +++ b/NetmeraUnity/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,1221 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 0 + y: 66 + width: 1728 + height: 966 + m_ShowMode: 4 + m_Title: Project + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1728 + height: 916 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 15 + draggingID: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1319 + y: 0 + width: 409 + height: 916 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 325.5 + height: 266.5 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 266.5 + width: 1319 + height: 649.5 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1728 + height: 966 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1728 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 946 + width: 1728 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1319 + height: 916 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 16 + draggingID: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1319 + height: 266.5 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 17 + draggingID: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 325.5 + y: 0 + width: 993.5 + height: 266.5 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 362.5 + width: 1318 + height: 628.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets + m_LastFoldersGridSize: -1 + m_LastProjectPath: /Users/yunusdilber/Desktop/Projects/Netmera_Unity/NetmeraUnity + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: c04c0000 + m_LastClickedID: 19648 + m_ExpandedIDs: 00000000c04c0000c24c0000c44c0000c64c0000c84c0000ca4c0000cc4c0000ce4c0000d04c0000d24c0000d44c0000d64c0000d84c000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000c04c0000c24c0000c44c0000c64c0000c84c0000ca4c0000cc4c0000ce4c0000d04c0000d24c0000d44c0000d64c0000d84c0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1319 + y: 96 + width: 408 + height: 895 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 96 + width: 324.5 + height: 245.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 2cfbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 325.5 + y: 96 + width: 991.5 + height: 245.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -166, y: -26} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: -96.5} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-camera-mode-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Brush Attributes + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Terrain Tools + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Brush Masks + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Lighting Visualization Colors + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Overlays/OverlayMenu + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: AINavigationOverlay + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: SceneView/CamerasOverlay + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/PBR Validation Settings + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Path + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 507 + y: 94 + width: 1532 + height: 790 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 3064, y: 1538} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -766 + m_HBaseRangeMax: 766 + m_VBaseRangeMin: -384.5 + m_VBaseRangeMax: 384.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1532 + height: 769 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 766, y: 384.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -766 + y: -384.5 + width: 1532 + height: 769 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 3064, y: 1580} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 362.5 + width: 1318 + height: 628.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/NetmeraUnity/UserSettings/Search.index b/NetmeraUnity/UserSettings/Search.index new file mode 100644 index 00000000..4b70da61 --- /dev/null +++ b/NetmeraUnity/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": ["Assets/Temp/", "Assets/External/"], + "options": { + "types": true, + "properties": true, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/NetmeraUnity/UserSettings/Search.settings b/NetmeraUnity/UserSettings/Search.settings new file mode 100644 index 00000000..92b0f6ea --- /dev/null +++ b/NetmeraUnity/UserSettings/Search.settings @@ -0,0 +1,76 @@ +trackSelection = true +refreshSearchWindowsInPlayMode = false +pickerAdvancedUI = false +fetchPreview = true +defaultFlags = 0 +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + log = { + active = false + priority = 210 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } + asset = { + active = true + priority = 25 + defaultAction = null + } + adb = { + active = false + priority = 2500 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + profilermarkers = { + active = false + priority = 100 + defaultAction = null + } + store = { + active = false + priority = 100 + defaultAction = null + } + packages = { + active = false + priority = 90 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +hideTabs = false +expandedQueries = [ +] +queryBuilder = true +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" +minIndexVariations = 2 +findProviderIndexHelper = true \ No newline at end of file diff --git a/NetmeraUnityAndroid/app/build.gradle b/NetmeraUnityAndroid/app/build.gradle index eef6429a..c93188f4 100644 --- a/NetmeraUnityAndroid/app/build.gradle +++ b/NetmeraUnityAndroid/app/build.gradle @@ -3,13 +3,12 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 33 defaultConfig { applicationId "com.netmera.unity.plugin" - minSdkVersion 16 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -30,13 +29,7 @@ android { dependencies { - implementation("androidx.appcompat:appcompat:1.3.1") { - version { - strictly '1.3.1' - } - } - - implementation 'com.google.android.material:material:1.4.0' + implementation("com.google.android.material:material:1.5.0") testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/NetmeraUnityAndroid/sdk/build.gradle b/NetmeraUnityAndroid/sdk/build.gradle index 5dc0330b..758a9a90 100644 --- a/NetmeraUnityAndroid/sdk/build.gradle +++ b/NetmeraUnityAndroid/sdk/build.gradle @@ -3,12 +3,11 @@ plugins { } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 33 defaultConfig { - minSdkVersion 16 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -30,19 +29,11 @@ android { dependencies { - implementation 'com.netmera:nmcore:3.9.10-noads' - implementation 'com.netmera:nmfcm:3.9.3-noads' - implementation 'com.netmera:nmhms:3.9.5-noads' + implementation 'com.netmera:nmcore:3.13.0-noads' + implementation 'com.netmera:nmfcm:3.13.0-noads' + implementation 'com.netmera:nmhms:3.13.0-noads' implementation 'androidx.core:core:1.1.0' - implementation 'com.google.android.material:material:1.4.0' - implementation 'com.google.firebase:firebase-messaging:21.0.1' implementation 'com.huawei.agconnect:agconnect-core:1.5.2.300' - - implementation("androidx.appcompat:appcompat:1.3.1") { - version { - strictly '1.3.1' - } - } } apply plugin: "com.huawei.agconnect"