PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PHXH:d5fc02018834a5fd539aa00759c41f52e19e960d
Branches Tags
PHXH:Android_Dev
PHXH:Android_release
PHXH:iOS_release
PHXH:main
...
compare: PHXH:b56c54c7a82434293e0e807991148a803a47b538
Branches Tags
PHXH:Android_Dev
PHXH:Android_release
PHXH:iOS_release
PHXH:main

2 Commits
d5fc020188 ... b56c54c7a8

Author SHA1 Message Date
zhangaotian b56c54c7a8 【补提】Firebase 2024-07-26 13:17:43 +08:00
zhangaotian 8ff0c58613 Revert "【打包】Bug UnityAds重复" 
This reverts commit 6678755854.
 2024-07-26 12:39:18 +08:00
6 changed files with 15 additions and 13 deletions
Show Stats Expand all files Collapse all files

2
Forest/Assets/PhxhSDK

@ -1 +1 @@
Subproject commit fdd9587d42783dadf5f859d31529e709e0c3588b
Subproject commit db095ce6f3fda9518f6ad1c8d248788348a698e2

1
Forest/Assets/Plugins/Android/mainTemplate.gradle
View File

@ -13,6 +13,7 @@ dependencies {
implementation 'com.facebook.android:facebook-gamingservices:[17.0.0,18)' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:9
implementation 'com.facebook.android:facebook-login:[17.0.0,18)' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:7
implementation 'com.facebook.android:facebook-share:[17.0.0,18)' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:8
implementation 'com.google.ads.mediation:facebook:6.14.0.0' // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24
implementation 'com.google.ads.mediation:unity:4.12.0.0' // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25
implementation 'com.google.android.gms:play-services-ads:22.6.0' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7
implementation 'com.google.android.gms:play-services-base:18.4.0' // Assets/Firebase/Editor/AppDependencies.xml:17

4
Forest/Assets/Plugins/Android/settingsTemplate.gradle
View File

@ -25,10 +25,10 @@ dependencyResolutionManagement {
url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7
}
maven {
url "https://repo.maven.apache.org/maven2/" // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33
url "https://repo.maven.apache.org/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33
}
maven {
url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25
url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25
}
mavenLocal()
// Android Resolver Repos End

10
Forest/Assets/StreamingAssets/google-services-desktop.json
View File

@ -1,20 +1,20 @@
{
"project_info": {
"project_number": "419683978289",
"project_id": "forest-ecab9",
"storage_bucket": "forest-ecab9.appspot.com"
"project_number": "538591464962",
"project_id": "forest-7df8e",
"storage_bucket": "forest-7df8e.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:419683978289:ios:7c056d17e75cb2740a5910",
"mobilesdk_app_id": "1:538591464962:ios:fe4e485e90fcf1256ca11b",
"android_client_info": {
"package_name": "com.woodfire.nutsbolts"
}
},
"api_key": [
{
"current_key": "AIzaSyBrJKEh-Jnp2nKXzqD-T7vT0cGecvzuAkU"
"current_key": "AIzaSyDflprLn8mo0G5VOUSjhgvM7bhK7IoMQpo"
}
],
"services": {

1
Forest/Packages/manifest.json
View File

@ -3,6 +3,7 @@
"com.cysharp.unitask": "http://1.14.122.170:3000/PHXH/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "1.21.19",
"com.unity.ads": "4.4.2",
"com.unity.collab-proxy": "2.2.0",
"com.unity.device-simulator.devices": "1.0.0",
"com.unity.feature.development": "1.0.1",

10
Forest/ProjectSettings/ProjectSettings.asset
View File

@ -249,18 +249,18 @@ PlayerSettings:
clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a
templatePackageId: com.unity.template.urp-blank@3.0.2
templateDefaultScene: Assets/Scenes/SampleScene.unity
useCustomMainManifest: 1
useCustomMainManifest: 0
useCustomLauncherManifest: 0
useCustomMainGradleTemplate: 1
useCustomMainGradleTemplate: 0
useCustomLauncherGradleManifest: 0
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 1
useCustomGradlePropertiesTemplate: 0
useCustomGradleSettingsTemplate: 0
useCustomProguardFile: 0
AndroidTargetArchitectures: 3
AndroidTargetDevices: 1
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
androidSplashScreen: {fileID: 2800000, guid: 21dcf543011935f4d9ed45ea2c276936, type: 3}
AndroidKeystoreName: '{inproject}: keystore.keystore'
AndroidKeyaliasName: avery
AndroidEnableArmv9SecurityFeatures: 0
@ -816,7 +816,7 @@ PlayerSettings:
webGLMemoryGeometricGrowthCap: 96
webGLPowerPreference: 2
scriptingDefineSymbols:
Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD
Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD;SDK_UNITYADS
Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;USE_ADDRESSABLES;SDK_FIREBASE;SDK_ADMOD;SDK_UNITYADS
WebGL: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
iPhone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD