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

Assets/Game/Main/Resource/LeeScripts/NeedMoreEXP.cs

@@ -8,8 +8,6 @@ public class NeedMoreEXP : MonoBehaviour
 {
     public Text Line1;
 
-    public Text Line2;
-
     private int? id;
 
     private void Awake()

Assets/Game/Main/Resource/LeeScripts/TiXianCell.cs

@@ -26,6 +26,7 @@ public class TiXianCell : BasePanel
                 {
                     DialogControl.Instance.NetWorkRequest<WithDrawDialogBean>(false, "app/v2/cscmnq/do_wd", new Dictionary<string, object>() { { "wdId",(int)info.id } },(obj)=> 
                     {
+                        Debug.LogError(obj.status);
                         switch (obj.status)
                         {
                             case 1:

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -232,8 +232,8 @@ RectTransform:
   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: 3.3, y: 75.4}
-  m_SizeDelta: {x: 682.12756, y: 63.697815}
+  m_AnchoredPosition: {x: -0.00000011921, y: -0.00000095367}
+  m_SizeDelta: {x: 673.5792, y: 244.92233}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5808459
 MonoBehaviour:
@@ -2545,7 +2545,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 782149801}
   m_HandleRect: {fileID: 782149800}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -16995,8 +16995,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1531958713}
   m_HandleRect: {fileID: 1531958712}
   m_Direction: 2
-  m_Value: 1.0000032
-  m_Size: 0.9349216
+  m_Value: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -19020,84 +19020,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 535701310}
   m_CullTransparentMesh: 0
---- !u!1 &539065259
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 539065260}
-  - component: {fileID: 539065262}
-  - component: {fileID: 539065261}
-  m_Layer: 5
-  m_Name: Line2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &539065260
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 539065259}
-  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: 776755300}
-  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}
-  m_AnchoredPosition: {x: 3.3, y: 0}
-  m_SizeDelta: {x: 682.12756, y: 63.697815}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &539065261
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 539065259}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.5372549, g: 0.33333334, b: 0.23529413, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: da1eea3279d21de4185dc3ca8e28341e, type: 3}
-    m_FontSize: 40
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 48
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5FEB\u53BB\u63D0\u5347\u7ECF\u9A8C\u503C\u9886\u53D6\u7EA2\u5305\u5427"
---- !u!222 &539065262
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 539065259}
-  m_CullTransparentMesh: 0
 --- !u!1 &539830727
 GameObject:
   m_ObjectHideFlags: 0
@@ -26625,7 +26547,6 @@ RectTransform:
   m_Children:
   - {fileID: 2116582661}
   - {fileID: 5808458}
-  - {fileID: 539065260}
   - {fileID: 999794556}
   m_Father: {fileID: 1132365598}
   m_RootOrder: 1
@@ -32769,7 +32690,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 776755300}
-  m_RootOrder: 3
+  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}
@@ -37046,7 +36967,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Line1: {fileID: 5808459}
-  Line2: {fileID: 539065261}
 --- !u!1 &1135140078
 GameObject:
   m_ObjectHideFlags: 0
@@ -66934,7 +66854,7 @@ MonoBehaviour:
   RealAwards: {fileID: 3336770981114390305, guid: c8a7c6a15b5684cebbd1bbb8dec4d3b6,
     type: 3}
   rdp: {fileID: 1520725255}
-  nme: {fileID: 0}
+  nme: {fileID: 1132365601}
 --- !u!1 &2053463148
 GameObject:
   m_ObjectHideFlags: 0

Assets/Plugins/Android/LauncherManifest.xml.DISABLED

+<?xml version="1.0" encoding="utf-8"?>
+<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="preferExternal">
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true"/>
+
+    <application android:label="@string/app_name"
+                 android:icon="@mipmap/app_icon"/>
+</manifest>

Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta

+fileFormatVersion: 2
+guid: 33c2a9493430d2147b575dc4e10c5477
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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,6 +41,12 @@ 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
@@ -118,6 +124,7 @@ PlayerSettings:
   vulkanNumSwapchainBuffers: 3
   vulkanEnableSetSRGBWrite: 0
   vulkanEnableLateAcquireNextImage: 0
+  useSecurityBuild: 0
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -465,6 +472,7 @@ PlayerSettings:
       m_Kind: 4
       m_SubKind: App Store
   m_BuildTargetBatching: []
+  m_BuildTargetEncrypting: []
   m_BuildTargetGraphicsJobs:
   - m_BuildTarget: MacStandaloneSupport
     m_GraphicsJobs: 0