1.0.7修改

Assets/Game/Main/Prefabs/Car.prefab

@@ -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

@@ -2562,7 +2562,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}
@@ -4419,12 +4419,12 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 2118302534}
-  - {fileID: 634203768}
   - {fileID: 716226832}
   - {fileID: 835587878}
   - {fileID: 1776466864}
   - {fileID: 223744066}
   - {fileID: 771430749}
+  - {fileID: 634203768}
   - {fileID: 904973031}
   - {fileID: 842828050}
   m_Father: {fileID: 0}
@@ -8717,7 +8717,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}
@@ -20552,8 +20552,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1531958713}
   m_HandleRect: {fileID: 1531958712}
   m_Direction: 2
-  m_Value: 1.0000033
-  m_Size: 0.93547666
+  m_Value: 1.0000032
+  m_Size: 0.9349216
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -26636,7 +26636,7 @@ RectTransform:
   - {fileID: 1077792143}
   - {fileID: 592572115}
   m_Father: {fileID: 105570271}
-  m_RootOrder: 1
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -29849,15 +29849,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}
@@ -31633,7 +31633,7 @@ RectTransform:
   m_Children:
   - {fileID: 504194498}
   m_Father: {fileID: 105570271}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -34024,7 +34024,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}
@@ -45415,7 +45415,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}
@@ -58160,7 +58160,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}
@@ -63610,11 +63610,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: -69}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1614112643
@@ -69034,11 +69034,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: 309}
   m_SizeDelta: {x: 121.23505, y: 163.89551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1747314419
@@ -70477,7 +70477,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}
@@ -73433,7 +73433,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}
@@ -73706,7 +73706,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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -589,7 +589,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();
@@ -660,7 +660,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

@@ -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()

ProjectSettings/GraphicsSettings.asset

@@ -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

@@ -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