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

Assets/AdSDK/AD/AD_Manager/AdManager.cs

@@ -111,6 +111,10 @@ public class AdManager
     /// </summary>
     public void LoadSplashAd(ZXADSplashListener listener)
     {
+#if UNITY_EDITOR
+        listener.onError("editor");
+        return;
+#endif
         if (!IsInitAd)
         {
             listener.onError("没有初始化");

Assets/Game/Main/Prefabs/Car.prefab

@@ -234,6 +234,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 455528768893061781}
+  - {fileID: 259696605779131939}
   - {fileID: 455528767847454826}
   - {fileID: 6164941453790126981}
   - {fileID: 3510243741663195066}
@@ -724,7 +725,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 455528767290619777}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1306,9 +1307,16 @@ MonoBehaviour:
   GetMyCar: {fileID: 455528767810083864}
   WaitStopCar: {fileID: 455528767808094878}
   unLockVideoObj: {fileID: 455528768448655824}
-  floatSpeedObj: {fileID: 455528767847454827}
   floatStickObj: {fileID: 912378304521807189}
-  floatStickTipsObj: {fileID: 455528768375203045}
+  floatUpdateObj: {fileID: 762901296262371212}
+  wait_car_lv: {fileID: 7044497534119971449}
+  wait_car_name: {fileID: 8713304315439543895}
+  get_car_lv: {fileID: 6673880531657116118}
+  get_car_name: {fileID: 2802716176765414323}
+  update_car_lv: {fileID: 4727704433475320167}
+  level_coin: {fileID: 5117247163371686327}
+  update_car_name: {fileID: 8220562401280959265}
+  proction: {fileID: 613104889841395424}
   mTimerCG: {fileID: 1483011184502997944}
   FlyCoinCar: {fileID: 455528768893061780}
   FlyCoinObj: {fileID: 6190847088453777850}
@@ -1373,7 +1381,7 @@ RectTransform:
   - {fileID: 455528767669848399}
   - {fileID: 455528768568571533}
   m_Father: {fileID: 455528767290619777}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1459,7 +1467,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 455528767290619777}
-  m_RootOrder: 4
+  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}
@@ -1807,6 +1815,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &613104889841395424
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 259696605779131939}
+  - component: {fileID: 5770000278109398240}
+  - component: {fileID: 5203582658881749762}
+  m_Layer: 5
+  m_Name: protection
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &259696605779131939
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 613104889841395424}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 455528767290619777}
+  m_RootOrder: 1
+  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: 0, y: 0}
+  m_SizeDelta: {x: 345, y: 255}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5770000278109398240
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 613104889841395424}
+  m_CullTransparentMesh: 0
+--- !u!114 &5203582658881749762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 613104889841395424}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: eb7899469a1f3460ea746ad18b656406, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &762901296262371212
 GameObject:
   m_ObjectHideFlags: 0
@@ -1821,12 +1903,12 @@ GameObject:
   - component: {fileID: 6596436543216092854}
   - component: {fileID: 6207907394166489083}
   m_Layer: 5
-  m_Name: float_level
+  m_Name: float_update
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6164941453790126981
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1842,7 +1924,7 @@ RectTransform:
   - {fileID: 8758704712556509915}
   - {fileID: 2950162160294252860}
   m_Father: {fileID: 455528767290619777}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1942,7 +2024,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 455528768202490609}
-        m_MethodName: OnClickSpeedCar
+        m_MethodName: OnClickUpdateCar
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -1971,7 +2053,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3510243741663195066
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1985,7 +2067,7 @@ RectTransform:
   m_Children:
   - {fileID: 1441305568589058748}
   m_Father: {fileID: 455528767290619777}
-  m_RootOrder: 3
+  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}
@@ -2827,7 +2909,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0.0000066754, y: -27.82}
-  m_SizeDelta: {x: 81, y: 19}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5492192752785619345
 MonoBehaviour:
@@ -2880,7 +2962,7 @@ GameObject:
   - component: {fileID: 5066077494491596098}
   - component: {fileID: 5117247163371686327}
   m_Layer: 5
-  m_Name: Text
+  m_Name: coin
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2945,7 +3027,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 11
+  m_Text: 
 --- !u!1 &3722102618775797525
 GameObject:
   m_ObjectHideFlags: 0
@@ -2958,7 +3040,7 @@ GameObject:
   - component: {fileID: 6312878048576377554}
   - component: {fileID: 8220562401280959265}
   m_Layer: 5
