From 76ce5fe79afabe8d324638476cf8d44853131755 Mon Sep 17 00:00:00 2001
From: Foldcc_b1 <lhyuau@qq.com>
Date: Sat, 28 Jan 2023 17:47:11 +0800
Subject: [PATCH] update core

---
 Assets/Runtime/ADAggregator/ADManager.cs  |  7 ++++++-
 Assets/Runtime/ADAggregator/ADPlayer.cs   | 14 +++++++++++++-
 Assets/package.json                       |  2 +-
 ProjectSettings/EditorBuildSettings.asset |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Assets/Runtime/ADAggregator/ADManager.cs b/Assets/Runtime/ADAggregator/ADManager.cs
index 40b410b..0dbae38 100644
--- a/Assets/Runtime/ADAggregator/ADManager.cs
+++ b/Assets/Runtime/ADAggregator/ADManager.cs
@@ -48,15 +48,20 @@ namespace Runtime.ADAggregator
 
         private AsyncAdPlayer _curAsyncPlayer;
 
+        private string _userId;
+
+        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;
             _instance.name = "[GameUpdater] <color=green>Init<color>";
             AD_Dicts = new Dictionary<AD_Type, ADPlayer>();
+            _userId = userId;
 #if UNITY_EDITOR
             onCallback?.Invoke();
 #else
diff --git a/Assets/Runtime/ADAggregator/ADPlayer.cs b/Assets/Runtime/ADAggregator/ADPlayer.cs
index 171b2a9..1c59cba 100644
--- a/Assets/Runtime/ADAggregator/ADPlayer.cs
+++ b/Assets/Runtime/ADAggregator/ADPlayer.cs
@@ -30,7 +30,12 @@ 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()
@@ -43,5 +48,12 @@ namespace Runtime.ADAggregator
         public virtual void CloseAD()
         {
         }
+        
+        public void OnError(object code, string message)
+        {
+            this.OnErrorAction?.Invoke();
+            this.OnErrorAction = null;
+            curState = 0;
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/package.json b/Assets/package.json
index deb69e1..185791d 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.1",
+  "version": "1.0.2",
   "unity": "2021.1",
   "license": "MIT",
   "repository": {
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 5c58c2b..57d9e1c 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,6 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Sample-Commercialization.unity
+    path: Assets/Sample/Sample-Commercialization.unity
     guid: 2cda990e2423bbf4892e6590ba056729
   m_configObjects: {}