From 52d50b30858b8e201a4bf58ea47993587deeb91f Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Tue, 27 Aug 2024 13:47:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=8C=85=E5=90=8D=E3=80=91?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AE=BE=E7=BD=AE=E5=8C=85=E5=90=8D=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E4=B8=BAcom.woodfire.androidnutsbolts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/values/google-services.xml | 12 ++++++------ .../StreamingAssets/google-services-desktop.json | 12 +++++------- .../google-services-desktop.json.meta | 2 +- Forest/Assets/google-services.json | 4 ++-- Forest/ProjectSettings/ProjectSettings.asset | 6 +++--- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/Forest/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml b/Forest/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml index 859be1a..f8789df 100644 --- a/Forest/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml +++ b/Forest/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml @@ -1,9 +1,9 @@ - 419683978289 - forest-ecab9.appspot.com - forest-ecab9 - AIzaSyD04yMvefyMunQ3fiVJHLzjCWFKqEuA1LM - AIzaSyD04yMvefyMunQ3fiVJHLzjCWFKqEuA1LM - 1:419683978289:android:43d76a971b667d590a5910 + 538591464962 + forest-7df8e.appspot.com + forest-7df8e + AIzaSyBMVG_JJZkMmEaApdiyCnWbBRQDy1kMAsw + AIzaSyBMVG_JJZkMmEaApdiyCnWbBRQDy1kMAsw + 1:538591464962:android:9dc6147831e4c0ce6ca11b diff --git a/Forest/Assets/StreamingAssets/google-services-desktop.json b/Forest/Assets/StreamingAssets/google-services-desktop.json index 875f6e3..15066dc 100644 --- a/Forest/Assets/StreamingAssets/google-services-desktop.json +++ b/Forest/Assets/StreamingAssets/google-services-desktop.json @@ -7,22 +7,20 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:538591464962:ios:fe4e485e90fcf1256ca11b", + "mobilesdk_app_id": "1:538591464962:android:9dc6147831e4c0ce6ca11b", "android_client_info": { - "package_name": "com.woodfire.nutsbolts" + "package_name": "com.woodfire.androidnutsbolts" } }, + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyDflprLn8mo0G5VOUSjhgvM7bhK7IoMQpo" + "current_key": "AIzaSyBMVG_JJZkMmEaApdiyCnWbBRQDy1kMAsw" } ], "services": { - "analytics_service": { - "status": 0 - }, "appinvite_service": { - "status": 1 + "other_platform_oauth_client": [] } } } diff --git a/Forest/Assets/StreamingAssets/google-services-desktop.json.meta b/Forest/Assets/StreamingAssets/google-services-desktop.json.meta index 4662341..e447f2d 100644 --- a/Forest/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/Forest/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b5fb671f61b34183b2995f55bbf4f82 +guid: 8a48bce82d435444d932529df3936562 TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/Assets/google-services.json b/Forest/Assets/google-services.json index 3dea0d4..15066dc 100644 --- a/Forest/Assets/google-services.json +++ b/Forest/Assets/google-services.json @@ -7,9 +7,9 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:538591464962:android:f41f33f7dafdf0c06ca11b", + "mobilesdk_app_id": "1:538591464962:android:9dc6147831e4c0ce6ca11b", "android_client_info": { - "package_name": "com.woodfire.nutsbolts" + "package_name": "com.woodfire.androidnutsbolts" } }, "oauth_client": [], diff --git a/Forest/ProjectSettings/ProjectSettings.asset b/Forest/ProjectSettings/ProjectSettings.asset index 1dbd52b..79b87de 100644 --- a/Forest/ProjectSettings/ProjectSettings.asset +++ b/Forest/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0.3 + bundleVersion: 1.0.4 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -158,7 +158,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.woodfire.nutsbolts + Android: com.woodfire.androidnutsbolts Standalone: com.woodfire.nutsbolts iPhone: com.woodfire.nutsbolts buildNumber: @@ -167,7 +167,7 @@ PlayerSettings: iPhone: 3 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 5 + AndroidBundleVersionCode: 9 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 34 AndroidPreferredInstallLocation: 0 From 08e60eac52f19db2a1f861ffcd8df6ce78712e6f Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Tue, 27 Aug 2024 13:59:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90Facebook=E3=80=91=E5=85=B3?= =?UTF-8?q?=E9=97=ADfb=E5=8F=8A=E7=9B=B8=E5=85=B3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset | 6 +++--- Forest/Assets/Plugins/Android/AndroidManifest.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Forest/Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset b/Forest/Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset index bdfed2d..181f513 100644 --- a/Forest/Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset +++ b/Forest/Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset @@ -14,11 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: selectedAppIndex: 0 clientTokens: - - 0322ff953bd57fb04a65e6c9712299de + - appIds: - - 358605903639996 + - appLabels: - - Forest Nuts and Bolts + - cookie: 1 logging: 1 status: 1 diff --git a/Forest/Assets/Plugins/Android/AndroidManifest.xml b/Forest/Assets/Plugins/Android/AndroidManifest.xml index 835a93d..22f2601 100644 --- a/Forest/Assets/Plugins/Android/AndroidManifest.xml +++ b/Forest/Assets/Plugins/Android/AndroidManifest.xml @@ -17,10 +17,10 @@ - - + + - + \ No newline at end of file