Merge branch 'develop_mjb_cscmnq_1.0.6' of…

Merge branch 'develop_mjb_cscmnq_1.0.6' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.6

Merge branch 'develop_mjb_cscmnq_1.0.6' of…
Merge branch 'develop_mjb_cscmnq_1.0.6' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.6
8cee60e3 · zhangzhe · f7a4171a · 261610dc · f7a4171a · 8cee60e3
Commit 8cee60e3 authored Jun 22, 2021 by zhangzhe
12 changed files
--- a/Assets/Game/Main/Resource/Guide/手.png
+++ b/Assets/Game/Main/Resource/Guide/手.png
--- a/Assets/Game/Main/Resource/Guide/手指拷贝.png
+++ b/Assets/Game/Main/Resource/Guide/手指拷贝.png
--- a/Assets/Game/Main/Resource/ui/top/0.3元1.png.meta
+++ b/Assets/Game/Main/Resource/ui/top/0.3元1.png.meta
 fileFormatVersion: 2
-guid: f364fb4943be14474aa28348e03d64f9
+guid: ff8fe5f5113094fbbb0ef45fa9265048
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}

--- a/Assets/Game/Main/Resource/ui/top/0.3元1-2.png
+++ b/Assets/Game/Main/Resource/ui/top/0.3元1-2.png
--- a/Assets/Game/Main/Resource/ui/top/0.3元1-2.png.meta
+++ b/Assets/Game/Main/Resource/ui/top/0.3元1-2.png.meta
+fileFormatVersion: 2
+guid: c25ebcf8b870f495a9eb7034649ad372
+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: 
--- a/Assets/Game/Main/Resource/ui/top/0.3元1.png
+++ b/Assets/Game/Main/Resource/ui/top/0.3元1.png
--- a/Assets/Game/Main/Scenes/CrazyCar.unity
+++ b/Assets/Game/Main/Scenes/CrazyCar.unity
@@ -1619,6 +1619,80 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 49182874}
  m_CullTransparentMesh: 0
+--- !u!1 &50620018
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 50620019}
+  - component: {fileID: 50620021}
+  - component: {fileID: 50620020}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &50620019
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 50620018}
+  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: 699910950}
+  m_RootOrder: 0
+  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: -96, y: -533}
+  m_SizeDelta: {x: 98, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &50620020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 50620018}
+  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: ff8fe5f5113094fbbb0ef45fa9265048, 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!222 &50620021
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 50620018}
+  m_CullTransparentMesh: 0
 --- !u!1 &52321694
 GameObject:
  m_ObjectHideFlags: 0
@@ -7803,6 +7877,80 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  speed: 1
+--- !u!1 &261466075
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 261466076}
+  - component: {fileID: 261466078}
+  - component: {fileID: 261466077}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &261466076
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 261466075}
+  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: 415499552}
+  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: -90.8, y: 611.7}
+  m_SizeDelta: {x: 101, y: 57}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &261466077
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 261466075}
+  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: 3637d4651b3274e72bdf930189a2e455, 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!222 &261466078
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 261466075}
+  m_CullTransparentMesh: 0
 --- !u!1 &262268925
 GameObject:
  m_ObjectHideFlags: 0
@@ -8283,6 +8431,42 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &290488166
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 290488167}
+  m_Layer: 5
+  m_Name: Step5
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &290488167
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 290488166}
+  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:
+  - {fileID: 1618834231}
+  m_Father: {fileID: 970469213}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 415, y: 667}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &292040176
 GameObject:
  m_ObjectHideFlags: 0
@@ -11828,7 +12012,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 93, y: -340}
-  m_SizeDelta: {x: 112, y: 101}
+  m_SizeDelta: {x: 97, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &382383543
 MonoBehaviour:
@@ -13067,7 +13251,6 @@ GameObject:
  m_Component:
  - component: {fileID: 415499552}
  - component: {fileID: 415499554}
-  - component: {fileID: 415499553}
  m_Layer: 5
  m_Name: click4
  m_TagString: Untagged
@@ -13086,7 +13269,9 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 1348152036}
  - {fileID: 1689009340}
+  - {fileID: 261466076}
  - {fileID: 2035028203}
  - {fileID: 1785447892}
  m_Father: {fileID: 970469213}
@@ -13094,38 +13279,9 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -692}
-  m_SizeDelta: {x: 750, y: 2000}
+  m_AnchoredPosition: {x: 0, y: -670}
+  m_SizeDelta: {x: 750, y: 1334}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &415499553
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 415499551}
-  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: 2f04f5c9365c644cca676c0057c517bc, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &415499554
 CanvasRenderer:
  m_ObjectHideFlags: 0
