From 4f47834719907b650d8478d892605157924948c7 Mon Sep 17 00:00:00 2001 From: Foldcc_b1 Date: Thu, 14 Sep 2023 14:21:41 +0800 Subject: [PATCH] update core --- Assets/Runtime/ADAggregator/ADManager.cs | 2 +- Assets/Runtime/ADAggregator/ADPlayer.cs | 1 + Assets/Runtime/ADAggregator/AsyncAdPlayer.cs | 23 +++++++++++--------- Assets/package.json | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Assets/Runtime/ADAggregator/ADManager.cs b/Assets/Runtime/ADAggregator/ADManager.cs index 7ef55a6..eecefa4 100644 --- a/Assets/Runtime/ADAggregator/ADManager.cs +++ b/Assets/Runtime/ADAggregator/ADManager.cs @@ -163,7 +163,7 @@ namespace Runtime.ADAggregator } var player = AD_Dicts[adType]; - _curAsyncPlayer = new AsyncAdPlayer(player, callback); + _curAsyncPlayer = new AsyncAdPlayer(player,adScene , callback); } catch (Exception e) { diff --git a/Assets/Runtime/ADAggregator/ADPlayer.cs b/Assets/Runtime/ADAggregator/ADPlayer.cs index 1545fa8..a411bbb 100644 --- a/Assets/Runtime/ADAggregator/ADPlayer.cs +++ b/Assets/Runtime/ADAggregator/ADPlayer.cs @@ -10,6 +10,7 @@ namespace Runtime.ADAggregator protected int curState; public string Key; + public string AdScene; protected ADListener adListener; public Action OnErrorAction; diff --git a/Assets/Runtime/ADAggregator/AsyncAdPlayer.cs b/Assets/Runtime/ADAggregator/AsyncAdPlayer.cs index 79de66a..6801ad8 100644 --- a/Assets/Runtime/ADAggregator/AsyncAdPlayer.cs +++ b/Assets/Runtime/ADAggregator/AsyncAdPlayer.cs @@ -5,21 +5,23 @@ namespace Runtime.ADAggregator { public class AsyncAdPlayer { - private Action _callback; - private ADPlayer _adPlayer; - private bool firstLoad; - private bool isKill; - private bool isUpdate; + private Action _callback; + private ADPlayer _adPlayer; + private bool firstLoad; + private bool isKill; + private bool isUpdate; private AdTimeHandler overHandler; + private string _Ad_scene; private float _outTime; - public AsyncAdPlayer(ADPlayer player , Action callback) + public AsyncAdPlayer(ADPlayer player , string adScene, Action callback) { - - this._outTime = 0; + + this._Ad_scene = adScene; + this._outTime = 0; this._callback = callback; - this.isKill = false; + this.isKill = false; this.firstLoad = true; this._adPlayer = player; if (_adPlayer == null) @@ -33,7 +35,8 @@ namespace Runtime.ADAggregator } ADManager.Instance.OpenMask(); _adPlayer.OnErrorAction = OnError; - isUpdate = true; + _adPlayer.AdScene = this._Ad_scene; + isUpdate = true; ADManager.Instance.AddUpdater(DoUpdate); } diff --git a/Assets/package.json b/Assets/package.json index 9e24d78..926a2d2 100644 --- a/Assets/package.json +++ b/Assets/package.json @@ -2,7 +2,7 @@ "name": "com.foldcc.cc-framework.commercialization", "displayName": "CC-Framework.commercialization", "description": "商业化sdk通用组件,包含广告、内购、用户统计、归因统计等", - "version": "1.0.7", + "version": "1.0.6", "unity": "2021.1", "license": "MIT", "repository": {