-  m_Name: Text
+  m_Name: name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2978,10 +3060,10 @@ RectTransform:
   m_Father: {fileID: 2950162160294252860}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 67, y: -9.5}
-  m_SizeDelta: {x: 28, y: 19}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6312878048576377554
 CanvasRenderer:
@@ -3222,7 +3304,7 @@ GameObject:
   - component: {fileID: 1283727564970248323}
   - component: {fileID: 4727704433475320167}
   m_Layer: 5
-  m_Name: Text
+  m_Name: lv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3399,10 +3481,10 @@ RectTransform:
   m_Father: {fileID: 2950162160294252860}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 24, y: -9.5}
-  m_SizeDelta: {x: 48, y: 19}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3489746108897833716
 CanvasRenderer:

Assets/Game/Main/Resource/Home/组 5160 拷贝 9.png.meta

+fileFormatVersion: 2
+guid: eb7899469a1f3460ea746ad18b656406
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -809,15 +809,15 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
-    m_FontSize: 33
+    m_FontSize: 25
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 3
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
-    m_RichText: 0
-    m_HorizontalOverflow: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "100.98\u4E07/\u5206\u949F"
@@ -2347,6 +2347,11 @@ MonoBehaviour:
   MyDriverObj: {fileID: 923216953}
   DoubleTimerObj: {fileID: 1465665558}
   DoubleObj: {fileID: 606793024}
+  tvrewardCoinEveryMinute: {fileID: 30418249}
+  tvrewardCashEveryMinute: {fileID: 154543858}
+  cashNumTv: {fileID: 0}
+  levelTv: {fileID: 920415600}
+  procetTimeObj: {fileID: 0}
 --- !u!1 &107878020
 GameObject:
   m_ObjectHideFlags: 0
@@ -17762,10 +17767,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   useDoubleCoinByVideoNumTv: {fileID: 1275170388}
-  countDownTime: {fileID: 835192717}
+  countDownTime: {fileID: 0}
   doubleCountdownSecond: 0
-  content0: {fileID: 657080180}
-  content1: {fileID: 1632078713}
+  content0: {fileID: 0}
+  content1: {fileID: 0}
 --- !u!1 &864805489
 GameObject:
   m_ObjectHideFlags: 0
@@ -22169,7 +22174,7 @@ PrefabInstance:
     - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}
       propertyPath: IS_TGYZ
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}

Assets/Game/Main/Scenes/CrazyCar_BACKUP_444.unity.meta

-fileFormatVersion: 2
-guid: 58b335bd4bf034bb78160d1bd5109565
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_BACKUP_502.unity.meta

-fileFormatVersion: 2
-guid: dfa8b86d6fc814a1abe13f2a864998cd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_BASE_444.unity.meta

-fileFormatVersion: 2
-guid: e8a3f2b686ac64576b7342434e57978d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_BASE_502.unity.meta

-fileFormatVersion: 2
-guid: 25803d01451f2496f9b98cba7f80e98d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_LOCAL_444.unity.meta

-fileFormatVersion: 2
-guid: 78d800fe377cb47dc8ef62a6ace61186
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_LOCAL_502.unity.meta

-fileFormatVersion: 2
-guid: a20851a3a30284155bca1564a1f61e6b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_REMOTE_444.unity.meta

-fileFormatVersion: 2
-guid: f8448eacb34e14c1db6bb5463ead3a07
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scenes/CrazyCar_REMOTE_502.unity.meta

-fileFormatVersion: 2
-guid: b7a20fb6a105e4735a87b4747b82f437
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scripts/Contract/CarContract.cs

@@ -29,11 +29,18 @@ public class CarContract
         /// <param name="parkingSpaceId"></param>
         void GetPickInCar(int parkingSpaceId);
 
+        /// <summary>
+        /// 升级车
+        /// </summary>
+        /// <param name="parkingSpaceId"></param>
+        void GetUpdateCar(int parkingSpaceId);
+
         /// <summary>
         /// 加速
         /// </summary>
         /// <param name="parkingSpaceId"></param>
         void GetAcceleratorCar(int parkingSpaceId,bool isVideo);
+
     }
 
 }

Assets/Game/Main/Scripts/Model/ParkInfoBean.cs

@@ -42,7 +42,20 @@ public class ParkInfoBean
     /// 从第几块地开始需要看视频
     /// </summary>
     public int lockNeedWatchVideoStartNum { get; set; }