@@ -14505,7 +14661,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 91, y: -347}
-  m_SizeDelta: {x: 112, y: 101}
+  m_SizeDelta: {x: 97, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &455875925
 MonoBehaviour:
@@ -22312,6 +22468,42 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &699910949
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 699910950}
+  m_Layer: 5
+  m_Name: Step6
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &699910950
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 699910949}
+  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:
+  - {fileID: 50620019}
+  m_Father: {fileID: 970469213}
+  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}
+  m_AnchoredPosition: {x: 0, y: 667}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &700544935
 GameObject:
  m_ObjectHideFlags: 0
@@ -30276,7 +30468,7 @@ GameObject:
  - component: {fileID: 970469211}
  - component: {fileID: 970469210}
  m_Layer: 5
-  m_Name: Canvas
+  m_Name: guide
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -30355,6 +30547,8 @@ RectTransform:
  m_Children:
  - {fileID: 415499552}
  - {fileID: 577554102}
+  - {fileID: 290488167}
+  - {fileID: 699910950}
  m_Father: {fileID: 0}
  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -41152,6 +41346,80 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1348152035
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1348152036}
+  - component: {fileID: 1348152038}
+  - component: {fileID: 1348152037}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1348152036
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348152035}
+  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: 415499552}
+  m_RootOrder: 0
+  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: 750, y: 3000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1348152037
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348152035}
+  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: 0, g: 0, b: 0, a: 0.6}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  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!222 &1348152038
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1348152035}
+  m_CullTransparentMesh: 0
 --- !u!1 &1351371391
 GameObject:
  m_ObjectHideFlags: 0
@@ -49942,6 +50210,80 @@ RectTransform:
    type: 3}
  m_PrefabInstance: {fileID: 1562048778}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1618834230
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1618834231}
+  - component: {fileID: 1618834233}
+  - component: {fileID: 1618834232}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1618834231
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1618834230}
+  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: 290488167}
+  m_RootOrder: 0
+  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: -96, y: -533}
+  m_SizeDelta: {x: 98, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1618834232
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1618834230}
+  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: ff8fe5f5113094fbbb0ef45fa9265048, 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!222 &1618834233
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1618834230}
+  m_CullTransparentMesh: 0
 --- !u!1 &1619064314
 GameObject:
  m_ObjectHideFlags: 0
@@ -52076,7 +52418,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1689009340
 RectTransform:
  m_ObjectHideFlags: 0
@@ -52089,7 +52431,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 415499552}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
@@ -52669,7 +53011,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
  m_AnchoredPosition: {x: 83, y: -347}
-  m_SizeDelta: {x: 112, y: 101}
+  m_SizeDelta: {x: 97, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1699807654
 MonoBehaviour:
@@ -55393,12 +55735,12 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 415499552}
-  m_RootOrder: 2
+  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}
-  m_AnchoredPosition: {x: 1.7, y: 522.2}
-  m_SizeDelta: {x: 725.2573, y: 148.32993}
+  m_AnchoredPosition: {x: -42.9, y: 547.4}
+  m_SizeDelta: {x: 196.79178, y: 198.7561}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1785447893
 MonoBehaviour:
@@ -55456,7 +55798,7 @@ MonoBehaviour:
        m_CallState: 2
      - m_Target: {fileID: 716226833}
        m_MethodName: clickWithDrawBg
-        m_Mode: 1
+        m_Mode: 3
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -58738,6 +59080,84 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1885306645}
  m_CullTransparentMesh: 0
+--- !u!1 &1890460380
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1890460381}
+  - component: {fileID: 1890460383}
+  - component: {fileID: 1890460382}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1890460381
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1890460380}
+  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: 1891798943}
+  m_RootOrder: 0
+  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: -1.38, y: 21.13}
+  m_SizeDelta: {x: 104.57158, y: 52.864067}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1890460382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1890460380}
+  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.98039216, g: 0.019607844, b: 0.2, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 66d2f797a9d094b3598e5816d772b676, type: 3}
+    m_FontSize: 15
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "2000\u5143"
+--- !u!222 &1890460383
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1890460380}
+  m_CullTransparentMesh: 0
 --- !u!1 &1891798942
 GameObject:
  m_ObjectHideFlags: 0
@@ -58767,7 +59187,8 @@ RectTransform:
  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_Children:
+  - {fileID: 1890460381}
  m_Father: {fileID: 5414249952764383350}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -58849,7 +59270,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f364fb4943be14474aa28348e03d64f9, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c25ebcf8b870f495a9eb7034649ad372, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -62061,7 +62482,13 @@ MonoBehaviour:
  Car4Obj: {fileID: 1741054207}
  flyBox: {fileID: 771430748}
  step4: {fileID: 415499551}
