Commit 9d32bdcf authored by zhangzhe's avatar zhangzhe

no message

parent 7ccaa747
fileFormatVersion: 2
guid: 3bdf81920b9ea8e46abd100e083eefe7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 699ec949cb5539f48b04345cd60af6dd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: b0fdeff412c9a1f4e82faa8ef0aeb063
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -58,7 +58,7 @@ public class HomePresenter : HomeContract.Presenter ...@@ -58,7 +58,7 @@ public class HomePresenter : HomeContract.Presenter
public void GetHomeInfo() public void GetHomeInfo()
{ {
Debug.Log("请求主页信息接口"); Debug.Log("请求主页信息接口");
HttpTool.Instance._Get("app/v1/wdlc/home_info", null, new Action<HomeInfoBean>((bean) => HttpTool.Instance._Get("app/v2/cscmnq/home_info", null, new Action<HomeInfoBean>((bean) =>
{ {
PlayerDataControl.Instance.VideoUnlockCarID = bean.unlockLandByVideoId; PlayerDataControl.Instance.VideoUnlockCarID = bean.unlockLandByVideoId;
PlayerDataControl.Instance.diamondByVideoRewardNum = bean.diamondByVideoRewardNum; PlayerDataControl.Instance.diamondByVideoRewardNum = bean.diamondByVideoRewardNum;
......
...@@ -141,7 +141,7 @@ public class AdUtils ...@@ -141,7 +141,7 @@ public class AdUtils
{ {
EventUtils.OnEvent("reward_reduceAllTime", "激励视频_及时雨"); EventUtils.OnEvent("reward_reduceAllTime", "激励视频_及时雨");
} }
else if (actionName.Equals("diamond_reward")) else if (actionName.Equals("diamond_reward_v2"))
{ {
EventUtils.OnEvent("reward_addDiamond", "激励视频_领取钻石"); EventUtils.OnEvent("reward_addDiamond", "激励视频_领取钻石");
} }
......
...@@ -325,24 +325,24 @@ public class CarUIControl : MonoBehaviour ...@@ -325,24 +325,24 @@ public class CarUIControl : MonoBehaviour
public Text fruitTimeTv; public Text fruitTimeTv;
public void setTime(LandListData entity) public void setTime(LandListData entity)
{ {
//if (entity.landPlantData == null) if (entity.landPlantData == null)
//{ {
// return; return;
//} }
//stopTime = (int)entity.landPlantData.appearWormCountdownSecond; stopTime = (int)entity.landPlantData.appearWormCountdownSecond;
//totalTime = (int)entity.landPlantData.growthAllSecond; totalTime = (int)entity.landPlantData.growthAllSecond;
//currentCarTime = (int)entity.landPlantData.growthLastSecond; currentCarTime = (int)entity.landPlantData.growthLastSecond;
////设置暂停状态 //设置暂停状态
//setPauseTime(currentCarTime); setPauseTime(currentCarTime);
////关闭上一次倒计时 //关闭上一次倒计时
//if (timeControl != null) if (timeControl != null)
//{ {
// StopCoroutine(timeControl); StopCoroutine(timeControl);
//} }
//if (currentCarTime > 0) if (currentCarTime > 0)
//{ {
// timeControl = StartCoroutine(timeConteller()); timeControl = StartCoroutine(timeConteller());
//} }
} }
...@@ -355,6 +355,7 @@ public class CarUIControl : MonoBehaviour ...@@ -355,6 +355,7 @@ public class CarUIControl : MonoBehaviour
if (progressBarImg != null) if (progressBarImg != null)
{ {
progressBarImg.fillAmount = 1 - (currentCarTime / (float)totalTime); progressBarImg.fillAmount = 1 - (currentCarTime / (float)totalTime);
fruitTimeTv.text = ((1 - (currentCarTime / (float)totalTime)) * 100).ToString() + "%";
} }
yield return new WaitForSecondsRealtime(1f); yield return new WaitForSecondsRealtime(1f);
if (currentCarTime <= 0) if (currentCarTime <= 0)
......
...@@ -489,7 +489,7 @@ public class DialogControl : MonoBehaviour ...@@ -489,7 +489,7 @@ public class DialogControl : MonoBehaviour
Invoke("moveDiamondDialog", 1f); Invoke("moveDiamondDialog", 1f);
//#endif //#endif
HttpTool.Instance._Get("app/v1/wdlc/reward/diamond_by_video_status", parm, new Action<DiamondStatusBean>((bean) => HttpTool.Instance._Get("app/v2/cscmnq/diamond_by_video_status", parm, new Action<DiamondStatusBean>((bean) =>
{ {
DiamondplayNum = bean.playNum; DiamondplayNum = bean.playNum;
tv_diamond_num.text = bean.rewardDiamondNum.ToString(); tv_diamond_num.text = bean.rewardDiamondNum.ToString();
...@@ -1232,7 +1232,7 @@ public class DialogControl : MonoBehaviour ...@@ -1232,7 +1232,7 @@ public class DialogControl : MonoBehaviour
public void LookvideoGetDiamond() public void LookvideoGetDiamond()
{ {
AdUtils.PlayRewardAd("diamond_reward", new Action<bool>((cb) => AdUtils.PlayRewardAd("diamond_reward_v2", new Action<bool>((cb) =>
{ {
if (cb) if (cb)
{ {
......
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