diff --git a/Assets/Editor/BFBuildProjectTools/BuildInfo.cs b/Assets/Editor/BFBuildProjectTools/BuildInfo.cs index f26cc2930..3405ed321 100644 --- a/Assets/Editor/BFBuildProjectTools/BuildInfo.cs +++ b/Assets/Editor/BFBuildProjectTools/BuildInfo.cs @@ -34,12 +34,12 @@ namespace BFEditor.Build public bool IsGPChannel() { - return bundleName == "com.knight.connect.rpg"; + return bundleName == "com.combo.heroes.puzzle.rpg"; } public bool IsGPOfficial() { - return bundleName == "com.knight.connect.rpg"; + return bundleName == "com.combo.heroes.puzzle.rpg"; } // dev包使用mono编译，不会导出as工程 diff --git a/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs b/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs index ca839b6dc..d11aebb88 100644 --- a/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs +++ b/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs @@ -16,7 +16,7 @@ namespace BFEditor.Build BFPlatformOptions platform = BFPlatformOptions.AndroidDev; const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android"; const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android"; - const string ANDROID_GP_PACKAGE_NAME = "com.knight.connect.rpg"; + const string ANDROID_GP_PACKAGE_NAME = "com.combo.heroes.puzzle.rpg"; const string IOS_PACKAGE_NAME = "com.juzu.b6.dev.ios"; public BuildProjectWindow() diff --git a/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs b/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs index e19edddd2..df4f90ea1 100644 --- a/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs +++ b/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs @@ -131,7 +131,7 @@ namespace BFEditor.Build // 应用名 if (buildInfo.IsPublish()) { - PlayerSettings.productName = "Knight Connect"; + PlayerSettings.productName = "Knight Combo"; } else { diff --git a/Assets/Editor/JenkinsAdapter.cs b/Assets/Editor/JenkinsAdapter.cs index ad801f7f1..9d02ce3fe 100644 --- a/Assets/Editor/JenkinsAdapter.cs +++ b/Assets/Editor/JenkinsAdapter.cs @@ -50,7 +50,7 @@ public class JenkinsAdapter { var buildInfo = new BuildInfo(); buildInfo.version = "0.1.0"; buildInfo.mode = "publish_release"; - buildInfo.bundleName = "com.juzu.b6"; + buildInfo.bundleName = "com.combo.heroes.puzzle.rpg"; buildInfo.skipVersion = false; BuildProjectTools.BuildResources(buildInfo, Application.streamingAssetsPath, true); @@ -60,7 +60,7 @@ public class JenkinsAdapter { // 设置版本号 PlayerSettings.bundleVersion = buildInfo.version; //Jenkins要求自动构建最低ios8.0 - PlayerSettings.iOS.targetOSVersionString = "10.0"; + PlayerSettings.iOS.targetOSVersionString = "12.0"; //设置Build为日期格式 PlayerSettings.iOS.buildNumber = BuildVersion; @@ -85,7 +85,7 @@ public class JenkinsAdapter { } PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.iOS, symbols); // 商品名称 - PlayerSettings.productName = "Lonely Survivor"; + PlayerSettings.productName = "Knight Combo"; // BuildType设置dev/release EditorUserBuildSettings.iOSBuildConfigType = iOSBuildType.Release; // 使用IL2CPP @@ -116,7 +116,7 @@ public class JenkinsAdapter { return names.ToArray(); } - #region Get Build Path + #region Get Build Path private static string GetIosBuildPath() { return "build/iOS"; } diff --git a/Assets/Editor/Package.cs b/Assets/Editor/Package.cs index 15f9f0897..68d159fa9 100644 --- a/Assets/Editor/Package.cs +++ b/Assets/Editor/Package.cs @@ -27,34 +27,34 @@ public class Package { project.AddBuildPropertyForConfig(release, "CODE_SIGN_RESOURCE_RULES_PATH", "$(SDKROOT)/ResourceRules.plist"); #region - string projPath = Path.GetFullPath (pathToBuiltProject); + string projPath = Path.GetFullPath(pathToBuiltProject); //添加推送和其他的有点不一样，需要添加一个文件。这个文件只能考进去。或者事先准备好了Base.entitlements 文件，文件类容 就是你手动添加进去的内容，你手动添加完成后生成的那个文件 - string entitlement = Application.dataPath + "/Editor/entitlement.entitlements"; - File.Copy (entitlement, pathToBuiltProject + "/Unity-iPhone/entitlement.entitlements"); + // string entitlement = Application.dataPath + "/Editor/entitlement.entitlements"; + // File.Copy (entitlement, pathToBuiltProject + "/Unity-iPhone/entitlement.entitlements"); //Max Ad Review service - File.Copy (Application.dataPath + "/MaxSdk/AppLovin/Editor/AppLovinQualityServiceSetup-ios.rb", pathToBuiltProject + "/AppLovinQualityServiceSetup-ios.rb"); + File.Copy(Application.dataPath + "/ThirdParty/MaxSdk/AppLovin/Editor/AppLovinQualityServiceSetup-ios.rb", pathToBuiltProject + "/AppLovinQualityServiceSetup-ios.rb"); - project.AddCapability (targetGuid, PBXCapabilityType.AssociatedDomains, pathToBuiltProject + "/Unity-iPhone/entitlement.entitlements", true); + project.AddCapability(targetGuid, PBXCapabilityType.AssociatedDomains, pathToBuiltProject + "/Unity-iPhone/entitlement.entitlements", true); - // Enable Push Notifications - project.AddFrameworkToProject (targetGuid_Framework, "UserNotifications.framework", false); + // Enable Push Notifications + // project.AddFrameworkToProject (targetGuid_Framework, "UserNotifications.framework", false); // Enable background mode // project.AddCapability (targetGuid, PBXCapabilityType.BackgroundModes); #region google service plist file // google service - string googleServicePath = Application.dataPath + "/Plugins/iOS/GoogleService-Info.plist"; - File.Copy(googleServicePath, pathToBuiltProject + "/GoogleService-Info.plist"); + // string googleServicePath = Application.dataPath + "/Plugins/iOS/GoogleService-Info.plist"; + // File.Copy(googleServicePath, pathToBuiltProject + "/GoogleService-Info.plist"); - project.AddFileToBuild(targetGuid, project.AddFile("GoogleService-Info.plist", "GoogleService-Info.plist", PBXSourceTree.Source)); + // project.AddFileToBuild(targetGuid, project.AddFile("GoogleService-Info.plist", "GoogleService-Info.plist", PBXSourceTree.Source)); #endregion // Add background modes string plistPath = pathToBuiltProject + "/Info.plist"; - PlistDocument plist = new PlistDocument (); - plist.ReadFromString (File.ReadAllText (plistPath)); + PlistDocument plist = new PlistDocument(); + plist.ReadFromString(File.ReadAllText(plistPath)); PlistElementDict rootDict = plist.root; //在playersetting里设置iosUseCustomAppBackgroundBehavior 和 iOSBackgroundModes // PlistElementArray arr = rootDict.CreateArray ("UIBackgroundModes"); @@ -63,11 +63,11 @@ public class Package { //解决错误：ITMS-90339 string exitsOnSuspendKey = "UIApplicationExitsOnSuspend"; - if (rootDict.values.ContainsKey (exitsOnSuspendKey)) { - rootDict.values.Remove (exitsOnSuspendKey); + if (rootDict.values.ContainsKey(exitsOnSuspendKey)) { + rootDict.values.Remove(exitsOnSuspendKey); } - File.WriteAllText (plistPath, plist.WriteToString ()); + File.WriteAllText(plistPath, plist.WriteToString()); #endregion // 根据实际需要添加framework或者tbd @@ -80,13 +80,16 @@ public class Package { // project.AddFrameworkToProject(targetGuid_Framework, "CoreTelephony.framework", false); // AF - // project.AddFrameworkToProject(targetGuid_Framework, "AdSupport.framework", false); - // project.AddFrameworkToProject(targetGuid_Framework, "iAd.framework", false); + project.AddFrameworkToProject(targetGuid_Framework, "AdSupport.framework", false); + project.AddFrameworkToProject(targetGuid_Framework, "iAd.framework", false); // AF END */ - // // ATT - project.AddFrameworkToProject(targetGuid_Framework, "AppTrackingTransparency.framework", false); - // // ATT END + // adjust + project.AddFrameworkToProject(targetGuid_Framework, "AdServices.framework", false); + + // ATT + project.AddFrameworkToProject(targetGuid_Framework, "AppTrackingTransparency.framework", false); + // ATT END // 苹果登录 project.AddFrameworkToProject(targetGuid_Framework, "AuthenticationServices.framework", true); @@ -715,12 +718,12 @@ public class Package { CFBundleURLSchemes - fb222326627097275 + fb277827051329111 FacebookAppID - 222326627097275 + 277827051329111 FacebookClientToken 63ee45cf6edfede0ab7cd532592fb3f1 FacebookDisplayName diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 6f9ebdb20..9b4700e24 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -25,11 +25,11 @@ - - + + - + diff --git a/Assets/Plugins/iOS/CustomAppController.mm b/Assets/Plugins/iOS/CustomAppController.mm index 6abcab85c..dd512871b 100644 --- a/Assets/Plugins/iOS/CustomAppController.mm +++ b/Assets/Plugins/iOS/CustomAppController.mm @@ -12,11 +12,11 @@ IMPL_APP_CONTROLLER_SUBCLASS (CustomAppController) - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [super application:application didFinishLaunchingWithOptions:launchOptions]; - [[FirebaseSDK getInstance] initialize]; + // [[FirebaseSDK getInstance] initialize]; // [START set_messaging_delegate] - [FIRMessaging messaging].delegate = self; + // [FIRMessaging messaging].delegate = self; // [END set_messaging_delegate] - + if ([UNUserNotificationCenter class] != nil) { // iOS 10 or later // For iOS 10 display notification (sent via APNS) diff --git a/Assets/Scripts/Common/SDK/AdManager.cs b/Assets/Scripts/Common/SDK/AdManager.cs index f2e54d5ee..fdb166e0e 100644 --- a/Assets/Scripts/Common/SDK/AdManager.cs +++ b/Assets/Scripts/Common/SDK/AdManager.cs @@ -26,7 +26,7 @@ public partial class AdManager : BF.MonoSingleton private const string Key = "9uHgeBwag3NXva9MC23ToO3q11Ve59bF1uwg4qGltdGmCQ7OSByFZ_3b1ZF7krMlkHQo5gXzIokVDsvg1rwbr-"; string bannerAdUnitId = "YOUR_BANNER_AD_UNIT_ID"; // Retrieve the ID from your account string adInterstitialUnitId = "YOUR_AD_UNIT_ID"; - string adRewardUnitId = "e0fc2e3efef362de"; + string adRewardUnitId = "e54f27e345da90df"; // Start is called before the first frame update public void Init(string init = "") diff --git a/Assets/Scripts/Common/SDK/IAPManager.cs b/Assets/Scripts/Common/SDK/IAPManager.cs index e7289391c..84a1ad4d2 100644 --- a/Assets/Scripts/Common/SDK/IAPManager.cs +++ b/Assets/Scripts/Common/SDK/IAPManager.cs @@ -77,6 +77,12 @@ public class IAPManager : /* MonoBehaviour, */ IStoreListener { IAPDebug($"init fail: {er}"); initCallback?.Invoke(false, null, er); } + + public void OnInitializeFailed(InitializationFailureReason error, string message) { + string er = error.ToString("G"); + IAPDebug($"init fail2: {er}"); + initCallback?.Invoke(false, null, er); + } #endregion #region ================================================== 购买 ================================================== diff --git a/Assets/Scripts/Const/BFPlatform.Gate.cs b/Assets/Scripts/Const/BFPlatform.Gate.cs index cb7409a56..0e5525e7c 100644 --- a/Assets/Scripts/Const/BFPlatform.Gate.cs +++ b/Assets/Scripts/Const/BFPlatform.Gate.cs @@ -64,7 +64,7 @@ namespace BF public partial class BFPlatform { - const String LoginCenterURL = "https://b6-entrance.bigfoot-studio.link"; + const String LoginCenterURL = "https://entrance.bigfoot-studio.link"; static Dictionary BFLoginCenterURLDict = new Dictionary() { // dev @@ -77,7 +77,7 @@ namespace BF {"com.juzu.b6.release.ios", "http://game.juzugame.com:3000"}, // gp - {"com.knight.connect.rpg", "https://b6-entrance.bigfoot-studio.link"}, + {"com.combo.heroes.puzzle.rpg", "https://entrance.bigfoot-studio.link"}, }; //combine url解析的数据 diff --git a/Assets/Scripts/Const/BFPlatform.Language.cs b/Assets/Scripts/Const/BFPlatform.Language.cs index 6043dc41f..d2f9d8401 100644 --- a/Assets/Scripts/Const/BFPlatform.Language.cs +++ b/Assets/Scripts/Const/BFPlatform.Language.cs @@ -48,7 +48,7 @@ namespace BF {"com.juzu.b6.release.android", new BFLanguageInfo(new List{"en"})}, {"com.juzu.b6.release.ios", new BFLanguageInfo(new List{"en"})}, // 这个是gp渠道 - {"com.knight.connect.rpg", new BFLanguageInfo(new List{"en", "cn", "zh", "th", "ru", "id", "vi"})}, + {"com.combo.heroes.puzzle.rpg", new BFLanguageInfo(new List{"en", "cn", "zh", "th", "ru", "id", "vi"})}, {"com.juzu.b6.ios", new BFLanguageInfo(new List{"en"})}, }; diff --git a/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset b/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset index 5b815c3f2..c891f8228 100644 --- a/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset +++ b/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset @@ -14,11 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: selectedAppIndex: 0 clientTokens: - - 7ec364275c7766833d2ebace0c5a806e + - cd6be8cc57dff789f3476ee1b25e2410 appIds: - - 222326627097275 + - 277827051329111 appLabels: - - Knight Connect + - Combo Hero cookie: 1 logging: 1 status: 1 diff --git a/Assets/ThirdParty/Firebase/Editor/FirebaseDependencies.xml b/Assets/ThirdParty/Firebase/Editor/FirebaseDependencies.xml index eec63723a..94a7045fa 100644 --- a/Assets/ThirdParty/Firebase/Editor/FirebaseDependencies.xml +++ b/Assets/ThirdParty/Firebase/Editor/FirebaseDependencies.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/Assets/ThirdParty/IronSource/Editor/ISAdColonyAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISAdColonyAdapterDependencies.xml index 42f9b66ae..92430b2d4 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISAdColonyAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISAdColonyAdapterDependencies.xml @@ -16,11 +16,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISAdMobAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISAdMobAdapterDependencies.xml index 41d26c8df..b9f4183e6 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISAdMobAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISAdMobAdapterDependencies.xml @@ -16,11 +16,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISAppLovinAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISAppLovinAdapterDependencies.xml index cc3114cad..9e6047736 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISAppLovinAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISAppLovinAdapterDependencies.xml @@ -14,11 +14,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISChartboostAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISChartboostAdapterDependencies.xml index 1b3b4da66..9e20b7093 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISChartboostAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISChartboostAdapterDependencies.xml @@ -14,11 +14,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISFacebookAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISFacebookAdapterDependencies.xml index b5e00d57b..682ae8b27 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISFacebookAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISFacebookAdapterDependencies.xml @@ -16,11 +16,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISFyberAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISFyberAdapterDependencies.xml index a28759c69..c495b0dd6 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISFyberAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISFyberAdapterDependencies.xml @@ -16,11 +16,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISLiftoffAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISLiftoffAdapterDependencies.xml index 7bead7da8..265a0b15b 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISLiftoffAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISLiftoffAdapterDependencies.xml @@ -16,11 +16,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISPangleAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISPangleAdapterDependencies.xml index 94b4e48ea..3697dbbf5 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISPangleAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISPangleAdapterDependencies.xml @@ -14,11 +14,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISTapJoyAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISTapJoyAdapterDependencies.xml index 43f164396..cab986005 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISTapJoyAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISTapJoyAdapterDependencies.xml @@ -14,11 +14,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/ISUnityAdsAdapterDependencies.xml b/Assets/ThirdParty/IronSource/Editor/ISUnityAdsAdapterDependencies.xml index 54d03acb9..f43b57032 100644 --- a/Assets/ThirdParty/IronSource/Editor/ISUnityAdsAdapterDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/ISUnityAdsAdapterDependencies.xml @@ -15,11 +15,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Editor/IronSourceSDKDependencies.xml b/Assets/ThirdParty/IronSource/Editor/IronSourceSDKDependencies.xml index 3fe72c605..bca4e52a1 100644 --- a/Assets/ThirdParty/IronSource/Editor/IronSourceSDKDependencies.xml +++ b/Assets/ThirdParty/IronSource/Editor/IronSourceSDKDependencies.xml @@ -25,11 +25,11 @@ - + diff --git a/Assets/ThirdParty/IronSource/Plugins/Android.meta b/Assets/ThirdParty/IronSource/Plugins/Android.meta deleted file mode 100644 index bba14b44c..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 263e67daff704bc46a0bd6c79dc4e04b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS.meta b/Assets/ThirdParty/IronSource/Plugins/iOS.meta deleted file mode 100644 index 192067a46..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce0759e93aacad942a240043d586ee5d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.h b/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.h deleted file mode 100644 index c82dd986a..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// BannerLevelPlayCallbacksWrapper.h -// iOSBridge -// -// Created by Moshe Aviv Aslanov on 02/05/2022. -// Copyright © 2022 yossi mozgerashvily. All rights reserved. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol BannerLevelPlayCallbacksWrapper - -- (void)bannerLevelPlayDidLoad:(ISBannerView *)bannerView withAdInfo:(ISAdInfo *)adInfo; -- (void)bannerLevelPlayDidFailToLoadWithError:(NSError *)error; -- (void)bannerLevelPlayDidClickWithAdInfo:(ISAdInfo *)adInfo; -- (void)bannerLevelPlayDidPresentScreenWithAdInfo:(ISAdInfo *)adInfo; -- (void)bannerLevelPlayDidDismissScreenWithAdInfo:(ISAdInfo *)adInfo; -- (void)bannerLevelPlayDidLeaveApplicationWithAdInfo:(ISAdInfo *)adInfo; - -@end - -@interface BannerLevelPlayCallbacksWrapper : NSObject - -@property (nonatomic, weak) id delegate; - -- (instancetype) initWithDelegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.h.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.h.meta deleted file mode 100644 index 3dec5d069..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.h.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: af7bfe9c27e814ff487a0a3cf8b0deaa -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.m b/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.m deleted file mode 100644 index dbf3b6ca1..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// BannerLevelPlayCallbacksWrapper.m -// iOSBridge -// -// Created by Moshe Aviv Aslanov on 02/05/2022. -// Copyright © 2022 yossi mozgerashvily. All rights reserved. -// - -#import "BannerLevelPlayCallbacksWrapper.h" - -@implementation BannerLevelPlayCallbacksWrapper - --(instancetype)initWithDelegate:(id)delegate { - self = [super init]; - - if (self) { - _delegate = delegate; - } - - return self; -} - - - -- (void)didClickWithAdInfo:(ISAdInfo *)adInfo { - [_delegate bannerLevelPlayDidClickWithAdInfo:adInfo]; -} - -- (void)didDismissScreenWithAdInfo:(ISAdInfo *)adInfo { - [_delegate bannerLevelPlayDidDismissScreenWithAdInfo:adInfo]; -} - -- (void)didFailToLoadWithError:(NSError *)error { - [_delegate bannerLevelPlayDidFailToLoadWithError:error]; -} - -- (void)didLeaveApplicationWithAdInfo:(ISAdInfo *)adInfo { - [_delegate bannerLevelPlayDidLeaveApplicationWithAdInfo:adInfo]; -} - -- (void)didLoad:(ISBannerView *)bannerView withAdInfo:(ISAdInfo *)adInfo { - [_delegate bannerLevelPlayDidLoad:bannerView withAdInfo:adInfo]; -} - -- (void)didPresentScreenWithAdInfo:(ISAdInfo *)adInfo { - [_delegate bannerLevelPlayDidPresentScreenWithAdInfo:adInfo]; -} - -@end diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.m.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.m.meta deleted file mode 100644 index 573cec693..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/BannerLevelPlayCallbacksWrapper.m.meta +++ /dev/null @@ -1,37 +0,0 @@ -fileFormatVersion: 2 -guid: 60fc38be92f4246c181eddba2bc88ce6 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.h b/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.h deleted file mode 100644 index 745e7d4c4..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// InterstitialLevelPlayCallbacksWrapper.h -// iOSBridge -// -// Created by Moshe Aviv Aslanov on 02/05/2022. -// Copyright © 2022 yossi mozgerashvily. All rights reserved. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol InterstitialLevelPlayCallbacksWrapper - -- (void)interstitialLevelPlayDidLoadWithAdInfo:(ISAdInfo *)adInfo; -- (void)interstitialLevelPlayDidFailToLoadWithError:(NSError *)error; -- (void)interstitialLevelPlayDidOpenWithAdInfo:(ISAdInfo *)adInfo; -- (void)interstitialLevelPlayDidCloseWithAdInfo:(ISAdInfo *)adInfo; -- (void)interstitialLevelPlayDidShowWithAdInfo:(ISAdInfo *)adInfo; -- (void)interstitialLevelPlayDidFailToShowWithError:(NSError *)error andAdInfo:(ISAdInfo *)adInfo; -- (void)interstitialLevelPlayDidClickWithAdInfo:(ISAdInfo *)adInfo; - -@end - -@interface InterstitialLevelPlayCallbacksWrapper : NSObject - -@property (nonatomic, weak) id delegate; - -- (instancetype) initWithDelegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.h.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.h.meta deleted file mode 100644 index d9ce1b960..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.h.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 1f2eff7284b2a4b50a8b939df611dd1e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.m b/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.m deleted file mode 100644 index b44be8b93..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.m +++ /dev/null @@ -1,51 +0,0 @@ -// -// InterstitialLevelPlayCallbacksWrapper.m -// iOSBridge -// -// Created by Moshe Aviv Aslanov on 02/05/2022. -// Copyright © 2022 yossi mozgerashvily. All rights reserved. -// - -#import "InterstitialLevelPlayCallbacksWrapper.h" - -@implementation InterstitialLevelPlayCallbacksWrapper - --(instancetype)initWithDelegate:(id)delegate { - self = [super init]; - - if (self) { - _delegate = delegate; - } - - return self; -} - -- (void)didClickWithAdInfo:(ISAdInfo *)adInfo { - [_delegate interstitialLevelPlayDidClickWithAdInfo:adInfo]; -} - -- (void)didCloseWithAdInfo:(ISAdInfo *)adInfo { - [_delegate interstitialLevelPlayDidCloseWithAdInfo:adInfo]; -} - -- (void)didFailToLoadWithError:(NSError *)error { - [_delegate interstitialLevelPlayDidFailToLoadWithError:error]; -} - -- (void)didFailToShowWithError:(NSError *)error andAdInfo:(ISAdInfo *)adInfo { - [_delegate interstitialLevelPlayDidFailToShowWithError:error andAdInfo:adInfo]; -} - -- (void)didLoadWithAdInfo:(ISAdInfo *)adInfo { - [_delegate interstitialLevelPlayDidLoadWithAdInfo:adInfo]; -} - -- (void)didOpenWithAdInfo:(ISAdInfo *)adInfo { - [_delegate interstitialLevelPlayDidOpenWithAdInfo:adInfo]; -} - -- (void)didShowWithAdInfo:(ISAdInfo *)adInfo { - [_delegate interstitialLevelPlayDidShowWithAdInfo:adInfo]; -} - -@end diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.m.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.m.meta deleted file mode 100644 index dde8def06..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/InterstitialLevelPlayCallbacksWrapper.m.meta +++ /dev/null @@ -1,37 +0,0 @@ -fileFormatVersion: 2 -guid: f25fb256f58c048c6a7226937ae353b8 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/IronSourceUnityConfig.m b/Assets/ThirdParty/IronSource/Plugins/iOS/IronSourceUnityConfig.m deleted file mode 100644 index 4209bfc10..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/IronSourceUnityConfig.m +++ /dev/null @@ -1,78 +0,0 @@ -// -// iOSBridge -// -// Created by Ori on 5/13/15. -// - -#import -#import -#import - -@interface IronSourceUnityConfig:NSObject -//IronSource -- (void) setClientSideCallbacks:(bool)useClientSideCallbacks; -- (void) setLanguage:(NSString *)language; -- (void) setRewardedVideoCustomParams:(NSString *)rvParams; -- (void) setOfferwallCustomParams:(NSString *)owParams; - -@end - -@implementation IronSourceUnityConfig - -//IronSource -- (void) setClientSideCallbacks:(bool)useClientSideCallbacks { - NSNumber *ucsc = @0; - if (useClientSideCallbacks) - ucsc = @1; - - [ISSupersonicAdsConfiguration configurations].useClientSideCallbacks = ucsc; -} - -- (void) setLanguage:(NSString *)language { - [ISSupersonicAdsConfiguration configurations].language = language; -} - -- (void) setRewardedVideoCustomParams:(NSString *)rvParams { - NSError *jsonError; - NSData *objectData = [rvParams dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *json = [NSJSONSerialization JSONObjectWithData:objectData options:NSJSONReadingMutableContainers error:&jsonError]; - if (!jsonError) - [ISConfigurations configurations].rewardedVideoCustomParameters = json; -} - -- (void) setOfferwallCustomParams:(NSString *)owParams { - NSError *jsonError; - NSData *objectData = [owParams dataUsingEncoding:NSUTF8StringEncoding]; - NSDictionary *json = [NSJSONSerialization JSONObjectWithData:objectData options:NSJSONReadingMutableContainers error:&jsonError]; - if (!jsonError) - [ISConfigurations configurations].offerwallCustomParameters = json; -} - - - -#ifdef __cplusplus -extern "C" { -#endif - -#define ParseNSStringParam( _x_ ) ( _x_ != NULL ) ? [NSString stringWithUTF8String:_x_] : [NSString stringWithUTF8String:""] - - //IronSource - void CFSetClientSideCallbacks(bool useClientSideCallbacks){ - [[IronSourceUnityConfig new] setClientSideCallbacks:useClientSideCallbacks]; - } - void CFSetLanguage(const char *language){ - [[IronSourceUnityConfig new] setLanguage:ParseNSStringParam(language)]; - } - void CFSetRewardedVideoCustomParams(const char *rvParams){ - [[IronSourceUnityConfig new] setRewardedVideoCustomParams:ParseNSStringParam(rvParams)]; - } - void CFSetOfferwallCustomParams(const char *owParam){ - [[IronSourceUnityConfig new] setOfferwallCustomParams:ParseNSStringParam(owParam)]; - } - - -#ifdef __cplusplus -} -#endif - -@end diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/IronSourceUnityConfig.m.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/IronSourceUnityConfig.m.meta deleted file mode 100644 index 14c233d5a..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/IronSourceUnityConfig.m.meta +++ /dev/null @@ -1,37 +0,0 @@ -fileFormatVersion: 2 -guid: 4e72efacda2c34ed89e61385b8d7a609 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.h b/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.h deleted file mode 100644 index 60ad52f13..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// RewardedVideoLevelPlayCallbacksWrapper.h -// iOSBridge -// -// Created by Moshe Aviv Aslanov on 02/05/2022. -// Copyright © 2022 yossi mozgerashvily. All rights reserved. -// - -#import -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol RewardedVideoLevelPlayCallbacksWrapper - -- (void)rewardedVideoLevelPlayDidLoadWithAdInfo:(ISAdInfo *)adInfo; -- (void)rewardedVideoLevelPlayDidFailToLoadWithError:(NSError *)error; -- (void)hasAvailableAdWithAdInfo:(ISAdInfo *)adInfo; -- (void)hasNoAvailableAd; -- (void)rewardedVideoLevelPlayDidReceiveRewardForPlacement:(ISPlacementInfo *)placementInfo withAdInfo:(ISAdInfo *)adInfo; -- (void)rewardedVideoLevelPlayDidFailToShowWithError:(NSError *)error andAdInfo:(ISAdInfo *)adInfo; -- (void)rewardedVideoLevelPlayDidOpenWithAdInfo:(ISAdInfo *)adInfo; -- (void)rewardedVideoLevelPlayDidCloseWithAdInfo:(ISAdInfo *)adInfo; -- (void)rewardedVideoLevelPlayDidClick:(ISPlacementInfo *)placementInfo withAdInfo:(ISAdInfo *)adInfo; - -@end - -@interface RewardedVideoLevelPlayCallbacksWrapper : NSObject - -@property (nonatomic, weak) iddelegate; - -- (instancetype) initWithDelegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.h.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.h.meta deleted file mode 100644 index 4a43c1f16..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.h.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 1e5e0888f5ca14ec093b485ce7d79d57 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.m b/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.m deleted file mode 100644 index c77c54a24..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.m +++ /dev/null @@ -1,59 +0,0 @@ -// -// RewardedVideoLevelPlayCallbacksWrapper.m -// iOSBridge -// -// Created by Moshe Aviv Aslanov on 02/05/2022. -// Copyright © 2022 yossi mozgerashvily. All rights reserved. -// - -#import "RewardedVideoLevelPlayCallbacksWrapper.h" - -@implementation RewardedVideoLevelPlayCallbacksWrapper --(instancetype)initWithDelegate:(id)delegate { - self = [super init]; - - if (self) { - _delegate = delegate; - } - - return self; -} - - -- (void)didClick:(ISPlacementInfo *)placementInfo withAdInfo:(ISAdInfo *)adInfo { - [_delegate rewardedVideoLevelPlayDidClick:placementInfo withAdInfo:adInfo]; -} - -- (void)didCloseWithAdInfo:(ISAdInfo *)adInfo { - [_delegate rewardedVideoLevelPlayDidCloseWithAdInfo:adInfo]; -} - -- (void)didFailToShowWithError:(NSError *)error andAdInfo:(ISAdInfo *)adInfo { - [_delegate rewardedVideoLevelPlayDidFailToShowWithError:error andAdInfo:adInfo]; -} - -- (void)didOpenWithAdInfo:(ISAdInfo *)adInfo { - [_delegate rewardedVideoLevelPlayDidOpenWithAdInfo:adInfo]; -} - -- (void)didReceiveRewardForPlacement:(ISPlacementInfo *)placementInfo withAdInfo:(ISAdInfo *)adInfo { - [_delegate rewardedVideoLevelPlayDidReceiveRewardForPlacement:placementInfo withAdInfo:adInfo]; -} - -- (void)hasAvailableAdWithAdInfo:(ISAdInfo *)adInfo { - [_delegate hasAvailableAdWithAdInfo:adInfo]; -} - -- (void)hasNoAvailableAd { - [_delegate hasNoAvailableAd]; -} - -- (void)didFailToLoadWithError:(NSError *)error { - [_delegate rewardedVideoLevelPlayDidFailToLoadWithError:error]; -} - -- (void)didLoadWithAdInfo:(ISAdInfo *)adInfo { - [_delegate rewardedVideoLevelPlayDidLoadWithAdInfo:adInfo]; -} - -@end diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.m.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.m.meta deleted file mode 100644 index 4c6f78196..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/RewardedVideoLevelPlayCallbacksWrapper.m.meta +++ /dev/null @@ -1,37 +0,0 @@ -fileFormatVersion: 2 -guid: c7bb9ed2c15d149e1a78721153239089 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.h b/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.h deleted file mode 100644 index d63bffef6..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// iOSBridge.h -// iOSBridge -// -// Created by Supersonic. -// Copyright (c) 2015 Supersonic. All rights reserved. -// - -#import -#import -#import "RewardedVideoLevelPlayCallbacksWrapper.h" -#import "InterstitialLevelPlayCallbacksWrapper.h" -#import "BannerLevelPlayCallbacksWrapper.h" - -static NSString * UnityGitHash = @"aebf03d"; -typedef void (*ISUnityBackgroundCallback)(const char* args); -typedef void (*ISUnityPauseGame)(const bool gamePause); - -@interface iOSBridge : NSObject - -@end - - diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.h.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.h.meta deleted file mode 100644 index 7a341bd7d..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.h.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 6f61c9193b3484489a0c059a3aeed43c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.m b/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.m deleted file mode 100644 index b81b03b2b..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.m +++ /dev/null @@ -1,1292 +0,0 @@ -// -// iOSBridge.m -// iOSBridge -// -// Created by Supersonic. -// Copyright (c) 2015 Supersonic. All rights reserved. -// - -#import "iOSBridge.h" -#import - - -// Converts NSString to C style string by way of copy (Mono will free it) -#define MakeStringCopy( _x_ ) ( _x_ != NULL && [_x_ isKindOfClass:[NSString class]] ) ? strdup( [_x_ UTF8String] ) : NULL - -// Converts C style string to NSString -#define GetStringParam( _x_ ) ( _x_ != NULL ) ? [NSString stringWithUTF8String:_x_] : [NSString stringWithUTF8String:""] - -#define BANNER_POSITION_TOP 1 -#define BANNER_POSITION_BOTTOM 2 - -#ifdef __cplusplus -extern "C" { -#endif - void UnityPause(int pause); - extern void UnitySendMessage( const char *className, const char *methodName, const char *param ); - -#ifdef __cplusplus -} -#endif - -@interface iOSBridge () -{ - ISBannerView* _bannerView; - NSInteger _position; - UIViewController* _bannerViewController; - BOOL _shouldHideBanner; -} - -@property (nonatomic, strong) RewardedVideoLevelPlayCallbacksWrapper *rewardedVideoLevelPlayDelegate; -@property (nonatomic, strong) InterstitialLevelPlayCallbacksWrapper *interstitialLevelPlayDelegate; -@property (nonatomic, strong) BannerLevelPlayCallbacksWrapper *bannerLevelPlayDelegate; - -@end - -static NSString * const EMPTY_STRING = @""; - -@implementation iOSBridge -static ISUnityBackgroundCallback backgroundCallback; -static bool pauseGame; - - -char *const IRONSOURCE_EVENTS = "IronSourceEvents"; -char *const IRONSOURCE_REWARDED_VIDEO_EVENTS = "IronSourceRewardedVideoEvents"; -char *const IRONSOURCE_INTERSTITIAL_EVENTS = "IronSourceInterstitialEvents"; -char *const IRONSOURCE_BANNER_EVENTS = "IronSourceBannerEvents"; - -+ (iOSBridge *)start { - static iOSBridge *instance; - static dispatch_once_t onceToken; - dispatch_once( &onceToken, - ^{ - instance = [iOSBridge new]; - }); - - return instance; -} - -- (instancetype)init { - if(self = [super init]){ - self.rewardedVideoLevelPlayDelegate = [[RewardedVideoLevelPlayCallbacksWrapper alloc]initWithDelegate:(id)self]; - self.interstitialLevelPlayDelegate = [[InterstitialLevelPlayCallbacksWrapper alloc]initWithDelegate:(id)self]; - self.bannerLevelPlayDelegate = [[BannerLevelPlayCallbacksWrapper alloc]initWithDelegate:(id)self]; - - [IronSource setRewardedVideoDelegate:self]; - [IronSource setInterstitialDelegate:self]; - [IronSource setISDemandOnlyInterstitialDelegate:self]; - [IronSource setISDemandOnlyRewardedVideoDelegate:self]; - [IronSource setOfferwallDelegate:self]; - [IronSource setBannerDelegate:self]; - [IronSource addImpressionDataDelegate:self]; - [IronSource setConsentViewWithDelegate:self]; - - //set level play listeneres - [IronSource setLevelPlayBannerDelegate:self.bannerLevelPlayDelegate]; - [IronSource setLevelPlayInterstitialDelegate:self.interstitialLevelPlayDelegate]; - [IronSource setLevelPlayRewardedVideoDelegate:self.rewardedVideoLevelPlayDelegate]; - - - _bannerView = nil; - _bannerViewController = nil; - _position = BANNER_POSITION_BOTTOM; - _shouldHideBanner = NO; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orientationChanged:) - name:UIDeviceOrientationDidChangeNotification object:nil]; - } - - return self; -} - -- (void)setPluginDataWithType:(NSString *)pluginType pluginVersion:(NSString *)version pluginFrameworkVersion:(NSString *)frameworkVersion { - [ISConfigurations getConfigurations].plugin = pluginType; - [ISConfigurations getConfigurations].pluginVersion = version; - [ISConfigurations getConfigurations].pluginFrameworkVersion = frameworkVersion; -} - -#pragma mark Base API - -- (const char *)getAdvertiserId { - NSString *advertiserId = [IronSource advertiserId]; - - return MakeStringCopy(advertiserId); -} - -- (void)validateIntegration { - [ISIntegrationHelper validateIntegration]; -} - -- (void)shouldTrackNetworkState:(BOOL)flag { - [IronSource shouldTrackReachability:flag]; -} - -- (BOOL)setDynamicUserId:(NSString *)dynamicUserId { - return [IronSource setDynamicUserId:dynamicUserId]; -} - -- (void)setAdaptersDebug:(BOOL)enabled { - [IronSource setAdaptersDebug:enabled]; -} - -- (void)setConsent:(BOOL)consent { - [IronSource setConsent:consent]; -} - -- (void)setMetaDataWithKey:(NSString *)key value:(NSString *)value { - [IronSource setMetaDataWithKey:key value:value]; -} - -- (void)setMetaDataWithKey:(NSString *)key values:(NSMutableArray *)valuesArray { - [IronSource setMetaDataWithKey:key values:valuesArray]; -} - -- (void)setManualLoadRewardedVideo:(BOOL) isOn { - if (isOn) { - [IronSource setRewardedVideoManualDelegate:self]; - [IronSource setLevelPlayRewardedVideoManualDelegate:self.rewardedVideoLevelPlayDelegate]; - } - else { - NSLog(@"Manual load false is the defualt value"); - - } -} - -- (void)setNetworkData:(NSString *)networkKey data:(NSString *)networkData { - NSError* error; - if (!networkData) { - return; - } - - NSData *data = [networkData dataUsingEncoding:NSUTF8StringEncoding]; - if (!data) { - return; - } - - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error]; - if (!dict) { - return; - } - - [IronSource setNetworkDataWithNetworkKey:networkKey andNetworkData:dict]; -} - -#pragma mark Init SDK - -- (void)setUserId:(NSString *)userId { - [IronSource setUserId:userId]; -} - -- (void)initWithAppKey:(NSString *)appKey { - [IronSource initWithAppKey:appKey delegate:self]; -} - -- (void)initWithAppKey:(NSString *)appKey adUnits:(NSArray *)adUnits { - [IronSource initWithAppKey:appKey adUnits:adUnits delegate:self]; -} - -- (void)initISDemandOnly:(NSString *)appKey adUnits:(NSArray *)adUnits { - [IronSource initISDemandOnly:appKey adUnits:adUnits]; -} - -#pragma mark Rewarded Video API - -- (void)showRewardedVideo { - [IronSource showRewardedVideoWithViewController:[UIApplication sharedApplication].keyWindow.rootViewController]; -} - -- (void)showRewardedVideoWithPlacement:(NSString *)placementName { - [IronSource showRewardedVideoWithViewController:[UIApplication sharedApplication].keyWindow.rootViewController placement:placementName]; -} - -- (const char *) getPlacementInfo:(NSString *)placementName { - char *res = nil; - - if (placementName){ - ISPlacementInfo *placementInfo = [IronSource rewardedVideoPlacementInfo:placementName]; - if(placementInfo){ - NSDictionary *dict = @{@"placement_name": [placementInfo placementName], - @"reward_amount": [placementInfo rewardAmount], - @"reward_name": [placementInfo rewardName]}; - - res = MakeStringCopy([self getJsonFromObj:dict]); - } - } - - return res; -} - -- (BOOL)isRewardedVideoAvailable { - return [IronSource hasRewardedVideo]; -} - -- (BOOL)isRewardedVideoPlacementCapped:(NSString *)placementName { - return [IronSource isRewardedVideoCappedForPlacement:placementName]; -} - -- (void)setRewardedVideoServerParameters:(NSDictionary *)params { - [IronSource setRewardedVideoServerParameters:params]; -} - -- (void)clearRewardedVideoServerParameters { - [IronSource clearRewardedVideoServerParameters]; -} - -#pragma mark Rewarded Video Manual Load API - -- (void)loadRewardedVideo { - [IronSource loadRewardedVideo]; -} - -#pragma mark Rewarded Video DemanOnly API - -- (void)showISDemandOnlyRewardedVideo:(NSString *)instanceId { - [IronSource showISDemandOnlyRewardedVideo:[UIApplication sharedApplication].keyWindow.rootViewController instanceId:instanceId]; -} - -- (void)loadISDemandOnlyRewardedVideo:(NSString *)instanceId { - [IronSource loadISDemandOnlyRewardedVideo:instanceId]; -} - -- (BOOL)isDemandOnlyRewardedVideoAvailable:(NSString *)instanceId { - return [IronSource hasISDemandOnlyRewardedVideo:instanceId]; -} - -#pragma mark Init Delegate - -- (void)initializationDidComplete { - UnitySendMessage(IRONSOURCE_EVENTS, "onSdkInitializationCompleted", ""); -} - -#pragma mark Rewarded Video Delegate - -- (void)rewardedVideoHasChangedAvailability:(BOOL)available { - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAvailabilityChanged", (available) ? "true" : "false"); -} - -- (void)didReceiveRewardForPlacement:(ISPlacementInfo *)placementInfo { - NSDictionary *dict = @{@"placement_reward_amount": placementInfo.rewardAmount, - @"placement_reward_name": placementInfo.rewardName, - @"placement_name": placementInfo.placementName}; - - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdRewarded", MakeStringCopy([self getJsonFromObj:dict])); -} - -- (void)rewardedVideoDidFailToShowWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdShowFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdShowFailed",""); -} - -- (void)rewardedVideoDidOpen { - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdOpened", ""); - if (pauseGame) { - UnityPause(1); - } -} - -- (void)rewardedVideoDidClose { - if (pauseGame) { - UnityPause(0); - } - [self centerBanner]; - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdClosed", ""); -} - -- (void)rewardedVideoDidStart { - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdStarted", ""); -} - -- (void)rewardedVideoDidEnd { - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdEnded", ""); -} - -- (void)didClickRewardedVideo:(ISPlacementInfo *)placementInfo { - NSDictionary *dict = @{@"placement_reward_amount": placementInfo.rewardAmount, - @"placement_reward_name": placementInfo.rewardName, - @"placement_name": placementInfo.placementName}; - - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdClicked", MakeStringCopy([self getJsonFromObj:dict])); -} - -#pragma mark Rewarded Video Level Play Delegate - -- (void)rewardedVideoLevelPlayDidClick:(nonnull ISPlacementInfo *)placementInfo withAdInfo:(nonnull ISAdInfo *)adInfo { - NSDictionary *dict = @{@"placement_reward_amount": placementInfo.rewardAmount, - @"placement_reward_name": placementInfo.rewardName, - @"placement_name": placementInfo.placementName}; - NSArray *params = @[dict, [self getAdInfoData:adInfo]]; - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdClicked", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)rewardedVideoLevelPlayDidCloseWithAdInfo:(nonnull ISAdInfo *)adInfo { - if (pauseGame) { - UnityPause(0); - } - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdClosed",[self getAdInfoData:adInfo].UTF8String); -} - -- (void)rewardedVideoLevelPlayDidFailToLoadWithError:(nonnull NSError *)error { - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdLoadFailed", MakeStringCopy([self parseErrorToEvent:error])); -} - -- (void)rewardedVideoLevelPlayDidFailToShowWithError:(nonnull NSError *)error andAdInfo:(nonnull ISAdInfo *)adInfo { - NSArray *params = @[(error) ? [self parseErrorToEvent:error] : @"" , [self getAdInfoData:adInfo]]; - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdShowFailed", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)rewardedVideoLevelPlayDidLoadWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdReady", [self getAdInfoData:adInfo].UTF8String); -} - -- (void)rewardedVideoLevelPlayDidOpenWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdOpened", [self getAdInfoData:adInfo].UTF8String); - if (pauseGame) { - UnityPause(1); - } -} - -- (void)rewardedVideoLevelPlayDidReceiveRewardForPlacement:(nonnull ISPlacementInfo *)placementInfo withAdInfo:(nonnull ISAdInfo *)adInfo { - NSDictionary *dict = @{@"placement_reward_amount": placementInfo.rewardAmount, - @"placement_reward_name": placementInfo.rewardName, - @"placement_name": placementInfo.placementName}; - NSArray *params = @[dict, [self getAdInfoData:adInfo]]; - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdRewarded", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)hasAvailableAdWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdAvailable", [self getAdInfoData:adInfo].UTF8String); -} - -- (void)hasNoAvailableAd { - UnitySendMessage(IRONSOURCE_REWARDED_VIDEO_EVENTS, "onAdUnavailable",""); - -} - -#pragma mark Rewarded Video DemandOnly Delegate - -- (void)rewardedVideoDidLoad:(NSString *)instanceId{ - NSArray *params = @[instanceId]; - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdLoadedDemandOnly", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)rewardedVideoDidFailToLoadWithError:(NSError *)error instanceId:(NSString *)instanceId{ - NSArray *params; - if (error) - params = @[instanceId, [self parseErrorToEvent:error]]; - else - params = @[instanceId,@""]; - - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdLoadFailedDemandOnly", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)rewardedVideoAdRewarded:(NSString *)instanceId { - NSArray *params = @[instanceId]; - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdRewardedDemandOnly", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)rewardedVideoDidFailToShowWithError:(NSError *)error instanceId:(NSString *)instanceId { - - NSArray *params; - if (error) - params = @[instanceId, [self parseErrorToEvent:error]]; - else - params = @[instanceId,@""]; - - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdShowFailedDemandOnly", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)rewardedVideoDidOpen:(NSString *)instanceId { - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdOpenedDemandOnly", MakeStringCopy(instanceId)); - if (pauseGame) { - UnityPause(1); - } -} - -- (void)rewardedVideoDidClose:(NSString *)instanceId { - if (pauseGame) { - UnityPause(0); - } - [self centerBanner]; - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdClosedDemandOnly", MakeStringCopy(instanceId)); -} - -- (void)rewardedVideoDidClick:(NSString *)instanceId { - NSArray *params = @[instanceId]; - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdClickedDemandOnly", MakeStringCopy([self getJsonFromObj:params])); -} - -#pragma mark Interstitial API - -- (void)loadInterstitial { - [IronSource loadInterstitial]; -} - -- (void)showInterstitial { - [IronSource showInterstitialWithViewController:[UIApplication sharedApplication].keyWindow.rootViewController]; -} - -- (void)showInterstitialWithPlacement:(NSString *)placementName { - [IronSource showInterstitialWithViewController:[UIApplication sharedApplication].keyWindow.rootViewController placement:placementName]; -} - -- (BOOL)isInterstitialReady { - return [IronSource hasInterstitial]; -} - -- (BOOL)isInterstitialPlacementCapped:(NSString *)placementName { - return [IronSource isInterstitialCappedForPlacement:placementName]; -} - -#pragma mark Interstitial DemandOnly API - -- (void)loadISDemandOnlyInterstitial:(NSString *)instanceId { - [IronSource loadISDemandOnlyInterstitial:instanceId]; -} - -- (void)showISDemandOnlyInterstitial:(NSString *)instanceId { - [IronSource showISDemandOnlyInterstitial:[UIApplication sharedApplication].keyWindow.rootViewController instanceId:instanceId]; -} - -- (BOOL)isISDemandOnlyInterstitialReady:(NSString *)instanceId { - return [IronSource hasISDemandOnlyInterstitial:instanceId]; -} - -#pragma mark Interstitial Delegate - -- (void)interstitialDidLoad { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdReady", ""); -} - -- (void)interstitialDidFailToLoadWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdLoadFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdLoadFailed",""); -} - -- (void)interstitialDidOpen { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdOpened", ""); - if (pauseGame) { - UnityPause(1); - } -} - -- (void)interstitialDidClose { - if (pauseGame) { - UnityPause(0); - } - [self centerBanner]; - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdClosed", ""); -} - -- (void)interstitialDidShow { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdShowSucceeded", ""); -} - -- (void)interstitialDidFailToShowWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdShowFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdShowFailed",""); -} - -- (void)didClickInterstitial { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdClicked", ""); -} - -#pragma mark Interstitial Level Play Delegate - -- (void)interstitialLevelPlayDidClickWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdClicked", [self getAdInfoData:adInfo].UTF8String); -} - -- (void)interstitialLevelPlayDidCloseWithAdInfo:(nonnull ISAdInfo *)adInfo { - if (pauseGame) { - UnityPause(0); - } - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdClosed", [self getAdInfoData:adInfo].UTF8String); -} - -- (void)interstitialLevelPlayDidFailToLoadWithError:(nonnull NSError *)error { - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdLoadFailed", MakeStringCopy([self parseErrorToEvent:error])); -} - -- (void)interstitialLevelPlayDidFailToShowWithError:(nonnull NSError *)error andAdInfo:(nonnull ISAdInfo *)adInfo { - NSArray *params = @[(error) ? [self parseErrorToEvent:error] : @"" , [self getAdInfoData:adInfo]]; - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdShowFailed", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)interstitialLevelPlayDidLoadWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdReady", [self getAdInfoData:adInfo].UTF8String); -} - -- (void)interstitialLevelPlayDidOpenWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdOpened", [self getAdInfoData:adInfo].UTF8String); - if (pauseGame) { - UnityPause(1); - } -} - -- (void)interstitialLevelPlayDidShowWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_INTERSTITIAL_EVENTS, "onAdShowSucceeded", [self getAdInfoData:adInfo].UTF8String); -} - -#pragma mark Interstitial DemandOnly Delegate - -- (void)interstitialDidLoad:(NSString *)instanceId { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdReadyDemandOnly", MakeStringCopy(instanceId)); -} - -- (void)interstitialDidFailToLoadWithError:(NSError *)error instanceId:(NSString *)instanceId { - NSArray *parameters; - if (error) - parameters = @[instanceId, [self parseErrorToEvent:error]]; - else - parameters = @[instanceId, @""]; - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdLoadFailedDemandOnly",MakeStringCopy([self getJsonFromObj:parameters])); -} - -- (void)interstitialDidOpen:(NSString *)instanceId { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdOpenedDemandOnly", MakeStringCopy(instanceId)); - if (pauseGame) { - UnityPause(1); - } -} - -- (void)interstitialDidClose:(NSString *)instanceId { - if (pauseGame) { - UnityPause(0); - } - [self centerBanner]; - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdClosedDemandOnly", MakeStringCopy(instanceId)); -} - -- (void)interstitialDidShow:(NSString *)instanceId { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdShowSucceededDemandOnly", MakeStringCopy(instanceId)); -} - -- (void)interstitialDidFailToShowWithError:(NSError *)error instanceId:(NSString *)instanceId { - NSArray *parameters; - if (error) - parameters = @[instanceId, [self parseErrorToEvent:error]]; - else - parameters = @[instanceId, @""]; - - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdShowFailedDemandOnly", MakeStringCopy([self getJsonFromObj:parameters])); -} - -- (void)didClickInterstitial:(NSString *)instanceId { - UnitySendMessage(IRONSOURCE_EVENTS, "onInterstitialAdClickedDemandOnly", MakeStringCopy(instanceId)); -} - -#pragma mark Offerwall API - -- (void)showOfferwall { - [IronSource showOfferwallWithViewController:[UIApplication sharedApplication].keyWindow.rootViewController]; -} - -- (void)showOfferwallWithPlacement:(NSString *)placementName { - [IronSource showOfferwallWithViewController:[UIApplication sharedApplication].keyWindow.rootViewController placement:placementName]; -} - -- (void)getOfferwallCredits { - [IronSource offerwallCredits]; -} - -- (BOOL)isOfferwallAvailable { - return [IronSource hasOfferwall]; -} - -#pragma mark Offerwall Delegate - -- (void)offerwallHasChangedAvailability:(BOOL)available { - UnitySendMessage(IRONSOURCE_EVENTS, "onOfferwallAvailable", (available) ? "true" : "false"); -} - -- (void)offerwallDidShow { - UnitySendMessage(IRONSOURCE_EVENTS, "onOfferwallOpened", ""); -} - -- (void)offerwallDidFailToShowWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onOfferwallShowFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onOfferwallShowFailed", ""); -} - -- (void)offerwallDidClose { - [self centerBanner]; - UnitySendMessage(IRONSOURCE_EVENTS, "onOfferwallClosed", ""); -} - -- (BOOL)didReceiveOfferwallCredits:(NSDictionary *)creditInfo { - if(creditInfo) - UnitySendMessage(IRONSOURCE_EVENTS, "onOfferwallAdCredited", [self getJsonFromObj:creditInfo].UTF8String); - - return YES; -} - -- (void)didFailToReceiveOfferwallCreditsWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onGetOfferwallCreditsFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onGetOfferwallCreditsFailed", ""); -} - -#pragma mark ConsentView API - --(void)loadConsentViewWithType:(NSString *)consentViewType { - [IronSource loadConsentViewWithType: consentViewType]; -} - --(void)showConsentViewWithType:(NSString *)consentViewType { - @synchronized(self) { - UIViewController* viewController = [UIApplication sharedApplication].keyWindow.rootViewController; - [IronSource showConsentViewWithViewController:viewController andType:consentViewType]; - } -} - -#pragma mark Banner API - -- (void)loadBanner:(NSString *)description width:(NSInteger)width height:(NSInteger)height position:(NSInteger)position placement:(NSString *)placement adaptive:(bool) isAdaptive { - @synchronized(self) { - _position = position; - ISBannerSize* size = [self getBannerSize:description width:width height:height]; - size.adaptive = isAdaptive; - - _bannerViewController = [UIApplication sharedApplication].keyWindow.rootViewController; - [IronSource loadBannerWithViewController:_bannerViewController size:size placement:placement]; - } -} - -- (void)destroyBanner { - dispatch_async(dispatch_get_main_queue(), ^{ - @synchronized(self) { - if (_bannerView != nil) { - [IronSource destroyBanner:_bannerView]; - _bannerView = nil; - _bannerViewController = nil; - _shouldHideBanner = NO; - } - } - }); -} - -- (void)displayBanner { - _shouldHideBanner = NO; - dispatch_async(dispatch_get_main_queue(), ^{ - @synchronized(self) { - if (_bannerView != nil) { - [_bannerView setHidden:_shouldHideBanner]; - } - } - }); -} - -- (void)hideBanner { - _shouldHideBanner = YES; - dispatch_async(dispatch_get_main_queue(), ^{ - @synchronized(self) { - if (_bannerView != nil) { - [_bannerView setHidden:_shouldHideBanner]; - } - } - }); -} - -- (BOOL)isBannerPlacementCapped:(NSString *)placementName { - return [IronSource isBannerCappedForPlacement:placementName]; -} - -- (ISBannerSize *) getBannerSize:(NSString *)description width:(NSInteger)width height:(NSInteger)height { - if ([description isEqualToString:@"CUSTOM"]) { - return [[ISBannerSize alloc] initWithWidth:width andHeight:height]; - } - if ([description isEqualToString:@"SMART"]) { - return ISBannerSize_SMART; - } - if ([description isEqualToString:@"RECTANGLE"]) { - return ISBannerSize_RECTANGLE; - } - if ([description isEqualToString:@"LARGE"]) { - return ISBannerSize_LARGE; - } - else { - return ISBannerSize_BANNER; - } -} - -#pragma mark Banner Delegate - -- (CGPoint)getBannerCenter:(NSInteger)position rootView:(UIView *)rootView { - CGFloat y; - if (position == BANNER_POSITION_TOP) { - y = (_bannerView.frame.size.height / 2); - if (@available(ios 11.0, *)) { - y += rootView.safeAreaInsets.top; - } - } - else { - y = rootView.frame.size.height - (_bannerView.frame.size.height / 2); - if (@available(ios 11.0, *)) { - y -= rootView.safeAreaInsets.bottom; - } - } - - return CGPointMake(rootView.frame.size.width / 2, y); -} - -- (void)bannerDidLoad:(ISBannerView *)bannerView { - dispatch_async(dispatch_get_main_queue(), ^{ - @synchronized(self) { - _bannerView = bannerView; - [_bannerView setAccessibilityLabel:@"bannerContainer"]; - [_bannerView setHidden:_shouldHideBanner]; - - _bannerView.center = [self getBannerCenter:_position rootView:_bannerViewController.view]; - [_bannerViewController.view addSubview:_bannerView]; - - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdLoaded", ""); - } - }); -} - -- (void)bannerDidFailToLoadWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdLoadFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdLoadFailed", ""); -} - -- (void)didClickBanner { - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdClicked", ""); -} - -- (void)bannerWillPresentScreen { - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdScreenPresented", ""); -} - -- (void)bannerDidDismissScreen { - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdScreenDismissed", ""); -} - -- (void)bannerWillLeaveApplication { - UnitySendMessage(IRONSOURCE_EVENTS, "onBannerAdLeftApplication", ""); -} - - -- (void)centerBanner { - dispatch_async(dispatch_get_main_queue(), ^{ - @synchronized(self) { - if (_bannerView != nil && _bannerViewController != nil) { - _bannerView.center = [self getBannerCenter:_position rootView:_bannerViewController.view]; - } - } - }); -} - -- (void)orientationChanged:(NSNotification *)notification { - [self centerBanner]; -} - -#pragma mark Banner Level Play Delegate - - -- (void)bannerLevelPlayDidClickWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_BANNER_EVENTS, "onAdClicked", [self getAdInfoData:adInfo].UTF8String); - -} - -- (void)bannerLevelPlayDidDismissScreenWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_BANNER_EVENTS, "onAdScreenDismissed", [self getAdInfoData:adInfo].UTF8String); - -} - -- (void)bannerLevelPlayDidFailToLoadWithError:(nonnull NSError *)error { - UnitySendMessage(IRONSOURCE_BANNER_EVENTS, "onAdLoadFailed", (error) ? MakeStringCopy([self parseErrorToEvent:error]):""); -} - -- (void)bannerLevelPlayDidLeaveApplicationWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_BANNER_EVENTS, "onAdLeftApplication", [self getAdInfoData:adInfo].UTF8String); -} - -- (void)bannerLevelPlayDidLoad:(nonnull ISBannerView *)bannerView withAdInfo:(nonnull ISAdInfo *)adInfo { - dispatch_async(dispatch_get_main_queue(), ^{ - @synchronized(self) { - _bannerView = bannerView; - [_bannerView setAccessibilityLabel:@"bannerContainer"]; - [_bannerView setHidden:_shouldHideBanner]; - - _bannerView.center = [self getBannerCenter:_position rootView:_bannerViewController.view]; - [_bannerViewController.view addSubview:_bannerView]; - - UnitySendMessage(IRONSOURCE_BANNER_EVENTS, "onAdLoaded", [self getAdInfoData:adInfo].UTF8String); - } - }); -} - -- (void)bannerLevelPlayDidPresentScreenWithAdInfo:(nonnull ISAdInfo *)adInfo { - UnitySendMessage(IRONSOURCE_BANNER_EVENTS, "onAdScreenPresented", [self getAdInfoData:adInfo].UTF8String); -} - -#pragma mark Helper methods - -- (void) setSegment:(NSString*) segmentJSON { - [IronSource setSegmentDelegate:self]; - ISSegment *segment = [[ISSegment alloc] init]; - NSError* error; - if (!segmentJSON) - return; - - NSData *data = [segmentJSON dataUsingEncoding:NSUTF8StringEncoding]; - if (!data) - return; - - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error]; - - if (!dict) - return; - - NSMutableArray *allKeys = [[dict allKeys] mutableCopy]; - for (id key in allKeys) - { - NSString* keyString = (NSString*)key; - NSString *object = [dict objectForKey: keyString]; - if ([keyString isEqualToString:@"age"]){ - segment.age = [object intValue] ; - } - else if([keyString isEqualToString:@"gender"]){ - if([object caseInsensitiveCompare:@"male"] == NSOrderedSame) - segment.gender = IRONSOURCE_USER_MALE ; - else if([object caseInsensitiveCompare:@"female"] == NSOrderedSame) - segment.gender = IRONSOURCE_USER_FEMALE; - - } - else if ([keyString isEqualToString:@"level"]){ - segment.level = [object intValue]; - } - else if ([keyString isEqualToString:@"isPaying"]){ - segment.paying = [object boolValue]; - } - else if ([keyString isEqualToString:@"userCreationDate"]){ - NSDate *date = [NSDate dateWithTimeIntervalSince1970: [object longLongValue]/1000]; - segment.userCreationDate = date; - - } - else if ([keyString isEqualToString:@"segmentName"]){ - segment.segmentName = object; - - } else if ([keyString isEqualToString:@"iapt"]){ - segment.iapTotal = [object doubleValue]; - } - else{ - [segment setCustomValue:object forKey:keyString]; - } - - } - - [IronSource setSegment:segment]; -} - -- (void)didReceiveSegement:(NSString *)segment{ - UnitySendMessage(IRONSOURCE_EVENTS, "onSegmentReceived", MakeStringCopy(segment)); -} - -- (NSString *)parseErrorToEvent:(NSError *)error{ - if (error){ - NSString* codeStr = [NSString stringWithFormat:@"%ld", (long)[error code]]; - - NSDictionary *dict = @{@"error_description": [error localizedDescription], - @"error_code": codeStr}; - - return [self getJsonFromObj:dict]; - } - return nil; -} - -- (NSString *)getJsonFromObj:(id)obj { - NSError *error; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:obj options:0 error:&error]; - if (!jsonData) { - NSLog(@"Got an error: %@", error); - return @""; - } else { - NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; - return jsonString; - } -} - -- (NSString *) getAdInfoData:(ISAdInfo *) adinfo{ - if (adinfo!=nil) { - NSString *adInfoString = [NSString stringWithFormat:@"%@", adinfo]; - return adInfoString; - } - return EMPTY_STRING; -} - -#pragma mark ImpressionData Delegate - -- (void)impressionDataDidSucceed:(ISImpressionData *)impressionData { - if (backgroundCallback!=nil) { - const char * serializedParameters = [self getJsonFromObj:[impressionData all_data]].UTF8String; - backgroundCallback(serializedParameters); - } - UnitySendMessage(IRONSOURCE_EVENTS, "onImpressionSuccess", [self getJsonFromObj:[impressionData all_data]].UTF8String); - -} - -#pragma mark ConsentView Delegate - -- (void)consentViewDidAccept:(NSString *)consentViewType { - UnitySendMessage(IRONSOURCE_EVENTS, "onConsentViewDidAccept", MakeStringCopy(consentViewType)); -} - -- (void)consentViewDidDismiss:(NSString *)consentViewType { - UnitySendMessage(IRONSOURCE_EVENTS, "onConsentViewDidDismiss", MakeStringCopy(consentViewType)); -} - -- (void)consentViewDidFailToLoadWithError:(NSError *)error consentViewType:(NSString *)consentViewType { - NSArray *params; - if (error) - params = @[consentViewType, [self parseErrorToEvent:error]]; - else - params = @[consentViewType, @""]; - - UnitySendMessage(IRONSOURCE_EVENTS, "onConsentViewDidFailToLoadWithError", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)consentViewDidLoadSuccess:(NSString *)consentViewType { - UnitySendMessage(IRONSOURCE_EVENTS, "onConsentViewDidLoadSuccess", MakeStringCopy(consentViewType)); -} - -- (void)consentViewDidFailToShowWithError:(NSError *)error consentViewType:(NSString *)consentViewType { - NSArray *params; - if (error) - params = @[consentViewType, [self parseErrorToEvent:error]]; - else - params = @[consentViewType, @""]; - - UnitySendMessage(IRONSOURCE_EVENTS, "onConsentViewDidFailToShowWithError", MakeStringCopy([self getJsonFromObj:params])); -} - -- (void)consentViewDidShowSuccess:(NSString *)consentViewType { - UnitySendMessage(IRONSOURCE_EVENTS, "onConsentViewDidShowSuccess", MakeStringCopy(consentViewType)); -} - -#pragma mark ConversionValue API - --(const char *) getConversionValue { - NSNumber *conversionValue = [IronSource getConversionValue]; - char *res = MakeStringCopy([conversionValue stringValue]); - return res; -} - -#pragma mark ILRD API -- (void)setAdRevenueData:(NSString *)dataSource impressionData:(NSData *)impressionData { - [IronSource setAdRevenueDataWithDataSource:dataSource impressionData:impressionData]; -} - -#pragma mark TestSuite API -- (void)launchTestSuite { - [IronSource launchTestSuite:[UIApplication sharedApplication].keyWindow.rootViewController]; -} - -#pragma mark - C Section - -#ifdef __cplusplus -extern "C" { -#endif - - void RegisterCallback(ISUnityBackgroundCallback func){ - backgroundCallback=func; - } - void RegisterPauseGameFunction(bool func){ - pauseGame=func; - } - - void CFSetPluginData(const char *pluginType, const char *pluginVersion, const char *pluginFrameworkVersion){ - [[iOSBridge start] setPluginDataWithType:GetStringParam(pluginType) pluginVersion:GetStringParam(pluginVersion) pluginFrameworkVersion:GetStringParam(pluginFrameworkVersion)]; - } - - const char *CFGetAdvertiserId(){ - return [[iOSBridge start] getAdvertiserId]; - } - - void CFValidateIntegration(){ - [[iOSBridge start] validateIntegration]; - } - - void CFShouldTrackNetworkState(bool flag){ - [[iOSBridge start] shouldTrackNetworkState:flag]; - } - - bool CFSetDynamicUserId(char *dynamicUserId){ - return [[iOSBridge start] setDynamicUserId:GetStringParam(dynamicUserId)]; - } - - void CFSetAdaptersDebug(bool enabled){ - [[iOSBridge start] setAdaptersDebug:enabled]; - } - - void CFSetUserId(char *userId){ - return [[iOSBridge start] setUserId:GetStringParam(userId)]; - } - - void CFSetConsent (bool consent) { - [[iOSBridge start] setConsent:consent]; - } - - void CFSetMetaData (char *key, char *value) { - [[iOSBridge start] setMetaDataWithKey:GetStringParam(key) value:GetStringParam(value)]; - } - - void CFSetMetaDataWithValues (char *key,const char *values[]) { - NSMutableArray *valuesArray = [NSMutableArray new]; - if(values != nil ) { - int i = 0; - - while (values[i] != nil) { - [valuesArray addObject: [NSString stringWithCString: values[i] encoding:NSASCIIStringEncoding]]; - i++; - } - - [[iOSBridge start] setMetaDataWithKey:GetStringParam(key) values:valuesArray]; - } - } - - void CFSetManualLoadRewardedVideo(bool isOn) { - [[iOSBridge start] setManualLoadRewardedVideo:isOn]; - } - - void CFSetNetworkData (char *networkKey, char *networkData) { - [[iOSBridge start] setNetworkData:GetStringParam(networkKey) data:GetStringParam(networkData)]; - } - -#pragma mark Init SDK - - void CFInit(const char *appKey){ - [[iOSBridge start] initWithAppKey:GetStringParam(appKey)]; - } - - void CFInitWithAdUnits(const char *appKey, const char *adUnits[]){ - NSMutableArray *adUnitsArray = [NSMutableArray new]; - - if(adUnits != nil ) { - int i = 0; - - while (adUnits[i] != nil) { - [adUnitsArray addObject: [NSString stringWithCString: adUnits[i] encoding:NSASCIIStringEncoding]]; - i++; - } - - [[iOSBridge start] initWithAppKey:GetStringParam(appKey) adUnits:adUnitsArray]; - } - } - - void CFInitISDemandOnly(const char *appKey, const char *adUnits[]){ - NSMutableArray *adUnitsArray = [NSMutableArray new]; - - if(adUnits != nil ) { - int i = 0; - - while (adUnits[i] != nil) { - [adUnitsArray addObject: [NSString stringWithCString: adUnits[i] encoding:NSASCIIStringEncoding]]; - i++; - } - [[iOSBridge start] initISDemandOnly:GetStringParam(appKey) adUnits:adUnitsArray]; - } - } - -#pragma mark RewardedVideo API - - void CFLoadRewardedVideo() { - [[iOSBridge start] loadRewardedVideo]; - } - - void CFShowRewardedVideo(){ - [[iOSBridge start] showRewardedVideo]; - } - - void CFShowRewardedVideoWithPlacementName(char *placementName){ - [[iOSBridge start] showRewardedVideoWithPlacement:GetStringParam(placementName)]; - } - - const char *CFGetPlacementInfo(char *placementName){ - return [[iOSBridge start] getPlacementInfo:GetStringParam(placementName)]; - } - - bool CFIsRewardedVideoAvailable(){ - return [[iOSBridge start] isRewardedVideoAvailable]; - } - - bool CFIsRewardedVideoPlacementCapped(char *placementName){ - return [[iOSBridge start] isRewardedVideoPlacementCapped:GetStringParam(placementName)]; - } - - void CFSetRewardedVideoServerParameters(char *jsonString) { - NSData *data = [GetStringParam(jsonString) dataUsingEncoding:NSUTF8StringEncoding]; - if (!data) { - return; - } - - NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil]; - if (dict) { - [[iOSBridge start] setRewardedVideoServerParameters:dict]; - } - } - - void CFClearRewardedVideoServerParameters() { - [[iOSBridge start] clearRewardedVideoServerParameters]; - } - -#pragma mark RewardedVideo DemandOnly API - - void CFShowISDemandOnlyRewardedVideo(char * instanceId){ - [[iOSBridge start] showISDemandOnlyRewardedVideo:GetStringParam(instanceId)]; - } - - void CFLoadISDemandOnlyRewardedVideo(char * instanceId) { - [[iOSBridge start] loadISDemandOnlyRewardedVideo:GetStringParam(instanceId)]; - } - - bool CFIsDemandOnlyRewardedVideoAvailable(char * instanceId) { - return [[iOSBridge start] isDemandOnlyRewardedVideoAvailable:GetStringParam(instanceId)]; - } - -#pragma mark Interstitial API - - void CFLoadInterstitial(){ - [[iOSBridge start] loadInterstitial]; - } - - void CFShowInterstitial(){ - [[iOSBridge start] showInterstitial]; - } - - void CFShowInterstitialWithPlacementName(char *placementName){ - [[iOSBridge start] showInterstitialWithPlacement:GetStringParam(placementName)]; - } - - bool CFIsInterstitialReady(){ - return [[iOSBridge start] isInterstitialReady]; - } - - bool CFIsInterstitialPlacementCapped(char *placementName){ - return [[iOSBridge start] isInterstitialPlacementCapped:GetStringParam(placementName)]; - } - -#pragma mark Interstitial DemandOnly API - - void CFLoadISDemandOnlyInterstitial(char * instanceId) { - [[iOSBridge start] loadISDemandOnlyInterstitial:GetStringParam(instanceId)]; - } - - void CFShowISDemandOnlyInterstitial(char * instanceId) { - [[iOSBridge start] showISDemandOnlyInterstitial:GetStringParam(instanceId)]; - - } - - bool CFIsDemandOnlyInterstitialReady(char * instanceId) { - return [[iOSBridge start] isISDemandOnlyInterstitialReady:GetStringParam(instanceId)]; - } - -#pragma mark Offerwall API - - void CFShowOfferwall(){ - [[iOSBridge start] showOfferwall]; - } - - void CFShowOfferwallWithPlacementName(char *placementName){ - [[iOSBridge start] showOfferwallWithPlacement:GetStringParam(placementName)]; - } - - void CFGetOfferwallCredits(){ - [[iOSBridge start] getOfferwallCredits]; - } - - bool CFIsOfferwallAvailable(){ - return [[iOSBridge start] isOfferwallAvailable]; - } - -#pragma mark Banner API - - void CFLoadBanner(char* description, int width, int height, int position, char* placementName, bool isAdaptive){ - [[iOSBridge start] loadBanner:GetStringParam(description) width:width height:height position:position placement:GetStringParam(placementName) adaptive:isAdaptive]; - } - - void CFDestroyBanner (){ - [[iOSBridge start] destroyBanner]; - } - - void CFDisplayBanner (){ - [[iOSBridge start] displayBanner]; - } - - void CFHideBanner (){ - [[iOSBridge start] hideBanner]; - } - - bool CFIsBannerPlacementCapped (char *placementName){ - return [[iOSBridge start] isBannerPlacementCapped:GetStringParam(placementName)]; - } - -#pragma mark Segment API - - void CFSetSegment (char* jsonString) { - [[iOSBridge start] setSegment:GetStringParam(jsonString)]; - } - -#pragma mark ConsentView API - - void CFLoadConsentViewWithType (char* consentViewType){ - [[iOSBridge start] loadConsentViewWithType:GetStringParam(consentViewType)]; - } - - void CFShowConsentViewWithType (char* consentViewType){ - [[iOSBridge start] showConsentViewWithType:GetStringParam(consentViewType)]; - } - -#pragma mark ConversionValue API - - const char *CFGetConversionValue(){ - return [[iOSBridge start] getConversionValue]; - } - -#pragma mark ILRD API - void CFSetAdRevenueData(char* datasource,char* impressiondata){ - NSData *data=[GetStringParam(impressiondata)dataUsingEncoding:NSUTF8StringEncoding]; - if (!data) { - return; - } - return [[iOSBridge start] setAdRevenueData:GetStringParam(datasource)impressionData:data]; - } - -#pragma mark TestSuite API - void CFLaunchTestSuite(){ - [[iOSBridge start] launchTestSuite]; - } - -#pragma mark - ISRewardedVideoManualDelegate methods - - - - (void)rewardedVideoDidLoad { - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdReady", ""); - } - - - (void)rewardedVideoDidFailToLoadWithError:(NSError *)error { - if (error) - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdLoadFailed", MakeStringCopy([self parseErrorToEvent:error])); - else - UnitySendMessage(IRONSOURCE_EVENTS, "onRewardedVideoAdLoadFailed",""); - - } - - -#ifdef __cplusplus -} -#endif - -@end - diff --git a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.m.meta b/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.m.meta deleted file mode 100644 index 92f41764f..000000000 --- a/Assets/ThirdParty/IronSource/Plugins/iOS/iOSBridge.m.meta +++ /dev/null @@ -1,37 +0,0 @@ -fileFormatVersion: 2 -guid: c024270438f4d434cbc1a2a03d75c299 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/IronSource/Scripts/IronSource.cs b/Assets/ThirdParty/IronSource/Scripts/IronSource.cs index 67951396a..687c79d34 100644 --- a/Assets/ThirdParty/IronSource/Scripts/IronSource.cs +++ b/Assets/ThirdParty/IronSource/Scripts/IronSource.cs @@ -16,8 +16,8 @@ public class IronSource : IronSourceIAgent { #if UNITY_EDITOR || UNITY_STANDALONE _platformAgent = new UnsupportedPlatformAgent(); -#elif (UNITY_IPHONE || UNITY_IOS) - _platformAgent = new iOSAgent(); +// #elif (UNITY_IPHONE || UNITY_IOS) + // _platformAgent = new iOSAgent(); #elif UNITY_ANDROID _platformAgent = new AndroidAgent (); #endif diff --git a/Assets/ThirdParty/IronSource/Scripts/IronSourceConfig.cs b/Assets/ThirdParty/IronSource/Scripts/IronSourceConfig.cs index a43dc35ee..41d93eb7b 100644 --- a/Assets/ThirdParty/IronSource/Scripts/IronSourceConfig.cs +++ b/Assets/ThirdParty/IronSource/Scripts/IronSourceConfig.cs @@ -53,46 +53,46 @@ public class IronSourceConfig } - #elif (UNITY_IPHONE || UNITY_IOS) && !UNITY_EDITOR - [DllImport("__Internal")] - private static extern void CFSetLanguage (string language); + // #elif (UNITY_IPHONE || UNITY_IOS) && !UNITY_EDITOR + // [DllImport("__Internal")] + // private static extern void CFSetLanguage (string language); - [DllImport("__Internal")] - private static extern void CFSetClientSideCallbacks (bool useClientSideCallbacks); + // [DllImport("__Internal")] + // private static extern void CFSetClientSideCallbacks (bool useClientSideCallbacks); - [DllImport("__Internal")] - private static extern void CFSetRewardedVideoCustomParams (string rewardedVideoCustomParams); + // [DllImport("__Internal")] + // private static extern void CFSetRewardedVideoCustomParams (string rewardedVideoCustomParams); - [DllImport("__Internal")] - private static extern void CFSetOfferwallCustomParams (string offerwallCustomParams); + // [DllImport("__Internal")] + // private static extern void CFSetOfferwallCustomParams (string offerwallCustomParams); - public void setLanguage (string language) - { - CFSetLanguage (language); - } + // public void setLanguage (string language) + // { + // CFSetLanguage (language); + // } - public void setClientSideCallbacks (bool status) - { - CFSetClientSideCallbacks (status); - } + // public void setClientSideCallbacks (bool status) + // { + // CFSetClientSideCallbacks (status); + // } - public void setRewardedVideoCustomParams (Dictionary rewardedVideoCustomParams) - { - string json = IronSourceJSON.Json.Serialize (rewardedVideoCustomParams); - CFSetRewardedVideoCustomParams (json); - } + // public void setRewardedVideoCustomParams (Dictionary rewardedVideoCustomParams) + // { + // string json = IronSourceJSON.Json.Serialize (rewardedVideoCustomParams); + // CFSetRewardedVideoCustomParams (json); + // } - public void setOfferwallCustomParams (Dictionary offerwallCustomParams) - { - string json = IronSourceJSON.Json.Serialize (offerwallCustomParams); - CFSetOfferwallCustomParams (json); - } + // public void setOfferwallCustomParams (Dictionary offerwallCustomParams) + // { + // string json = IronSourceJSON.Json.Serialize (offerwallCustomParams); + // CFSetOfferwallCustomParams (json); + // } - public IronSourceConfig () - { + // public IronSourceConfig () + // { - } + // } #else diff --git a/Assets/ThirdParty/IronSource/Scripts/IronSourceEvents.cs b/Assets/ThirdParty/IronSource/Scripts/IronSourceEvents.cs index 5b35599ee..d779fc801 100644 --- a/Assets/ThirdParty/IronSource/Scripts/IronSourceEvents.cs +++ b/Assets/ThirdParty/IronSource/Scripts/IronSourceEvents.cs @@ -7,12 +7,12 @@ using System.Runtime.InteropServices; public class IronSourceEvents : MonoBehaviour { -#if UNITY_IPHONE || UNITY_IOS - delegate void ISUnityBackgroundCallback(string args); - [DllImport("__Internal")] - static extern void RegisterCallback(ISUnityBackgroundCallback func); +// #if UNITY_IPHONE || UNITY_IOS +// delegate void ISUnityBackgroundCallback(string args); +// [DllImport("__Internal")] +// static extern void RegisterCallback(ISUnityBackgroundCallback func); -#endif +// #endif #if UNITY_ANDROID #pragma warning disable CS0067 @@ -151,11 +151,11 @@ public class IronSourceEvents : MonoBehaviour #endif -#if UNITY_IPHONE || UNITY_IOS - #if !UNITY_EDITOR - RegisterCallback(FireCallback); - #endif -#endif +// #if UNITY_IPHONE || UNITY_IOS +// #if !UNITY_EDITOR +// RegisterCallback(FireCallback); +// #endif +// #endif gameObject.name = "IronSourceEvents"; //Change the GameObject name to IronSourceEvents. DontDestroyOnLoad(gameObject); //Makes the object not be destroyed automatically when loading a new scene. } @@ -709,18 +709,18 @@ public class IronSourceEvents : MonoBehaviour #if !UNITY_ANDROID -#if UNITY_IPHONE || UNITY_IOS +// #if UNITY_IPHONE || UNITY_IOS - [AOT.MonoPInvokeCallback(typeof(ISUnityBackgroundCallback))] - public static void FireCallback(string args) - { - if (onImpressionDataReadyEvent != null) - { - InvokeEvent(onImpressionDataReadyEvent, args); - } - } -#endif +// [AOT.MonoPInvokeCallback(typeof(ISUnityBackgroundCallback))] +// public static void FireCallback(string args) +// { +// if (onImpressionDataReadyEvent != null) +// { +// InvokeEvent(onImpressionDataReadyEvent, args); +// } +// } +// #endif // ******************************* Init Event ******************************* diff --git a/Assets/ThirdParty/IronSource/Scripts/iOSAgent.cs b/Assets/ThirdParty/IronSource/Scripts/iOSAgent.cs index 73b25072a..4c02b6bf2 100644 --- a/Assets/ThirdParty/IronSource/Scripts/iOSAgent.cs +++ b/Assets/ThirdParty/IronSource/Scripts/iOSAgent.cs @@ -7,502 +7,502 @@ using System.Linq; using System; using System.Globalization; -public class iOSAgent : IronSourceIAgent -{ - [DllImport("__Internal")] - private static extern void CFSetPluginData(string pluginType, string pluginVersion, string pluginFrameworkVersion); +// public class iOSAgent : IronSourceIAgent +// { + // [DllImport("__Internal")] + // private static extern void CFSetPluginData(string pluginType, string pluginVersion, string pluginFrameworkVersion); - [DllImport("__Internal")] - private static extern string CFGetAdvertiserId(); + // [DllImport("__Internal")] + // private static extern string CFGetAdvertiserId(); - [DllImport("__Internal")] - private static extern void CFValidateIntegration(); + // [DllImport("__Internal")] + // private static extern void CFValidateIntegration(); - [DllImport("__Internal")] - private static extern void CFShouldTrackNetworkState(bool track); + // [DllImport("__Internal")] + // private static extern void CFShouldTrackNetworkState(bool track); - [DllImport("__Internal")] - private static extern bool CFSetDynamicUserId(string dynamicUserId); + // [DllImport("__Internal")] + // private static extern bool CFSetDynamicUserId(string dynamicUserId); - [DllImport("__Internal")] - private static extern void CFSetAdaptersDebug(bool enabled); + // [DllImport("__Internal")] + // private static extern void CFSetAdaptersDebug(bool enabled); - [DllImport("__Internal")] - private static extern void CFSetMetaData(string key, string value); + // [DllImport("__Internal")] + // private static extern void CFSetMetaData(string key, string value); - [DllImport("__Internal")] - private static extern void CFSetMetaDataWithValues(string key, params string[] values); + // [DllImport("__Internal")] + // private static extern void CFSetMetaDataWithValues(string key, params string[] values); - [DllImport("__Internal")] - private static extern string CFGetConversionValue(); + // [DllImport("__Internal")] + // private static extern string CFGetConversionValue(); - [DllImport("__Internal")] - private static extern void CFSetManualLoadRewardedVideo(bool isOn); + // [DllImport("__Internal")] + // private static extern void CFSetManualLoadRewardedVideo(bool isOn); - [DllImport("__Internal")] - private static extern void CFSetNetworkData(string networkKey, string networkData); + // [DllImport("__Internal")] + // private static extern void CFSetNetworkData(string networkKey, string networkData); - delegate void ISUnityPauseGame(bool pause); - [DllImport("__Internal")] - private static extern void RegisterPauseGameFunction(bool pasue); + // delegate void ISUnityPauseGame(bool pause); + // [DllImport("__Internal")] + // private static extern void RegisterPauseGameFunction(bool pasue); - //******************* SDK Init *******************// + // //******************* SDK Init *******************// - [DllImport("__Internal")] - private static extern void CFSetUserId(string userId); + // [DllImport("__Internal")] + // private static extern void CFSetUserId(string userId); - [DllImport("__Internal")] - private static extern void CFInit(string appKey); + // [DllImport("__Internal")] + // private static extern void CFInit(string appKey); - [DllImport("__Internal")] - private static extern void CFInitWithAdUnits(string appKey, params string[] adUnits); + // [DllImport("__Internal")] + // private static extern void CFInitWithAdUnits(string appKey, params string[] adUnits); - [DllImport("__Internal")] - private static extern void CFInitISDemandOnly(string appKey, params string[] adUnits); + // [DllImport("__Internal")] + // private static extern void CFInitISDemandOnly(string appKey, params string[] adUnits); - //******************* RewardedVideo API *******************// + // //******************* RewardedVideo API *******************// - [DllImport("__Internal")] - private static extern void CFLoadRewardedVideo(); + // [DllImport("__Internal")] + // private static extern void CFLoadRewardedVideo(); - [DllImport("__Internal")] - private static extern void CFShowRewardedVideo(); + // [DllImport("__Internal")] + // private static extern void CFShowRewardedVideo(); - [DllImport("__Internal")] - private static extern void CFShowRewardedVideoWithPlacementName(string placementName); + // [DllImport("__Internal")] + // private static extern void CFShowRewardedVideoWithPlacementName(string placementName); - [DllImport("__Internal")] - private static extern bool CFIsRewardedVideoAvailable(); + // [DllImport("__Internal")] + // private static extern bool CFIsRewardedVideoAvailable(); - [DllImport("__Internal")] - private static extern bool CFIsRewardedVideoPlacementCapped(string placementName); + // [DllImport("__Internal")] + // private static extern bool CFIsRewardedVideoPlacementCapped(string placementName); - [DllImport("__Internal")] - private static extern string CFGetPlacementInfo(string placementName); + // [DllImport("__Internal")] + // private static extern string CFGetPlacementInfo(string placementName); - [DllImport("__Internal")] - private static extern void CFSetRewardedVideoServerParameters(string jsonString); + // [DllImport("__Internal")] + // private static extern void CFSetRewardedVideoServerParameters(string jsonString); - [DllImport("__Internal")] - private static extern void CFClearRewardedVideoServerParameters(); + // [DllImport("__Internal")] + // private static extern void CFClearRewardedVideoServerParameters(); - //******************* RewardedVideo DemandOnly API *******************// + // //******************* RewardedVideo DemandOnly API *******************// - [DllImport("__Internal")] - private static extern void CFShowISDemandOnlyRewardedVideo(string instanceId); + // [DllImport("__Internal")] + // private static extern void CFShowISDemandOnlyRewardedVideo(string instanceId); - [DllImport("__Internal")] - private static extern void CFLoadISDemandOnlyRewardedVideo(string instanceId); + // [DllImport("__Internal")] + // private static extern void CFLoadISDemandOnlyRewardedVideo(string instanceId); - [DllImport("__Internal")] - private static extern bool CFIsDemandOnlyRewardedVideoAvailable(string instanceId); + // [DllImport("__Internal")] + // private static extern bool CFIsDemandOnlyRewardedVideoAvailable(string instanceId); - //******************* Interstitial API *******************// + // //******************* Interstitial API *******************// - [DllImport("__Internal")] - private static extern void CFLoadInterstitial(); + // [DllImport("__Internal")] + // private static extern void CFLoadInterstitial(); - [DllImport("__Internal")] - private static extern void CFShowInterstitial(); + // [DllImport("__Internal")] + // private static extern void CFShowInterstitial(); - [DllImport("__Internal")] - private static extern void CFShowInterstitialWithPlacementName(string placementName); + // [DllImport("__Internal")] + // private static extern void CFShowInterstitialWithPlacementName(string placementName); - [DllImport("__Internal")] - private static extern bool CFIsInterstitialReady(); + // [DllImport("__Internal")] + // private static extern bool CFIsInterstitialReady(); - [DllImport("__Internal")] - private static extern bool CFIsInterstitialPlacementCapped(string placementName); + // [DllImport("__Internal")] + // private static extern bool CFIsInterstitialPlacementCapped(string placementName); - //******************* Interstitial DemandOnly API *******************// + // //******************* Interstitial DemandOnly API *******************// - [DllImport("__Internal")] - private static extern void CFLoadISDemandOnlyInterstitial(string instanceId); + // [DllImport("__Internal")] + // private static extern void CFLoadISDemandOnlyInterstitial(string instanceId); - [DllImport("__Internal")] - private static extern void CFShowISDemandOnlyInterstitial(string instanceId); + // [DllImport("__Internal")] + // private static extern void CFShowISDemandOnlyInterstitial(string instanceId); - [DllImport("__Internal")] - private static extern bool CFIsDemandOnlyInterstitialReady(string instanceId); + // [DllImport("__Internal")] + // private static extern bool CFIsDemandOnlyInterstitialReady(string instanceId); - //******************* Offerwall API *******************// + // //******************* Offerwall API *******************// - [DllImport("__Internal")] - private static extern void CFShowOfferwall(); + // [DllImport("__Internal")] + // private static extern void CFShowOfferwall(); - [DllImport("__Internal")] - private static extern void CFShowOfferwallWithPlacementName(string placementName); + // [DllImport("__Internal")] + // private static extern void CFShowOfferwallWithPlacementName(string placementName); - [DllImport("__Internal")] - private static extern void CFGetOfferwallCredits(); + // [DllImport("__Internal")] + // private static extern void CFGetOfferwallCredits(); - [DllImport("__Internal")] - private static extern bool CFIsOfferwallAvailable(); + // [DllImport("__Internal")] + // private static extern bool CFIsOfferwallAvailable(); - //******************* Banner API *******************// + // //******************* Banner API *******************// - [DllImport("__Internal")] - private static extern void CFLoadBanner(string description, int width, int height, int position, string placementName, bool isAdaptive); + // [DllImport("__Internal")] + // private static extern void CFLoadBanner(string description, int width, int height, int position, string placementName, bool isAdaptive); - [DllImport("__Internal")] - private static extern void CFDestroyBanner(); + // [DllImport("__Internal")] + // private static extern void CFDestroyBanner(); - [DllImport("__Internal")] - private static extern void CFDisplayBanner(); + // [DllImport("__Internal")] + // private static extern void CFDisplayBanner(); - [DllImport("__Internal")] - private static extern void CFHideBanner(); + // [DllImport("__Internal")] + // private static extern void CFHideBanner(); - [DllImport("__Internal")] - private static extern bool CFIsBannerPlacementCapped(string placementName); + // [DllImport("__Internal")] + // private static extern bool CFIsBannerPlacementCapped(string placementName); - [DllImport("__Internal")] - private static extern void CFSetSegment(string json); + // [DllImport("__Internal")] + // private static extern void CFSetSegment(string json); - [DllImport("__Internal")] - private static extern void CFSetConsent(bool consent); + // [DllImport("__Internal")] + // private static extern void CFSetConsent(bool consent); - //******************* ConsentView API *******************// + // //******************* ConsentView API *******************// - [DllImport("__Internal")] - private static extern void CFLoadConsentViewWithType(string consentViewType); + // [DllImport("__Internal")] + // private static extern void CFLoadConsentViewWithType(string consentViewType); - [DllImport("__Internal")] - private static extern void CFShowConsentViewWithType(string consentViewType); + // [DllImport("__Internal")] + // private static extern void CFShowConsentViewWithType(string consentViewType); - //******************* ILRD API *******************// + // //******************* ILRD API *******************// - [DllImport("__Internal")] - private static extern void CFSetAdRevenueData(string dataSource, string impressionData); + // [DllImport("__Internal")] + // private static extern void CFSetAdRevenueData(string dataSource, string impressionData); - //******************* TestSuite API *******************// + // //******************* TestSuite API *******************// - [DllImport("__Internal")] - private static extern void CFLaunchTestSuite(); + // [DllImport("__Internal")] + // private static extern void CFLaunchTestSuite(); - public iOSAgent() - { - } + // public iOSAgent() + // { + // } - #region IronSourceIAgent implementation + // #region IronSourceIAgent implementation - //******************* Base API *******************// + // //******************* Base API *******************// - public void onApplicationPause(bool pause) - { + // public void onApplicationPause(bool pause) + // { - } + // } - public string getAdvertiserId() - { - return CFGetAdvertiserId(); - } + // public string getAdvertiserId() + // { + // return CFGetAdvertiserId(); + // } - public void validateIntegration() - { - CFValidateIntegration(); - } + // public void validateIntegration() + // { + // CFValidateIntegration(); + // } - public void shouldTrackNetworkState(bool track) - { - CFShouldTrackNetworkState(track); - } + // public void shouldTrackNetworkState(bool track) + // { + // CFShouldTrackNetworkState(track); + // } - public bool setDynamicUserId(string dynamicUserId) - { - return CFSetDynamicUserId(dynamicUserId); - } + // public bool setDynamicUserId(string dynamicUserId) + // { + // return CFSetDynamicUserId(dynamicUserId); + // } - public void setAdaptersDebug(bool enabled) - { - CFSetAdaptersDebug(enabled); - } + // public void setAdaptersDebug(bool enabled) + // { + // CFSetAdaptersDebug(enabled); + // } - public void setMetaData(string key, params string[] values) - { - CFSetMetaDataWithValues(key, values); - } + // public void setMetaData(string key, params string[] values) + // { + // CFSetMetaDataWithValues(key, values); + // } - public void setMetaData(string key, string value) - { - CFSetMetaData(key, value); - } - - public int? getConversionValue() - { - CultureInfo invCulture = CultureInfo.InvariantCulture; - int parsedInt; - if (int.TryParse(string.Format(invCulture, "{0}", CFGetConversionValue()), NumberStyles.Any, invCulture, out parsedInt)) - { - return parsedInt; - } - - return null; - } - - public void setManualLoadRewardedVideo(bool isOn) - { - CFSetManualLoadRewardedVideo(isOn); - } - - public void setNetworkData(string networkKey, string networkData) - { - CFSetNetworkData(networkKey, networkData); - } - - [AOT.MonoPInvokeCallback(typeof(ISUnityPauseGame))] - public void SetPauseGame(bool pause) - { - RegisterPauseGameFunction(pause); - if (pause) - { - setMetaData("IS_PAUSE_GAME_FLAG", "true"); - } - else - { - setMetaData("IS_PAUSE_GAME_FLAG", "false"); - } - } - - //******************* SDK Init *******************// - - public void setUserId(string userId) - { - CFSetUserId(userId); - } - - public void init(string appKey) - { - CFSetPluginData("Unity", IronSource.pluginVersion(), IronSource.unityVersion()); - Debug.Log("IntegrationHelper pluginVersion: " + IronSource.pluginVersion()); - CFInit(appKey); - } - - public void init(string appKey, params string[] adUnits) - { - CFSetPluginData("Unity", IronSource.pluginVersion(), IronSource.unityVersion()); - Debug.Log("IntegrationHelper pluginVersion: " + IronSource.pluginVersion()); - CFInitWithAdUnits(appKey, adUnits); - } - - public void initISDemandOnly(string appKey, params string[] adUnits) - { - CFSetPluginData("Unity", IronSource.pluginVersion(), IronSource.unityVersion()); - Debug.Log("IntegrationHelper pluginVersion: " + IronSource.pluginVersion()); - CFInitISDemandOnly(appKey, adUnits); - } - - //******************* RewardedVideo API *******************// - - public void loadRewardedVideo() - { - CFLoadRewardedVideo(); - } - - public void showRewardedVideo() - { - CFShowRewardedVideo(); - } - - public void showRewardedVideo(string placementName) - { - CFShowRewardedVideoWithPlacementName(placementName); - } - - public bool isRewardedVideoAvailable() - { - return CFIsRewardedVideoAvailable(); - } - - public bool isRewardedVideoPlacementCapped(string placementName) - { - return CFIsRewardedVideoPlacementCapped(placementName); - } - - public IronSourcePlacement getPlacementInfo(string placementName) - { - IronSourcePlacement sp = null; - - string spString = CFGetPlacementInfo(placementName); - if (spString != null) - { - Dictionary spDic = IronSourceJSON.Json.Deserialize(spString) as Dictionary; - string pName = spDic["placement_name"].ToString(); - string rewardName = spDic["reward_name"].ToString(); - int rewardAmount = Convert.ToInt32(spDic["reward_amount"].ToString()); - sp = new IronSourcePlacement(pName, rewardName, rewardAmount); - } - - return sp; - } - - public void setRewardedVideoServerParams(Dictionary parameters) - { - string json = IronSourceJSON.Json.Serialize(parameters); - CFSetRewardedVideoServerParameters(json); - } - - public void clearRewardedVideoServerParams() - { - CFClearRewardedVideoServerParameters(); - } - - //******************* RewardedVideo DemandOnly API *******************// - - public void showISDemandOnlyRewardedVideo(string instanceId) - { - CFShowISDemandOnlyRewardedVideo(instanceId); - } - - public void loadISDemandOnlyRewardedVideo(string instanceId) - { - CFLoadISDemandOnlyRewardedVideo(instanceId); - } - - public bool isISDemandOnlyRewardedVideoAvailable(string instanceId) - { - return CFIsDemandOnlyRewardedVideoAvailable(instanceId); - } - - //******************* Interstitial API *******************// - - public void loadInterstitial() - { - CFLoadInterstitial(); - } - - public void showInterstitial() - { - CFShowInterstitial(); - } - - public void showInterstitial(string placementName) - { - CFShowInterstitialWithPlacementName(placementName); - } - - public bool isInterstitialReady() - { - return CFIsInterstitialReady(); - } - - public bool isInterstitialPlacementCapped(string placementName) - { - return CFIsInterstitialPlacementCapped(placementName); - } - - //******************* Interstitial DemandOnly API *******************// - - public void loadISDemandOnlyInterstitial(string instanceId) - { - CFLoadISDemandOnlyInterstitial(instanceId); - } - - public void showISDemandOnlyInterstitial(string instanceId) - { - CFShowISDemandOnlyInterstitial(instanceId); - } - - public bool isISDemandOnlyInterstitialReady(string instanceId) - { - return CFIsDemandOnlyInterstitialReady(instanceId); - } - - //******************* Offerwall API *******************// - - public void showOfferwall() - { - CFShowOfferwall(); - } - - public void showOfferwall(string placementName) - { - CFShowOfferwallWithPlacementName(placementName); - } - - public void getOfferwallCredits() - { - CFGetOfferwallCredits(); - } - - public bool isOfferwallAvailable() - { - return CFIsOfferwallAvailable(); - } - - //******************* Banner API *******************// - - public void loadBanner(IronSourceBannerSize size, IronSourceBannerPosition position) - { - loadBanner(size, position, ""); - } - - public void loadBanner(IronSourceBannerSize size, IronSourceBannerPosition position, string placementName) - { - CFLoadBanner(size.Description, (int)size.Width, (int)size.Height, (int)position, placementName, (bool)size.IsAdaptiveEnabled()); - } - - public void destroyBanner() - { - CFDestroyBanner(); - } - - public void displayBanner() - { - CFDisplayBanner(); - } - - public void hideBanner() - { - CFHideBanner(); - } - - public bool isBannerPlacementCapped(string placementName) - { - return CFIsBannerPlacementCapped(placementName); - } - - public void setSegment(IronSourceSegment segment) - { - Dictionary dict = segment.getSegmentAsDict(); - string json = IronSourceJSON.Json.Serialize(dict); - CFSetSegment(json); - } - - public void setConsent(bool consent) - { - CFSetConsent(consent); - } - - public void loadConsentViewWithType(string consentViewType) - { - CFLoadConsentViewWithType(consentViewType); - } - - public void showConsentViewWithType(string consentViewType) - { - CFShowConsentViewWithType(consentViewType); - } - - //******************* ILRD API *******************// - - public void setAdRevenueData(string dataSource, Dictionary impressionData) - { - string json = IronSourceJSON.Json.Serialize(impressionData); - CFSetAdRevenueData(dataSource, json); - } - - //******************* TestSuite API *******************// - - public void launchTestSuite() - { - Debug.Log("iOSAgent: launching TestSuite"); - CFLaunchTestSuite(); - } - - #endregion -} + // public void setMetaData(string key, string value) + // { + // CFSetMetaData(key, value); + // } + + // public int? getConversionValue() + // { + // CultureInfo invCulture = CultureInfo.InvariantCulture; + // int parsedInt; + // if (int.TryParse(string.Format(invCulture, "{0}", CFGetConversionValue()), NumberStyles.Any, invCulture, out parsedInt)) + // { + // return parsedInt; + // } + + // return null; + // } + + // public void setManualLoadRewardedVideo(bool isOn) + // { + // CFSetManualLoadRewardedVideo(isOn); + // } + + // public void setNetworkData(string networkKey, string networkData) + // { + // CFSetNetworkData(networkKey, networkData); + // } + + // [AOT.MonoPInvokeCallback(typeof(ISUnityPauseGame))] + // public void SetPauseGame(bool pause) + // { + // RegisterPauseGameFunction(pause); + // if (pause) + // { + // setMetaData("IS_PAUSE_GAME_FLAG", "true"); + // } + // else + // { + // setMetaData("IS_PAUSE_GAME_FLAG", "false"); + // } + // } + + // //******************* SDK Init *******************// + + // public void setUserId(string userId) + // { + // CFSetUserId(userId); + // } + + // public void init(string appKey) + // { + // CFSetPluginData("Unity", IronSource.pluginVersion(), IronSource.unityVersion()); + // Debug.Log("IntegrationHelper pluginVersion: " + IronSource.pluginVersion()); + // CFInit(appKey); + // } + + // public void init(string appKey, params string[] adUnits) + // { + // CFSetPluginData("Unity", IronSource.pluginVersion(), IronSource.unityVersion()); + // Debug.Log("IntegrationHelper pluginVersion: " + IronSource.pluginVersion()); + // CFInitWithAdUnits(appKey, adUnits); + // } + + // public void initISDemandOnly(string appKey, params string[] adUnits) + // { + // CFSetPluginData("Unity", IronSource.pluginVersion(), IronSource.unityVersion()); + // Debug.Log("IntegrationHelper pluginVersion: " + IronSource.pluginVersion()); + // CFInitISDemandOnly(appKey, adUnits); + // } + + // //******************* RewardedVideo API *******************// + + // public void loadRewardedVideo() + // { + // CFLoadRewardedVideo(); + // } + + // public void showRewardedVideo() + // { + // CFShowRewardedVideo(); + // } + + // public void showRewardedVideo(string placementName) + // { + // CFShowRewardedVideoWithPlacementName(placementName); + // } + + // public bool isRewardedVideoAvailable() + // { + // return CFIsRewardedVideoAvailable(); + // } + + // public bool isRewardedVideoPlacementCapped(string placementName) + // { + // return CFIsRewardedVideoPlacementCapped(placementName); + // } + + // public IronSourcePlacement getPlacementInfo(string placementName) + // { + // IronSourcePlacement sp = null; + + // string spString = CFGetPlacementInfo(placementName); + // if (spString != null) + // { + // Dictionary spDic = IronSourceJSON.Json.Deserialize(spString) as Dictionary; + // string pName = spDic["placement_name"].ToString(); + // string rewardName = spDic["reward_name"].ToString(); + // int rewardAmount = Convert.ToInt32(spDic["reward_amount"].ToString()); + // sp = new IronSourcePlacement(pName, rewardName, rewardAmount); + // } + + // return sp; + // } + + // public void setRewardedVideoServerParams(Dictionary parameters) + // { + // string json = IronSourceJSON.Json.Serialize(parameters); + // CFSetRewardedVideoServerParameters(json); + // } + + // public void clearRewardedVideoServerParams() + // { + // CFClearRewardedVideoServerParameters(); + // } + + // //******************* RewardedVideo DemandOnly API *******************// + + // public void showISDemandOnlyRewardedVideo(string instanceId) + // { + // CFShowISDemandOnlyRewardedVideo(instanceId); + // } + + // public void loadISDemandOnlyRewardedVideo(string instanceId) + // { + // CFLoadISDemandOnlyRewardedVideo(instanceId); + // } + + // public bool isISDemandOnlyRewardedVideoAvailable(string instanceId) + // { + // return CFIsDemandOnlyRewardedVideoAvailable(instanceId); + // } + + // //******************* Interstitial API *******************// + + // public void loadInterstitial() + // { + // CFLoadInterstitial(); + // } + + // public void showInterstitial() + // { + // CFShowInterstitial(); + // } + + // public void showInterstitial(string placementName) + // { + // CFShowInterstitialWithPlacementName(placementName); + // } + + // public bool isInterstitialReady() + // { + // return CFIsInterstitialReady(); + // } + + // public bool isInterstitialPlacementCapped(string placementName) + // { + // return CFIsInterstitialPlacementCapped(placementName); + // } + + // //******************* Interstitial DemandOnly API *******************// + + // public void loadISDemandOnlyInterstitial(string instanceId) + // { + // CFLoadISDemandOnlyInterstitial(instanceId); + // } + + // public void showISDemandOnlyInterstitial(string instanceId) + // { + // CFShowISDemandOnlyInterstitial(instanceId); + // } + + // public bool isISDemandOnlyInterstitialReady(string instanceId) + // { + // return CFIsDemandOnlyInterstitialReady(instanceId); + // } + + // //******************* Offerwall API *******************// + + // public void showOfferwall() + // { + // CFShowOfferwall(); + // } + + // public void showOfferwall(string placementName) + // { + // CFShowOfferwallWithPlacementName(placementName); + // } + + // public void getOfferwallCredits() + // { + // CFGetOfferwallCredits(); + // } + + // public bool isOfferwallAvailable() + // { + // return CFIsOfferwallAvailable(); + // } + + // //******************* Banner API *******************// + + // public void loadBanner(IronSourceBannerSize size, IronSourceBannerPosition position) + // { + // loadBanner(size, position, ""); + // } + + // public void loadBanner(IronSourceBannerSize size, IronSourceBannerPosition position, string placementName) + // { + // CFLoadBanner(size.Description, (int)size.Width, (int)size.Height, (int)position, placementName, (bool)size.IsAdaptiveEnabled()); + // } + + // public void destroyBanner() + // { + // CFDestroyBanner(); + // } + + // public void displayBanner() + // { + // CFDisplayBanner(); + // } + + // public void hideBanner() + // { + // CFHideBanner(); + // } + + // public bool isBannerPlacementCapped(string placementName) + // { + // return CFIsBannerPlacementCapped(placementName); + // } + + // public void setSegment(IronSourceSegment segment) + // { + // Dictionary dict = segment.getSegmentAsDict(); + // string json = IronSourceJSON.Json.Serialize(dict); + // CFSetSegment(json); + // } + + // public void setConsent(bool consent) + // { + // CFSetConsent(consent); + // } + + // public void loadConsentViewWithType(string consentViewType) + // { + // CFLoadConsentViewWithType(consentViewType); + // } + + // public void showConsentViewWithType(string consentViewType) + // { + // CFShowConsentViewWithType(consentViewType); + // } + + // //******************* ILRD API *******************// + + // public void setAdRevenueData(string dataSource, Dictionary impressionData) + // { + // string json = IronSourceJSON.Json.Serialize(impressionData); + // CFSetAdRevenueData(dataSource, json); + // } + + // //******************* TestSuite API *******************// + + // public void launchTestSuite() + // { + // Debug.Log("iOSAgent: launching TestSuite"); + // CFLaunchTestSuite(); + // } + + // #endregion +// } #endif diff --git a/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset b/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset index b2b2d4463..476470d58 100644 --- a/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset +++ b/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset @@ -28,5 +28,5 @@ MonoBehaviour: userTrackingUsageDescriptionZhHans: userTrackingUsageDescriptionZhHant: adMobAndroidAppId: - adMobIosAppId: ca-app-pub-8252390069143459~9766550824 + adMobIosAppId: ca-app-pub-8252390069143459~7358844489 snapAppStoreAppId: 0 diff --git a/Assets/XLua/Gen/IAPManagerWrap.cs b/Assets/XLua/Gen/IAPManagerWrap.cs index a0f32903d..c5381d8ca 100644 --- a/Assets/XLua/Gen/IAPManagerWrap.cs +++ b/Assets/XLua/Gen/IAPManagerWrap.cs @@ -160,7 +160,9 @@ namespace XLua.CSObjectWrap IAPManager gen_to_be_invoked = (IAPManager)translator.FastGetCSObj(L, 1); - + int gen_param_count = LuaAPI.lua_gettop(L); + + if(gen_param_count == 2&& translator.Assignable(L, 2)) { UnityEngine.Purchasing.InitializationFailureReason _error;translator.Get(L, 2, out _error); @@ -168,6 +170,17 @@ namespace XLua.CSObjectWrap + return 0; + } + if(gen_param_count == 3&& translator.Assignable(L, 2)&& (LuaAPI.lua_isnil(L, 3) || LuaAPI.lua_type(L, 3) == LuaTypes.LUA_TSTRING)) + { + UnityEngine.Purchasing.InitializationFailureReason _error;translator.Get(L, 2, out _error); + string _message = LuaAPI.lua_tostring(L, 3); + + gen_to_be_invoked.OnInitializeFailed( _error, _message ); + + + return 0; } @@ -175,6 +188,8 @@ namespace XLua.CSObjectWrap return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } + return LuaAPI.luaL_error(L, "invalid arguments to IAPManager.OnInitializeFailed!"); + } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] diff --git a/Assets/XLua/Gen/UnityEngine_Purchasing_ProductMetadataWrap.cs b/Assets/XLua/Gen/UnityEngine_Purchasing_ProductMetadataWrap.cs index 267fbadce..ee1627552 100644 --- a/Assets/XLua/Gen/UnityEngine_Purchasing_ProductMetadataWrap.cs +++ b/Assets/XLua/Gen/UnityEngine_Purchasing_ProductMetadataWrap.cs @@ -65,6 +65,15 @@ namespace XLua.CSObjectWrap return 1; } + if(LuaAPI.lua_gettop(L) == 2 && translator.Assignable(L, 2)) + { + UnityEngine.Purchasing.ProductMetadata _productMetadata = (UnityEngine.Purchasing.ProductMetadata)translator.GetObject(L, 2, typeof(UnityEngine.Purchasing.ProductMetadata)); + + var gen_ret = new UnityEngine.Purchasing.ProductMetadata(_productMetadata); + translator.Push(L, gen_ret); + + return 1; + } if(LuaAPI.lua_gettop(L) == 1) { diff --git a/Assets/XLua/Gen/UnityEngine_Purchasing_ProductWrap.cs b/Assets/XLua/Gen/UnityEngine_Purchasing_ProductWrap.cs index 26aa936f6..bf666f447 100644 --- a/Assets/XLua/Gen/UnityEngine_Purchasing_ProductWrap.cs +++ b/Assets/XLua/Gen/UnityEngine_Purchasing_ProductWrap.cs @@ -21,7 +21,7 @@ namespace XLua.CSObjectWrap { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(UnityEngine.Purchasing.Product); - Utils.BeginObjectRegister(type, L, translator, 0, 2, 6, 0); + Utils.BeginObjectRegister(type, L, translator, 0, 2, 8, 0); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Equals", _m_Equals); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetHashCode", _m_GetHashCode); @@ -31,6 +31,8 @@ namespace XLua.CSObjectWrap Utils.RegisterFunc(L, Utils.GETTER_IDX, "metadata", _g_get_metadata); Utils.RegisterFunc(L, Utils.GETTER_IDX, "availableToPurchase", _g_get_availableToPurchase); Utils.RegisterFunc(L, Utils.GETTER_IDX, "transactionID", _g_get_transactionID); + Utils.RegisterFunc(L, Utils.GETTER_IDX, "appleOriginalTransactionID", _g_get_appleOriginalTransactionID); + Utils.RegisterFunc(L, Utils.GETTER_IDX, "appleProductIsRestored", _g_get_appleProductIsRestored); Utils.RegisterFunc(L, Utils.GETTER_IDX, "hasReceipt", _g_get_hasReceipt); Utils.RegisterFunc(L, Utils.GETTER_IDX, "receipt", _g_get_receipt); @@ -178,6 +180,34 @@ namespace XLua.CSObjectWrap return 1; } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _g_get_appleOriginalTransactionID(RealStatePtr L) + { + try { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + + UnityEngine.Purchasing.Product gen_to_be_invoked = (UnityEngine.Purchasing.Product)translator.FastGetCSObj(L, 1); + LuaAPI.lua_pushstring(L, gen_to_be_invoked.appleOriginalTransactionID); + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 1; + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _g_get_appleProductIsRestored(RealStatePtr L) + { + try { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + + UnityEngine.Purchasing.Product gen_to_be_invoked = (UnityEngine.Purchasing.Product)translator.FastGetCSObj(L, 1); + LuaAPI.lua_pushboolean(L, gen_to_be_invoked.appleProductIsRestored); + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 1; + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_hasReceipt(RealStatePtr L) { diff --git a/Assets/lua/app/common/pay_manager.lua.bytes b/Assets/lua/app/common/pay_manager.lua.bytes index 6e08e17c9..38072d5db 100644 Binary files a/Assets/lua/app/common/pay_manager.lua.bytes and b/Assets/lua/app/common/pay_manager.lua.bytes differ diff --git a/Assets/lua/app/common/platform.lua.bytes b/Assets/lua/app/common/platform.lua.bytes index c0a49a04c..23b04d36e 100644 Binary files a/Assets/lua/app/common/platform.lua.bytes and b/Assets/lua/app/common/platform.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_manager.lua.bytes b/Assets/lua/app/common/sdk_manager.lua.bytes index f93853e30..7c302aadb 100644 Binary files a/Assets/lua/app/common/sdk_manager.lua.bytes and b/Assets/lua/app/common/sdk_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_pay_default_manager.lua.bytes b/Assets/lua/app/common/sdk_pay_default_manager.lua.bytes index cc55c4632..b6d3f23fe 100644 Binary files a/Assets/lua/app/common/sdk_pay_default_manager.lua.bytes and b/Assets/lua/app/common/sdk_pay_default_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes b/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes index f5193c00a..fa66a8dc9 100644 Binary files a/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes and b/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes b/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes index 7f377abbf..bd0436be6 100644 Binary files a/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes and b/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes differ diff --git a/Assets/lua/app/config/recharge.lua.bytes b/Assets/lua/app/config/recharge.lua.bytes index 241e8e307..a5fab7153 100644 Binary files a/Assets/lua/app/config/recharge.lua.bytes and b/Assets/lua/app/config/recharge.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index eff85f3cb..fd2ceab96 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/login/login_manager.lua.bytes b/Assets/lua/app/module/login/login_manager.lua.bytes index 2ccf2ec6f..5d3f0b8bd 100644 Binary files a/Assets/lua/app/module/login/login_manager.lua.bytes and b/Assets/lua/app/module/login/login_manager.lua.bytes differ diff --git a/Assets/lua/app/net/net_manager.lua.bytes b/Assets/lua/app/net/net_manager.lua.bytes index 9263135b5..241ae8fbf 100644 Binary files a/Assets/lua/app/net/net_manager.lua.bytes and b/Assets/lua/app/net/net_manager.lua.bytes differ diff --git a/Assets/lua/app/proto/proto_msg_type.lua.bytes b/Assets/lua/app/proto/proto_msg_type.lua.bytes index 1d3fe2137..f2bdfa6f2 100644 Binary files a/Assets/lua/app/proto/proto_msg_type.lua.bytes and b/Assets/lua/app/proto/proto_msg_type.lua.bytes differ diff --git a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes index 8a0aa13b1..57a4a2be8 100644 Binary files a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes index f8299c7ba..388c3f6e0 100644 Binary files a/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/chapter_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index fef708ad8..7dce8d85c 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/shop_comp.lua.bytes b/Assets/lua/app/ui/shop/shop_comp.lua.bytes index 0149a0d17..34927a278 100644 Binary files a/Assets/lua/app/ui/shop/shop_comp.lua.bytes and b/Assets/lua/app/ui/shop/shop_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/ui_manager.lua.bytes b/Assets/lua/app/ui/ui_manager.lua.bytes index 25043bee4..3188ccf26 100644 Binary files a/Assets/lua/app/ui/ui_manager.lua.bytes and b/Assets/lua/app/ui/ui_manager.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes b/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes index c80dca681..7ed9287ca 100644 Binary files a/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes and b/Assets/lua/app/userdata/activity/gold_pig/gold_pig_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/shop/shop_data.lua.bytes b/Assets/lua/app/userdata/shop/shop_data.lua.bytes index 162a77daa..3bcf5d471 100644 Binary files a/Assets/lua/app/userdata/shop/shop_data.lua.bytes and b/Assets/lua/app/userdata/shop/shop_data.lua.bytes differ diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index 13da1487c..03fdbd1c8 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ - + pb/proto/protocol.protocspb" Gift act_type (RactType @@ -210,14 +210,12 @@ skill_cast (R skillCast rewards ( 2 .cspb.RewardRrewards" ChapterDailyChallengeResetReq"e ChapterDailyChallengeResetRspD -daily_challenge ( 2.cspb.ChapterDailyChallengeRdailyChallenge" +daily_challenge ( 2.cspb.ChapterDailyChallengeRdailyChallenge" ChapterGoldChallenge2 -today_challenge_count (RtodayChallengeCount2 -total_challenge_count (RtotalChallengeCount- -max_chapter_gold_id (RmaxChapterGoldId3 -latest_chapter_gold_id (RlatestChapterGoldId"F -ChapterGoldChallengeStartReq& -chapter_gold_id (R chapterGoldId"l +today_challenge_count (RtodayChallengeCount- +max_chapter_gold_id (RmaxChapterGoldId3 +latest_chapter_gold_id (RlatestChapterGoldId" +ChapterGoldChallengeStartReq"l ChapterGoldChallengeStartRsp( err_code (2 .cspb.ErrCodeRerrCode" costs ( 2 .cspb.RewardRcosts" @@ -236,31 +234,6 @@ skill_cast (R skillCast ChapterGoldChallengeFarmRsp( err_code (2 .cspb.ErrCodeRerrCode" costs ( 2 .cspb.RewardRcosts& -rewards ( 2 .cspb.RewardRrewards" -ChapterShardsChallenge2 -today_challenge_count (RtodayChallengeCount2 -total_challenge_count (RtotalChallengeCount1 -max_chapter_shards_id (RmaxChapterShardsId7 -latest_chapter_shards_id (RlatestChapterShardsId"L -ChapterShardsChallengeStartReq* -chapter_shards_id (RchapterShardsId"n -ChapterShardsChallengeStartRsp( -err_code (2 .cspb.ErrCodeRerrCode" -costs ( 2 .cspb.RewardRcosts" -#ChapterShardsChallengeSettlementReq -win (Rwin! - total_damage (R totalDamage* -chapter_shards_id (RchapterShardsId+ - task_stat ( 2.cspb.TaskStatRtaskStat" -#ChapterShardsChallengeSettlementRsp( -err_code (2 .cspb.ErrCodeRerrCode& -rewards ( 2 .cspb.RewardRrewardsG -shards_challenge ( 2.cspb.ChapterShardsChallengeRshardsChallenge"K -ChapterShardsChallengeFarmReq* -chapter_shards_id (RchapterShardsId" -ChapterShardsChallengeFarmRsp( -err_code (2 .cspb.ErrCodeRerrCode" -costs ( 2 .cspb.RewardRcosts& rewards ( 2 .cspb.RewardRrewards" Reward type (Rtype @@ -281,12 +254,7 @@ skill_cast (R skillCast level (Rlevel"* Recovery id (Rid -ts (Rts" - CDKeyUseReq -key ( Rkey"_ - CDKeyUseRsp( -err_code (2 .cspb.ErrCodeRerrCode& -rewards ( 2 .cspb.RewardRrewards"M +ts (Rts"M EnergyLimit# diamond_count (R diamondCount ad_count (RadCount" @@ -551,7 +519,7 @@ facebookId"C client_info ( 2.cspb.ClientInfoR clientInfo -skip_guide (R skipGuide" +skip_guide (R skipGuide" LoginRsp( err_code (2 .cspb.ErrCodeRerrCode* today_first_login (RtodayFirstLogin @@ -586,8 +554,7 @@ task_daily ( 2.cspb.TaskDailyR taskDaily+ mall_daily ( 2.cspb.MallDailyR mallDaily+ mall_idle ( 2.cspb.MallIdleRmallIdleS chapter_daily_challenge ( 2.cspb.ChapterDailyChallengeRchapterDailyChallengeP -chapter_gold_challenge ( 2.cspb.ChapterGoldChallengeRchapterGoldChallengeV -chapter_shards_challenge ( 2.cspb.ChapterShardsChallengeRchapterShardsChallenge"U +chapter_gold_challenge ( 2.cspb.ChapterGoldChallengeRchapterGoldChallenge"U PipedReq id ( Rid ts (Rts @@ -717,7 +684,7 @@ clear10Hit skill_cast (R skillCast skill_box (RskillBox& kills_boss_turn - (R killsBossTurn* + (R killsBossTurn* ErrCode SUCCESS @@ -741,8 +708,11 @@ skill_cast (R skillCast TIME_OUTn FUNC_NOT_OPENo SIGN_IS_FINISHED -ACCELERATION_TIME_ERROR# -DUNGEON_FARM_EXCEED_MAX_FAILED" +ACCELERATION_TIME_ERROR +DUNGEON_COUNT_NOT_ENOUGH +DUNGEON_TYPE_INVALID +DUNGEON_DIFF_INVALID +DUNGEON_AD_ADD_LIMIT" MASTERY_PREV_LEVEL_NOT_ENOUGH RUNE_LEVEL_MAX RUNE_NO_NEXT @@ -799,12 +769,7 @@ skill_cast (R skillCast BOUNTY_LEVEL_NOT_REACHED  BOUNTY_LEVEL_CLAIMED  ENERGY_BY_DIAMOND_LIMIT  -ENERGY_BY_AD_LIMIT  -CDKEY_NOT_EXISTS  -CDKEY_ALREADY_USED  - CDKEY_INVALID  - CDKEY_EXPIRED  - CDKEY_LIMITED *L +ENERGY_BY_AD_LIMIT *L KickOutReason MAINTAIN FLOW_CTRL diff --git a/Assets/scenes/enter_scene.unity b/Assets/scenes/enter_scene.unity index 39d9fad36..e94eb7468 100644 --- a/Assets/scenes/enter_scene.unity +++ b/Assets/scenes/enter_scene.unity @@ -210,7 +210,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startManually: 0 - appToken: vrk2qnizxc00 + appToken: asezin7bs3r4 environment: 1 logLevel: 3 eventBuffering: 0 @@ -280,7 +280,7 @@ MonoBehaviour: enableLog: 0 networkType: 1 tokens: - - appid: 4bd4464b39394188a6708fee41f352f7 + - appid: e6758afddf584e73b9b647da025bf7db serverUrl: https://ta.perfeggsgame.com mode: 0 timeZone: 1 @@ -462,8 +462,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: devKey: XHsvoUhhNvMamKMSEvrew3 - iosDevKey: - appID: + iosDevKey: R4qWrbCEhSQRBgeQVvGHQ9 + appID: 6450101181 UWPAppID: isDebug: 0 getConversionData: 0 diff --git a/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml index 13ad0e024..7fdc00e1b 100644 --- a/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml +++ b/BFVersions/android/dz_google_abb/unityLibrary/src/main/AndroidManifest.xml @@ -21,10 +21,10 @@ - + - + diff --git a/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml b/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml index 177e5653e..419dc1860 100644 --- a/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml +++ b/BFVersions/android/dz_google_apk/unityLibrary/src/main/AndroidManifest.xml @@ -33,11 +33,11 @@ - + - + diff --git a/Packages/manifest.json b/Packages/manifest.json index b3db96846..5aefabd6a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.ide.vscode": "1.2.5", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.postprocessing": "3.2.2", - "com.unity.purchasing": "4.1.5", + "com.unity.purchasing": "4.9.2", "com.unity.quicksearch": "2.0.2", "com.unity.recorder": "2.5.7", "com.unity.test-framework": "1.1.31", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 49fdbe43e..8ea0e5a00 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -71,7 +71,7 @@ "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "4.1.5", + "version": "4.9.2", "depth": 0, "source": "registry", "dependencies": { @@ -80,7 +80,7 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.0.1" + "com.unity.services.core": "1.8.1" }, "url": "https://packages.unity.com" }, @@ -101,11 +101,13 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.0.1", + "version": "1.8.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index cdeb396b5..0daa0ed76 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -150,7 +150,6 @@ PlayerSettings: m_ColorGamuts: 0000000003000000 targetPixelDensity: 30 resolutionScalingMode: 0 - resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -946,11 +945,11 @@ PlayerSettings: m_VersionName: apiCompatibilityLevel: 6 activeInputHandler: 0 - cloudProjectId: + cloudProjectId: 8771655b-cf6c-4071-b910-87d862578d67 framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: Combo Hero + organizationId: juzugame cloudEnabled: 0 legacyClampBlendShapeWeights: 0 virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 6125b308a..cb699bb72 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -17,10 +17,10 @@ UnityConnectSettings: m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 UnityAnalyticsSettings: - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_InitializeOnStartup: 1 UnityAdsSettings: