From d8f2bcb9ee515e975081a709661f1a6cc0573e6f Mon Sep 17 00:00:00 2001 From: zhangjie0072 Date: Mon, 8 Aug 2022 20:14:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E9=9F=B31.0.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/StarkBuilderSetting.asset | 4 +- Assets/Resources/Image/UI/Btn_AdsTip.png | Bin 1296 -> 1370 bytes Assets/Resources/Image/UI/game-tip.png | Bin 2582 -> 2628 bytes .../Image/UI/level-select-lockicon.png | Bin 1509 -> 1398 bytes Assets/Resources/Image/UI/settle-skip.png | Bin 2554 -> 2114 bytes Assets/Resources/Image/UI/settle-tip.png | Bin 2381 -> 2810 bytes .../Resources/Image/UI/settle-tip1-share.png | Bin 0 -> 2487 bytes .../Image/UI/settle-tip1-share.png.meta | 98 +++++++++++ Assets/Resources/UIs/PanelGame.prefab | 2 +- Assets/Resources/UIs/PanelResult.prefab | 127 +++++++++++++- Assets/Scenes/Main.unity | 5 + Assets/Scripts/Game/GameLogic.cs | 11 ++ Assets/Scripts/UI/CustomControl/EndingCell.cs | 4 +- Assets/Scripts/UI/PanelGame.cs | 28 ++- Assets/Scripts/UI/PanelResult.cs | 60 ++++++- .../Common/GameInterface/TKGSDKManager.cs | 23 ++- .../Config/Scripts/TKGAdPositionName.cs | 4 + .../Scripts/SDK/TKGNativeInterfaceWebgl.cs | 162 +++++++++++++++++- 18 files changed, 507 insertions(+), 21 deletions(-) create mode 100644 Assets/Resources/Image/UI/settle-tip1-share.png create mode 100644 Assets/Resources/Image/UI/settle-tip1-share.png.meta diff --git a/Assets/Editor/StarkBuilderSetting.asset b/Assets/Editor/StarkBuilderSetting.asset index 8b3c565b..5a2dd0ba 100644 --- a/Assets/Editor/StarkBuilderSetting.asset +++ b/Assets/Editor/StarkBuilderSetting.asset @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: a: 0 b: 0 - c: + c: tt48073ebad739259407 d: e: 2 f: 1 g: 0 - h: 0 + h: 1 i: 2 j: 0 k: 0 diff --git a/Assets/Resources/Image/UI/Btn_AdsTip.png b/Assets/Resources/Image/UI/Btn_AdsTip.png index d427d1d3e3b962b47e0113c30b956977712bf38b..db77e22e5c395fa97747da1d249ccb43061e7a6b 100644 GIT binary patch delta 1048 zcmV+z1n2vZ3fc;gK>^*7Ldt*tzrp^Ajq`bZ`h$o6rKtajjr@g)|JmFB)71a%?*EsY z|IE(+kd*(Pq5taZ|L5rcvbF!XyZ^?>|MTt+4;s*#D1`|J&UEouL1xs{fLf|MBww@bUkYm;Zmh!T*(+|D&ey zc6$AYjQD_r`-O@By}+JuSod37E|MBtofrbCx-~aIN z|JvLC)7AEVg79{F^m-kB|GmHYfra&afc1NS{fCS6dw=qGd-{Zkx@V#xJSq-GH0CZR+) zb0vsu6N@}M7wp_27`Y5gJ0}>qf5Jr?{g>lGUB7m7V#r1Z`LqR9Dcy0QGEq}f|A~B$ zc#2mh$_SBb#``DZjAmt@k^$r(;;S!+G!e2CA`2l*2hHGY>__(3Kz6~tH}dN;5+kJ3 zcocWJ7MyMRk#Y^><4!biC@ABnwq*uK>; zQPpZ9A$-n3>ZTf6?V1xIyLK+i$onCrPHz;e3TYV3S~4lVF%I%c5Se5|1L7nFRH~g- zbq^^ceJteN&QN&_YD|{Bf0Sb+$JH9ElY=DtNb-;^7s*&xM;h@fP7v6&J6lbhRgRKu zL^XI;C(i0lRQu9Jl0xX1d6U&66KhMA$Z87>(+73 z_`^H)tDYR47$-<_c$ke+gU~>*sf^vB|4-q|`Jd9R!g&N%~S~YZ9Th zAxV;sfXLq6l1OdeMc&o7ZV^aayP18YY+NUdxOA5L-Lrhvf~jEgno>89(*6Mq2SbEP SUuVz&0000@RoLdt*siH-Alefook|G&ZirKtby?*EC6{Dq1C+1vln(*L`? z|CgKp=ji{;&i|>b|B#gbo}vHY;{UR>|H8!oxV!(x$p7Hs|LN-gtFHgs-2cqY|Jd38 z@9_VxviX9B@_2mwhKlibd;W-w_I-i>?(hGqt^f1$@pgLsh>ZAvg!_MmiT|su|Jd69 z?(YA?#s8?Q|J~mIz{3B}(f`xb|D&e=prilj>Hn^=|H;e$kdy!77c*7A3I`hH+TvfD%UBb^Qd{^2e{Bm6;4O*f6qMI-O?2W5oFnDKIwaqnhj zpX@Ml80C9=ZzIJ&JVa>NkF*fdRU#cBOmAAj+~W`u#mJAu2pKdUmA|e9AGKnTzoL*f zi3=$X4o9S6pEMYQeDHr`svfCwPAJNG%Htsh;oI3dq(v!mmgFwu%VnTAROvV*gp<#r za|w0tt`ePo9E*f6oqLf;?8U>@t%Qk+7LSDR=|COQu$0i-+?)tG^W>80$*Ta;pi@<^ zLz*VDmQ0FoHb$B+f(y49(S+EhfLgV)is2z;WHdrP9}1Pnq{e?_*-N`da$T*lI=M)) z4m%d9eT~~a1c7nTu5(e6g(zl>)qnnu-H@aZ24>!5^+>xE7fB5!M*yFTFMlF}* zikh1vZSL0pZW}XXMm7(#QJQRMx<*wc%eJu0!_(aY)sRz-nwvR8Tcm?@GZX9^&`oW+ z`4()k*Bl2!)8T)9=M9(HKcht=r=yYm{G7nGw^&EByeo^eb2HS5PBc2s0P#zSR#N5J=p)pZ%ol-6f2;aT)*b*}QGdLeRbzbgZJZf8=FD6wlD%UjP6A07*qo IM6N<$g4v%ZCjbBd diff --git a/Assets/Resources/Image/UI/game-tip.png b/Assets/Resources/Image/UI/game-tip.png index 7d06a9fbd404050a2057611a8147e950bcd3022e..7af94e83922ea07322aef14f6fc5de3874500e4e 100644 GIT binary patch literal 2628 zcmZWq2{e@J8y_j%a#IT3v1A)0yD+k3Z`4S(N`Nk|OFGUoYD*EyZez305&^ZuUS`};lb_r1@1&KG83j@h$Ya5n;h*mKg< z*or-$VLt}HaI$0Wr(KQgX}hz*X#)hJG@6@vc?Ub^@U+4hB8obNrxA#4OBQA}CTtS& zWwypb7?KS(vry|#Bz}-Tz}D)I^uK^D_<67eKc_$A|9aUB^DoqT+Q0Yx*|mlLRra4! z(p%(@_zx+=ditGb<$aIe!9OWIO6b2e*$i9oGrt@wvPH688yS*Y6}ALy%t#PjOBUa< zu+NJ9=HCSX-z{HSp(hr`Nl<4GMe0y(0dIZaV==5RLWLo$&H^O_@(*w3NU?IIVR-_I z)nRc23YB60Jq%_7YZErtVR;e?WT8|Gm<)KX1S}>r;h@3@3XZI$iZ90qL(6S=CdbT_ z{J!` zc&-3%ykKJm7_%_`iv7t@q6uZkq2oS`JOk3X%`7SC3WL_WFpvR%JHhlDV6H+(AT+zf z*h}b7gM}fOX@|PsfqW5`Xg~>t7bdVe2ee8k*N4$EC`QBkWcb{?kuC{q-(Z3aZGNy$ zhu6+9M}>EfVfrn!--Ajlyt0IMk6l~u9J|BiJfU;j`+X`-$Y!a#9 z+H=Eqp3GPrxxE>cby!%0U$)!Wz*4!HE1bVc5Id_|+9dGT(-fAByAuQF?maJ{Jl}#p zN}sGj7k4-+_n zIV;i<1Z@$q$zt7dj+L|2Z$ddI{QO7Kc2D?w^14fLWZPke7NU1pnTvJW=UY@;A7ni0 zBkfr7KFAo>kwJ+VlQMg#PB)Sw!dlijloia3-|cH}cEcZ}h(mT`3PPC3id<+vhCn#5KLZCF`w(VLBW$ z${Z|6y=xQA2(n^$+8`6pAS$#cTLc3g@j8A)I@Y>p!6jFCHU~Po< zm~QTxAep}MpxS+KRlABLl268+>G#IbbfbNHWjk&U3JDHk-S0=uPLkbc29|W&dh*+| zwX#E=SD0Pt>s0x6&(bwFN6&6KPH;xGNWwf5buA z>*4kuQz~IvLQeOUoJ0(M&hM&PGv>OJxy#=Z!}o4;S4FWJQM%eZqpo?8B*_o~N9}bY z%F^AJ-#_s=$*$cll@&-sx(n7XAV`L$7yTn8eEI4_sP)H9@U|ua3T6VXWgh4SY0lp` zzs-h@-Tkn$$gqzZ7lRTIkucA6+n#7fq7Zz9C<#H&GDmOa2IKa~B+Aye$KBu}I+6D~ z@y^|pr)%JHS(m0mog=S@RwPYa03HJNZHh{o{V?}bi;EA>J+ZNBTTQb-pIMcxNveW_ z)%ZN=oQIZ9Z0VO9%J_G7*6K2WxR|gf&Cv-}ARm9`| z{-M*n<|o>aS*1$h)gBL$r%=RWL)7EcIDdgjT1Umk3)VwT`<$rI;MiN{2PpiiO*q~I z&2tmg1BGYB2xDznNBeRMq(f)T^gi-c^$QV)ZhjWy6HRIKTqHP19-h6rH+IKp;9}A| zS}4h1I(I5tF$|MK6HC#v8t3*JEwB;gL#r7??KJ7RwbUb^gl^tP!RpdAra}n^1e6XQEMh(oD$V?x#4tR_pJzLW6-&y7_e}uXpB{Qf>V$$4WAaM>p-(-6zZpW5N^GKTQ7ezYpWT7^1LzH3yzYjNTbY z^0zYDft5c|ej^v}__V8~>+~BQAIWRG%p4eXwrOZgEmLWi9LuzgKd6?===~S{`sZVv z_mxM_ila~6rX|}ciHB=&_dY?lgoiMRYxX+l_D%BLNJkF1G~MsYq3UuO?G=}q*KgRL zsTC@|xLft;(Y@mn-!_TeW#W(bXyHF`Gec(Nw?DQdkRL)5-v1SOa%}`3F**=NiQrfI zMC9baL<;cx(nWKlcai;k`UF>=2IEDV45AfVWeh8)YHIVYcoB-;-I(`fIOxipRwrSc v(MxkjWl^YX=i;w~%VxRfgNmMT5CM_7J@TD{M`IWJ&xbf^Vs2by=y?DC5q6XH literal 2582 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 delta 966 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 OVr5~A{Alhi^6+1+GDg7w literal 2554 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 diff --git a/Assets/Resources/Image/UI/settle-tip1-share.png b/Assets/Resources/Image/UI/settle-tip1-share.png new file mode 100644 index 0000000000000000000000000000000000000000..45282a16f5fc070435dbb5045520660e21e45497 GIT binary patch literal 2487 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 V() { "尖叫吧小鸡仔" }, () => + { + Debug.Log("分享结束 ----"); + }); } private void PlayFilm(int[] pSoundOrder) @@ -70,6 +75,12 @@ public class GameLogic : MonoBehaviour PanelResult tUIResult = UIManager.Instance.OpenUI(); tUIResult.ReviewShowed = false;// !TKGSDKManager.Instance.NotifyGameEnd(PlayerData.Instance.CurrentLevel, tIsWin); + + TKGSDKManager.Instance.ScreenRecordingLogic(TKGSDKManager.SCLCategory.结束, "share title", new List() { "尖叫吧小鸡仔" }, () => + { + Debug.Log("分享结束 ----"); + }); + bool tHasComplete = PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID) == tLvData.Endings.Count; if (tEndingID >= 0) { diff --git a/Assets/Scripts/UI/CustomControl/EndingCell.cs b/Assets/Scripts/UI/CustomControl/EndingCell.cs index 064c5a09..2348c15c 100644 --- a/Assets/Scripts/UI/CustomControl/EndingCell.cs +++ b/Assets/Scripts/UI/CustomControl/EndingCell.cs @@ -60,7 +60,7 @@ public class EndingCell : MonoBehaviour } else if(TKGSDKManager.Instance.GetRewardWay() == TKGSDKManager.WayOfReward.RewardAd) // 只展示激励视频广告 { - mBtnShareTip.gameObject.SetActive(true); + mBtnAdTip.gameObject.SetActive(true); } } else // 已经看过提示了，就这俩按钮都不展示 @@ -116,7 +116,7 @@ public class EndingCell : MonoBehaviour { UIManager.Instance.OpenUI(); }); - WatchAdSucceed(true); + //WatchAdSucceed(true); } private void OnClickShareTip() diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs index 113a3cb5..d3fb05a0 100644 --- a/Assets/Scripts/UI/PanelGame.cs +++ b/Assets/Scripts/UI/PanelGame.cs @@ -52,6 +52,12 @@ public class PanelGame : BasePanel mBtnEndings.DelClick = OnClickEndings; mAni = GetComponent(); + +#if H5_DY + mBtnShareGame.gameObject.SetActive(false); +#elif H5_WX + mBtnShareGame.gameObject.SetActive(true); +#endif } public void Init(bool pWithOpening = false) @@ -164,7 +170,7 @@ public class PanelGame : BasePanel PanelLevel tUILevel = UIManager.Instance.OpenUI(); tUILevel.Init(true); - //TKGSDKManager.Instance.PlayInterstitialAd(Const.AdsEvtValue.GamingSelect); + TKGSDKManager.Instance.ShowInterstitialAd(TKGIVAdPositionName.gaming_select); } private void OnClickMenu() @@ -174,8 +180,24 @@ public class PanelGame : BasePanel private void OnClickEndings() { - PanelEndings tUIEndings = UIManager.Instance.OpenUI(); - tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + if (!PlayerData.Instance.LevelReachGoodEnding(GameConfig.Instance.LevelSort[PlayerData.Instance.CurrentLevel-1])) + { + TKGSDKManager.Instance.ShowRewardAd(TKGRVPositionName.RV_GetTips, (_isReward) => + { + if (_isReward) + { + Debug.Log("CURR LEVEL : " + PlayerData.Instance.CurrentLevel); + PlayerData.Instance.AddEndingAdTip(GameConfig.Instance.LevelSort[PlayerData.Instance.CurrentLevel-1], 0); + PanelEndings tUIEndings = UIManager.Instance.OpenUI(); + tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + } + }); + } + else + { + PanelEndings tUIEndings = UIManager.Instance.OpenUI(); + tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + } } private void OnClickPlay() diff --git a/Assets/Scripts/UI/PanelResult.cs b/Assets/Scripts/UI/PanelResult.cs index e79e01cd..d8d1d489 100644 --- a/Assets/Scripts/UI/PanelResult.cs +++ b/Assets/Scripts/UI/PanelResult.cs @@ -1,9 +1,14 @@ using System; using System.Collections; using System.Collections.Generic; + using UnityEngine; using UnityEngine.UI; +#if H5_DY +using StarkSDKSpace; +#endif + public class PanelResult : BasePanel { public Action DelAgain; @@ -27,6 +32,7 @@ public class PanelResult : BasePanel [SerializeField] Button mBtnAgain1; [SerializeField] Button mBtnNext; [SerializeField] Button mBtnChoose; + [SerializeField] Button mBtnSuccShare; [SerializeField] Button mBtnAgain2; [SerializeField] Button mBtnTip; @@ -45,6 +51,8 @@ public class PanelResult : BasePanel UIUtils.BindBtn(mBtnAgain1, OnClickAgain, AudioClipType.Click_Normal); UIUtils.BindBtn(mBtnNext, OnClickNext, AudioClipType.Click_Normal); UIUtils.BindBtn(mBtnChoose, OnClickChoose, AudioClipType.Click_Normal); + UIUtils.BindBtn(mBtnSuccShare, OnClickSuccShare, AudioClipType.Click_Normal); + UIUtils.BindBtn(mBtnAgain2, OnClickAgain, AudioClipType.Click_Normal); UIUtils.BindBtn(mBtnTip, OnClickEndings, AudioClipType.Click_Normal); @@ -52,6 +60,24 @@ public class PanelResult : BasePanel UIUtils.BindBtn(mBtnShareSkip, OnClickShareSkip, AudioClipType.Click_Normal); mBtnEndings.DelClick = OnClickEndings; + + string platform = StarkSDK.API.GetSystemInfo().platform; + +#if H5_DY + if (platform != null && platform.ToLower().Contains("ios")) + { + mBtnSuccShare.gameObject.SetActive(false); + } + else + { + mBtnSuccShare.gameObject.SetActive(true); + } + + mBtnShareResult.gameObject.SetActive(false); +#else + mBtnSuccShare.gameObject.SetActive(false); + mBtnShareResult.gameObject.SetActive(true); +#endif } public override void OnFocus(bool pFocus) @@ -123,7 +149,7 @@ public class PanelResult : BasePanel if (!ReviewShowed) { - //TKGSDKManager.Instance.PlayInterstitialAd(Const.AdsEvtValue.EndRetry); + TKGSDKManager.Instance.ShowInterstitialAd(TKGIVAdPositionName.end_game_retry); } } @@ -135,7 +161,7 @@ public class PanelResult : BasePanel if (!ReviewShowed) { - //TKGSDKManager.Instance.PlayInterstitialAd(Const.AdsEvtValue.EndNext); + TKGSDKManager.Instance.ShowInterstitialAd(TKGIVAdPositionName.end_game_next); } } @@ -148,10 +174,18 @@ public class PanelResult : BasePanel if (!ReviewShowed) { - //TKGSDKManager.Instance.PlayInterstitialAd(Const.AdsEvtValue.EndSelect); + TKGSDKManager.Instance.ShowInterstitialAd(TKGIVAdPositionName.end_game_select); } } + private void OnClickSuccShare() + { + TKGSDKManager.Instance.ScreenRecordingLogic(TKGSDKManager.SCLCategory.分享, "share title", new List() { "尖叫吧小鸡仔" }, () => + { + Debug.Log("分享结束 ----"); + }); + } + private void OnClickShareResult() { TKGSDKManager.Instance.ShareShareAppMessageByType(TKGSDKManager.ShareType.ShareAppOriginImg); @@ -159,8 +193,24 @@ public class PanelResult : BasePanel private void OnClickEndings() { - PanelEndings tUIEndings = UIManager.Instance.OpenUI(); - tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + if (!PlayerData.Instance.LevelReachGoodEnding(GameConfig.Instance.LevelSort[PlayerData.Instance.CurrentLevel - 1])) + { + TKGSDKManager.Instance.ShowRewardAd(TKGRVPositionName.RV_GetTips, (_isReward) => + { + if (_isReward) + { + Debug.Log("CURR LEVEL : " + PlayerData.Instance.CurrentLevel); + PlayerData.Instance.AddEndingAdTip(GameConfig.Instance.LevelSort[PlayerData.Instance.CurrentLevel - 1], 0); + PanelEndings tUIEndings = UIManager.Instance.OpenUI(); + tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + } + }); + } + else + { + PanelEndings tUIEndings = UIManager.Instance.OpenUI(); + tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + } } private void OnClickSkip() diff --git a/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs b/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs index 26dfe01e..6a1aa6c0 100644 --- a/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs +++ b/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs @@ -178,6 +178,7 @@ public class TKGSDKManager : TKGSingleton return; #endif + Debug.Log("TKGSDKManager ShowInterstitialAd pos : " + _adPos.ToString()); if (IsNoAllAD || IsRemoveAds) { _callback?.Invoke(); @@ -642,7 +643,11 @@ public class TKGSDKManager : TKGSingleton public WayOfReward GetRewardWay() { +#if H5_DY + return WayOfReward.RewardAd; +#elif H5_WX return WayOfReward.Share; +#endif } public void ShareShareAppMessageByType(ShareType _shareType = ShareType.ShareAppOriginImg) @@ -758,13 +763,19 @@ public class TKGSDKManager : TKGSingleton #endif } - #region dy +#region dy /// /// 录屏 只支持安卓 /// public void ScreenRecordingLogic(SCLCategory sCLCategory, string title, List topics, System.Action actA = null) { + string platform = StarkSDK.API.GetSystemInfo().platform; + if (platform != null && platform.ToLower().Contains("ios")) + { + return; + } + bool flg = StarkSDKSpace.CanIUse.GetStarkGameRecorder; Debug.Log("can use flg : " + flg + " , sCLCategory : " + sCLCategory); switch (sCLCategory) @@ -783,6 +794,10 @@ public class TKGSDKManager : TKGSingleton if (StarkSDK.API.GetStarkGameRecorder().GetVideoRecordState() == StarkSDKSpace.StarkGameRecorder.VideoRecordState.RECORD_COMPLETED) { Debug.Log("call 录制结束了，可以分享"); + + int tipIndex = GetRandomIndex(); + string titleTemp = GetRandomShareTips(tipIndex); + StarkSDKSpace.StarkSDK.API.GetStarkGameRecorder().ShareVideoWithTitleTopics((_onShareVideoSuccessCallback) => { Debug.Log("分享成功,获得奖励"); actA?.Invoke(); }, (errMsg) => { @@ -796,7 +811,7 @@ public class TKGSDKManager : TKGSingleton PopupTipsPanel.PopupTips("分享失败，请重新录制"); } }, () => { Debug.Log("取消分享"); - }, title, topics); + }, titleTemp, topics); } break; default: @@ -837,7 +852,7 @@ public class TKGSDKManager : TKGSingleton } - #endregion +#endregion - #endregion +#endregion } \ No newline at end of file diff --git a/Assets/TKGSDK/Config/Scripts/TKGAdPositionName.cs b/Assets/TKGSDK/Config/Scripts/TKGAdPositionName.cs index 19f31493..90ff1720 100644 --- a/Assets/TKGSDK/Config/Scripts/TKGAdPositionName.cs +++ b/Assets/TKGSDK/Config/Scripts/TKGAdPositionName.cs @@ -15,6 +15,10 @@ public enum TKGIVAdPositionName IV_Retry, IV_NextLevel, IV_Back, + gaming_select, + end_game_retry, + end_game_next, + end_game_select } public enum TKGNativePositionName diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs index d789b1d3..0a96d4f9 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs @@ -3,10 +3,13 @@ using System; using System.Collections; using System.Collections.Generic; + using UnityEngine; #if H5_WX using WeChatWASM; +#elif H5_DY +using StarkSDKSpace; #endif namespace Touka @@ -24,8 +27,19 @@ namespace Touka private WXInterstitialAd interstitialAd; private WXRewardedVideoAd rewardAd; private WeChatWASM.SystemInfo sysInfo; +#elif H5_DY + public string DY_RV_ID = "oa31oo12lhr20333ed"; + public string DY_IV_ID = "dd5iaf297h193cbbfn"; + public string DY_Banner_ID = ""; + + private int px2dp(int px) => (int)(px * (160 / Screen.dpi)); + StarkAdManager.BannerStyle m_style = new StarkAdManager.BannerStyle(); + StarkAdManager.BannerAd m_bannerAdIns = null; + + StarkAdManager.InterstitialAd m_interstitalAd = null; #endif + public TKGNativeInterfaceWebgl() { @@ -57,8 +71,9 @@ namespace Touka #endif #if H5_DY - - //StarkSDKSpace.StarkSDK.API.GetStarkAdManager(); + StarkSDK.API.GetStarkAdManager(); + _initCallback(); + initAds(); #endif TKGDebugger.LogDebug("init ----- 02"); } @@ -128,9 +143,65 @@ namespace Touka //拉取的广告可能跟设置的不一样，需要动态调整位置 bannerAd.style.top = (int)sysInfo.windowHeight - res.height; }); +#elif H5_DY + m_style.width = 320; + m_style.left = 10; + m_style.top = 100; + m_bannerAdIns = StarkSDK.API.GetStarkAdManager().CreateBannerAd(DY_Banner_ID, m_style, 30, + OnAdError, OnBannerLoaded, OnBannerResize); #endif } + /// + /// banner callback error + /// + /// + /// + private void OnAdError(int errorCode, string errorMsg) + { + Debug.Log("OnAdError, errorCode : " + errorCode + " , errorMsg : " + errorMsg); + } + + /// + /// on banner loaded + /// + private void OnBannerLoaded() + { + Debug.Log("OnBannerLoaded"); + + if (m_bannerAdIns != null) + + m_bannerAdIns.Show(); + ChangeBannerStyle(); + } + + /// + /// on banner resize + /// + /// + /// + private void OnBannerResize(int width, int height) + { + Debug.Log("OnBannerResize, width : " + width + " , height : " + height); + } + + private void ChangeBannerStyle() + { + int w = m_style.width; //获取banner宽度大小 + int h = m_style.height; //获取banner高度大小 + int sw = px2dp(Screen.width); //获得屏幕宽度(dp) + int sh = px2dp(Screen.height); //获得屏幕高度(dp) + + m_style.top = sh - h; //底部 + m_style.left = sw / 2 - w / 2; //中央 + m_style.width = w; + + if(m_bannerAdIns != null) + { + m_bannerAdIns.ReSize(m_style); //使用Resize函数调整位置和大小 + } + } + /// /// Show banner Ad /// @@ -184,9 +255,39 @@ namespace Touka { adUnitId = "" }); + +#elif H5_DY + //CreateAndLoadIV(); #endif } + private void CreateAndLoadIV() + { + m_interstitalAd = StarkSDK.API.GetStarkAdManager().CreateInterstitialAd(DY_IV_ID, OnIVError, OnIVClose, OnIVLoaded); + } + + private void OnIVError(int errorCode, string errorMsg) + { + Debug.Log("OnIVError, errorCode : " + errorCode + " , errorMsg : " + errorMsg); + } + + private void OnIVClose() + { + if(m_interstitalAd != null) + { + m_interstitalAd.Destory(); + } + m_interstitalAd = null; + } + + private void OnIVLoaded() + { + if(m_interstitalAd != null) + { + Debug.Log("m_interstitalAd OnIVLoaded"); + } + } + /// /// Show Interstitial Ad /// @@ -212,9 +313,38 @@ namespace Touka { Debug.Log("tkg native webgl showInterstitialAd ----- 02"); } +#elif H5_DY + +#if UNITY_WEBGL + return; +#endif + + if(m_interstitalAd != null) + { + Debug.Log("in show iv, m_interstitalAd is not null"); + if (m_interstitalAd.IsLoaded()) + { + Debug.Log("in show iv, m_interstitalAd is loaded"); + m_interstitalAd.Show(); + } + else + { + Debug.Log("in show iv, m_interstitalAd is not loaded"); + m_interstitalAd.Load(); + m_interstitalAd.Show(); + } + + } + else + { + Debug.Log("in show iv, m_interstitalAd is null"); + CreateAndLoadIV(); + } #endif } + + private void initRewardAd() { Debug.Log("tkg native webgl initRewardAd -----"); @@ -243,6 +373,34 @@ namespace Touka { Debug.Log("tkg native webgl showRewardAd ----- 02"); } +#elif H5_DY + //抖音 + StarkSDKSpace.StarkSDK.API.GetStarkAdManager().ShowVideoAdWithId(DY_RV_ID, (isdone) => + { + if (isdone) + { + //播放成功 + //RecordEvents("AdComplete", "WhereCompleteAd", title); + Debug.Log("关闭回调，播放成功"); + if (TKGSDKCallback.mRewardCallback != null) + { + TKGSDKCallback.mRewardCallback.Invoke(true); + TKGSDKCallback.mRewardCallback = null; + } + } + else + { + Debug.Log("关闭回调，播放失败"); + if (TKGSDKCallback.mRewardCallback != null) + { + TKGSDKCallback.mRewardCallback.Invoke(false); + TKGSDKCallback.mRewardCallback = null; + } + } + }, (errcode, errmessage) => + { + Debug.Log("失败回调, errorcode : " + errcode + " , errmessage : " + errmessage); + }, null); #endif }