+    /// <summary>
+    /// 每分钟金币奖励值
+    /// </summary>
+    public int rewardCoinEveryMinute { get; set; }
+    /// <summary>
+    /// 每分钟现金奖励值
+    /// </summary>
+    public double rewardCashEveryMinute { get; set; }
+    public LevelProgress levelProgress { get; set; }
 
+    public class LevelProgress
+    {
+        public int level;
+    }
 }
 [Serializable]
 public class ParkingSpace
@@ -51,17 +64,19 @@ public class ParkingSpace
     public int status { get; set; }//0 未解锁  1 可停车 2 已停车 3 待取车 4 待解锁
     public string unlockCarName { get; set; }//车名
     public CarDataDTO carDataDTO { get; set; }
+
 }
 [Serializable]
 public class CarDataDTO
 {
-    public int id { get; set; }
+    public int carId { get; set; }
     public bool isTicketsIssues { get; set; }//是否被贴条
     public int issuesTicketLastSecond { get; set; }//汽车在倒数第几秒被贴条
     public int lastParkingTimeSecond { get; set; }//剩余停车时间
     public int level { get; set; }//等级
     public int parkingTimeSecond { get; set; }//总共的停车时间
     public int rewardEveryMinute { get; set; }//停车每分钟收益
+    public int? levelCoin { get; set; }
     //public int? statusLastFlushTS { get; set; }//刷新状态时间戳
 
 }
\ No newline at end of file

Assets/Game/Main/Scripts/Presenter/CarPresenter.cs

@@ -43,7 +43,7 @@ public class CarPresenter : CarContract.Presenter
             UnityEngine.Debug.unityLogger.Log("加速剂不足 Error "+code+ "errMsg" + errMsg);
         }));
     }
-
+    //停车
     public void GetPickInCar(int parkingSpaceId)
     {
         parm.Clear();
@@ -52,14 +52,15 @@ public class CarPresenter : CarContract.Presenter
         {
             Guide.guide.onClickStep1();
             Guide.guide.showStep7();
-            mView.CarInfo(bean);
+            // mView.CarInfo(bean);
+            EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
 
         }), new Action<string, string>((code, errMsg) =>
         {
 
         }));
     }
-
+    //取车
     public void GetPickUpCar(int parkingSpaceId)
     {
         parm.Clear();
@@ -67,14 +68,29 @@ public class CarPresenter : CarContract.Presenter
         HttpTool.Instance._Post("app/v1/game/fkqcw/parking/pickup", parm, new Action<ParkingSpace>((bean) =>
         {
             Guide.guide.onClickStep3();
-            mView.CarInfo(bean);
+          //  mView.CarInfo(bean);
+            EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
 
         }), new Action<string, string>((code, errMsg) =>
         {
 
         }));
     }
+    public void GetUpdateCar(int parkingSpaceId)
+    {
+        parm.Clear();
+        parm.Add("carId", parkingSpaceId);
+        HttpTool.Instance._Post("app/v1/game/fkqcw/parking/upgrade", parm, new Action<EmptyBean>((bean) =>
+        {
+            //Guide.guide.onClickStep3();
+            //  mView.CarInfo(bean);
+            EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
 
+        }), new Action<string, string>((code, errMsg) =>
+        {
+
+        }));
+    }
     public void GetUnLockCar(int parkingSpaceId)
     {
         //不需要看视频解锁
@@ -123,4 +139,6 @@ public class CarPresenter : CarContract.Presenter
 
 
     }
+
+   
 }

Assets/Game/Main/Scripts/View/CarDataControl.cs

@@ -111,6 +111,15 @@ public class CarDataControl : MonoBehaviour, CarContract.View
         mPresenter.GetPickInCar(carId);
     }
     /// <summary>
+    /// 点击升级车
+    /// </summary>
+    public void OnClickUpdateCar()
+    {
+        EventUtils.OnEvent("update_click");
+        AudioUtils.ins.PlayBtnAudio();
+        mPresenter.GetUpdateCar(carId);
+    }
+    /// <summary>
     /// 列表刷新数据收到的数据
     /// </summary>
     /// <param name="arg"></param>

Assets/Game/Main/Scripts/View/CarUIControl.cs

@@ -15,11 +15,15 @@ public class CarUIControl : MonoBehaviour
     private CanvasGroup m_CanvasGroup;
     
     public GameObject unLockVideoObj;//解锁看视频图标
