ソースを参照

修改切换地图ui

lzx 1 日 前
コミット
366ea02063

BIN
Assets/Res/UI/LevelChoosePanel/8222cd423e0f95a409ab3a21db7f52eb.png


+ 203 - 0
Assets/Res/UI/LevelChoosePanel/8222cd423e0f95a409ab3a21db7f52eb.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: ByscvHykW3o/YAIIKnhHs9ShaFguL4O5DmbdlERwFZw1yXDDOSQrn82uFblR
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 657 - 100
Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_AnchoredPosition: {x: -0.000015258789, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9173684396724230179
@@ -133,8 +133,8 @@ 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: -11.5489, y: -344.4}
-  m_SizeDelta: {x: 451.1251, y: 34.2721}
+  m_AnchoredPosition: {x: -41.7, y: -384.1}
+  m_SizeDelta: {x: 451.1251, y: 45.875}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7336380052441854382
 CanvasRenderer:
@@ -157,7 +157,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.7019608, a: 0.85882354}
+  m_Color: {r: 0.6156863, g: 0.6862745, b: 0.6431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -223,8 +223,8 @@ 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: -93.8}
-  m_SizeDelta: {x: 298.803, y: 54.7022}
+  m_AnchoredPosition: {x: -20, y: -49.4}
+  m_SizeDelta: {x: 298.803, y: 106.2965}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &700079147170673296
 CanvasRenderer:
@@ -256,11 +256,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 44
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
-    m_MaxSize: 52
+    m_MaxSize: 300
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -319,7 +319,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 5, y: -8.4}
+  m_AnchoredPosition: {x: -5.200012, y: -14.399994}
   m_SizeDelta: {x: 163, y: 44}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &3548920735970161296
@@ -408,7 +408,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7274836141279032238
@@ -442,7 +442,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -491,8 +491,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: -0.8001003, y: 52.9}
-  m_SizeDelta: {x: 492.68, y: 33.1795}
+  m_AnchoredPosition: {x: 5.5839, y: 94.19008}
+  m_SizeDelta: {x: 531.6478, y: 36.3993}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5233347206102238726
 MonoBehaviour:
@@ -541,7 +541,7 @@ MonoBehaviour:
   m_MinValue: 0
   m_MaxValue: 1
   m_WholeNumbers: 0
-  m_Value: 0.354
+  m_Value: 1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -565,6 +565,95 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &3056255915321412976
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3405981342033330950}
+  - component: {fileID: 6419126460201600798}
+  - component: {fileID: 6928674705232068254}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3405981342033330950
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3056255915321412976}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6578784403621460593}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 29.2, y: 1.5}
+  m_SizeDelta: {x: 25, y: 26}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6419126460201600798
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3056255915321412976}
+  m_CullTransparentMesh: 1
+--- !u!114 &6928674705232068254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3056255915321412976}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.854902, g: 0.8588236, b: 0.86666673, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  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
+  _icon_name: dec_map_icon2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 7ceaf8c112ed81700d38e023cdd01c47
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3928254918750203810
 GameObject:
   m_ObjectHideFlags: 0
@@ -849,7 +938,7 @@ 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: -1.3, y: 111.24746}
+  m_AnchoredPosition: {x: -0.000012159, y: 159.7}
   m_SizeDelta: {x: 493.6785, y: 74.059}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1408737160681650111
@@ -955,7 +1044,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8858969093048269334
@@ -1009,6 +1098,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &5155747675084282624
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5091619205551799956}
+  - component: {fileID: 9150589898022879235}
+  - component: {fileID: 5389723256030474093}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5091619205551799956
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5155747675084282624}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7389830302287868273}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 63.5, y: 0}
+  m_SizeDelta: {x: 182, y: 182}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &9150589898022879235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5155747675084282624}
+  m_CullTransparentMesh: 1
+--- !u!114 &5389723256030474093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5155747675084282624}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.47058827, g: 0.654902, b: 0.8235295, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  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
+  _icon_name: dec_glow
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 20.902199
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5188785653245930354
 GameObject:
   m_ObjectHideFlags: 0
@@ -1068,7 +1246,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.45098042, g: 0.43921572, b: 0.38823533, a: 1}
+  m_Color: {r: 0.30588236, g: 0.26666668, b: 0.227451, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1146,7 +1324,7 @@ MonoBehaviour:
     m_Top: 1
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 4.17
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1223,7 +1401,7 @@ RectTransform:
   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: 1624}
+  m_SizeDelta: {x: 748, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1359551343155104095
 CanvasRenderer:
@@ -1246,14 +1424,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.6901961}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2ce0740c14f50c442b22a6e578a7726d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8a39f9817e4bb6048a00dd9dd1f76544, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1338,6 +1516,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3838201398444664671}
   - {fileID: 5996218483595023549}
   - {fileID: 3448986095428033778}
   - {fileID: 116889275732161449}
@@ -1347,13 +1526,12 @@ RectTransform:
   - {fileID: 7892632760807934045}
   - {fileID: 5693100649297059383}
   - {fileID: 6705522348014208234}
-  - {fileID: 6012375192494328535}
   m_Father: {fileID: 9037135992368401232}
   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: 534.6832, y: 750.1214}
+  m_AnchoredPosition: {x: -3.6557, y: 63.386597}
+  m_SizeDelta: {x: 605.781, y: 859.2291}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6624760465754027965
 CanvasRenderer:
@@ -1376,7 +1554,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_Color: {r: 0.30588236, g: 0.42352945, b: 0.37254903, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1393,7 +1571,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1406,6 +1584,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6774701749572014135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1857008029141030025}
+  - component: {fileID: 5411936683948853825}
+  - component: {fileID: 4291107290588238652}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Tongyong (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1857008029141030025
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774701749572014135}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3590038822651024970}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
+  m_SizeDelta: {x: 22, y: 20}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &5411936683948853825
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774701749572014135}
+  m_CullTransparentMesh: 1
+--- !u!114 &4291107290588238652
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774701749572014135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7725491, g: 0.7411765, b: 0.6745098, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  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
+  _icon_name: dec_map_suo
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 79efd91d4f98d1967eff87055daf4492
+  imageH: 53.2287
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7182261811213703053
 GameObject:
   m_ObjectHideFlags: 0
@@ -1441,7 +1708,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 267.3, y: -396.3}
+  m_AnchoredPosition: {x: 247.4, y: -459.5}
   m_SizeDelta: {x: 428.11, y: 220.5094}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6166222951810868570
@@ -1465,7 +1732,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.58431375, g: 0.58431375, b: 0.5764706, a: 1}
+  m_Color: {r: 0.34509805, g: 0.30980393, b: 0.26666668, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1474,7 +1741,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -1521,8 +1788,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 14.600006, y: 0}
+  m_SizeDelta: {x: -29.2, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5325227394525925118
 CanvasRenderer:
@@ -1545,7 +1812,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7019608, g: 0.654902, b: 0.5882353, a: 1}
+  m_Color: {r: 0.85098046, g: 0.854902, b: 0.86274517, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1554,18 +1821,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 32
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7B2C\u4E00\u7AE0.\u900D\u9065\u6E38"
+  m_Text: "\u5317\u6D77"
 --- !u!1 &7693130723521537062
 GameObject:
   m_ObjectHideFlags: 0
@@ -1600,9 +1867,98 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.43051147, y: 0.61389923}
+  m_SizeDelta: {x: -7.307, y: -4.6042}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7911065620788399886
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3838201398444664671}
+  - component: {fileID: 3556593206140447287}
+  - component: {fileID: 8322207378195391467}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3838201398444664671
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7911065620788399886}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4534880848114758260}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -21.075012, y: -19.227417}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3556593206140447287
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7911065620788399886}
+  m_CullTransparentMesh: 1
+--- !u!114 &8322207378195391467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7911065620788399886}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  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
+  _icon_name: dec_juxing
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 7ceaf8c112ed81700d38e023cdd01c47
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8125396639363880815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1641,8 +1997,8 @@ RectTransform:
   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: 2.3566, y: 56.176025}
-  m_SizeDelta: {x: 252.4655, y: 65.1254}
+  m_AnchoredPosition: {x: -0.6037, y: 83.04645}
+  m_SizeDelta: {x: 274.7817, y: 79.2438}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7414710902306389851
 CanvasRenderer:
@@ -1682,7 +2038,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1763,6 +2119,7 @@ GameObject:
   - component: {fileID: 7389830302287868273}
   - component: {fileID: 7908578725401352913}
   - component: {fileID: 890217472061856336}
+  - component: {fileID: 8847888511754474620}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Fill
@@ -1782,7 +2139,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 5091619205551799956}
   m_Father: {fileID: 6795561961694487067}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1811,7 +2169,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.68235296, g: 0.8078432, b: 0.8000001, a: 1}
+  m_Color: {r: 0.41176474, g: 0.5294118, b: 0.6313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1841,6 +2199,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8847888511754474620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8551123114888839117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &8572950913021192746
 GameObject:
   m_ObjectHideFlags: 0
@@ -1900,7 +2271,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.41960788, g: 0.40784317, b: 0.3529412, a: 1}
+  m_Color: {r: 0.3019608, g: 0.2627451, b: 0.22352943, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1989,7 +2360,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
+    m_FontSize: 18
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -2035,6 +2406,7 @@ RectTransform:
   - {fileID: 1390114855689535063}
   - {fileID: 5584341330677092523}
   - {fileID: 4534880848114758260}
+  - {fileID: 3590038822651024970}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2096,7 +2468,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: ShopBtnWidgetGame
-    gameObject: {fileID: 121537455608265632}
+    gameObject: {fileID: 8599672486795074892}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -2148,12 +2520,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3904336313667662518}
+  - {fileID: 3405981342033330950}
   m_Father: {fileID: 4534880848114758260}
   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: -174.8}
-  m_SizeDelta: {x: 404, y: 34}
+  m_AnchoredPosition: {x: 7.9892, y: -159.34589}
+  m_SizeDelta: {x: 168.9374, y: 46.5201}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1326854359071030663
 CanvasRenderer:
@@ -2176,7 +2549,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21960786, g: 0.27450982, b: 0.28235295, a: 1}
+  m_Color: {r: 0.42352945, g: 0.5529412, b: 0.5176471, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2193,7 +2566,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_jianbiandi1
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2241,8 +2614,8 @@ 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: 0}
-  m_SizeDelta: {x: 535, y: 276}
+  m_AnchoredPosition: {x: -1.3, y: -9.6137}
+  m_SizeDelta: {x: 582.93, y: 300.7258}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4246003462805992071
 CanvasRenderer:
@@ -2295,118 +2668,302 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1001 &940294652879713634
+--- !u!1001 &4506222564502478261
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 4534880848114758260}
+    m_TransformParent: {fileID: 9037135992368401232}
     m_Modifications:
-    - target: {fileID: 910660254783983298, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-      propertyPath: m_Name
-      value: ShopBtnWidgetGame
-      objectReference: {fileID: 0}
-    - target: {fileID: 910660254783983298, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1463050438306358852, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-      propertyPath: m_FontData.m_FontSize
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_Pivot.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_Pivot.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 98.7123
+      value: 160.5204
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 58.3894
+      value: 53.7076
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20.202423
+      value: 211.32388
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -227.78363
+      value: -589.4135
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: CurrIndex
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComs.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComs.Array.data[1]
+      value: 
+      objectReference: {fileID: 6774701749572014135}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComsStateTypes.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComsStateTypes.Array.data[1]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].Target
+      value: 
+      objectReference: {fileID: 6774701749572014135}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].Target
+      value: 
+      objectReference: {fileID: 6774701749572014135}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].x
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].y
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].z
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Datas.Array.data[0].x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].x
+      value: 0.9058824
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].y
+      value: 0.86666673
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].z
+      value: 0.7725491
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Datas.Array.data[0].x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -1.7727966
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -3.1649017
+      objectReference: {fileID: 0}
+    - target: {fileID: 4360649484400356509, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Text
+      value: "\u6982\u7387"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Name
+      value: Btn_GaiLvGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: isScriptControl
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8836760789256366128, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Color.b
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 8836760789256366128, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Color.g
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 8836760789256366128, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Color.r
+      value: 0.74509805
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
---- !u!1 &121537455608265632 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 910660254783983298, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-  m_PrefabInstance: {fileID: 940294652879713634}
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 1857008029141030025}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5795172039040046989}
+  m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+--- !u!114 &147899801984921896 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4360649484400356509, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &6012375192494328535 stripped
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &3590038822651024970 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-  m_PrefabInstance: {fileID: 940294652879713634}
+  m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8158165431304432478 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8599672486795074892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &8599672486795074892 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5795172039040046989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8599672486795074892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 147899801984921896}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: uiToggle
+    gameObject: {fileID: 8158165431304432478}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1

+ 2 - 2
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -62,7 +62,7 @@ namespace Fort23.Mono
             }
 
 
-            toggleList.GetChildObj();
+            // toggleList.GetChildObj();
             _shopBtnWidgets[0].OnPointerClick();
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
@@ -134,7 +134,7 @@ namespace Fort23.Mono
                 Text_Go.text = "前往";
             }
 
-            toggleList.ClickWidget(shopBtnWidget.uiToggle);
+            // toggleList.ClickWidget(shopBtnWidget.uiToggle);
 
             smallPlacesConfig = shopBtnWidget.SmallPlacesConfig;
             AccountFileInfo.SmallPlacesData smallPlacesData =

+ 40 - 1
Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidget.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -33,11 +34,49 @@ namespace Fort23.Mono
             this.ShopGroupConfig = shopGroupConfig;
             Text_Name.text = LanguageManager.Instance.Text(ShopGroupConfig.shopName);
         }
-        
+
         public void CustomInit(int smallPlacesId)
         {
             this.SmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesId);
             Text_Name.text = LanguageManager.Instance.Text(SmallPlacesConfig.placeName);
+
+            PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID - 1);
+            AccountFileInfo.SmallPlacesData lastSmallPlacesData =
+                PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID - 1);
+            SmallPlacesConfig lastSmallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(SmallPlacesConfig.ID - 1);
+            if (SmallPlacesConfig.ID > 1 && (lastSmallPlacesData == null ||
+                                             lastSmallPlacesData.completionEventCount <
+                                             lastSmallPlacesConfig.CompletionEventCount))
+            {
+                uiToggle.Hind();
+                // TipMessagePanel.OpenTipMessagePanel(
+                //     $"[{LanguageManager.Instance.Text(shopBtnWidget.SmallPlacesConfig.placeName)}]未解锁, 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁. ");
+
+                return;
+            }
+
+            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+            {
+                AccountFileInfo.EventList eventList =
+                    AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                        ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                if (eventList == null || !eventList.isCompleted)
+                {
+                    uiToggle.Hind();
+                    return;
+                }
+            }
+
+            AccountFileInfo.SmallPlacesData currentSmallPlacesData =
+                PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID);
+            if (currentSmallPlacesData == null)
+            {
+                uiToggle.Hind();
+                return;
+            }
+
+            uiToggle.Show();
         }
     }
 }