-  step5: {fileID: 577554101}
+  Step5: {fileID: 290488166}
+  Step6: {fileID: 0}
+  Step7: {fileID: 0}
+  Step8: {fileID: 0}
+  Step9: {fileID: 0}
+  Step10: {fileID: 0}
+  Step11: {fileID: 0}
 --- !u!1 &2020284656
 GameObject:
  m_ObjectHideFlags: 0
@@ -62503,11 +62930,11 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 415499552}
-  m_RootOrder: 1
+  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}
-  m_AnchoredPosition: {x: 308, y: 417}
+  m_AnchoredPosition: {x: -28, y: 525.3}
  m_SizeDelta: {x: 154, y: 138}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &2035028204
--- a/Assets/Game/Main/Scripts/Item/ExchangeItem.cs
+++ b/Assets/Game/Main/Scripts/Item/ExchangeItem.cs
@@ -27,17 +27,12 @@ public class ExchangeItem : MonoBehaviour
    public void clickDuihuan()
    {
        Debug.Log(""+ bean.id);
-        Dictionary<string, object> parm = new Dictionary<string, object>();
-        parm.Clear();
-        parm.Add("id", bean.id);
-        HttpTool.Instance._Post("app/v1/game/module/exchange/choose", parm, new Action<GoodsBean>((bean) =>
-        {
-            // setItemData(bean);
-           FindObjectOfType<DialogControl>().ShowRealAwardsWinDialog().SetUpSubviews(bean.goods.img,bean.goods.name,bean.no);
-
-        }), new Action<string, string>((code, errMsg) =>
+        if (bean.status==0)
        {
+            ToastPlugin.ToastHelper.ShowToast("余额不足");
+            return;
+        }
+        FindObjectOfType<DialogControl>().ShowRealAwardsWinDialog().SetUpSubviews(bean.img, bean.name, bean.id+"");
       
-        }));
    }
 }
--- a/Assets/Game/Main/Scripts/Item/PlantTreeItem.cs
+++ b/Assets/Game/Main/Scripts/Item/PlantTreeItem.cs
@@ -128,7 +128,7 @@ public class PlantTreeItem : MonoBehaviour
                //EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean);

                // 0.3元提现后, 直接弹出实物奖励页面
-                if (mData.id == 1&&mData.status==1)
+                if (mData.id == 1&&bean.status==1)
                {
                    FindObjectOfType<DialogControl>().closePlantTreeWithDrawDialog();

@@ -176,4 +176,5 @@ public class PlantTreeItem : MonoBehaviour
       
       
    }
+   
 }
--- a/Assets/Game/Main/Scripts/Utils/Guide.cs
+++ b/Assets/Game/Main/Scripts/Utils/Guide.cs
@@ -8,7 +8,8 @@ public class Guide : MonoBehaviour
    public GameObject Car4Parent,Car4Bottom;
    public GameObject Car4Obj;
    public GameObject flyBox;
-    public GameObject step4, step5;
+    public GameObject step4;
+    public GameObject Step5, Step6, Step7, Step8, Step9, Step10,Step11;
    private int carListNum;
    public static Guide guide;
    private bool isStartShow = false;
@@ -20,6 +21,12 @@ public class Guide : MonoBehaviour
    private string step3Key = "step3Key";
    private string step4Key = "step4Key";
    private string step5Key = "step5Key";
+    private string step6Key = "step6Key";
+    private string step7Key = "step7Key";
+    private string step8Key = "step8Key";
+    private string step9Key = "step9Key";
+    private string step10Key = "step10Key";
+    private string step11Key = "step11Key";
    // private string step6Key = "step6Key";


@@ -28,7 +35,7 @@ public class Guide : MonoBehaviour
        guide = this;
        isStartShow = false;

-        fitFrame();
+        //fitFrame();
    }

    // 判断是否是刘海屏
@@ -126,18 +133,18 @@ public class Guide : MonoBehaviour
        carListNum--;
        Debug.Log("点击第3步");
        DissmissGuide(false);
-        flyBox.SetActive(true);
-        PlayerDataControl.Instance.IsNewUser = false;
+       // flyBox.SetActive(true);
+        
        //新版本去掉第四和第五步
-        //if (PlayerPrefs.GetInt(step4Key, 0) == 0)
-        //{
-        //    if (PlayerDataControl.Instance.IsNewUser)
-        //    {
-        //        PlayerPrefs.SetInt(step4Key, 1);
-        //        step4.SetActive(true);
-        //        plantHand.SetActive(false);
-        //    }
-        //}
+        if (PlayerPrefs.GetInt(step4Key, 0) == 0)
+        {
+            if (PlayerDataControl.Instance.IsNewUser)
+            {
+                PlayerPrefs.SetInt(step4Key, 1);
+                step4.SetActive(true);
+                plantHand.SetActive(false);
+            }
+        }
        //if (PlayerPrefs.GetInt(step4Key, 0) == 0)
        //{
        //    if (PlayerDataControl.Instance.IsNewUser)
