diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom index 8b64f08..2f1419c 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom @@ -1,13 +1,9 @@ - - 4.0.0 - com.google.firebase - firebase-analytics-unity - 13.2.0 - aar - - - - + + + 4.0.0 + com.google.firebase + firebase-analytics-unity + 13.2.0 + srcaar + + \ No newline at end of file diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom index 3298caf..300b531 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom @@ -1,13 +1,9 @@ - - 4.0.0 - com.google.firebase - firebase-app-unity - 13.2.0 - aar - - - - + + + 4.0.0 + com.google.firebase + firebase-app-unity + 13.2.0 + srcaar + + \ No newline at end of file diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom index 4cacadc..817586c 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom @@ -1,13 +1,9 @@ - - 4.0.0 - com.google.firebase - firebase-config-unity - 13.2.0 - aar - - - - + + + 4.0.0 + com.google.firebase + firebase-config-unity + 13.2.0 + srcaar + + \ No newline at end of file diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom index 779592b..228af67 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom @@ -1,13 +1,9 @@ - - 4.0.0 - com.google.firebase - firebase-crashlytics-unity - 13.2.0 - aar - - - - + + + 4.0.0 + com.google.firebase + firebase-crashlytics-unity + 13.2.0 + srcaar + + \ No newline at end of file diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom b/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom index 4eebc55..726d6bc 100755 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom @@ -1,13 +1,9 @@ - - 4.0.0 - com.google.firebase - firebase-messaging-unity - 13.2.0 - aar - - - - + + + 4.0.0 + com.google.firebase + firebase-messaging-unity + 13.2.0 + srcaar + + \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0.meta index 4760347..0ca443b 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d943c0af46c60a429184f04c942cde9 +guid: a7af485f0f21a4a1189272bf030ae253 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar old mode 100644 new mode 100755 similarity index 99% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.aar rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar index efa1c66..9d515f0 Binary files a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.aar and b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar.meta similarity index 93% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.aar.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar.meta index e130811..cb5c0f0 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e27c1f0b3b2b424681fb7cf484f3af9 +guid: 22c85dee4bd494f38874d3bdb1d63285 labels: - gpsr PluginImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom old mode 100644 new mode 100755 similarity index 74% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.pom rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom index 6e16f10..c340c69 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.pom +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom @@ -1,9 +1,9 @@  - + 4.0.0 com.google.firebase firebase-analytics-unity - 13.1.0 + 13.2.0 aar \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.pom.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.pom.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom.meta index 5f96eb6..816403f 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.pom.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.pom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9311565d4088717489fbc41ca680b9eb +guid: 590932756910f413bab176a25ae19f14 labels: - gpsr DefaultImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0.meta index c2ac75b..cc576ea 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62b6226f5d750d64d8ab67f6984cfb86 +guid: bf0f1b11fd2ce4aa58931cd5050c1c72 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.aar old mode 100644 new mode 100755 similarity index 99% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.aar rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.aar index c379bdc..a330c36 Binary files a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.aar and b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.aar differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.aar.meta similarity index 93% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.aar.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.aar.meta index 58deda2..e2bc2e0 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b62fd3e2ae2ff1549be54ba45af56adb +guid: c274a8d135d6a43dab7216178e53b45e labels: - gpsr PluginImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom old mode 100644 new mode 100755 similarity index 73% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.pom rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom index 6f6e46a..90cee6a --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.pom +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom @@ -1,9 +1,9 @@  - + 4.0.0 com.google.firebase firebase-app-unity - 13.1.0 + 13.2.0 aar \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.pom.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.pom.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom.meta index 405f273..e5d8bb6 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.pom.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.2.0/firebase-app-unity-13.2.0.pom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9dc9fb4bdf5529f4dbf3ebe5fd9e8dbc +guid: 3b21a756fe3204b8989a5eb35df798c5 labels: - gpsr DefaultImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0.meta index 6a32f94..caaf18a 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00c3d74a6d7f1794fb433ee61f47277d +guid: a07e37a2cb06b4a728a11c36cad75a03 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.aar old mode 100644 new mode 100755 similarity index 99% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.aar rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.aar index 83c66e4..455f34f Binary files a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.aar and b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.aar differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.aar.meta similarity index 93% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.aar.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.aar.meta index 7743b2d..0c61d8a 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.1.0/firebase-analytics-unity-13.1.0.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 713224fa2d32a8c48a68fa2afeddccd4 +guid: 96e187fd7bca4417e9aceb6463020fd0 labels: - gpsr PluginImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom old mode 100644 new mode 100755 similarity index 73% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.pom rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom index df84480..bd73b4f --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.1.0/firebase-config-unity-13.1.0.pom +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom @@ -1,9 +1,9 @@  - + 4.0.0 com.google.firebase firebase-config-unity - 13.1.0 + 13.2.0 aar \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.pom.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.pom.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom.meta index 6f33e0a..c51b935 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.pom.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-config-unity/13.2.0/firebase-config-unity-13.2.0.pom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: abaa62c7928d3c5488492e9c29f6ca58 +guid: b14fe4dad7cfc42e9b0fc74e9601c09e labels: - gpsr DefaultImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0.meta index 6c0e204..3afed19 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd400106ae8eebe45883723eed04020a +guid: 5b8e123189e6d42f9b245ac827f802ed folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.aar old mode 100644 new mode 100755 similarity index 99% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.aar rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.aar index e726ad6..3e0edf0 Binary files a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.aar and b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.aar differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.aar.meta similarity index 93% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.aar.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.aar.meta index b2b7475..456dd87 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11f8afb848a938e4abddaf14c62cbbf2 +guid: e318bc7e3f3f946e7848dbed386b2257 labels: - gpsr PluginImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom old mode 100644 new mode 100755 similarity index 74% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.pom rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom index c2c3eb8..1a582d1 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.1.0/firebase-crashlytics-unity-13.1.0.pom +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom @@ -1,9 +1,9 @@  - + 4.0.0 com.google.firebase firebase-crashlytics-unity - 13.1.0 + 13.2.0 aar \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.pom.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.pom.meta rename to Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom.meta index 5c5b8ac..2067184 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.1.0/firebase-app-unity-13.1.0.pom.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.2.0/firebase-crashlytics-unity-13.2.0.pom.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0029950cbc3769e4c9c743b76439fd13 +guid: 8fb50ff9e3b8746cfaa8ede5d7c1384f labels: - gpsr DefaultImporter: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity.meta new file mode 100644 index 0000000..b594c47 --- /dev/null +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: daa4f175043514243b5339219f52759f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0.meta new file mode 100644 index 0000000..2349f0c --- /dev/null +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6434fb1d1fe5a46f096e64740e2e9b2d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.aar new file mode 100755 index 0000000..179bdde Binary files /dev/null and b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.aar differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.aar.meta new file mode 100644 index 0000000..f4592a9 --- /dev/null +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: a6af306148f9b410b9ff094d5925e32a +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/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom new file mode 100755 index 0000000..56a083c --- /dev/null +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + com.google.firebase + firebase-messaging-unity + 13.2.0 + aar + + \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom.meta new file mode 100644 index 0000000..4360da9 --- /dev/null +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.2.0/firebase-messaging-unity-13.2.0.pom.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6d8ada791b0fa464a9258f5b077d9458 +labels: +- gpsr +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Common/FileParse/FileParse.cs b/Assets/Script/Common/FileParse/FileParse.cs index 38b8663..e818dd1 100644 --- a/Assets/Script/Common/FileParse/FileParse.cs +++ b/Assets/Script/Common/FileParse/FileParse.cs @@ -5,6 +5,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; using Google.MiniJSON; +using Unity.VisualScripting.Dependencies.NCalc; using UnityEngine; namespace WZ @@ -114,56 +115,72 @@ namespace WZ for (int i = 0; i < _configs.Length; i++) { string valueTemp = _configs[i].Value.ToString(); - //LoggerUtils.Debug("[FileParse] ParseConfigsInner key" + _configs[i].Key + "value:" + valueTemp); + LoggerUtils.Debug("[FileParse] ParseConfigsInner key" + _configs[i].Key + "value:" + valueTemp); if (_configs[i].Key.ToLower() == KEY_Admob_CollapsibleBannerId.ToLower()) { StaticValue.AdmobCollapsibleBannerId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_NormalBannerId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_NormalBannerId.ToLower()) { StaticValue.AdmobNormalBannerId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_SplashId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_SplashId.ToLower()) { StaticValue.AdmobSplashId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_NativeId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_NativeId.ToLower()) { StaticValue.AdmobNativeId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_SMALL_NativeId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_SMALL_NativeId.ToLower()) { StaticValue.AdmobSmallNativeId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_MINDDLE_NativeId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_MINDDLE_NativeId.ToLower()) { StaticValue.AdmobMinddleNativeId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_FULL_NativeId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_FULL_NativeId.ToLower()) { StaticValue.AdmobFullNativeId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_RewardId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_RewardId.ToLower()) { StaticValue.AdmobRewardId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Admob_InterId.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Admob_InterId.ToLower()) { StaticValue.AdmobInterId = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_PRIVACY_URL.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_PRIVACY_URL.ToLower()) { StaticValue.PrivacyUrl = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_ADJUST_ID.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_ADJUST_ID.ToLower()) { StaticValue.AdjustToken = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Max_APPKEY.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Max_APPKEY.ToLower()) { + StaticValue.ApplovinKey = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_THINKDATA_ID.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_THINKDATA_ID.ToLower()) { StaticValue.TDAppID = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_THINKDATA_SS_URL.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_THINKDATA_SS_URL.ToLower()) { StaticValue.TDServerURL = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Max_Inter.ToLower()) + } + else if (_configs[i].Key.ToLower() == KEY_Max_Inter.ToLower()) { - StaticValue.InterAdUnitID = valueTemp; - }else if (_configs[i].Key.ToLower() == KEY_Max_Reward.ToLower()) + StaticValue.MaxInterAdUnitID = valueTemp; + } + else if (_configs[i].Key.ToLower() == KEY_Max_Reward.ToLower()) { - StaticValue.RewardAdUnitID = valueTemp; + StaticValue.MaxRewardAdUnitID = valueTemp; } else if (_configs[i].Key.ToLower() == KEY_TopOn_AppId.ToLower()) { @@ -183,6 +200,14 @@ namespace WZ { StaticValue.TopOnRewardAdUnitID = valueTemp; } + else if (_configs[i].Key.ToLower() == Key_Max_SpareInter.ToLower()) + { + StaticValue.MaxSparespareInterAdUnitID = valueTemp; + } + else if (_configs[i].Key.ToLower() == Key_Max_SpareReward.ToLower()) + { + StaticValue.MaxSparespareRewardAdUnitID = valueTemp; + } } } @@ -318,6 +343,8 @@ namespace WZ public const string KEY_Max_APPKEY = "ad_appkey"; public const string KEY_Max_Inter = "ad_interstital_id"; public const string KEY_Max_Reward = "ad_reward_id"; + public const string Key_Max_SpareInter = "SpareInterAdUnitID"; + public const string Key_Max_SpareReward = "SpareRewardAdUnitId"; public struct PlayerPrefPair { diff --git a/Assets/Script/Common/StaticValue.cs b/Assets/Script/Common/StaticValue.cs index 0f0baee..5d07ad7 100644 --- a/Assets/Script/Common/StaticValue.cs +++ b/Assets/Script/Common/StaticValue.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace WZ { - + public static class StaticValue { public static string AdmobCollapsibleBannerId = ""; @@ -25,7 +25,7 @@ namespace WZ public static string PrivacyUrl = ""; public static string TopOnAppID = ""; - + public static string TopOnAppKey = ""; public static string TopOnRewardAdUnitID = ""; @@ -41,9 +41,11 @@ namespace WZ public static string TDServerURL = "https://data.tapvicogames.com"; // max - public static string InterAdUnitID = ""; + public static string MaxInterAdUnitID = ""; - public static string RewardAdUnitID = ""; + public static string MaxRewardAdUnitID = ""; + public static string MaxSparespareInterAdUnitID = ""; + public static string MaxSparespareRewardAdUnitID = ""; } } diff --git a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs index 02e90bb..b1f31e8 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs @@ -13,14 +13,18 @@ namespace WZ public string ClientName => "AppLovin"; public PlatformType Platfrom => PlatformType.AppLovin; private string _max_app_key; - private string _max_interstitial_units; - private string _max_rewarded_units; - private MaxSdkBase.AdInfo _interAdInfo; - private MaxSdkBase.AdInfo _rewardAdInfo; - private int _rewardRetryAttempt; - private int _interRetryAttempt; - private float _rvStartLoadTime = 0; - private float _ivStartLoadTime = 0; + // 广告单元ID字典，支持多个广告位 + private List _maxInterstitialUnits = new List(); + private List _maxRewardedUnits = new List(); + // 广告信息字典，按广告位存储 + private Dictionary _interAdInfos = new Dictionary(); + private Dictionary _rewardAdInfos = new Dictionary(); + // 重试次数字典，按广告位存储 + private Dictionary _rewardRetryAttempts = new Dictionary(); + private Dictionary _interRetryAttempts = new Dictionary(); + // 加载时间字典，按广告位存储 + private Dictionary _rvStartLoadTimes = new Dictionary(); + private Dictionary _ivStartLoadTimes = new Dictionary(); private string _rvPos; private string _ivPos; private Action _rvCloseCallback = null; @@ -30,12 +34,14 @@ namespace WZ private bool _receivedReward = false; public void Initialize() { - + + _max_app_key = AdConfigParser.GetMaxAppKey(); if (string.IsNullOrEmpty(_max_app_key) || _initialized) return; LoggerUtils.Debug("[Max] init max"); // 关闭反转debug面板 MaxSdk.SetCreativeDebuggerEnabled(false); - + _maxInterstitialUnits = AdConfigParser.GetMaxAdUnits(AdsType.Interstitial); + _maxRewardedUnits = AdConfigParser.GetMaxAdUnits(AdsType.Rewarded); InitRewardedCallback(); InitInterstitialCallback(); @@ -47,6 +53,7 @@ namespace WZ MaxSdk.SetVerboseLogging(false); MaxSdk.SetSdkKey(_max_app_key); MaxSdk.InitializeSdk(); + LoadRewarded(); LoadInterstitial(); _initialized = true; @@ -55,14 +62,13 @@ namespace WZ public void RefreshAdsData() { _max_app_key = AdConfigParser.GetMaxAppKey(); - _max_interstitial_units = AdConfigParser.GetMaxAdUnits(AdsType.Interstitial).FirstOrDefault(); - _max_rewarded_units = AdConfigParser.GetMaxAdUnits(AdsType.Rewarded).FirstOrDefault(); + _maxInterstitialUnits = AdConfigParser.GetMaxAdUnits(AdsType.Interstitial); + _maxRewardedUnits = AdConfigParser.GetMaxAdUnits(AdsType.Rewarded); } #region 激励广告功能 private void InitRewardedCallback() { - if (string.IsNullOrEmpty(_max_rewarded_units)) return; MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnRewardedAdLoadedEvent; MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnRewardedAdLoadFailedEvent; MaxSdkCallbacks.Rewarded.OnAdDisplayFailedEvent += OnRewardedAdFailedToDisplayEvent; @@ -73,36 +79,117 @@ namespace WZ MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnRewardedAdReceivedRewardEvent; } + + public void LoadRewarded() { - if (string.IsNullOrEmpty(_max_rewarded_units)) return; - MaxSdk.LoadRewardedAd(_max_rewarded_units); - AdsActionEvents.TrackAdStartLoad(Platfrom, "", "", AdsType.Rewarded); - _rvStartLoadTime = Time.realtimeSinceStartup; + foreach (var kvp in _maxRewardedUnits) + { + LoggerUtils.Debug("[MAX] start load rewarded ad unit: "+kvp); + LoadRewarded(kvp); + } } - public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) + + private void LoadRewarded(string adUnitId) + { + if (!_maxRewardedUnits.Contains(adUnitId)) return; + if (string.IsNullOrEmpty(adUnitId)) return; + AdsActionEvents.TrackAdStartLoad(Platfrom, "", "", AdsType.Rewarded); + MaxSdk.LoadRewardedAd(adUnitId); + _rvStartLoadTimes[adUnitId] = Time.realtimeSinceStartup; + + // 初始化重试次数 + if (!_rewardRetryAttempts.ContainsKey(adUnitId)) + { + _rewardRetryAttempts[adUnitId] = 0; + } + } + + public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) { _rvPos = adPos; _rvCloseCallback = rewardCallback; _rvShowFailedCallback = showFailedCallback; - MaxSdk.ShowRewardedAd(_max_rewarded_units); + MaxSdk.ShowRewardedAd(GetHighestPayingAdUnit(AdsType.Rewarded)); } public double GetRewardedRevenue() { - if (IsRewardedAvailable() && _rewardAdInfo != null) + return GetHighestPayingAdRevenue(AdsType.Rewarded); + } + + private double GetHighestPayingAdRevenue(AdsType adsType) + { + var highestPayingAdUnit = GetHighestPayingAdUnit(adsType); + if (highestPayingAdUnit != null) { - return _rewardAdInfo.Revenue; + if (adsType == AdsType.Rewarded) + { + if (!_rewardAdInfos.TryGetValue(highestPayingAdUnit, out var adInfo)) + { + return -1; + } + return adInfo.Revenue; + } + else + { + if (!_interAdInfos.TryGetValue(highestPayingAdUnit, out var adInfo)) + { + return -1; + } + return adInfo.Revenue; + } } - else + return -1; + } + + public string GetHighestPayingAdUnit(AdsType adsType) + { + string highestPayingAdUnit = null; + double highestRevenue = -1; + + foreach (var kvp in adsType == AdsType.Rewarded ? _rewardAdInfos : _interAdInfos) { - return -1; + var adUnitId = kvp.Key; + var revenue = kvp.Value.Revenue; + + if (IsAdsAvailable(adUnitId,adsType) && revenue > highestRevenue) + { + highestRevenue = revenue; + highestPayingAdUnit = adUnitId; + } } + + return highestPayingAdUnit; } public bool IsRewardedAvailable() { - return string.IsNullOrEmpty(_max_rewarded_units) ? false : MaxSdk.IsRewardedAdReady(_max_rewarded_units); ; + List availableAdUnits = new List(); + + foreach (var kvp in _maxRewardedUnits) + { + if (IsAdsAvailable(kvp, AdsType.Rewarded)) + { + availableAdUnits.Add(kvp); + } + } + + return availableAdUnits.Count > 0; + } + + private bool IsAdsAvailable(string adUnit, AdsType adsType) + { + if (adsType == AdsType.Rewarded) + { + if (!_maxRewardedUnits.Contains(adUnit)) return false; + return MaxSdk.IsRewardedAdReady(adUnit); + } + else + { + if (!_maxInterstitialUnits.Contains(adUnit)) return false; + return MaxSdk.IsInterstitialReady(adUnit); + } } private void OnRewardedRevenue(string adunit, MaxSdkBase.AdInfo adInfo) @@ -115,21 +202,21 @@ namespace WZ { LoggerUtils.Debug("[Max] OnRewardedAdLoadedEvent network: " + adInfo.NetworkName + " revenue: " + adInfo.Revenue + " NetworkPlacement: " + adInfo.NetworkPlacement + " AdUnitIdentifier: " + adInfo.AdUnitIdentifier + " Placement: " + adInfo.Placement); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Rewarded); - _rewardAdInfo = adInfo; - _rewardRetryAttempt = 0; - AdsActionEvents.TrackAdLoaded(Platfrom, adInfo.NetworkName, adInfo.AdUnitIdentifier, AdsType.Rewarded, Time.realtimeSinceStartup - _rvStartLoadTime); + _rewardAdInfos.TryAdd(adunit, adInfo); + _rewardRetryAttempts.TryAdd(adunit, 0); + AdsActionEvents.TrackAdLoaded(Platfrom, adInfo.NetworkName, adInfo.AdUnitIdentifier, AdsType.Rewarded, Time.realtimeSinceStartup - (_rvStartLoadTimes.TryGetValue(adunit, out var time) ? time : 0)); } - - private void OnRewardedAdLoadFailedEvent(string adunit, MaxSdkBase.ErrorInfo errorInfo) { LoggerUtils.Debug("[Max] OnRewardedAdLoadFailedEvent errorInfo" + errorInfo.Message); - _rewardRetryAttempt++; - double retryDelay = Math.Pow(2, Math.Min(6, _rewardRetryAttempt)); - TimerUtils.Instance.DelayExecute((float)retryDelay, LoadRewarded); - AdsActionEvents.TrackAdFailToLoad(Platfrom, "", "", AdsType.Rewarded, Time.realtimeSinceStartup - _rvStartLoadTime, errorInfo.Message); - + if (!_rewardRetryAttempts.TryAdd(adunit, 0)) + { + _rewardRetryAttempts[adunit]++; + } + double retryDelay = Math.Pow(2, Math.Min(6, _rewardRetryAttempts[adunit])); + TimerUtils.Instance.DelayExecute((float)retryDelay, () => LoadRewarded(adunit)); + AdsActionEvents.TrackAdFailToLoad(Platfrom, "", "", AdsType.Rewarded, Time.realtimeSinceStartup - (_rvStartLoadTimes.TryGetValue(adunit, out var time) ? time : 0), errorInfo.Message); } private void OnRewardedAdDisplayedEvent(string adUnitId, MaxSdkBase.AdInfo info) @@ -141,7 +228,6 @@ namespace WZ { LoggerUtils.Debug("[Max] OnRewardedAdClickedEvent"); AdsActionEvents.TrackAdClicked(Platfrom,adInfo.NetworkName,adInfo.AdUnitIdentifier,AdsType.Rewarded,_rvPos,adInfo.Revenue); - } private void OnRewardedAdFailedToDisplayEvent(string adUnitId, MaxSdkBase.ErrorInfo errorInfo, MaxSdkBase.AdInfo adInfo) @@ -149,7 +235,8 @@ namespace WZ LoggerUtils.Debug("[Max] OnRewardedAdFailedToDisplayEvent :" + errorInfo.Message + " " + errorInfo.Code + " " + errorInfo.MediatedNetworkErrorMessage + " " + errorInfo.MediatedNetworkErrorCode); _rvShowFailedCallback?.Invoke(); _rvShowFailedCallback = null; - LoadRewarded(); + if(_rewardAdInfos.ContainsKey(adUnitId))_rewardAdInfos.Remove(adUnitId); + LoadRewarded(adUnitId); } private void OnRewardedAdHiddenEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) @@ -157,7 +244,8 @@ namespace WZ _rvCloseCallback?.Invoke(_receivedReward,adInfo.Revenue); _rvCloseCallback = null; _receivedReward = false; - LoadRewarded(); + if(_rewardAdInfos.ContainsKey(adUnitId))_rewardAdInfos.Remove(adUnitId); + LoadRewarded(adUnitId); LoggerUtils.Debug("[Max] OnRewardedAdHiddenEvent "+_receivedReward); AdsActionEvents.TrackAdClosed(Platfrom,adInfo.NetworkName,adInfo.AdUnitIdentifier,AdsType.Rewarded,_rvPos,adInfo.Revenue); } @@ -167,18 +255,12 @@ namespace WZ LoggerUtils.Debug("[Max] OnRewardedAdReceivedRewardEvent network: " + arg3.NetworkName + " revenue: " + arg3.Revenue + " NetworkPlacement: " + arg3.NetworkPlacement + " AdUnitIdentifier: " + arg3.AdUnitIdentifier + " Placement: " + arg3.Placement); _receivedReward = true; } - - private void RewardCallback() - { - - } #endregion #region 插页广告功能 private void InitInterstitialCallback() { - if (string.IsNullOrEmpty(_max_interstitial_units)) return; MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnInterstitialLoadedEvent; MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnInterstitialLoadFailedEvent; MaxSdkCallbacks.Interstitial.OnAdDisplayFailedEvent += OnInterstitialAdFailedToDisplayEvent; @@ -190,52 +272,78 @@ namespace WZ public void LoadInterstitial() { - if (string.IsNullOrEmpty(_max_rewarded_units)) return; - MaxSdk.LoadInterstitial(_max_interstitial_units); + foreach (var kvp in _maxInterstitialUnits) + { + LoggerUtils.Debug("[MAX] start load inter ad unit: "+kvp); + LoadInterstitial(kvp); + } + } + + public void LoadInterstitial(string adUnit) + { + + if (!_maxInterstitialUnits.Contains(adUnit)) return; + if (string.IsNullOrEmpty(adUnit)) return; + MaxSdk.LoadInterstitial(adUnit); AdsActionEvents.TrackAdStartLoad(Platfrom, "", "", AdsType.Interstitial); - _ivStartLoadTime = Time.realtimeSinceStartup; + _ivStartLoadTimes[adUnit] = Time.realtimeSinceStartup; + // 初始化重试次数 + if (!_interRetryAttempts.ContainsKey(adUnit)) + { + _interRetryAttempts[adUnit] = 0; + } } public double GetInterstitialRevenue() { - if (IsInterstitialAvailable() && _interAdInfo != null) - { - return _interAdInfo.Revenue; - } - else - { - return -1; - } + return GetHighestPayingAdRevenue(AdsType.Interstitial); } public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) { _ivPos = ivPos; _ivCloseCallback = closeCallback; - MaxSdk.ShowInterstitial(_max_interstitial_units); + MaxSdk.ShowInterstitial(GetHighestPayingAdUnit(AdsType.Interstitial)); } public bool IsInterstitialAvailable() { - return string.IsNullOrEmpty(_max_interstitial_units) ? false : MaxSdk.IsInterstitialReady(_max_interstitial_units); + List availableAdUnits = new List(); + + foreach (var kvp in _maxInterstitialUnits) + { + if (IsInterstitialAvailable(kvp)) + { + availableAdUnits.Add(kvp); + } + } + + return availableAdUnits.Count > 0; + } + + public bool IsInterstitialAvailable(string adUnit) + { + return IsAdsAvailable(adUnit,AdsType.Interstitial); } private void OnInterstitialLoadedEvent(string adunit, MaxSdkBase.AdInfo adInfo) { LoggerUtils.Debug("[Max] OnInterstitialLoadedEvent network: " + adInfo.NetworkName + " revenue: " + adInfo.Revenue + " NetworkPlacement: " + adInfo.NetworkPlacement + " AdUnitIdentifier: " + adInfo.AdUnitIdentifier + " Placement: " + adInfo.Placement); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Interstitial); - _interAdInfo = adInfo; - _interRetryAttempt = 0; - AdsActionEvents.TrackAdLoaded(Platfrom, adInfo.NetworkName, adInfo.AdUnitIdentifier, AdsType.Interstitial, Time.realtimeSinceStartup - _ivStartLoadTime); - + _interRetryAttempts.TryAdd(adunit, 0); + _interAdInfos.TryAdd(adunit, adInfo); + AdsActionEvents.TrackAdLoaded(Platfrom, adInfo.NetworkName, adInfo.AdUnitIdentifier, AdsType.Interstitial, Time.realtimeSinceStartup - (_ivStartLoadTimes.TryGetValue(adunit, out var time) ? time : 0)); } private void OnInterstitialLoadFailedEvent(string adUnitId, MaxSdkBase.ErrorInfo errorInfo) { LoggerUtils.Debug("[Max] OnInterstitialLoadFailedEvent :" + errorInfo); - _interRetryAttempt++; - double retryDelay = Math.Pow(2, Math.Min(6, _interRetryAttempt)); - TimerUtils.Instance.DelayExecute((float)retryDelay, LoadInterstitial); - AdsActionEvents.TrackAdFailToLoad(Platfrom, "","",AdsType.Interstitial,Time.realtimeSinceStartup - _ivStartLoadTime,errorInfo.Message); + if (!_interRetryAttempts.TryAdd(adUnitId, 0)) + { + _interRetryAttempts[adUnitId]++; + } + double retryDelay = Math.Pow(2, Math.Min(6, _interRetryAttempts[adUnitId])); + TimerUtils.Instance.DelayExecute((float)retryDelay, () => LoadInterstitial(adUnitId)); + AdsActionEvents.TrackAdFailToLoad(Platfrom, "", "", AdsType.Interstitial, Time.realtimeSinceStartup - (_ivStartLoadTimes.TryGetValue(adUnitId, out var time) ? time : 0), errorInfo.Message); } private void OnInterstitialAdFailedToDisplayEvent(string adUnitId, MaxSdkBase.ErrorInfo errorInfo, MaxSdkBase.AdInfo arg3) @@ -243,7 +351,8 @@ namespace WZ LoggerUtils.Debug("[Max] OnInterstitialAdFailedToDisplayEvent :" + errorInfo.Message + " " + errorInfo.Code + " " + errorInfo.MediatedNetworkErrorMessage + " " + errorInfo.MediatedNetworkErrorCode); _ivCloseCallback?.Invoke(0); _ivCloseCallback = null; - LoadInterstitial(); + if(_interAdInfos.ContainsKey(adUnitId))_interAdInfos.Remove(adUnitId); + LoadInterstitial(adUnitId); } private void OnInterstitialDisplayedEvent(string adUnitId, MaxSdkBase.AdInfo info) @@ -258,7 +367,8 @@ namespace WZ AdsActionEvents.TrackAdClosed(Platfrom,adInfo.NetworkName,adInfo.AdUnitIdentifier,AdsType.Interstitial, _ivPos,adInfo.Revenue); _ivCloseCallback?.Invoke(adInfo.Revenue); _ivCloseCallback = null; - LoadInterstitial(); + if(_interAdInfos.ContainsKey(adUnitId))_interAdInfos.Remove(adUnitId); + LoadInterstitial(adUnitId); } private void OnInterstitialRevenue(string adunit, MaxSdkBase.AdInfo adInfo) diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs index 6041fb2..0885ddc 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdConfigParser.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using Newtonsoft.Json; +using Unity.VisualScripting; using UnityEngine; namespace WZ @@ -171,8 +172,8 @@ namespace WZ { return adType switch { - AdsType.Interstitial => new List { StaticValue.InterAdUnitID }, - AdsType.Rewarded => new List { StaticValue.RewardAdUnitID }, + AdsType.Interstitial => new List { StaticValue.MaxInterAdUnitID,StaticValue.MaxSparespareInterAdUnitID }, + AdsType.Rewarded => new List { StaticValue.MaxRewardAdUnitID,StaticValue.MaxSparespareRewardAdUnitID }, _ => new List() }; } @@ -186,7 +187,7 @@ namespace WZ } else { - return new List{ StaticValue.InterAdUnitID }; + return new List{ StaticValue.MaxInterAdUnitID,StaticValue.MaxSparespareInterAdUnitID }; } case AdsType.Rewarded: @@ -196,7 +197,7 @@ namespace WZ } else { - return new List{ StaticValue.RewardAdUnitID }; + return new List{ StaticValue.MaxRewardAdUnitID,StaticValue.MaxSparespareRewardAdUnitID }; } default: return new List(); diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index d4ee755..f32e37f 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -14,11 +14,14 @@ using WZ; public class RushSDKManager : D_MonoSingleton { + protected override void Initialized() + { + base.Initialized(); + FileParse.Parse(); + } public void InitializeSdk(Action action, bool showLog) { LoggerUtils.Enabled = showLog; - FileParse.Parse(); - // AdConfigParser.Parse(); FireBaseSDKManager.Instance.Init(); ShuShuMangage.Instance.Init(); AdmobAdsManager.Instance.RefreshAdsData(); diff --git a/Assets/Script/Test.cs b/Assets/Script/Test.cs index d336252..cf17a3d 100644 --- a/Assets/Script/Test.cs +++ b/Assets/Script/Test.cs @@ -22,8 +22,12 @@ public class Test : MonoBehaviour public void OnShowAd() { - RushSDKManager.Instance.InitializeSdk(null, true); + // RushSDKManager.Instance.InitializeSdk(null, true); // KwaiAdsManager.Instance.ShowRewardAd(); + AdsSDKManager.Instance.ShowRewardAd("getcoin",(state,revenue)=> + { + LoggerUtils.Debug("[kwai] OnRewardedVideoAdShowed revenue:"+revenue+"+ state:"+state); + }); } public void OnShowInterstitial() @@ -36,10 +40,7 @@ public class Test : MonoBehaviour // TemplateId = NativeTemplateId.Medium // }, medium); - AdsSDKManager.Instance.ShowRewardAd("getcoin",(state,revenue)=> - { - LoggerUtils.Debug("[kwai] OnRewardedVideoAdShowed revenue:"+revenue+"+ state:"+state); - }); + // var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle // { // TemplateId = NativeTemplateId.Small @@ -57,6 +58,11 @@ public class Test : MonoBehaviour // { // Debug.LogWarning("luojian admob native ad start show fail,not ready."); // } + AdsSDKManager.Instance.ShowInterstitialAd("endgame",IvType.IV1, (revenue) => + { + LoggerUtils.Debug("oninter show call revenue:"+revenue); + + }); } public void OnInterShow()