Merge branch 'main' of http://v4.9ms.co:7777/yufeng/SDK_UnityMoney

Assets/Scenes/GameScene.unity

@@ -334,6 +334,101 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 231270962}
   m_CullTransparentMesh: 1
+--- !u!1 &336995263
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 336995266}
+  - component: {fileID: 336995265}
+  - component: {fileID: 336995264}
+  m_Layer: 0
+  m_Name: Reporter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &336995264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 336995263}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6767a180de870304caa2013b2772dd62, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &336995265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 336995263}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 600c02144c4813244abd262cbcbe8825, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  show: 0
+  UserData: 
+  fps: 0
+  fpsText: 
+  images:
+    clearImage: {fileID: 2800000, guid: 112c6fcf56e349449ab2e6ad76b67816, type: 3}
+    collapseImage: {fileID: 2800000, guid: 4623f326a884a2546ab39078bf7822c3, type: 3}
+    clearOnNewSceneImage: {fileID: 2800000, guid: 3a6bc61a8319b1949ab9f1f2db1302b4, type: 3}
+    showTimeImage: {fileID: 2800000, guid: 782e03669fa4a614e89ef56252134250, type: 3}
+    showSceneImage: {fileID: 2800000, guid: ff4dfb29f203a174ab8e4c498afe908a, type: 3}
+    userImage: {fileID: 2800000, guid: 2bcdc012e7356f1449ce7d3a31dc458c, type: 3}
+    showMemoryImage: {fileID: 2800000, guid: f447d62f2dacf9843be7cbf168a3a9d0, type: 3}
+    softwareImage: {fileID: 2800000, guid: 6c91fc88ee6c791468318d85febfb48d, type: 3}
+    dateImage: {fileID: 2800000, guid: a7561cd0a9f62a84e99bff1abce2a222, type: 3}
+    showFpsImage: {fileID: 2800000, guid: 90b2f48155dc0e74f8e428561ac79da5, type: 3}
+    infoImage: {fileID: 2800000, guid: 2954bef266e6d794aba08ceacc887a0f, type: 3}
+    saveLogsImage: {fileID: 2800000, guid: 4a4821d80a1fc774fb76eac6213544e7, type: 3}
+    searchImage: {fileID: 2800000, guid: bfef37b5a26d2264798616d960451329, type: 3}
+    copyImage: {fileID: 2800000, guid: 7f36d71624c630046b855909c497be17, type: 3}
+    copyAllImage: {fileID: 2800000, guid: b2eeb4320cc98864391dcb102e0778b9, type: 3}
+    closeImage: {fileID: 2800000, guid: b65e9be99974bc94eab5d6698811d0b8, type: 3}
+    buildFromImage: {fileID: 2800000, guid: 8702be598dd9f504ca33be2afee2ca33, type: 3}
+    systemInfoImage: {fileID: 2800000, guid: e9011b1dc9256ad4d9c19a31c595f95f, type: 3}
+    graphicsInfoImage: {fileID: 2800000, guid: 999d31716332cc04eb4abc9c9270b0ca, type: 3}
+    backImage: {fileID: 2800000, guid: a0632a18e7c665641b94fea66506ab50, type: 3}
+    logImage: {fileID: 2800000, guid: e876b803a4dd5c5488078071d15aa9c0, type: 3}
+    warningImage: {fileID: 2800000, guid: 1066be8e7b994b94c8a182b8dbe30705, type: 3}
+    errorImage: {fileID: 2800000, guid: 7640ebf8b3a92124d821d3b4b8b3fd7e, type: 3}
+    barImage: {fileID: 2800000, guid: 8128d4f4c0193e34586f9631ef7d4787, type: 3}
+    button_activeImage: {fileID: 2800000, guid: 2580a2e903691e44282e56ed6e0ff37a, type: 3}
+    even_logImage: {fileID: 2800000, guid: d27aad55b568c6544b0b95a95da44bc7, type: 3}
+    odd_logImage: {fileID: 2800000, guid: 8ffbb44a2c3adae45913474e4fd487f5, type: 3}
+    selectedImage: {fileID: 2800000, guid: 17117a429b08e7e43b0b6c8421de69fe, type: 3}
+    reporterScrollerSkin: {fileID: 11400000, guid: 1cc68832d00d3284a9324a4dc05be753, type: 2}
+  size: {x: 32, y: 32}
+  maxSize: 20
+  numOfCircleToShow: 1
+  Initialized: 0
+--- !u!4 &336995266
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 336995263}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &519420028
 GameObject:
   m_ObjectHideFlags: 0
