Skip to content

Commit 969e790

Browse files
and3r817and3r817
authored
Update Android SDK to 3.0.1 (#10)
1 parent 36c5fd8 commit 969e790

74 files changed

Lines changed: 1920 additions & 748 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/BidMachine/Api/BannerRequest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public IAdRequestBuilder SetSize(BannerSize size)
4848

4949
public IAdRequestBuilder SetAdContentType(AdContentType contentType)
5050
{
51-
client.SetAdContentType(contentType);
5251
return this;
5352
}
5453

@@ -88,9 +87,9 @@ public IAdRequestBuilder SetBidPayload(string bidPayLoad)
8887
return this;
8988
}
9089

91-
public IAdRequestBuilder SetNetworks(string jsonNetworksData)
90+
public IAdRequestBuilder SetNetworks(string networks)
9291
{
93-
client.SetNetworks(jsonNetworksData);
92+
client.SetNetworks(networks);
9493
return this;
9594
}
9695

‎Assets/BidMachine/Api/BidMachine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private static IBidMachine GetInstance()
2020
return client ??= BidMachineClientFactory.GetBidMachine();
2121
}
2222

23-
public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "1.2.1";
23+
public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "3.0.1";
2424

2525
/// <summary>
2626
/// Initializes BidMachine SDK.

‎Assets/BidMachine/Api/InterstitialRequest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ public IAdRequestBuilder SetBidPayload(string bidPayLoad)
7777
return this;
7878
}
7979

80-
public IAdRequestBuilder SetNetworks(string jsonNetworksData)
80+
public IAdRequestBuilder SetNetworks(string networks)
8181
{
82-
client.SetNetworks(jsonNetworksData);
82+
client.SetNetworks(networks);
8383
return this;
8484
}
8585

‎Assets/BidMachine/Api/RewardedRequest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ public IAdRequestBuilder SetBidPayload(string bidPayLoad)
7777
return this;
7878
}
7979

80-
public IAdRequestBuilder SetNetworks(string jsonNetworksData)
80+
public IAdRequestBuilder SetNetworks(string networks)
8181
{
82-
client.SetNetworks(jsonNetworksData);
82+
client.SetNetworks(networks);
8383
return this;
8484
}
8585

‎Assets/BidMachine/Common/IInterstitialAd.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ public interface IInterstitialAd : IAd<IInterstitialAdListener>
77
void Show();
88
}
99

10-
public interface IInterstitialAdListener : IFullscreenAdListener<IInterstitialAd> { }
11-
}
10+
public interface ICommonInterstitialAdListener<TAd, TAdError>
11+
: ICommonFullscreenAdListener<TAd, TAdError> { }
12+
13+
public interface IInterstitialAdListener
14+
: ICommonInterstitialAdListener<IInterstitialAd, BMError> { }
15+
}

‎Assets/BidMachine/Common/IRewardedAd.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22

33
namespace BidMachineAds.Unity.Common
44
{
5-
public interface IRewardedAd : IAd<IRewardedAdListener> {
5+
public interface IRewardedAd : IAd<IRewardedAdListener>
6+
{
67
void Show();
78
}
89

9-
public interface IRewardedAdListener : IFullscreenAdListener<IRewardedAd>
10+
public interface ICommonRewardedAdListener<TAd, TAdError>
11+
: ICommonFullscreenAdListener<TAd, TAdError>
1012
{
11-
void onAdRewarded(IRewardedAd ad) { }
13+
void onAdRewarded(TAd ad) { }
1214
}
13-
}
15+
16+
public interface IRewardedAdListener : ICommonRewardedAdListener<IRewardedAd, BMError> { }
17+
}

‎Assets/BidMachine/Demo/BidMachineController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class BidMachineController : MonoBehaviour
3030
new InterstitialRequestListener();
3131

3232
private RewardedAd rewardedAd;
33-
private readonly IRewardedAdListener rewardedListener = new RewardedListener();
33+
private readonly IRewardedAdListener rewardedListener = new RewardedAdListener();
3434
private IAdRequest rewardedRequest;
3535
private readonly IAdRequestListener rewardedRequestListener = new RewardedRequestListener();
3636

@@ -395,7 +395,7 @@ public void onRequestSuccess(IAdRequest request, string auctionResult)
395395
}
396396
}
397397

