Skip to content

W
wdlc_mjb_unity
Commit 43b89272 authored by zhangzhe's avatar zhangzhe
Browse files
Options

修改bug： 

1.立即领取，观看视频后，红包样式没有翻倍领取按钮
2.财神每隔1.5分钟出现一次，财神首次出现在引导结束后1分钟出现
3.看视频结束后，请求地块接口多次app/v3/cscmnq/first_info
4.手速红包 弹窗没有金额
parent ccf1d3ba
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 36 deletions
Assets/Game/Main/Resource/ui/WithdrawEveryDay.meta deleted 100644 → 0
View file @ ccf1d3ba
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 43b89272
...@@ -4060,7 +4060,7 @@ MonoBehaviour: ...@@ -4060,7 +4060,7 @@ MonoBehaviour:
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 1 m_IntArgument: 2
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
...@@ -5015,7 +5015,7 @@ RectTransform: ...@@ -5015,7 +5015,7 @@ RectTransform:
- {fileID: 159254896} - {fileID: 159254896}
- {fileID: 2071444202} - {fileID: 2071444202}
m_Father: {fileID: 2052625159} m_Father: {fileID: 2052625159}
m_RootOrder: 31 m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -9107,9 +9107,9 @@ RectTransform: ...@@ -9107,9 +9107,9 @@ RectTransform:
m_Father: {fileID: 1548415916} m_Father: {fileID: 1548415916}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: -72.5} m_AnchoredPosition: {x: 355, y: 0}
m_SizeDelta: {x: 710, y: 0} m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110 --- !u!114 &300181110
...@@ -10090,7 +10090,7 @@ MonoBehaviour: ...@@ -10090,7 +10090,7 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 66d2f797a9d094b3598e5816d772b676, type: 3} m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
m_FontSize: 109 m_FontSize: 109
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
...@@ -54011,7 +54011,7 @@ MonoBehaviour: ...@@ -54011,7 +54011,7 @@ MonoBehaviour:
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 2 m_IntArgument: 1
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
Assets/Game/Main/Scripts/Presenter/CarPresenter.cs
View file @ 43b89272
...@@ -121,7 +121,7 @@ public class CarPresenter : CarContract.Presenter ...@@ -121,7 +121,7 @@ public class CarPresenter : CarContract.Presenter
// Guide.guide.showStep7(); // Guide.guide.showStep7();
mView.CarInfo(bean); mView.CarInfo(bean);
LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
...@@ -166,7 +166,8 @@ public class CarPresenter : CarContract.Presenter ...@@ -166,7 +166,8 @@ public class CarPresenter : CarContract.Presenter
{ {
GameObject.Find("Dialog").GetComponent<DialogControl>().ShowJingxiDialog(); GameObject.Find("Dialog").GetComponent<DialogControl>().ShowJingxiDialog();
} }
//LeeMainController.Instance.UpdateTitleBG2Info();
LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
...@@ -192,6 +193,7 @@ public class CarPresenter : CarContract.Presenter ...@@ -192,6 +193,7 @@ public class CarPresenter : CarContract.Presenter
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
//更新车库列表 //更新车库列表
EventCenter.Broadcast(MyEventType.UPDATE_GARAGE); EventCenter.Broadcast(MyEventType.UPDATE_GARAGE);
LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
...@@ -214,6 +216,7 @@ public class CarPresenter : CarContract.Presenter ...@@ -214,6 +216,7 @@ public class CarPresenter : CarContract.Presenter
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA); EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
//更新车库列表 //更新车库列表
EventCenter.Broadcast(MyEventType.UPDATE_GARAGE); EventCenter.Broadcast(MyEventType.UPDATE_GARAGE);
LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
......
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ 43b89272
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using DG.Tweening;
using UnityEngine; using UnityEngine;
public class Guide : MonoBehaviour public class Guide : MonoBehaviour
...@@ -188,7 +189,7 @@ public class Guide : MonoBehaviour ...@@ -188,7 +189,7 @@ public class Guide : MonoBehaviour
Debug.Log("点击第4步"); Debug.Log("点击第4步");
DissmissGuide(false); DissmissGuide(false);
PlayerDataControl.Instance.IsNewUser = false; PlayerDataControl.Instance.IsNewUser = false;
flyBox.SetActive(true); Invoke("showFlyBox", 60);
//Car4Obj.transform.parent = Car4Parent.transform; //Car4Obj.transform.parent = Car4Parent.transform;
if (PlayerPrefs.GetInt(step5Key, 0) == 0) if (PlayerPrefs.GetInt(step5Key, 0) == 0)
{ {
...@@ -379,4 +380,22 @@ public class Guide : MonoBehaviour ...@@ -379,4 +380,22 @@ public class Guide : MonoBehaviour
return false; return false;
} }
/// <summary>
/// 显示财神
/// </summary>
private void showFlyBox()
{
flyBox.SetActive(true);
}
public void FlyBoxAnimatorOnComplete()
{
Invoke("RestartFlyBoxAnimator", 90);
}
private void RestartFlyBoxAnimator()
{
flyBox.GetComponent<DOTweenPath>().DORestart();
}
} }
Assets/Game/Main/Scripts/View/CarUIControl.cs
View file @ 43b89272
...@@ -227,7 +227,7 @@ public class CarUIControl : MonoBehaviour ...@@ -227,7 +227,7 @@ public class CarUIControl : MonoBehaviour
setTime(land); setTime(land);
FastPlanting.Instance().landListDictionary[land.landId] = land; FastPlanting.Instance().landListDictionary[land.landId] = land;
LeeMainController.Instance.UpdateTitleBG2Info(); //LeeMainController.Instance.UpdateTitleBG2Info();
} }
else else
{ //没有数据 { //没有数据
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ 43b89272
...@@ -753,8 +753,8 @@ public class DialogControl : MonoBehaviour ...@@ -753,8 +753,8 @@ public class DialogControl : MonoBehaviour
Debug.Log("点击开"); Debug.Log("点击开");
if (type == 1) if (type == 1)
{ {
EventUtils.OnEvent("onlinePacket_click1", "点击悬浮红包"); EventUtils.OnEvent("zs_ljlq_show");
AdUtils.PlayRewardAd("video_reward1", new Action<bool>((cb) => AdUtils.PlayRewardAd("video_reward2", new Action<bool>((cb) =>
{ {
if (cb) if (cb)
{ {
...@@ -782,8 +782,8 @@ public class DialogControl : MonoBehaviour ...@@ -782,8 +782,8 @@ public class DialogControl : MonoBehaviour
} }
else else
{ {
EventUtils.OnEvent("zs_ljlq_show"); EventUtils.OnEvent("onlinePacket_click1", "点击悬浮红包");
AdUtils.PlayRewardAd("video_reward2", new Action<bool>((cb) => AdUtils.PlayRewardAd("video_reward1", new Action<bool>((cb) =>
{ {
if (cb) if (cb)
{ {
......
Assets/Game/Main/Scripts/View/FastPlanting.cs
View file @ 43b89272
...@@ -37,6 +37,8 @@ public class FastPlanting : SingletonMono<FastPlanting> ...@@ -37,6 +37,8 @@ public class FastPlanting : SingletonMono<FastPlanting>
{ {
FindObjectOfType<HomeInfoControl>().OnUpdateCarListData(); FindObjectOfType<HomeInfoControl>().OnUpdateCarListData();
LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
......
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ 43b89272
...@@ -694,6 +694,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -694,6 +694,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
//Guide.guide.showGuide(bean.isNewUser); //Guide.guide.showGuide(bean.isNewUser);
//mView.LandListInfo(bean); //mView.LandListInfo(bean);
OnUpdateCarListData(); OnUpdateCarListData();
LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) => }), new Action<string, string>((code, errMsg) =>
{ {
Debug.unityLogger.Log("Get 请求失败" + code + errMsg); Debug.unityLogger.Log("Get 请求失败" + code + errMsg);
......
Packages/packages-lock.json
View file @ 43b89272
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.analytics": { "com.unity.analytics": {
"version": "3.3.5", "version": "3.3.5",
...@@ -28,21 +28,21 @@ ...@@ -28,21 +28,21 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "1.2.16", "version": "1.2.16",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
"version": "1.0.6", "version": "1.0.6",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "1.1.4", "version": "1.1.4",
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.1.1" "com.unity.test-framework": "1.1.1"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.3", "version": "1.2.3",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.multiplayer-hlapi": { "com.unity.multiplayer-hlapi": {
"version": "1.0.8", "version": "1.0.8",
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"dependencies": { "dependencies": {
"nuget.mono-cecil": "0.1.6-preview" "nuget.mono-cecil": "0.1.6-preview"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.purchasing": { "com.unity.purchasing": {
"version": "2.2.1", "version": "2.2.1",
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.20", "version": "1.1.20",
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0" "com.unity.modules.jsonserialize": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "2.1.1", "version": "2.1.1",
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.2.17", "version": "1.2.17",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ugui": { "com.unity.ugui": {
"version": "1.0.0", "version": "1.0.0",
...@@ -122,14 +122,14 @@ ...@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0", "com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0" "com.unity.modules.xr": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"nuget.mono-cecil": { "nuget.mono-cecil": {
"version": "0.1.6-preview", "version": "0.1.6-preview",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.modules.ai": { "com.unity.modules.ai": {
"version": "1.0.0", "version": "1.0.0",
......
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