@@ -831,6 +926,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2137923634}
+  - component: {fileID: 2137923635}
   m_Layer: 0
   m_Name: '[SDKManager]'
   m_TagString: Untagged
@@ -853,6 +949,18 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2137923635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2137923633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d42e67765404c5c4f9d0a5df021643b9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -861,3 +969,4 @@ SceneRoots:
   - {fileID: 2137923634}
   - {fileID: 1332931146}
   - {fileID: 1222376250}
+  - {fileID: 336995266}

Assets/Script/SDKManager/AdjustManager/AdjustManager.cs

@@ -22,6 +22,9 @@ public class AdjustManager : NormalSingleton<AdjustManager>
         
         // 初始化Adjust SDK
         Adjust.InitSdk(config);
+        
+        //计时3分钟
+        AppSDKManager.Instance.Coroutine(AdjustNetwork.Instance.SetOrganic3Min());
     }
     
     /// <summary>

Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs

@@ -1,4 +1,5 @@
-using SDK.Utils;
+using System.Collections;
+using SDK.Utils;
 using UnityEngine;
 
 public class AdjustNetwork : NormalSingleton<AdjustNetwork>
@@ -12,6 +13,11 @@ public class AdjustNetwork : NormalSingleton<AdjustNetwork>
             return;
         }
         
+        if (network.ToLower().Replace(" ", "") == "Organic".ToLower().Replace(" ", ""))
+        {
+            return;
+        }
+        
         string curNetwork = PlayerPrefs.GetString(KEY_USER_NETWORK, "");
         if (string.IsNullOrEmpty(curNetwork))
         {
@@ -20,6 +26,31 @@ public class AdjustNetwork : NormalSingleton<AdjustNetwork>
         }
     }
 
+    /// <summary>
+    /// 3分钟设置自然量
+    /// </summary>
+    public IEnumerator SetOrganic3Min()
+    {
+        string curNetwork = PlayerPrefs.GetString(KEY_USER_NETWORK, "");
+        if (!string.IsNullOrEmpty(curNetwork))
+        {
+            yield break;
+        }
+
+        //写死3分钟
+        yield return new WaitForSeconds(3 * 60);
+        
+        //重新获取
+        curNetwork = PlayerPrefs.GetString(KEY_USER_NETWORK, "");
+        if (!string.IsNullOrEmpty(curNetwork))
+        {
+            yield break;
+        }
+        
+        PlayerPrefs.SetString(KEY_USER_NETWORK, "Organic");
+        PlayerPrefs.Save();
+    }
+
     /// <summary>
     /// 是否是自然量用户
     /// 默认买量用户

Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs

@@ -26,7 +26,7 @@ public class AdsSDKManager : NormalSingleton<AdsSDKManager>
     /// </summary>
     public bool IsMoreAdsBidding = false;
 
-    private void InitSDK()
+    public void InitSDK()
     {
         // 初始化广告平台状态
         BidPlatformManager.Instance.InitializePlatformStates(AdConfigParser.GetAdExpireInSec());

Assets/Script/SDKManager/FirebaseManager/FireBaseSDKManager.cs

@@ -9,7 +9,7 @@ public class FireBaseSDKManager : NormalSingleton<FireBaseSDKManager>
     public bool IsInit {private set; get; }
 
     public void Init()
-    { ;
+    {
         InitSDK();
     }
 

Assets/Script/Test.cs

@@ -1,9 +1,11 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class Test : MonoBehaviour
 {
+
     public void OnShowAd()
     {
         KwaiAdsManager.Instance.ShowRewardAd();