Commit 0718e065 authored by zxhljwl's avatar zxhljwl

Merge branch 'develop_1.0.3' of gitlab.huolea.com:wangxuewei/first_fkqcw into develop_1.0.3

parents bf2ba257 25461676
...@@ -592,7 +592,7 @@ CanvasGroup: ...@@ -592,7 +592,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 455528767808094878} m_GameObject: {fileID: 455528767808094878}
m_Enabled: 1 m_Enabled: 1
m_Alpha: 0 m_Alpha: 1
m_Interactable: 0 m_Interactable: 0
m_BlocksRaycasts: 1 m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0 m_IgnoreParentGroups: 0
...@@ -3886,7 +3886,7 @@ MonoBehaviour: ...@@ -3886,7 +3886,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Lv100 m_Text: Lv1
--- !u!1 &8541939284437355486 --- !u!1 &8541939284437355486
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -58,6 +58,7 @@ public class AdUtils ...@@ -58,6 +58,7 @@ public class AdUtils
public void onAdClose(AdEntity entity) public void onAdClose(AdEntity entity)
{ {
AdManager.Instance.LoadCacheRewardVideoAd("video"); AdManager.Instance.LoadCacheRewardVideoAd("video");
setCurrentAdEntity(entity);
callback(true); callback(true);
ReportVideo(actionName); ReportVideo(actionName);
} }
......
...@@ -62,6 +62,7 @@ public class EveryDayControl : MonoBehaviour ...@@ -62,6 +62,7 @@ public class EveryDayControl : MonoBehaviour
EventUtils.OnEvent("rewardVideo_dayCash", "激励视频_天天提现领取红心"); EventUtils.OnEvent("rewardVideo_dayCash", "激励视频_天天提现领取红心");
EventUtils.OnEvent("rewardVideo_all", "激励视频_天天提现领取红心"); EventUtils.OnEvent("rewardVideo_all", "激励视频_天天提现领取红心");
Dictionary<string, object> parameters = new Dictionary<string, object>(); Dictionary<string, object> parameters = new Dictionary<string, object>();
Debug.Log("Adcode"+AdUtils.getCurrentAdEntity().codeId);
parameters.Add("adCode", AdUtils.getCurrentAdEntity().codeId); parameters.Add("adCode", AdUtils.getCurrentAdEntity().codeId);
parameters.Add("id", sid); parameters.Add("id", sid);
HttpTool.Instance._Get("app/v1/game/module/receiveHearts", parameters, HttpTool.Instance._Get("app/v1/game/module/receiveHearts", parameters,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment