1 Commits

Author SHA1 Message Date
377a279ac3 1.0.11 2023-10-19 15:07:16 +08:00
2 changed files with 25 additions and 15 deletions

View File

@@ -7,8 +7,8 @@ namespace Runtime.ADAggregator
public class ADManager : MonoBehaviour public class ADManager : MonoBehaviour
{ {
private static ADManager _instance; private static ADManager _instance;
private static bool mIsCreate = false; private static bool mIsCreate = false;
private static bool mIsGMModel = false; private static bool mIsGMModel = false;
public static ADManager Instance public static ADManager Instance
{ {
@@ -22,7 +22,7 @@ namespace Runtime.ADAggregator
Destroy(objs[i]); Destroy(objs[i]);
} }
_instance = new GameObject().AddComponent<ADManager>(); _instance = new GameObject().AddComponent<ADManager>();
_instance.name = "[GameUpdater] <color=yellow>NoInit<color>"; _instance.name = "[GameUpdater] <color=yellow>NoInit<color>";
DontDestroyOnLoad(_instance); DontDestroyOnLoad(_instance);
_instance.InitTimeSystem(); _instance.InitTimeSystem();
@@ -54,7 +54,12 @@ namespace Runtime.ADAggregator
/// <summary> /// <summary>
/// 全局任意视频广告播放结束后事件, bool 表示是否完成奖励 /// 全局任意视频广告播放结束后事件, bool 表示是否完成奖励
/// </summary> /// </summary>
public event Action<bool> GLOBAL_ShowAwardVideoComplete; public event Action<bool> GLOBAL_ShowAwardVideoComplete;
/// <summary>
/// 全局任意视频广告玩家点击播放时
/// </summary>
public event Action<string , string> GLOBAL_ShowAwardVideoBefore;
public string UserId => _userId; public string UserId => _userId;
@@ -62,13 +67,13 @@ namespace Runtime.ADAggregator
private bool _isInit = false; private bool _isInit = false;
#pragma warning restore CS0414 #pragma warning restore CS0414
public void Init(Action onCallback, string userId, ADConfig adConfig, IAdController controller, public void Init(Action onCallback, string userId, ADConfig adConfig, IAdController controller,
params object[] args) params object[] args)
{ {
_isInit = true; _isInit = true;
_instance.name = "[GameUpdater] <color=green>Init<color>"; _instance.name = "[GameUpdater] <color=green>Init<color>";
AD_Dicts = new Dictionary<AD_Type, ADPlayer>(); AD_Dicts = new Dictionary<AD_Type, ADPlayer>();
_userId = userId; _userId = userId;
#if UNITY_EDITOR #if UNITY_EDITOR
onCallback?.Invoke(); onCallback?.Invoke();
#else #else
@@ -140,11 +145,13 @@ namespace Runtime.ADAggregator
/// <param name="callback"></param> /// <param name="callback"></param>
public void AsyncPlayAD(AD_Type adType, string adScene, Action<bool> callback) public void AsyncPlayAD(AD_Type adType, string adScene, Action<bool> callback)
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
if (adType == AD_Type.AwardVideo) if (adType == AD_Type.AwardVideo)
{ {
this.OnVideoComplete(true); this.OnVideoComplete(true);
} }
callback?.Invoke(true); callback?.Invoke(true);
return; return;
#endif #endif
@@ -153,6 +160,7 @@ namespace Runtime.ADAggregator
callback?.Invoke(true); callback?.Invoke(true);
return; return;
} }
_adController.EventLog("adScene", adScene); _adController.EventLog("adScene", adScene);
try try
{ {
@@ -163,7 +171,9 @@ namespace Runtime.ADAggregator
} }
var player = AD_Dicts[adType]; var player = AD_Dicts[adType];
_curAsyncPlayer = new AsyncAdPlayer(player,adScene , callback); if (adType == AD_Type.AwardVideo)
GLOBAL_ShowAwardVideoBefore?.Invoke(player.Key , adScene);
_curAsyncPlayer = new AsyncAdPlayer(player, adScene, callback);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -212,13 +222,13 @@ namespace Runtime.ADAggregator
#region TimeSystem #region TimeSystem
private List<Action> _updateList; private List<Action> _updateList;
private const int DefaultLength = 1024; private const int DefaultLength = 1024;
private List<AdTimeHandler> _timeHandlers; private List<AdTimeHandler> _timeHandlers;
private void InitTimeSystem() private void InitTimeSystem()
{ {
this._updateList = new List<Action>(DefaultLength); this._updateList = new List<Action>(DefaultLength);
this._timeHandlers = new List<AdTimeHandler>(); this._timeHandlers = new List<AdTimeHandler>();
} }

View File

@@ -2,7 +2,7 @@
"name": "com.foldcc.cc-framework.commercialization", "name": "com.foldcc.cc-framework.commercialization",
"displayName": "CC-Framework.commercialization", "displayName": "CC-Framework.commercialization",
"description": "商业化sdk通用组件包含广告、内购、用户统计、归因统计等", "description": "商业化sdk通用组件包含广告、内购、用户统计、归因统计等",
"version": "1.0.9", "version": "1.0.11",
"unity": "2021.1", "unity": "2021.1",
"license": "MIT", "license": "MIT",
"repository": { "repository": {