diff --git a/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.6.0/firebase-app-unity-12.6.0.pom b/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.6.0/firebase-app-unity-12.6.0.pom index d9bede6..3f12c42 100644 --- a/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.6.0/firebase-app-unity-12.6.0.pom +++ b/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.6.0/firebase-app-unity-12.6.0.pom @@ -1,13 +1,9 @@ - + + 4.0.0 com.google.firebase firebase-app-unity 12.6.0 - aar - - - - + srcaar + + \ No newline at end of file diff --git a/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.6.0/firebase-auth-unity-12.6.0.pom b/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.6.0/firebase-auth-unity-12.6.0.pom index 64cdce8..5e54ad5 100644 --- a/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.6.0/firebase-auth-unity-12.6.0.pom +++ b/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.6.0/firebase-auth-unity-12.6.0.pom @@ -1,13 +1,9 @@ - + + 4.0.0 com.google.firebase firebase-auth-unity 12.6.0 - aar - - - - + srcaar + + \ No newline at end of file diff --git a/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.6.0/firebase-database-unity-12.6.0.pom b/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.6.0/firebase-database-unity-12.6.0.pom index 4467fbe..2a64468 100644 --- a/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.6.0/firebase-database-unity-12.6.0.pom +++ b/Game/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.6.0/firebase-database-unity-12.6.0.pom @@ -1,13 +1,9 @@ - + + 4.0.0 com.google.firebase firebase-database-unity 12.6.0 - aar - - - - + srcaar + + \ No newline at end of file diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0.meta deleted file mode 100644 index 1bbfd4c..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 484c316408b5144ec928a9e70f22f8a3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar deleted file mode 100644 index 8f77272..0000000 Binary files a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar and /dev/null differ diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar.meta deleted file mode 100644 index 9516b84..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: e55cc54886cfc44fe9a2083efccee635 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 0 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom deleted file mode 100644 index 9451797..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-app-unity - 12.5.0 - aar - - \ No newline at end of file diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom.meta deleted file mode 100644 index 5f8ef3a..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 15be98810cfdc4029b6b98575ae94ffe -labels: -- gpsr -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0.meta deleted file mode 100644 index 386eb92..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c71b5534a87c94ba981739d10e2ec843 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar deleted file mode 100644 index 57c90d9..0000000 Binary files a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar and /dev/null differ diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar.meta deleted file mode 100644 index 4da6c22..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 29e22e68bed874922b7bdee36240d7f0 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 0 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom deleted file mode 100644 index fd0a22b..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-auth-unity - 12.5.0 - aar - - \ No newline at end of file diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom.meta deleted file mode 100644 index 8b592aa..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 145aa01c0723f48f2be71d60b62379bc -labels: -- gpsr -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0.meta deleted file mode 100644 index 4998c6f..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aea7a14d25f6b438f91c98a6ed51b109 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar deleted file mode 100644 index bfe9d28..0000000 Binary files a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar and /dev/null differ diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar.meta deleted file mode 100644 index 0240786..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 14b7ccb2926c54c548367bd9d84cd92f -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 0 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom deleted file mode 100644 index af9aef8..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-database-unity - 12.5.0 - aar - - \ No newline at end of file diff --git a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom.meta b/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom.meta deleted file mode 100644 index 770371c..0000000 --- a/Game/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2f80f421136eb4e4899283949d94f3a7 -labels: -- gpsr -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/Plugins/Android/mainTemplate.gradle b/Game/Assets/Plugins/Android/mainTemplate.gradle index c95f91d..99d6f96 100644 --- a/Game/Assets/Plugins/Android/mainTemplate.gradle +++ b/Game/Assets/Plugins/Android/mainTemplate.gradle @@ -5,13 +5,13 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start implementation 'com.google.android.gms:play-services-base:18.5.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:17 - implementation 'com.google.firebase:firebase-analytics:22.1.2' // Assets/Firebase/Editor/DatabaseDependencies.xml:15 - implementation 'com.google.firebase:firebase-app-unity:12.5.0' // Assets/Firebase/Editor/AppDependencies.xml:22 - implementation 'com.google.firebase:firebase-auth:23.1.0' // Assets/Firebase/Editor/AuthDependencies.xml:13 - implementation 'com.google.firebase:firebase-auth-unity:12.5.0' // Assets/Firebase/Editor/AuthDependencies.xml:20 + implementation 'com.google.firebase:firebase-analytics:22.2.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:15 + implementation 'com.google.firebase:firebase-app-unity:12.6.0' // Assets/Firebase/Editor/AppDependencies.xml:22 + implementation 'com.google.firebase:firebase-auth:23.2.0' // Assets/Firebase/Editor/AuthDependencies.xml:13 + implementation 'com.google.firebase:firebase-auth-unity:12.6.0' // Assets/Firebase/Editor/AuthDependencies.xml:20 implementation 'com.google.firebase:firebase-common:21.0.0' // Assets/Firebase/Editor/AppDependencies.xml:13 implementation 'com.google.firebase:firebase-database:21.0.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:13 - implementation 'com.google.firebase:firebase-database-unity:12.5.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:22 + implementation 'com.google.firebase:firebase-database-unity:12.6.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:22 implementation 'com.unity3d.ads:unity-ads:[4.12.0,4.13[' // Packages/com.unity.ads/Editor/Source/Dependencies.xml:7 // Android Resolver Dependencies End **DEPS**} diff --git a/Game/Assets/Settings/Project Configuration/Performance URP Config.asset b/Game/Assets/Settings/Project Configuration/Performance URP Config.asset index 042aabe..ada6ddd 100644 --- a/Game/Assets/Settings/Project Configuration/Performance URP Config.asset +++ b/Game/Assets/Settings/Project Configuration/Performance URP Config.asset @@ -72,6 +72,7 @@ MonoBehaviour: m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 @@ -83,8 +84,8 @@ MonoBehaviour: bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_PrefilteringModeMainLightShadows: 3 m_PrefilteringModeAdditionalLight: 0 - m_PrefilteringModeAdditionalLightShadows: 2 - m_PrefilterXRKeywords: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 m_PrefilteringModeForwardPlus: 0 m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeScreenSpaceOcclusion: 0 @@ -103,6 +104,10 @@ MonoBehaviour: m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 + m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 diff --git a/Game/Assets/Settings/Project Configuration/Quality URP Config.asset b/Game/Assets/Settings/Project Configuration/Quality URP Config.asset index 3a34687..4eecec5 100644 --- a/Game/Assets/Settings/Project Configuration/Quality URP Config.asset +++ b/Game/Assets/Settings/Project Configuration/Quality URP Config.asset @@ -72,6 +72,7 @@ MonoBehaviour: m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 @@ -82,9 +83,9 @@ MonoBehaviour: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_PrefilteringModeMainLightShadows: 3 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 2 - m_PrefilterXRKeywords: 0 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 m_PrefilteringModeForwardPlus: 0 m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeScreenSpaceOcclusion: 0 @@ -103,6 +104,10 @@ MonoBehaviour: m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 + m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 diff --git a/Game/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Game/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 900ef76..44db950 100644 --- a/Game/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Game/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -197,33 +197,18 @@ MonoBehaviour: m_StrikethroughThickness: 6.298828 m_TabWidth: 24 m_GlyphTable: - - m_Index: 3 + - m_Index: 2030 m_Metrics: - m_Width: 0 - m_Height: 0 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 0 - m_HorizontalAdvance: 24 + m_Width: 64 + m_Height: 9 + m_HorizontalBearingX: 11 + m_HorizontalBearingY: 9 + m_HorizontalAdvance: 86 m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 0 - m_Height: 0 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 40 - m_Metrics: - m_Width: 47 - m_Height: 59 - m_HorizontalBearingX: 7 - m_HorizontalBearingY: 59 - m_HorizontalAdvance: 57 - m_GlyphRect: - m_X: 163 + m_X: 10 m_Y: 10 - m_Width: 47 - m_Height: 59 + m_Width: 64 + m_Height: 9 m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 @@ -242,18 +227,18 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 69 + - m_Index: 40 m_Metrics: - m_Width: 40 - m_Height: 63 - m_HorizontalBearingX: 5 - m_HorizontalBearingY: 62 - m_HorizontalAdvance: 48 + m_Width: 47 + m_Height: 59 + m_HorizontalBearingX: 7 + m_HorizontalBearingY: 59 + m_HorizontalAdvance: 57 m_GlyphRect: - m_X: 347 + m_X: 163 m_Y: 10 - m_Width: 40 - m_Height: 63 + m_Width: 47 + m_Height: 59 m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 @@ -272,16 +257,76 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 71 + - m_Index: 75 m_Metrics: - m_Width: 40 - m_Height: 63 - m_HorizontalBearingX: 3 + m_Width: 38 + m_Height: 62 + m_HorizontalBearingX: 5 m_HorizontalBearingY: 62 m_HorizontalAdvance: 48 + m_GlyphRect: + m_X: 10 + m_Y: 38 + m_Width: 38 + m_Height: 62 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + - m_Index: 82 + m_Metrics: + m_Width: 42 + m_Height: 47 + m_HorizontalBearingX: 3 + m_HorizontalBearingY: 46 + m_HorizontalAdvance: 48 m_GlyphRect: m_X: 229 - m_Y: 76 + m_Y: 10 + m_Width: 42 + m_Height: 47 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + - m_Index: 86 + m_Metrics: + m_Width: 38 + m_Height: 47 + m_HorizontalBearingX: 2 + m_HorizontalBearingY: 46 + m_HorizontalAdvance: 43 + m_GlyphRect: + m_X: 290 + m_Y: 10 + m_Width: 38 + m_Height: 47 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + - m_Index: 3 + m_Metrics: + m_Width: 0 + m_Height: 0 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 0 + m_HorizontalAdvance: 24 + m_GlyphRect: + m_X: 0 + m_Y: 0 + m_Width: 0 + m_Height: 0 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + - m_Index: 69 + m_Metrics: + m_Width: 40 + m_Height: 63 + m_HorizontalBearingX: 5 + m_HorizontalBearingY: 62 + m_HorizontalAdvance: 48 + m_GlyphRect: + m_X: 347 + m_Y: 10 m_Width: 40 m_Height: 63 m_Scale: 1 @@ -302,21 +347,6 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 75 - m_Metrics: - m_Width: 38 - m_Height: 62 - m_HorizontalBearingX: 5 - m_HorizontalBearingY: 62 - m_HorizontalAdvance: 48 - m_GlyphRect: - m_X: 10 - m_Y: 38 - m_Width: 38 - m_Height: 62 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - m_Index: 76 m_Metrics: m_Width: 9 @@ -332,21 +362,6 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 79 - m_Metrics: - m_Width: 9 - m_Height: 62 - m_HorizontalBearingX: 5 - m_HorizontalBearingY: 62 - m_HorizontalAdvance: 19 - m_GlyphRect: - m_X: 463 - m_Y: 91 - m_Width: 9 - m_Height: 62 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - m_Index: 81 m_Metrics: m_Width: 38 @@ -362,18 +377,33 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 82 + - m_Index: 71 m_Metrics: - m_Width: 42 - m_Height: 47 + m_Width: 40 + m_Height: 63 m_HorizontalBearingX: 3 - m_HorizontalBearingY: 46 + m_HorizontalBearingY: 62 m_HorizontalAdvance: 48 m_GlyphRect: m_X: 229 - m_Y: 10 - m_Width: 42 - m_Height: 47 + m_Y: 76 + m_Width: 40 + m_Height: 63 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + - m_Index: 79 + m_Metrics: + m_Width: 9 + m_Height: 62 + m_HorizontalBearingX: 5 + m_HorizontalBearingY: 62 + m_HorizontalAdvance: 19 + m_GlyphRect: + m_X: 463 + m_Y: 91 + m_Width: 9 + m_Height: 62 m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 @@ -392,96 +422,66 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 86 - m_Metrics: - m_Width: 38 - m_Height: 47 - m_HorizontalBearingX: 2 - m_HorizontalBearingY: 46 - m_HorizontalAdvance: 43 - m_GlyphRect: - m_X: 290 - m_Y: 10 - m_Width: 38 - m_Height: 47 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - - m_Index: 2030 - m_Metrics: - m_Width: 64 - m_Height: 9 - m_HorizontalBearingX: 11 - m_HorizontalBearingY: 9 - m_HorizontalAdvance: 86 - m_GlyphRect: - m_X: 10 - m_Y: 10 - m_Width: 64 - m_Height: 9 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 m_CharacterTable: - m_ElementType: 1 - m_Unicode: 32 - m_GlyphIndex: 3 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 69 - m_GlyphIndex: 40 + m_Unicode: 8230 + m_GlyphIndex: 2030 m_Scale: 1 - m_ElementType: 1 m_Unicode: 95 m_GlyphIndex: 66 m_Scale: 1 - m_ElementType: 1 - m_Unicode: 98 - m_GlyphIndex: 69 + m_Unicode: 69 + m_GlyphIndex: 40 m_Scale: 1 - m_ElementType: 1 m_Unicode: 99 m_GlyphIndex: 70 m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 100 - m_GlyphIndex: 71 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 101 - m_GlyphIndex: 72 - m_Scale: 1 - m_ElementType: 1 m_Unicode: 104 m_GlyphIndex: 75 m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 105 - m_GlyphIndex: 76 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 108 - m_GlyphIndex: 79 - m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 110 - m_GlyphIndex: 81 - m_Scale: 1 - m_ElementType: 1 m_Unicode: 111 m_GlyphIndex: 82 m_Scale: 1 - - m_ElementType: 1 - m_Unicode: 114 - m_GlyphIndex: 85 - m_Scale: 1 - m_ElementType: 1 m_Unicode: 115 m_GlyphIndex: 86 m_Scale: 1 - m_ElementType: 1 - m_Unicode: 8230 - m_GlyphIndex: 2030 + m_Unicode: 32 + m_GlyphIndex: 3 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 98 + m_GlyphIndex: 69 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 101 + m_GlyphIndex: 72 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 105 + m_GlyphIndex: 76 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 110 + m_GlyphIndex: 81 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 100 + m_GlyphIndex: 71 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 108 + m_GlyphIndex: 79 + m_Scale: 1 + - m_ElementType: 1 + m_Unicode: 114 + m_GlyphIndex: 85 m_Scale: 1 m_AtlasTextures: - {fileID: 28268798066460806} diff --git a/Game/ProjectSettings/AndroidResolverDependencies.xml b/Game/ProjectSettings/AndroidResolverDependencies.xml index eda88d9..367e3db 100644 --- a/Game/ProjectSettings/AndroidResolverDependencies.xml +++ b/Game/ProjectSettings/AndroidResolverDependencies.xml @@ -1,26 +1,26 @@ com.google.android.gms:play-services-base:18.5.0 - com.google.firebase:firebase-analytics:22.1.2 - com.google.firebase:firebase-app-unity:12.5.0 - com.google.firebase:firebase-auth:23.1.0 - com.google.firebase:firebase-auth-unity:12.5.0 + com.google.firebase:firebase-analytics:22.2.0 + com.google.firebase:firebase-app-unity:12.6.0 + com.google.firebase:firebase-auth:23.2.0 + com.google.firebase:firebase-auth-unity:12.6.0 com.google.firebase:firebase-common:21.0.0 com.google.firebase:firebase-database:21.0.0 - com.google.firebase:firebase-database-unity:12.5.0 + com.google.firebase:firebase-database-unity:12.6.0 com.unity3d.ads:unity-ads:[4.12.0,4.13[ - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.aar - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.5.0/firebase-app-unity-12.5.0.pom - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.aar - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.5.0/firebase-auth-unity-12.5.0.pom - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.aar - Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.5.0/firebase-database-unity-12.5.0.pom + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.6.0/firebase-app-unity-12.6.0.aar + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.6.0/firebase-app-unity-12.6.0.pom + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.6.0/firebase-auth-unity-12.6.0.aar + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.6.0/firebase-auth-unity-12.6.0.pom + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.6.0/firebase-database-unity-12.6.0.aar + Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.6.0/firebase-database-unity-12.6.0.pom - + diff --git a/Game/ProjectSettings/ProjectSettings.asset b/Game/ProjectSettings/ProjectSettings.asset index f921362..99e2de4 100644 --- a/Game/ProjectSettings/ProjectSettings.asset +++ b/Game/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: Game + companyName: WIRM + productName: EBCD VR defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -141,7 +141,8 @@ PlayerSettings: visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: -64324148185763206, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -162,8 +163,9 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.unity.template.vr - Standalone: com.Unity-Technologies.VR-Template + Android: co.wirm.ebcd + Standalone: co.wirm.ebcd + iPhone: co.wirm.ebcd buildNumber: Standalone: 0 VisionOS: 0 diff --git a/Game/ProjectSettings/UnityConnectSettings.asset b/Game/ProjectSettings/UnityConnectSettings.asset index a88bee0..2d81664 100644 --- a/Game/ProjectSettings/UnityConnectSettings.asset +++ b/Game/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events @@ -23,7 +23,7 @@ UnityConnectSettings: m_Enabled: 0 m_TestMode: 0 m_InitializeOnStartup: 1 - m_PackageRequiringCoreStatsPresent: 0 + m_PackageRequiringCoreStatsPresent: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1