-    public GameObject floatSpeedObj;//加速图标
+    //public GameObject floatSpeedObj;//加速图标
     public GameObject floatStickObj;//贴条取车图标
-    public GameObject floatStickTipsObj;//贴条提示
-
+    //public GameObject floatStickTipsObj;//贴条提示
+    public GameObject floatUpdateObj;//升级图标
 
+    public Text wait_car_lv,wait_car_name;//停车时等级
+    public Text get_car_lv,get_car_name;//取车时车等级
+    public Text update_car_lv,level_coin,update_car_name;//升级时等级和所需金币
+    public GameObject proction;//保护罩
     //倒计时CanvasGroup
     public CanvasGroup mTimerCG;
 
@@ -32,6 +36,7 @@ public class CarUIControl : MonoBehaviour
     private CarTypeImg mCarImg;
     private ParkingSpace mCarData;
     private Coroutine flyCoinTimeControl;
+    
     private void Awake()
     {
         mCarImg = GetComponent<CarTypeImg>();
@@ -45,7 +50,22 @@ public class CarUIControl : MonoBehaviour
         if (car != null)
         {
             mCarData = car;
-            CarName.text = car.unlockCarName;
+            if (car.unlockCarName != null)
+            {
+                CarName.text = car.unlockCarName;
+                wait_car_name.text = car.unlockCarName;
+                get_car_name.text = car.unlockCarName;
+                update_car_name.text = car.unlockCarName;
+            }
+          
+            if (car.carDataDTO != null)
+            {
+                wait_car_lv.text = "Lv" + car.carDataDTO.level;
+                get_car_lv.text = "Lv" + car.carDataDTO.level;
+                update_car_lv.text = "Lv" + car.carDataDTO.level;
+                level_coin.text = car.carDataDTO.levelCoin.ToString();
+            }
+          
             if (car.id < PlayerDataControl.Instance.VideoUnlockCarID)
             {
                 unLockVideoObj.SetActive(false);
@@ -210,32 +230,38 @@ public class CarUIControl : MonoBehaviour
                 //车辆被贴条刷新车列表数据
                 EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
                 floatStickObj.SetActive(true);
+                floatUpdateObj.SetActive(false);
             }
-            if (floatStickTipsObj.activeSelf != true)
-            {
-                floatStickTipsObj.SetActive(true);
-            }
-            if (floatSpeedObj.activeSelf != false)
-            {
-                floatSpeedObj.SetActive(false);
-            }
-
+           
+            //if (floatStickTipsObj.activeSelf != true)
+            //{
+            //    floatStickTipsObj.SetActive(true);
+            //}
+            //if (floatSpeedObj.activeSelf != false)
+            //{
+            //    floatSpeedObj.SetActive(false);
+            //}
+            
             mTimerCG.alpha = 0;
         }
         else
         {
             isPauseTime = false;
-            if (floatSpeedObj.activeSelf != true)
-            {
-                floatSpeedObj.SetActive(true);
-            }
+            //if (floatSpeedObj.activeSelf != true)
+            //{
+            //    floatSpeedObj.SetActive(true);
+            //}
             if (floatStickObj.activeSelf != false)
             {
                 floatStickObj.SetActive(false);
             }
-            if (floatStickTipsObj.activeSelf != false)
+            //if (floatStickTipsObj.activeSelf != false)
+            //{
+            //    floatStickTipsObj.SetActive(false);
+            //}
+            if (floatUpdateObj.activeSelf != true)
             {
-                floatStickTipsObj.SetActive(false);
+                floatUpdateObj.SetActive(true);
             }
             mTimerCG.alpha = 1;
         }

Assets/Game/Main/Scripts/View/EveryDayControl.cs

@@ -19,6 +19,7 @@ public class EveryDayControl : MonoBehaviour
     public Text topComplateTv;//还剩余几颗
 
     public Sprite[] btnSpriteArray;//提现按钮的背景
+    public GameObject withdrawpage;
     void Start()
     {
         getHeartList();
@@ -126,5 +127,14 @@ public class EveryDayControl : MonoBehaviour
         }
        
     }
+    /// <summary>
+    /// 关闭页面
+    /// </summary>
+    public void closeWithdrawalEveryDay()
+    {
+        AudioUtils.ins.PlayBtnAudio();
+        withdrawpage.SetActive(false);
+        EventCenter.Broadcast(MyEventType.UPDATE_CAR_LIST_DATA);
+    }
 
 }