@@ -153,20 +160,17 @@ public class Guide : MonoBehaviour
    {
        Debug.Log("点击第4步");
        DissmissGuide(false);
+        PlayerDataControl.Instance.IsNewUser = false;
+        flyBox.SetActive(true);
        //Car4Obj.transform.parent = Car4Parent.transform;
        if (PlayerPrefs.GetInt(step5Key, 0) == 0)
-        {
-            if (PlayerDataControl.Instance.IsNewUser)
        {  
                PlayerPrefs.SetInt(step5Key, 1);
                Debug.Log("显示第5步");
-                step5.SetActive(true);
-                // ObjStep5.SetActive(true);
-                // hand_5.SetActive(true);
-            }
+                Step5.SetActive(true);
        }
        // step5.SetActive(true);
-        flyBox.SetActive(true);
+
        //if (PlayerDataControl.Instance.IsNewUser)
        //{
        //    ObjStep6.SetActive(true);
@@ -180,7 +184,13 @@ public class Guide : MonoBehaviour
    {
        Debug.Log("点击第5步");
        DissmissGuide(false);
-        EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
+        if (PlayerPrefs.GetInt(step6Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step6Key, 1);
+            Debug.Log("显示第6步");
+            Step6.SetActive(true);
+        }
+        //EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
        //ObjStep5.SetActive(false);
        //hand_5.SetActive(false);
        //if (PlayerPrefs.GetInt(step6Key, 0) == 0)
@@ -193,10 +203,19 @@ public class Guide : MonoBehaviour
        //    }
        //}

-        IsNewUser = false;
-        PlayerDataControl.Instance.IsNewUser = false;
+        //IsNewUser = false;
+        //PlayerDataControl.Instance.IsNewUser = false;
+    }
+    public void onClickStep6()
+    {
+        DissmissGuide(false);
+        if (PlayerPrefs.GetInt(step7Key, 0) == 0)
+        {
+            PlayerPrefs.SetInt(step7Key, 1);
+            Debug.Log("显示第7步");
+            Step7.SetActive(true);
+        }
    }
-
    //public void onClickStep6()
    //{
    //    Debug.Log("点击第6步");
@@ -247,7 +266,14 @@ public class Guide : MonoBehaviour
        ObjStep3.SetActive(false);
        //ObjStep4.SetActive(false);
        step4.SetActive(false);
-        step5.SetActive(false);
+       // step5.SetActive(false);
+        Step5.SetActive(false);
+        Step6.SetActive(false);
+        Step7.SetActive(false);
+        Step8.SetActive(false);
+        Step9.SetActive(false);
+        Step10.SetActive(false);
+        Step11.SetActive(false);
        //ObjStep5.SetActive(false);
        hand_1.SetActive(false);
        hand_2.SetActive(false);

--- a/Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
+++ b/Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
@@ -159,4 +159,21 @@ public class PlantTreeControl : MonoBehaviour
        getRecordLog();
      //  index = 3;
    }
+    //完成填写信息后
+    public void FinishWriteInfo(int id, Action<string> action)
+    {
+        Dictionary<string, object> parm = new Dictionary<string, object>();
+        parm.Clear();
+        parm.Add("id", id);
+        HttpTool.Instance._Post("app/v1/game/module/exchange/choose", parm, new Action<GoodsBean>((bean) =>
+        {
+            // setItemData(bean);
+            action(bean.no);
+
+        }), new Action<string, string>((code, errMsg) =>
+        {
+
+        }));
+    }
+   
 }
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -19,7 +19,7 @@
      "dependencies": {
        "com.unity.ugui": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.analytics": {
      "version": "3.3.5",
@@ -28,21 +28,21 @@
      "dependencies": {
        "com.unity.ugui": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.collab-proxy": {
      "version": "1.2.16",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ide.rider": {
      "version": "1.1.4",
@@ -51,14 +51,14 @@
      "dependencies": {
        "com.unity.test-framework": "1.1.1"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.ide.vscode": {
      "version": "1.2.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.multiplayer-hlapi": {
      "version": "1.0.8",
@@ -67,7 +67,7 @@
      "dependencies": {
        "nuget.mono-cecil": "0.1.6-preview"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.purchasing": {
      "version": "2.2.1",
@@ -76,7 +76,7 @@
      "dependencies": {
        "com.unity.ugui": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "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.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.textmeshpro": {
      "version": "2.1.1",
@@ -96,14 +96,14 @@
      "dependencies": {
        "com.unity.ugui": "1.0.0"
      },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.timeline": {
      "version": "1.2.17",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "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.com"
+      "url": "https://packages.unity.cn"
    },
    "nuget.mono-cecil": {
      "version": "0.1.6-preview",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
    },
    "com.unity.modules.ai": {
      "version": "1.0.0",