You've already forked CC-Framework.Commercialization
Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 915180881d | |||
| b56b47912e | |||
| 957c4e4045 | |||
| 377a279ac3 | |||
| b53846c98f | |||
| 89f5f66322 | |||
| acff3d126b | |||
| abc996cdc9 | |||
| e19d1f4339 | |||
| 495ec137b5 | |||
| 4a813fa481 | |||
| e154b3ef17 | |||
| bb0939fd98 | |||
| 082e6770aa |
26
CHANGELOG.md
26
CHANGELOG.md
@@ -1,3 +1,29 @@
|
||||
# [1.0.14]
|
||||
|
||||
### 修复
|
||||
|
||||
* `AsyncAdPlayer` 增加展示确认阶段和统一失败收口,避免 `show` 发起后无回调时主链失联。
|
||||
* 抽象播放器补充展示超时配置与内部展示开始通知,保持外部调用接口不变。
|
||||
* 清理广告源级失败对主链的误接线,避免 `AdSource` 过程回调误判为最终失败。
|
||||
|
||||
# [1.0.13]
|
||||
|
||||
### 修复
|
||||
|
||||
* 修复插屏成功关闭时误触发 `GLOBAL_ShowAwardVideoComplete` 全局奖励视频完成事件的问题。
|
||||
|
||||
# [1.0.12]
|
||||
|
||||
### 新增
|
||||
|
||||
* `ADManager` 新增 `EnterAdScenario(AD_Type, string)`,支持应用层显式上报广告场景到达。
|
||||
* `ADPlayer` 增加预热、重试和播放前钩子能力,用于平台层策略化调度。
|
||||
|
||||
### 修复
|
||||
|
||||
* `AsyncAdPlayer` 增强首播失败补偿和多次加载尝试,降低冷启动首次播放失败概率。
|
||||
* 初始化后可按广告位配置自动预热,避免高价值广告位首次点击才开始建链。
|
||||
|
||||
# [1.0.0]
|
||||
|
||||
基础版本.
|
||||
|
||||
@@ -33,4 +33,4 @@ namespace Runtime.ADAggregator
|
||||
onVideoComplete = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,9 +6,10 @@ namespace Runtime.ADAggregator
|
||||
{
|
||||
public class ADManager : MonoBehaviour
|
||||
{
|
||||
private static ADManager _instance;
|
||||
private static bool mIsCreate = false;
|
||||
|
||||
private static ADManager _instance;
|
||||
private static bool mIsCreate = false;
|
||||
private static bool mIsGMModel = false;
|
||||
|
||||
public static ADManager Instance
|
||||
{
|
||||
get
|
||||
@@ -34,7 +35,7 @@ namespace Runtime.ADAggregator
|
||||
}
|
||||
|
||||
#if UNITY_ANDROID
|
||||
public AndroidJavaObject activityContext { get; private set; }
|
||||
public AndroidJavaObject activityContext { get; private set; }
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
@@ -48,38 +49,66 @@ namespace Runtime.ADAggregator
|
||||
|
||||
private AsyncAdPlayer _curAsyncPlayer;
|
||||
|
||||
private string _userId;
|
||||
|
||||
/// <summary>
|
||||
/// 全局任意视频广告播放结束后事件, bool 表示是否完成奖励
|
||||
/// </summary>
|
||||
public event Action<bool> GLOBAL_ShowAwardVideoComplete;
|
||||
|
||||
/// <summary>
|
||||
/// 全局任意视频广告玩家点击播放时
|
||||
/// </summary>
|
||||
public event Action<string , string> GLOBAL_ShowAwardVideoBefore;
|
||||
|
||||
public string UserId => _userId;
|
||||
|
||||
#pragma warning disable CS0414
|
||||
private bool _isInit = false;
|
||||
#pragma warning restore CS0414
|
||||
|
||||
public void Init(Action onCallback , ADConfig adConfig , IAdController controller , params object[] args)
|
||||
|
||||
public void Init(Action onCallback, string userId, ADConfig adConfig, IAdController controller,
|
||||
params object[] args)
|
||||
{
|
||||
_isInit = true;
|
||||
_isInit = true;
|
||||
_instance.name = "[GameUpdater] <color=green>Init<color>";
|
||||
AD_Dicts = new Dictionary<AD_Type, ADPlayer>();
|
||||
AD_Dicts = new Dictionary<AD_Type, ADPlayer>();
|
||||
_userId = userId;
|
||||
#if UNITY_EDITOR
|
||||
onCallback?.Invoke();
|
||||
#else
|
||||
controller.Init(adConfig , args);
|
||||
_adController = controller;
|
||||
_adConfig = adConfig;
|
||||
PrewarmConfiguredPlayers();
|
||||
onCallback?.Invoke();
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 测试模式,此模式下,不会播放、加载任何广告,但是会模拟广告播放成功,正式版本不能调用此方法
|
||||
/// </summary>
|
||||
public void SetTestModel()
|
||||
{
|
||||
mIsGMModel = true;
|
||||
}
|
||||
|
||||
public bool IsRealy(AD_Type adType)
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
return true;
|
||||
#endif
|
||||
#pragma warning disable CS0162
|
||||
if (AD_Dicts.ContainsKey(adType) == false)
|
||||
if (!_isInit || mIsGMModel)
|
||||
{
|
||||
AD_Dicts[adType] = PlayerCreate(adType);
|
||||
return true;
|
||||
}
|
||||
return AD_Dicts[adType].IsReadly();
|
||||
#pragma warning disable CS0162
|
||||
if (!TryGetOrCreatePlayer(adType, out var player))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return player.IsReadly();
|
||||
#pragma warning restore CS0162
|
||||
}
|
||||
|
||||
@@ -88,11 +117,15 @@ namespace Runtime.ADAggregator
|
||||
#if UNITY_EDITOR
|
||||
return;
|
||||
#endif
|
||||
if (!_isInit || mIsGMModel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
// Debug.LogError("准备加载广告" + adType);
|
||||
#pragma warning disable CS0162
|
||||
if (!IsRealy(adType))
|
||||
if (!IsRealy(adType) && TryGetOrCreatePlayer(adType, out var player))
|
||||
{
|
||||
AD_Dicts[adType].LoadAD();
|
||||
player.LoadAD();
|
||||
}
|
||||
#pragma warning restore CS0162
|
||||
}
|
||||
@@ -113,21 +146,40 @@ namespace Runtime.ADAggregator
|
||||
/// <param name="callback"></param>
|
||||
public void AsyncPlayAD(AD_Type adType, string adScene, Action<bool> callback)
|
||||
{
|
||||
_adController.EventLog("adScene" , adScene);
|
||||
|
||||
#if UNITY_EDITOR
|
||||
if (adType == AD_Type.AwardVideo)
|
||||
{
|
||||
this.OnVideoComplete(true);
|
||||
}
|
||||
|
||||
callback?.Invoke(true);
|
||||
return;
|
||||
#endif
|
||||
if (!_isInit || mIsGMModel)
|
||||
{
|
||||
callback?.Invoke(true);
|
||||
return;
|
||||
}
|
||||
|
||||
_adController.EventLog("adScene", adScene);
|
||||
try
|
||||
{
|
||||
_curAsyncPlayer?.Kill();
|
||||
if (AD_Dicts.ContainsKey(adType) == false)
|
||||
if (!TryGetOrCreatePlayer(adType, out var player))
|
||||
{
|
||||
AD_Dicts[adType] = PlayerCreate(adType);
|
||||
callback?.Invoke(false);
|
||||
return;
|
||||
}
|
||||
var player = AD_Dicts[adType];
|
||||
_curAsyncPlayer = new AsyncAdPlayer(player, callback);
|
||||
|
||||
if (adType == AD_Type.AwardVideo)
|
||||
GLOBAL_ShowAwardVideoBefore?.Invoke(player.Key , NormalizeScenario(adScene));
|
||||
_curAsyncPlayer = new AsyncAdPlayer(player, NormalizeScenario(adScene), callback);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError(e);
|
||||
_adController.EventLog("error" , "showAdError" , e.Message);
|
||||
_adController.EventLog("error", "showAdError", e.Message);
|
||||
callback?.Invoke(false);
|
||||
}
|
||||
}
|
||||
@@ -137,16 +189,89 @@ namespace Runtime.ADAggregator
|
||||
#if UNITY_EDITOR
|
||||
return null;
|
||||
#endif
|
||||
if (!_isInit || mIsGMModel)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
#pragma warning disable CS0162
|
||||
return _adController.CreateAdPlayer(type);
|
||||
var adPlayer = _adController.CreateAdPlayer(type);
|
||||
if (adPlayer == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
adPlayer.ADType = type;
|
||||
return adPlayer;
|
||||
#pragma warning restore CS0162
|
||||
}
|
||||
|
||||
public void EnterAdScenario(AD_Type adType, string adScene)
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
return;
|
||||
#endif
|
||||
if (!_isInit || mIsGMModel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
#pragma warning disable CS0162
|
||||
if (!TryGetOrCreatePlayer(adType, out var player))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
player.EnterAdScenario(NormalizeScenario(adScene));
|
||||
#pragma warning restore CS0162
|
||||
}
|
||||
|
||||
private bool TryGetOrCreatePlayer(AD_Type type, out ADPlayer player)
|
||||
{
|
||||
if (AD_Dicts.TryGetValue(type, out player) && player != null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
player = PlayerCreate(type);
|
||||
if (player == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
AD_Dicts[type] = player;
|
||||
return true;
|
||||
}
|
||||
|
||||
private void PrewarmConfiguredPlayers()
|
||||
{
|
||||
foreach (AD_Type adType in Enum.GetValues(typeof(AD_Type)))
|
||||
{
|
||||
if (!TryGetOrCreatePlayer(adType, out var player))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!player.AutoPreloadOnInit)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
player.LoadAD();
|
||||
}
|
||||
}
|
||||
|
||||
private static string NormalizeScenario(string scenario)
|
||||
{
|
||||
return string.IsNullOrWhiteSpace(scenario) ? "__default__" : scenario.Trim();
|
||||
}
|
||||
|
||||
public void CloseAd(AD_Type adType)
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
return;
|
||||
#endif
|
||||
if (!_isInit || mIsGMModel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
#pragma warning disable CS0162
|
||||
if (adType != AD_Type.AwardVideo)
|
||||
{
|
||||
@@ -161,13 +286,14 @@ namespace Runtime.ADAggregator
|
||||
|
||||
#region TimeSystem
|
||||
|
||||
private List<Action> _updateList;
|
||||
private const int DefaultLength = 1024;
|
||||
private List<AdTimeHandler> _timeHandlers;
|
||||
|
||||
private List<Action> _updateList;
|
||||
private const int DefaultLength = 1024;
|
||||
private List<AdTimeHandler> _timeHandlers;
|
||||
|
||||
private void InitTimeSystem()
|
||||
{
|
||||
this._updateList = new List<Action>(DefaultLength);
|
||||
this._updateList = new List<Action>(DefaultLength);
|
||||
this._timeHandlers = new List<AdTimeHandler>();
|
||||
}
|
||||
|
||||
private void _InvokeUpdate(List<Action> list)
|
||||
@@ -186,7 +312,7 @@ namespace Runtime.ADAggregator
|
||||
list[i].Invoke();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (int i = this._timeHandlers.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var timeHandler = this._timeHandlers[i];
|
||||
@@ -201,8 +327,8 @@ namespace Runtime.ADAggregator
|
||||
}
|
||||
}
|
||||
|
||||
private void Update() => this._InvokeUpdate(this._updateList);
|
||||
|
||||
private void Update() => this._InvokeUpdate(this._updateList);
|
||||
|
||||
public AdTimeHandler CreateTimer(float delay, Action callback, Action<float> update = null)
|
||||
{
|
||||
if (delay <= 0)
|
||||
@@ -243,7 +369,7 @@ namespace Runtime.ADAggregator
|
||||
{
|
||||
this._updateList.Remove(updater);
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
public void CloseMask()
|
||||
@@ -255,6 +381,10 @@ namespace Runtime.ADAggregator
|
||||
{
|
||||
_adController.SetMask(true);
|
||||
}
|
||||
|
||||
|
||||
internal void OnVideoComplete(bool isComplete)
|
||||
{
|
||||
GLOBAL_ShowAwardVideoComplete?.Invoke(isComplete);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,11 +10,46 @@ namespace Runtime.ADAggregator
|
||||
protected int curState;
|
||||
|
||||
public string Key;
|
||||
public string AdScene;
|
||||
protected ADListener adListener;
|
||||
public Action OnErrorAction;
|
||||
public Action OnShowStartedAction;
|
||||
|
||||
public AD_Type ADType { get; internal set; }
|
||||
public int State => curState;
|
||||
|
||||
public virtual int MaxLoadAttempts
|
||||
{
|
||||
get
|
||||
{
|
||||
return ADType == AD_Type.AwardVideo ? 2 : 1;
|
||||
}
|
||||
}
|
||||
|
||||
public virtual float LoadRetryDelaySeconds
|
||||
{
|
||||
get
|
||||
{
|
||||
return ADType == AD_Type.AwardVideo ? 0.75f : 0f;
|
||||
}
|
||||
}
|
||||
|
||||
public virtual float ShowPendingTimeoutSeconds
|
||||
{
|
||||
get
|
||||
{
|
||||
return 5f;
|
||||
}
|
||||
}
|
||||
|
||||
public virtual bool AutoPreloadOnInit
|
||||
{
|
||||
get
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public ADPlayer Init(string key)
|
||||
{
|
||||
this.Key = key;
|
||||
@@ -30,18 +65,43 @@ namespace Runtime.ADAggregator
|
||||
}
|
||||
|
||||
public abstract void ShowAD(Action onClose, Action<bool> onVideoComplete);
|
||||
public abstract bool IsReadly();
|
||||
|
||||
public virtual bool IsReadly()
|
||||
{
|
||||
return this.curState == 2;
|
||||
}
|
||||
|
||||
public abstract void LoadAD();
|
||||
|
||||
public virtual void OnInit()
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void OnPlayRequestStarted()
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void EnterAdScenario(string scenario)
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 主动关闭广告
|
||||
/// </summary>
|
||||
public virtual void CloseAD()
|
||||
{
|
||||
}
|
||||
|
||||
protected void NotifyShowStarted()
|
||||
{
|
||||
OnShowStartedAction?.Invoke();
|
||||
}
|
||||
|
||||
public void OnError(object code, string message)
|
||||
{
|
||||
this.OnErrorAction?.Invoke();
|
||||
this.OnErrorAction = null;
|
||||
curState = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,23 +5,40 @@ namespace Runtime.ADAggregator
|
||||
{
|
||||
public class AsyncAdPlayer
|
||||
{
|
||||
private Action<bool> _callback;
|
||||
private ADPlayer _adPlayer;
|
||||
private bool firstLoad;
|
||||
private bool isKill;
|
||||
private bool isUpdate;
|
||||
private AdTimeHandler overHandler;
|
||||
|
||||
private float _outTime;
|
||||
|
||||
public AsyncAdPlayer(ADPlayer player , Action<bool> callback)
|
||||
private enum AsyncPlayPhase
|
||||
{
|
||||
|
||||
this._outTime = 0;
|
||||
this._callback = callback;
|
||||
this.isKill = false;
|
||||
this.firstLoad = true;
|
||||
this._adPlayer = player;
|
||||
Loading,
|
||||
ShowPending,
|
||||
Playing,
|
||||
Closing,
|
||||
Completed
|
||||
}
|
||||
|
||||
private const float LoadTimeoutSeconds = 15f;
|
||||
private const float ShowAckTimeoutSeconds = 2f;
|
||||
|
||||
private Action<bool> _callback;
|
||||
private ADPlayer _adPlayer;
|
||||
private bool isKill;
|
||||
private bool isUpdate;
|
||||
private int loadAttempts;
|
||||
private float nextLoadRetryTime;
|
||||
private AdTimeHandler overHandler;
|
||||
private AdTimeHandler _showPendingHandler;
|
||||
private string _adScene;
|
||||
private AsyncPlayPhase _phase;
|
||||
private float _loadElapsed;
|
||||
|
||||
public AsyncAdPlayer(ADPlayer player , string adScene, Action<bool> callback)
|
||||
{
|
||||
_adScene = adScene;
|
||||
_loadElapsed = 0f;
|
||||
_callback = callback;
|
||||
isKill = false;
|
||||
loadAttempts = 0;
|
||||
nextLoadRetryTime = 0f;
|
||||
_adPlayer = player;
|
||||
_phase = AsyncPlayPhase.Loading;
|
||||
if (_adPlayer == null)
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
@@ -33,7 +50,10 @@ namespace Runtime.ADAggregator
|
||||
}
|
||||
ADManager.Instance.OpenMask();
|
||||
_adPlayer.OnErrorAction = OnError;
|
||||
isUpdate = true;
|
||||
_adPlayer.OnShowStartedAction = OnShowStarted;
|
||||
_adPlayer.AdScene = _adScene;
|
||||
_adPlayer.OnPlayRequestStarted();
|
||||
isUpdate = true;
|
||||
ADManager.Instance.AddUpdater(DoUpdate);
|
||||
}
|
||||
|
||||
@@ -42,66 +62,112 @@ namespace Runtime.ADAggregator
|
||||
#if UNITY_EDITOR
|
||||
Debug.LogError("广告异常: " + this._adPlayer.Key);
|
||||
#endif
|
||||
// return;
|
||||
// if (isUpdate)
|
||||
// {
|
||||
// isUpdate = false;
|
||||
// ADManager.Instance.RemoveUpdater(DoUpdate);
|
||||
// }
|
||||
// ADManager.Instance.CloseMask();
|
||||
// _callback?.Invoke(false);
|
||||
// Clear();
|
||||
if (_phase == AsyncPlayPhase.Loading)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Fail(false);
|
||||
}
|
||||
|
||||
private void DoUpdate()
|
||||
{
|
||||
if (!isUpdate)
|
||||
return;
|
||||
_outTime += Time.deltaTime;
|
||||
if (this._outTime >= 15)
|
||||
{
|
||||
_callback?.Invoke(false);
|
||||
Kill();
|
||||
return;
|
||||
}
|
||||
|
||||
switch (_phase)
|
||||
{
|
||||
case AsyncPlayPhase.Loading:
|
||||
UpdateLoading();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateLoading()
|
||||
{
|
||||
_loadElapsed += Time.deltaTime;
|
||||
if (_loadElapsed >= LoadTimeoutSeconds)
|
||||
{
|
||||
Fail(false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (_adPlayer.IsReadly())
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
Debug.LogError("开始播放广告: " + this._adPlayer.Key);
|
||||
#endif
|
||||
_adPlayer.ShowAD(OnCloseAD, OnComplete);
|
||||
ADManager.Instance.CloseMask();
|
||||
isUpdate = false;
|
||||
ADManager.Instance.RemoveUpdater(DoUpdate);
|
||||
BeginShow();
|
||||
}
|
||||
else if(!_adPlayer.IsLoading())
|
||||
else if (!_adPlayer.IsLoading())
|
||||
{
|
||||
if (firstLoad)
|
||||
if (loadAttempts < _adPlayer.MaxLoadAttempts)
|
||||
{
|
||||
if (_loadElapsed < nextLoadRetryTime)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
Debug.LogError("开始加载广告: " + this._adPlayer.Key);
|
||||
#endif
|
||||
this._outTime = 0;
|
||||
_adPlayer.LoadAD();
|
||||
firstLoad = false;
|
||||
loadAttempts++;
|
||||
nextLoadRetryTime = _loadElapsed + _adPlayer.LoadRetryDelaySeconds;
|
||||
}
|
||||
else
|
||||
{
|
||||
_callback?.Invoke(false);
|
||||
Kill();
|
||||
Fail(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void BeginShow()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
Debug.LogError("开始播放广告: " + _adPlayer.Key);
|
||||
#endif
|
||||
try
|
||||
{
|
||||
_phase = AsyncPlayPhase.ShowPending;
|
||||
_showPendingHandler = ADManager.Instance.CreateTimer(
|
||||
_adPlayer.ShowPendingTimeoutSeconds > 0 ? _adPlayer.ShowPendingTimeoutSeconds : ShowAckTimeoutSeconds,
|
||||
() => Fail(false));
|
||||
_adPlayer.ShowAD(OnCloseAD, OnComplete);
|
||||
isUpdate = false;
|
||||
ADManager.Instance.RemoveUpdater(DoUpdate);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Debug.LogError(exception);
|
||||
_showPendingHandler?.Kill();
|
||||
Fail(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnShowStarted()
|
||||
{
|
||||
if (isKill)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_phase = AsyncPlayPhase.Playing;
|
||||
_showPendingHandler?.Kill();
|
||||
ADManager.Instance.CloseMask();
|
||||
}
|
||||
|
||||
private void OnCloseAD()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
Debug.LogError("关闭广告: " + this._adPlayer.Key);
|
||||
Debug.LogError("关闭广告: " + _adPlayer.Key);
|
||||
#endif
|
||||
_phase = AsyncPlayPhase.Closing;
|
||||
_showPendingHandler?.Kill();
|
||||
if (overHandler == null)
|
||||
{
|
||||
overHandler = ADManager.Instance.CreateTimer(1.5f, () =>
|
||||
{
|
||||
this._callback?.Invoke(false);
|
||||
_callback?.Invoke(false);
|
||||
Clear();
|
||||
});
|
||||
}
|
||||
@@ -109,30 +175,49 @@ namespace Runtime.ADAggregator
|
||||
|
||||
private void OnComplete(bool obj)
|
||||
{
|
||||
this.overHandler?.Kill();
|
||||
this.overHandler = ADManager.Instance.CreateTimer(0.05f, () =>
|
||||
_phase = AsyncPlayPhase.Completed;
|
||||
_showPendingHandler?.Kill();
|
||||
overHandler?.Kill();
|
||||
overHandler = ADManager.Instance.CreateTimer(0.05f, () =>
|
||||
{
|
||||
if (_adPlayer != null && _adPlayer.ADType == AD_Type.AwardVideo)
|
||||
{
|
||||
ADManager.Instance.OnVideoComplete(obj);
|
||||
}
|
||||
_callback?.Invoke(obj);
|
||||
Clear();
|
||||
});
|
||||
}
|
||||
|
||||
private void Fail(bool result)
|
||||
{
|
||||
_callback?.Invoke(result);
|
||||
Kill();
|
||||
}
|
||||
|
||||
//销毁广告
|
||||
public void Kill()
|
||||
{
|
||||
if (isKill)
|
||||
return;
|
||||
ADManager.Instance.CloseMask();
|
||||
ADManager.Instance.RemoveUpdater(DoUpdate);
|
||||
Clear();
|
||||
}
|
||||
|
||||
private void Clear()
|
||||
{
|
||||
ADManager.Instance.CloseMask();
|
||||
isKill = true;
|
||||
isUpdate = false;
|
||||
if (_adPlayer != null)
|
||||
{
|
||||
_adPlayer.OnErrorAction = null;
|
||||
_adPlayer.OnShowStartedAction = null;
|
||||
}
|
||||
_callback = null;
|
||||
_adPlayer = null;
|
||||
this.overHandler = null;
|
||||
overHandler = null;
|
||||
_showPendingHandler = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 131a6b21c8605f84396be9f6751fb6e3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,28 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 98b31b835f394db4a51957c3f0f3ac32, type: 3}
|
||||
m_Name: Sample-AdConfig
|
||||
m_EditorClassIdentifier:
|
||||
ConfigName:
|
||||
Id:
|
||||
Key:
|
||||
Key2:
|
||||
BaseAwardAdKeyValue:
|
||||
key:
|
||||
value:
|
||||
BaseInteractionAdKeyValue:
|
||||
key:
|
||||
value:
|
||||
BaseSplashAdKeyValue:
|
||||
key:
|
||||
value:
|
||||
CommonKeyValues: []
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d4eed937a29d5f2408fa1bb48c59169a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,208 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!104 &2
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 12
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 0
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 12
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_AtlasSize: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_ExtractAmbientOcclusion: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 256
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 2
|
||||
m_BakeBackend: 0
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVREnvironmentSampleCount: 500
|
||||
m_PVREnvironmentReferencePointCount: 2048
|
||||
m_PVRFilteringMode: 2
|
||||
m_PVRDenoiserTypeDirect: 0
|
||||
m_PVRDenoiserTypeIndirect: 0
|
||||
m_PVRDenoiserTypeAO: 0
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVREnvironmentMIS: 0
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ExportTrainingData: 0
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_LightingSettings: {fileID: 0}
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
maxJobWorkers: 0
|
||||
preserveTilesOutsideBounds: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &519420028
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 519420032}
|
||||
- component: {fileID: 519420031}
|
||||
- component: {fileID: 519420029}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &519420029
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 519420028}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &519420031
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 519420028}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 2
|
||||
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
|
||||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_FocalLength: 50
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 60
|
||||
orthographic: 1
|
||||
orthographic size: 5
|
||||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
m_TargetEye: 0
|
||||
m_HDR: 1
|
||||
m_AllowMSAA: 0
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 0
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!4 &519420032
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 519420028}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2cda990e2423bbf4892e6590ba056729
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "com.foldcc.cc-framework.commercialization",
|
||||
"displayName": "CC-Framework.commercialization",
|
||||
"description": "商业化sdk通用组件,包含广告、内购、用户统计、归因统计等",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.14",
|
||||
"unity": "2021.1",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user