Assets/Game/Main/Scripts/View/HomeInfoControl.cs

@@ -7,13 +7,16 @@ using UnityEngine.UI;
 public class HomeInfoControl : MonoBehaviour, HomeContract.View
 {
     private HomePresenter mPresenter;
-    public Text CoinNumTV, StickTimerTV, DriverTimerTV, DoubleTimerTV,AllSpeedTimerTV;
+    public Text CoinNumTV, StickTimerTV, DriverTimerTV, DoubleTimerTV,AllSpeedTimerTV,proTimerTv;
         //主页底部贴条倒计时
         //主页底部贴条文字
         //主页底部司机倒计时文字
         //主页底部司机文字
     public GameObject StickTimerObj, StickObj, MyDriverTimerObj, MyDriverObj, DoubleTimerObj, DoubleObj;
-
+    public Text tvrewardCoinEveryMinute, tvrewardCashEveryMinute;
+    public Text cashNumTv,levelTv;
+    public GameObject procetTimeObj;
+    public GameObject EveryDayWithDraw;
     private void Awake()
     {
         mPresenter = new HomePresenter(this);
@@ -87,8 +90,14 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
         SetAllSpeedTimer(mCarInfo.allSpeedUpCd);
         SetDoubleTimer(mCarInfo.doubleCountdownSecond);
         ParkListInfo(mCarInfo.parkingSpaceList);
+        setProction(mCarInfo.protectionCountdownSecond);
+        tvrewardCoinEveryMinute.text = "<size=33>" + mCarInfo.rewardCoinEveryMinute + "</size>"+"<size=25>/分钟</size>";
+        tvrewardCashEveryMinute.text = "约"+mCarInfo.rewardCashEveryMinute.ToString()+ "/分钟";
+        levelTv.text = "Lv:"+mCarInfo.levelProgress.level;
     }
 
+   
+
     private void ParkListInfo(List<ParkingSpace> mCarList)
     {
         if (mCarList == null)
@@ -101,7 +110,49 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
             EventCenter.Broadcast(MyEventType.UPDATE_CAR_DARA, car);
         }
     }
+    //防护罩倒计时
+    private int protectionTime;
+    private Coroutine protionControl;
+    public  void setProction(int time)
+    {
+        protectionTime = time;
+        if (protionControl != null)
+        {
+            
+        }
+        if (protectionTime > 0)
+        {
+            procetTimeObj.SetActive(true);
+            proTimerTv.text = UnityUtil.getCountdown(protectionTime);
+            protionControl = StartCoroutine(IEProctionIimer()); 
 
+        }
+        else
+        {
+            procetTimeObj.SetActive(false);
+        }
+
+    }
+    private IEnumerator IEProctionIimer()
+    {
+        while (protectionTime >= 0)
+        {
+            yield return new WaitForSeconds(1f);
+            if (protectionTime <= 0)
+            {
+               
+                procetTimeObj.SetActive(false);
+             
+                StopCoroutine(protionControl);
+                break;
+            }
+            else
+            {
+                protectionTime--;
+                proTimerTv.text = UnityUtil.getCountdown(protectionTime);
+            }
+        }
+    }
     private int StickCurrentTime;
     private Coroutine StickTimeControl;
     /// <summary>
@@ -312,4 +363,9 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
             OnUpdateCarListData();
         }
     }
+    public void onClickEveryDayWithDraw()
+    {
+        AudioUtils.ins.PlayBtnAudio();
+        EveryDayWithDraw.SetActive(true);
+    }
 }

Assets/Game/Splash/Splash.cs

@@ -33,10 +33,11 @@ public class Splash : MonoBehaviour
         //Debug.Log("初始化广告");
         AdManager.Instance.InitAd(new Action<bool>((cb)=> {
 
-            if (cb)
-            {
-                AppInfo();
-            }
+            //if (cb)
+            //{
+            //    AppInfo();
+            //}
+            AppInfo();
         }));
         PlayerDataControl.Instance.UserAgreementUrl = "https://newspool.huolea.com/sspapiNovel/su/custom/fkqcw/user.html";
         PlayerDataControl.Instance.AboutUsUrl = "https://newspool.huolea.com/sspapiNovel/su/custom/fkqcw/aboutMe.html";

Assets/Game/Splash/Splash.unity

@@ -2442,6 +2442,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: HTTP
       objectReference: {fileID: 0}
+    - target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}
       propertyPath: IS_TEST