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

# Conflicts:
#	Assets/Game/Main/Scenes/CrazyCar.unity

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -2415,7 +2415,11 @@ MonoBehaviour:
   DriverTimerTV: {fileID: 242298058}
   DoubleTimerTV: {fileID: 1465665560}
   AllSpeedTimerTV: {fileID: 1077363537}
+<<<<<<< .merge_file_a09900
   proTimerTv: {fileID: 0}
+=======
+  proTimerTv: {fileID: 70009395}
+>>>>>>> .merge_file_a01424
   StickTimerObj: {fileID: 694002146}
   StickObj: {fileID: 1183343286}
   MyDriverTimerObj: {fileID: 1507646506}
@@ -2426,8 +2430,13 @@ MonoBehaviour:
   tvrewardCashEveryMinute: {fileID: 154543858}
   cashNumTv: {fileID: 0}
   levelTv: {fileID: 920415600}
+<<<<<<< .merge_file_a09900
   procetTimeObj: {fileID: 0}
   EveryDayWithDraw: {fileID: 0}
+=======
+  procetTimeObj: {fileID: 70009392}
+  EveryDayWithDraw: {fileID: 1309034794}
+>>>>>>> .merge_file_a01424
 --- !u!1 &107878020
 GameObject:
   m_ObjectHideFlags: 0
@@ -5220,6 +5229,7 @@ GameObject:
   - component: {fileID: 272387969}
   - component: {fileID: 272387971}
   - component: {fileID: 272387970}
+  - component: {fileID: 272387972}
   m_Layer: 0
   m_Name: close
   m_TagString: Untagged
@@ -5283,6 +5293,60 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 272387968}
   m_CullTransparentMesh: 0
+--- !u!114 &272387972
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 272387968}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 272387970}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1309034796}
+        m_MethodName: closeWithdrawalEveryDay
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &272825154
 GameObject:
   m_ObjectHideFlags: 0
@@ -8661,10 +8725,10 @@ RectTransform:
   m_Father: {fileID: 300181109}
   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: 93.36, y: -45.84}
-  m_SizeDelta: {x: 126.72, y: 31.68}
+  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!114 &409306806
 MonoBehaviour:
@@ -14936,6 +15000,7 @@ GameObject:
   - component: {fileID: 697030936}
   - component: {fileID: 697030938}
   - component: {fileID: 697030937}
+  - component: {fileID: 697030939}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -14999,6 +15064,60 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 697030935}
   m_CullTransparentMesh: 0
+--- !u!114 &697030939
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 697030935}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 697030937}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 105570272}
+        m_MethodName: onClickEveryDayWithDraw
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &698230380
 GameObject:
   m_ObjectHideFlags: 0
@@ -26692,7 +26811,11 @@ MonoBehaviour:
   btnSpriteArray:
   - {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3}
   - {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3}
+<<<<<<< .merge_file_a09900
   withdrawpage: {fileID: 0}
+=======
+  withdrawpage: {fileID: 1309034794}
+>>>>>>> .merge_file_a01424
 --- !u!1 &1316945478
 GameObject:
   m_ObjectHideFlags: 0
@@ -35843,10 +35966,10 @@ RectTransform:
   m_Father: {fileID: 300181109}
   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: 30, y: -97.04}
-  m_SizeDelta: {x: 0, y: 30.720001}
+  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!114 &1853878469
 MonoBehaviour: