Skip to content

W
wdlc_mjb_unity
Commit d5524fe4 authored by LiLiuZhou's avatar LiLiuZhou
Browse files
Options

Merge branch 'develop_mjb_cscmnq_1.0.7' of… 

Merge branch 'develop_mjb_cscmnq_1.0.7' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.7
parents bcd25e03 7ccaa747
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 126 deletions
Assets/Game/Main/Prefabs/Car.prefab
View file @ d5524fe4
......@@ -1563,7 +1563,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &455528768205073270
RectTransform:
m_ObjectHideFlags: 0
......
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ d5524fe4
......@@ -1948,7 +1948,7 @@ RectTransform:
m_Children:
- {fileID: 915118056}
m_Father: {fileID: 716226832}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
......@@ -2545,7 +2545,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 782149801}
m_HandleRect: {fileID: 782149800}
m_Direction: 2
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
......@@ -3505,11 +3505,11 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 2118302534}
- {fileID: 634203768}
- {fileID: 716226832}
- {fileID: 835587878}
- {fileID: 1776466864}
- {fileID: 223744066}
- {fileID: 634203768}
- {fileID: 771430749}
- {fileID: 904973031}
- {fileID: 842828050}
......@@ -7150,7 +7150,7 @@ RectTransform:
m_LocalScale: {x: 0.0074962517, y: 0.0074962517, z: 0.0074962517}
m_Children: []
m_Father: {fileID: 105570271}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -9658,9 +9658,9 @@ RectTransform:
m_Father: {fileID: 1548415916}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -72.29167}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
......@@ -16996,8 +16996,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1531958713}
m_HandleRect: {fileID: 1531958712}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1.0000032
m_Size: 0.9349216
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -22125,7 +22125,7 @@ RectTransform:
- {fileID: 1077792143}
- {fileID: 592572115}
m_Father: {fileID: 105570271}
m_RootOrder: 1
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
......@@ -24760,15 +24760,15 @@ RectTransform:
- {fileID: 1867138966}
- {fileID: 1624929360}
- {fileID: 311469827}
- {fileID: 1142096296}
- {fileID: 1612576600}
- {fileID: 1863343229}
- {fileID: 1472916196}
- {fileID: 1861488240}
- {fileID: 52321695}
- {fileID: 1747314418}
- {fileID: 1142096296}
m_Father: {fileID: 105570271}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
......@@ -26226,14 +26226,14 @@ MonoBehaviour:
path:
wpLengths:
- 0
- 10.90613
- 5.5463805
- 11.212016
- 5.5597563
- 6.1961856
type: 1
subdivisionsXSegment: 10
subdivisions: 40
wps:
- {x: -2.8756156, y: 2.4261084, z: 100}
- {x: -3.5024998, y: 2.955, z: 100}
- {x: -1.3436712, y: -1.5280215, z: 90}
- {x: 0.21024093, y: 3.2540216, z: 90}
- {x: 3.7466066, y: -1.7448426, z: 90}
......@@ -26242,7 +26242,7 @@ MonoBehaviour:
b: {x: 0, y: 0, z: 0}
- a: {x: 7.2829723, y: -6.7437067, z: 90}
b: {x: 0, y: 0, z: 0}
length: 22.663618
length: 22.983376
isFinalized: 1
timesTable:
- 0.025
......@@ -26286,46 +26286,46 @@ MonoBehaviour:
- 0.975
- 1
lengthsTable:
- 0.15035214
- 0.5723822
- 1.2226055
- 2.0575345
- 3.0337222
- 4.1077776
- 5.236377
- 6.3763185
- 7.4845796
- 8.518503
- 9.436096
- 10.196958
- 10.765153
- 11.149754
- 11.484675
- 11.845319
- 12.262508
- 12.737176
- 13.256148
- 13.800106
- 14.346965
- 14.873441
- 15.356062
- 15.772276
- 16.102968
- 16.341343
- 16.530088
- 16.759212
- 17.05465
- 17.418272
- 17.843761
- 18.321693
- 18.841307
- 19.391195
- 19.959618
- 20.53468
- 21.104427
- 21.656958
- 22.180508
- 22.663618
- 0.15471439
- 0.5889805
- 1.2580361
- 2.1171157
- 3.1214933
- 4.226496
- 5.387515
- 6.5600595
- 7.6998096
- 8.762795
- 9.705688
- 10.4866905
- 11.068326
- 11.458006
- 11.790817
- 12.147154
- 12.5613785
- 13.035387
- 13.555864
- 14.102991
- 14.654059
- 15.185122
- 15.67202
- 16.091513
- 16.423817
- 16.66177
- 16.849846
- 17.07897
- 17.374407
- 17.73803
- 18.163519
- 18.64145
- 19.161064
- 19.710953
- 20.279375
- 20.854437
- 21.424185
- 21.976715
- 22.500265
- 22.983376
inspectorMode: 0
pathType: 1
handlesType: 0
......@@ -28054,7 +28054,7 @@ RectTransform:
- {fileID: 1259928011}
- {fileID: 953610385}
m_Father: {fileID: 105570271}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
......@@ -37204,7 +37204,7 @@ RectTransform:
m_Children:
- {fileID: 714177038}
m_Father: {fileID: 716226832}
m_RootOrder: 13
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -48306,7 +48306,7 @@ RectTransform:
- {fileID: 48029599}
- {fileID: 740829897}
m_Father: {fileID: 716226832}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -53261,11 +53261,11 @@ RectTransform:
- {fileID: 468169636}
- {fileID: 539830728}
m_Father: {fileID: 716226832}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 4, y: -215}
m_AnchoredPosition: {x: 4, y: -71}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1614995697
......@@ -57525,11 +57525,11 @@ RectTransform:
m_Children:
- {fileID: 278303764}
m_Father: {fileID: 716226832}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 314.38, y: 458.94}
m_AnchoredPosition: {x: 314.38, y: 307}
m_SizeDelta: {x: 121.23505, y: 163.89551}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1747314419
......@@ -58890,7 +58890,7 @@ RectTransform:
- {fileID: 300107173}
- {fileID: 1206812857221506103}
m_Father: {fileID: 105570271}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
......@@ -61430,7 +61430,7 @@ RectTransform:
m_Children:
- {fileID: 1754124954}
m_Father: {fileID: 716226832}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
......@@ -61629,7 +61629,7 @@ RectTransform:
- {fileID: 1440887899}
- {fileID: 1559272549}
m_Father: {fileID: 716226832}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
Assets/Game/Main/Scripts/Presenter/CarPresenter.cs
View file @ d5524fe4
......@@ -20,7 +20,8 @@ public class CarPresenter : CarContract.Presenter
//parm.Add("fromVideo", isVideo);
parm.Add("landId", landId);
HttpTool.Instance._Post("app/v1/wdlc/use_accelerators", parm, new Action<LandListData>((bean) =>
HttpTool.Instance._Post("app/v2/cscmnq/use_accelerators", parm, new Action<LandListData>((bean) =>
//HttpTool.Instance._Post("app/v1/wdlc/use_accelerators", parm, new Action<LandListData>((bean) =>
{
AudioUtils.ins.PlaySpeedAudio();
mView.clockTime(PlayerDataControl.Instance.acceleratorReduceMinute);
......@@ -95,7 +96,7 @@ public class CarPresenter : CarContract.Presenter
parm.Clear();
parm.Add("landId", landId);
parm.Add("plantId", plantId);
HttpTool.Instance._Post("app/v2/wdlc/seed", parm, new Action<LandListData>((bean) =>
HttpTool.Instance._Post("app/v2/cscmnq/seed", parm, new Action<LandListData>((bean) =>
{
Guide.guide.onClickStep1();
......@@ -113,7 +114,8 @@ public class CarPresenter : CarContract.Presenter
{
parm.Clear();
parm.Add("landId", landId);
HttpTool.Instance._Post("app/v1/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
HttpTool.Instance._Post("app/v2/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
//HttpTool.Instance._Post("app/v1/cscmnq/harvest_plant", parm, new Action<HavestBean>((bean) =>
{
UnityEngine.Debug.Log("收取接口成功");
AudioUtils.ins.PlayRewardAudio();
......
Assets/Game/Main/Scripts/Presenter/HomePresenter.cs
View file @ d5524fe4
......@@ -13,7 +13,8 @@ public class HomePresenter : HomeContract.Presenter
public void GetCheckAllSpeed()
{
//检查是否可以全体加速
HttpTool.Instance._Get("app/v1/wdlc/can_use_all_speed_up", null, new Action<VideoStatusBean>((bean) =>
HttpTool.Instance._Get("app/v2/cscmnq/can_use_all_speed_up", null, new Action<VideoStatusBean>((bean) =>
//HttpTool.Instance._Get("app/v1/wdlc/can_use_all_speed_up", null, new Action<VideoStatusBean>((bean) =>
{
Debug.Log("检查加速接口");
if (bean.status == 1)
......@@ -80,7 +81,8 @@ public class HomePresenter : HomeContract.Presenter
public void GetLandList()
{
HttpTool.Instance._Get("app/v1/wdlc/land_list", null, new Action<List<LandListData>>((bean) =>
HttpTool.Instance._Get("app/v2/cscmnq/land_list", null, new Action<List<LandListData>>((bean) =>
//HttpTool.Instance._Get("app/v1/wdlc/land_list", null, new Action<List<LandListData>>((bean) =>
{
// PlayerDataControl.Instance.VideoUnlockCarID = bean.lockNeedWatchVideoStartNum;
//Guide.guide.showGuide(bean.isNewUser);
......
Assets/Game/Main/Scripts/View/Anim/ClockFlyAnim.cs
View file @ d5524fe4
......@@ -13,7 +13,7 @@ public class ClockFlyAnim : MonoBehaviour
public void SetClockTime(int time)
{
timeTv.text = "-" + time + "<color=#FFFFFF>分钟</color>";
transform.gameObject.SetActive(true);
//transform.gameObject.SetActive(true);
}
private void OnEnable()
......
Assets/Game/Main/Scripts/View/CarUIControl.cs
View file @ d5524fe4
......@@ -349,35 +349,35 @@ public class CarUIControl : MonoBehaviour
private IEnumerator timeConteller()
{
yield return null;
//fruitTimeTv.text = UnityUtil.getCountdown(currentCarTime);
//while (currentCarTime >= 0)
//{
// if (progressBarImg != null)
// {
// progressBarImg.fillAmount = 1 - (currentCarTime / (float)totalTime);
// }
// yield return new WaitForSecondsRealtime(1f);
// if (currentCarTime <= 0)
// {
// //倒计时完成
// //关闭上一次倒计时
// StopCoroutine(timeControl);
// //开启新一轮倒计时 倒计时结束 变换状态
// EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
// Guide.guide.onClickStep2();
// break;
// }
// else
// {
// setPauseTime(currentCarTime);
// if (!isPauseTime)
// {
// currentCarTime--;
// }
// }
// fruitTimeTv.text = UnityUtil.getCountdown(currentCarTime);
// //SaveData.GetIns().saveFlowerLastTime(transform.tag, coinTime);
//}
fruitTimeTv.text = UnityUtil.getCountdown(currentCarTime);
while (currentCarTime >= 0)
{
if (progressBarImg != null)
{
progressBarImg.fillAmount = 1 - (currentCarTime / (float)totalTime);
}
yield return new WaitForSecondsRealtime(1f);
if (currentCarTime <= 0)
{
//倒计时完成
//关闭上一次倒计时
StopCoroutine(timeControl);
//开启新一轮倒计时 倒计时结束 变换状态
EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
Guide.guide.onClickStep2();
break;
}
else
{
setPauseTime(currentCarTime);
if (!isPauseTime)
{
//currentCarTime--;
}
}
fruitTimeTv.text = UnityUtil.getCountdown(currentCarTime);
//SaveData.GetIns().saveFlowerLastTime(transform.tag, coinTime);
}
}
//判断是否暂停
private void setPauseTime(int currentTime)
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ d5524fe4
......@@ -576,7 +576,7 @@ public class DialogControl : MonoBehaviour
parm.Clear();
parm["slot"] = "all_speed_up";
AllSpeedDialog.SetActive(true);
allSpeedDesc.text = "所有作物成熟速度加" + bean.reduceMinute + "分钟";
allSpeedDesc.text = "所有作物立即获得一次加速";
useAllSpeedByVideoNumTv.text = "每天0点重置视频次数(剩余" + bean.todayVideoRemainingNum + "次)";
//#if UNITY_IOS
// moveAllSpeedDialog();
......@@ -647,7 +647,7 @@ public class DialogControl : MonoBehaviour
{
if (cb)
{
HttpTool.Instance._Post("app/v1/wdlc/use_all_speed_up", null, new Action<AllSppedData>((bean) =>
HttpTool.Instance._Post("app/v2/cscmnq/use_all_speed_up", null, new Action<AllSppedData>((bean) =>
{
rain.SetActive(true);
AudioUtils.ins.PlaySpeedAudio();
......
Assets/Game/Main/Scripts/View/PanelControl.cs
View file @ d5524fe4
......@@ -17,7 +17,7 @@ public class PanelControl : MonoBehaviour
private void OnDestroy()
{
EventCenter.RemoveListener(MyEventType.OPEN_PANEL, OnOpenPanel);
EventCenter.AddListener(MyEventType.CLOSE_PANEL, OnClosePanel);
EventCenter.RemoveListener(MyEventType.CLOSE_PANEL, OnClosePanel);
}
private void OnOpenPanel()
......
Packages/packages-lock.json
View file @ d5524fe4
......@@ -19,7 +19,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.analytics": {
"version": "3.3.5",
......@@ -28,21 +28,21 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.1.4",
......@@ -51,14 +51,14 @@
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
......@@ -67,7 +67,7 @@
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
"version": "2.2.1",
......@@ -76,7 +76,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.20",
......@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
......@@ -96,14 +96,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
......@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
......
ProjectSettings/GraphicsSettings.asset
View file @ d5524fe4
......@@ -34,6 +34,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
ProjectSettings/ProjectSettings.asset
View file @ d5524fe4
......@@ -41,12 +41,6 @@ PlayerSettings:
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_ShowUnitySplashAds: 0
m_AdsAndroidGameId:
m_AdsIosGameId:
m_ShowSplashAdsSlogan: 0
m_SloganImage: {fileID: 0}
m_SloganHeight: 150
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
......@@ -124,7 +118,6 @@ PlayerSettings:
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
vulkanEnableLateAcquireNextImage: 0
useSecurityBuild: 0
m_SupportedAspectRatios:
4:3: 1
5:4: 1
......@@ -472,7 +465,6 @@ PlayerSettings:
m_Kind: 4
m_SubKind: App Store
m_BuildTargetBatching: []
m_BuildTargetEncrypting: []
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 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