From 9662ba6b46bc7735cda9ebb71be5360f7cfaa65e Mon Sep 17 00:00:00 2001 From: juncong lee Date: Fri, 19 Sep 2025 11:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=BB=98=E8=AE=A4admobID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaxSdk/Resources/AppLovinSettings.asset | 2 +- Assets/Plugins/Easy Save 3/Resources.meta | 8 +++ Assets/Plugins/Easy Save 3/Resources/ES3.meta | 8 +++ .../Resources/ES3/ES3Defaults.asset | 52 +++++++++++++++++++ .../Resources/ES3/ES3Defaults.asset.meta | 8 +++ .../SDKManager/AdjustManager/AdjustManager.cs | 1 - Assets/Script/SDKManager/Purchase/IAPInfo.cs | 5 ++ Assets/Script/SDKManager/RushSDKManager.cs | 2 +- Assets/Script/Version/Version.md | 14 +++++ .../json/2.1.5/plugin_setting_data.json | 2 +- .../com.unity.services.core/Settings.json | 0 11 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 Assets/Plugins/Easy Save 3/Resources.meta create mode 100644 Assets/Plugins/Easy Save 3/Resources/ES3.meta create mode 100644 Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset create mode 100644 Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset.meta create mode 100644 ProjectSettings/Packages/com.unity.services.core/Settings.json diff --git a/Assets/MaxSdk/Resources/AppLovinSettings.asset b/Assets/MaxSdk/Resources/AppLovinSettings.asset index 3678889..6f40b36 100644 --- a/Assets/MaxSdk/Resources/AppLovinSettings.asset +++ b/Assets/MaxSdk/Resources/AppLovinSettings.asset @@ -16,5 +16,5 @@ MonoBehaviour: sdkKey: customGradleVersionUrl: customGradleToolsVersion: - adMobAndroidAppId: ca-app-pub-4412893362169872~3251970323 + adMobAndroidAppId: adMobIosAppId: diff --git a/Assets/Plugins/Easy Save 3/Resources.meta b/Assets/Plugins/Easy Save 3/Resources.meta new file mode 100644 index 0000000..7f57749 --- /dev/null +++ b/Assets/Plugins/Easy Save 3/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d851df9d100d41e1b40268de2037ab8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3.meta b/Assets/Plugins/Easy Save 3/Resources/ES3.meta new file mode 100644 index 0000000..3e8a7db --- /dev/null +++ b/Assets/Plugins/Easy Save 3/Resources/ES3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96782be9eb17245cdacd3848bb0c8436 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset new file mode 100644 index 0000000..fd5568e --- /dev/null +++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b340139c9e4d054f904d8b452798652, type: 3} + m_Name: ES3Defaults + m_EditorClassIdentifier: + settings: + _location: 0 + path: SaveFile.es3 + encryptionType: 0 + compressionType: 0 + encryptionPassword: password + directory: 0 + format: 0 + prettyPrint: 1 + bufferSize: 2048 + saveChildren: 1 + typeChecking: 1 + safeReflection: 1 + memberReferenceMode: 0 + referenceMode: 2 + serializationDepthLimit: 64 + assemblyNames: + - Assembly-CSharp-firstpass + - ThinkingAnalytics + - Assembly-CSharp + - MaxSdk.Scripts + - IAPResolver + - ThinkupTpnPlugin.Script.IntegrationManager.Editor + - AdjustSdk.Scripts + - ThinkingSDK + - MaxSdk.Scripts.IntegrationManager.Editor + - GoogleMobileAds.Editor + - ThinkupTpnPlugin.Script.Editor + - FirebaseMessagingActivityGenerator + - AdjustSdk.Editor + - Purchasing.Common + showAdvancedSettings: 0 + addMgrToSceneAutomatically: 0 + autoUpdateReferences: 1 + addAllPrefabsToManager: 1 + logDebugInfo: 0 + logWarnings: 1 + logErrors: 1 diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset.meta b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset.meta new file mode 100644 index 0000000..0a5aee1 --- /dev/null +++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a6f5bf406cfe48e6baf0b0b0ffaae94 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index 85ada3b..791b50a 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -6,7 +6,6 @@ using AdjustSdk; using ThinkingData.Analytics; using Unity.VisualScripting; using Unity.VisualScripting.Antlr3.Runtime.Tree; -using UnityEditor.ShaderKeywordFilter; using UnityEngine; using WZ; diff --git a/Assets/Script/SDKManager/Purchase/IAPInfo.cs b/Assets/Script/SDKManager/Purchase/IAPInfo.cs index 528db05..60a898c 100644 --- a/Assets/Script/SDKManager/Purchase/IAPInfo.cs +++ b/Assets/Script/SDKManager/Purchase/IAPInfo.cs @@ -34,6 +34,11 @@ namespace WZ this.purchaseResult = purchaseResult; this.resultType = resultType; } + + public string ToJson() + { + return JsonUtility.ToJson(this); + } } } #endif \ No newline at end of file diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index 8efc229..0a8d9a0 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -21,7 +21,7 @@ public class RushSDKManager : D_MonoSingleton public static string GetSDKVersion() { - return "1.0.3.0"; + return "1.0.4.0"; } protected override void Initialized() { diff --git a/Assets/Script/Version/Version.md b/Assets/Script/Version/Version.md index 06d8131..84bbbd3 100644 --- a/Assets/Script/Version/Version.md +++ b/Assets/Script/Version/Version.md @@ -1,3 +1,17 @@ +# Version 1.0.4.0 2025.9.19 + +## Bugs + +- None + +## Known issues + +- None + +## Changelog + +- 新增支付逻辑 + # Version 1.0.3.0 2025.9.18 ## Bugs diff --git a/Assets/ThinkupTpnPlugin/Resources/json/2.1.5/plugin_setting_data.json b/Assets/ThinkupTpnPlugin/Resources/json/2.1.5/plugin_setting_data.json index f115a56..6184275 100644 --- a/Assets/ThinkupTpnPlugin/Resources/json/2.1.5/plugin_setting_data.json +++ b/Assets/ThinkupTpnPlugin/Resources/json/2.1.5/plugin_setting_data.json @@ -1 +1 @@ -{"curCountry":2,"china":{"android_version":"","ios_version":"","androidXSetting":0,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"6.5.10","ios_version":"","androidXSetting":1,"country":2,"android_admob_app_id":"ca-app-pub-4412893362169872~3251970323","ios_admob_app_id":""}} \ No newline at end of file +{"curCountry":2,"china":{"android_version":"","ios_version":"","androidXSetting":0,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"6.5.10","ios_version":"","androidXSetting":1,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}} \ No newline at end of file diff --git a/ProjectSettings/Packages/com.unity.services.core/Settings.json b/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000..e69de29