398-
private class RewardedListener : IRewardedAdListener
398+
private class RewardedAdListener : IRewardedAdListener
399399
{
400400
public void onAdClosed(IRewardedAd ad, bool finished)
401401
{

‎Assets/BidMachine/Demo/BidMachineDemoScene.unity‎

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 170076734}
41-
m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -98,7 +97,7 @@ LightmapSettings:
9897
m_TrainingDataDestination: TrainingData
9998
m_LightProbeSampleCountMultiplier: 4
10099
m_LightingDataAsset: {fileID: 0}
101-
m_UseShadowmask: 1
100+
m_LightingSettings: {fileID: 0}
102101
--- !u!196 &4
103102
NavMeshSettings:
104103
serializedVersion: 2
@@ -391,7 +390,6 @@ MonoBehaviour:
391390
m_EditorClassIdentifier:
392391
tgTesting: {fileID: 2038355073}
393392
tgLogging: {fileID: 1426276316}
394-
nativeAdView: {fileID: 434367058}
395393
--- !u!4 &107517183
396394
Transform:
397395
m_ObjectHideFlags: 0
@@ -1032,7 +1030,7 @@ MonoBehaviour:
10321030
m_Name:
10331031
m_EditorClassIdentifier:
10341032
m_Material: {fileID: 0}
1035-
m_Color: {r: 0.37614244, g: 0, b: 0.74509805, a: 1}
1033+
m_Color: {r: 0.09019608, g: 0.40392157, b: 0.93333334, a: 1}
10361034
m_RaycastTarget: 1
10371035
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
10381036
m_Maskable: 1
@@ -1753,13 +1751,6 @@ MonoBehaviour:
17531751
m_Script: {fileID: 11500000, guid: 5ad689cf39fa84081b58a4f636dab873, type: 3}
17541752
m_Name:
17551753
m_EditorClassIdentifier:
1756-
nativeAdViewTitle: {fileID: 933679484}
1757-
nativeAdViewDescription: {fileID: 193834810}
1758-
nativeAdViewSponsored: {fileID: 1947161983}
1759-
nativeAdViewIcon: {fileID: 1166978393}
1760-
nativeAdViewRatting: {fileID: 427295461}
1761-
nativeAdViewImage: {fileID: 624652368}
1762-
callToAction: {fileID: 1190020150}
17631754
--- !u!1 &454631855
17641755
GameObject:
17651756
m_ObjectHideFlags: 0
@@ -2955,70 +2946,6 @@ CanvasRenderer:
29552946
m_PrefabAsset: {fileID: 0}
29562947
m_GameObject: {fileID: 826195116}
29572948
m_CullTransparentMesh: 0
2958-
--- !u!850595691 &851830732
2959-
LightingSettings:
2960-
m_ObjectHideFlags: 0
2961-
m_CorrespondingSourceObject: {fileID: 0}
2962-
m_PrefabInstance: {fileID: 0}
2963-
m_PrefabAsset: {fileID: 0}
2964-
m_Name: Settings.lighting
2965-
serializedVersion: 6
2966-
m_GIWorkflowMode: 0
2967-
m_EnableBakedLightmaps: 1
2968-
m_EnableRealtimeLightmaps: 0
2969-
m_RealtimeEnvironmentLighting: 1
2970-
m_BounceScale: 1
2971-
m_AlbedoBoost: 1
2972-
m_IndirectOutputScale: 1
2973-
m_UsingShadowmask: 1
2974-
m_BakeBackend: 1
2975-
m_LightmapMaxSize: 1024
2976-
m_BakeResolution: 10
2977-
m_Padding: 2
2978-
m_LightmapCompression: 3
2979-
m_AO: 0
2980-
m_AOMaxDistance: 1
2981-
m_CompAOExponent: 1
2982-
m_CompAOExponentDirect: 0
2983-
m_ExtractAO: 0
2984-
m_MixedBakeMode: 2
2985-
m_LightmapsBakeMode: 1
2986-
m_FilterMode: 1
2987-
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
2988-
m_ExportTrainingData: 0
2989-
m_TrainingDataDestination: TrainingData
2990-
m_RealtimeResolution: 2
2991-
m_ForceWhiteAlbedo: 0
2992-
m_ForceUpdates: 0
2993-
m_FinalGather: 0
2994-
m_FinalGatherRayCount: 256
2995-
m_FinalGatherFiltering: 1
2996-
m_PVRCulling: 1
2997-
m_PVRSampling: 1
2998-
m_PVRDirectSampleCount: 32
2999-
m_PVRSampleCount: 256
3000-
m_PVREnvironmentSampleCount: 256
3001-
m_PVREnvironmentReferencePointCount: 2048
3002-
m_LightProbeSampleCountMultiplier: 4
3003-
m_PVRBounces: 2
3004-
m_PVRMinBounces: 2
3005-
m_PVREnvironmentImportanceSampling: 0
3006-
m_PVRFilteringMode: 2
3007-
m_PVRDenoiserTypeDirect: 0
3008-
m_PVRDenoiserTypeIndirect: 0
3009-
m_PVRDenoiserTypeAO: 0
3010-
m_PVRFilterTypeDirect: 0
3011-
m_PVRFilterTypeIndirect: 0
3012-
m_PVRFilterTypeAO: 0
3013-
m_PVRFilteringGaussRadiusDirect: 1
3014-
m_PVRFilteringGaussRadiusIndirect: 5
3015-
m_PVRFilteringGaussRadiusAO: 2
3016-
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
3017-
m_PVRFilteringAtrousPositionSigmaIndirect: 2
3018-
m_PVRFilteringAtrousPositionSigmaAO: 1
3019-
m_PVRTiledBaking: 0
3020-
m_NumRaysToShootPerTexel: -1
3021-
m_RespectSceneVisibilityWhenBakingGI: 0
30222949
--- !u!1 &933679482
30232950
GameObject:
30242951
m_ObjectHideFlags: 0

‎Assets/BidMachine/Editor/BidMachineDependencies.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</sources>
77
</iosPods>
88
<androidPackages>
9-
<androidPackage spec='io.bidmachine:ads:3.0.0'/>
10-
<androidPackage spec='io.bidmachine:ads.extensions.unity:3.0.0.3'/>
9+
<androidPackage spec='io.bidmachine:ads:3.0.1'/>
10+
<androidPackage spec='io.bidmachine:ads.extensions.unity:3.0.1.3'/>
1111
<repositories>
1212
<repository>https://artifactory.bidmachine.io/bidmachine</repository>
1313
</repositories>

‎Assets/BidMachine/Editor/BidMachinePostProcess.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_IPHONE
1+
#if UNITY_IOS
22
using System.Diagnostics.CodeAnalysis;
33
using BidMachineAds.Unity.Editor.iOS;
44
using UnityEditor;

0 commit comments

Comments
 (0)