1
0

2 Commits 2fa4979c6f ... 6069d37163

Autor SHA1 Mensaje Fecha
  DESKTOP-5BUCSUT\LSR 6069d37163 Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo hace 1 año
  DESKTOP-5BUCSUT\LSR aa4ae60f87 主界面UI 移动端适配 hace 1 año
Se han modificado 22 ficheros con 912 adiciones y 134 borrados
  1. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Group 103 (1).png
  2. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Group 103.png
  3. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Group 354 (1).png
  4. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Group 354.png
  5. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_B.png
  6. 133 0
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_B.png.meta
  7. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Bpressed.png
  8. 133 0
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Bpressed.png.meta
  9. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_X.png
  10. 133 0
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_X.png.meta
  11. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Xpressed.png
  12. 133 0
      SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Xpressed.png.meta
  13. 173 61
      SFGgouhuo/Assets/Bundles/UI/Prefab/FaceBuildPanel.prefab
  14. 1 1
      SFGgouhuo/Assets/Bundles/UI/Prefab/GuidePanel.prefab
  15. 7 7
      SFGgouhuo/Assets/Bundles/UI/Prefab/LoadingPanel.prefab
  16. 164 8
      SFGgouhuo/Assets/Bundles/UI/Prefab/MainPanel.prefab
  17. 1 46
      SFGgouhuo/Assets/Bundles/UI/Prefab/MobilePanel.prefab
  18. 8 8
      SFGgouhuo/Assets/GameResources/Player/PlayerArmature.prefab
  19. 1 1
      SFGgouhuo/Assets/GameResources/Street/FX/VFXAssets/Billboard/Art/VFX/Materials/LogoHologram_Mat 1.mat
  20. 1 1
      SFGgouhuo/Assets/GameResources/Street/FX/VFXAssets/Billboard/Art/VFX/Materials/LogoHologram_Mat 5.mat
  21. 12 0
      SFGgouhuo/Assets/Scripts/UI/BagButtonChangeUI.cs
  22. 12 1
      SFGgouhuo/Assets/Scripts/UI/GuideButtonChangeUI.cs

BIN
SFGgouhuo/Assets/Bundles/UI/Image/Group 103 (1).png


BIN
SFGgouhuo/Assets/Bundles/UI/Image/Group 103.png


BIN
SFGgouhuo/Assets/Bundles/UI/Image/Group 354 (1).png


BIN
SFGgouhuo/Assets/Bundles/UI/Image/Group 354.png


BIN
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_B.png


+ 133 - 0
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_B.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 0fe95f7ec47106544897ffb3fdd4907e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 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
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: 

BIN
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Bpressed.png


+ 133 - 0
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Bpressed.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 6bda4a492668dd040a8185d7fc27bd1b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 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
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: 

BIN
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_X.png


+ 133 - 0
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_X.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 00f8e4ffac55f404d92d86c9cf57326a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 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
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: 

BIN
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Xpressed.png


+ 133 - 0
SFGgouhuo/Assets/Bundles/UI/Image/Subtract_Xpressed.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 334708726f359d24cbf4bef69f918e97
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  vTOnly: 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
+  cookieLightType: 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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: 

+ 173 - 61
SFGgouhuo/Assets/Bundles/UI/Prefab/FaceBuildPanel.prefab

@@ -355,12 +355,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1884760737939374884}
-  m_RootOrder: 8
+  m_Father: {fileID: 1906414570362236726}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -182, y: 33.00006}
+  m_AnchoredPosition: {x: -182, y: 33}
   m_SizeDelta: {x: 201, y: 22}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7252493622141756459
@@ -429,13 +429,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1121702884829849981}
-  m_Father: {fileID: 1884760737939374884}
-  m_RootOrder: 3
+  m_Father: {fileID: 2420158490878900721}
+  m_RootOrder: 1
   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: 436.04468, y: 0}
-  m_SizeDelta: {x: 872.0895, y: 1080}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 436.04468, y: -0.000061035156}
+  m_SizeDelta: {x: 872.0895, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &745395704475117869
 GameObject:
@@ -473,9 +473,9 @@ RectTransform:
   m_Father: {fileID: 3615483969983450466}
   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: 408.2, y: -67.6}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -15.799988, y: -67.6}
   m_SizeDelta: {x: 412, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1179904542601660722
@@ -579,14 +579,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1906414570362236726}
-  - {fileID: 4998572468752533411}
-  - {fileID: 3615483969983450466}
-  - {fileID: 220491130163044046}
-  - {fileID: 8410889040451008707}
-  - {fileID: 2003491014843838516}
-  - {fileID: 7964368224665045075}
-  - {fileID: 2003491015673721992}
-  - {fileID: 5813218891943551988}
   m_Father: {fileID: 6692127427494941510}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -723,6 +715,83 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &1100662996694438140
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2420158490878900721}
+  - component: {fileID: 1277223873166056163}
+  - component: {fileID: 7690512498763098120}
+  m_Layer: 5
+  m_Name: SecondPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2420158490878900721
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1100662996694438140}
+  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: 8173371429987243940}
+  - {fileID: 220491130163044046}
+  m_Father: {fileID: 1906414570362236726}
+  m_RootOrder: 0
+  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_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1277223873166056163
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1100662996694438140}
+  m_CullTransparentMesh: 1
+--- !u!114 &7690512498763098120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1100662996694438140}
+  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: 0}
+  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: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1308644336814360181
 GameObject:
   m_ObjectHideFlags: 0
@@ -993,13 +1062,19 @@ 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: 2420158490878900721}
+  - {fileID: 4998572468752533411}
+  - {fileID: 2003491014843838516}
+  - {fileID: 7964368224665045075}
+  - {fileID: 2003491015673721992}
+  - {fileID: 5813218891943551988}
   m_Father: {fileID: 1884760737939374884}
   m_RootOrder: 0
   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.000061035156}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7704134203760241393
@@ -1140,16 +1215,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2003491014843838517}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 1884760737939374884}
-  m_RootOrder: 5
+  m_Father: {fileID: 1906414570362236726}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -1133, y: 121.6}
+  m_AnchoredPosition: {x: -1133, y: 121.59994}
   m_SizeDelta: {x: 115, y: 39}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2003491014843838514
@@ -1216,17 +1291,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2003491015673721993}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 4998572469344544931}
-  m_Father: {fileID: 1884760737939374884}
-  m_RootOrder: 7
+  m_Father: {fileID: 1906414570362236726}
+  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: 759.9, y: 477.3}
+  m_AnchoredPosition: {x: 759.9, y: 477.29993}
   m_SizeDelta: {x: 228, y: 44}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2003491015673722005
@@ -1757,6 +1832,42 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2592103767591891021
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8173371429987243940}
+  m_Layer: 5
+  m_Name: right
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8173371429987243940
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2592103767591891021}
+  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: 3615483969983450466}
+  m_Father: {fileID: 2420158490878900721}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -518.5, y: 0}
+  m_SizeDelta: {x: 1037, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2621862234034967004
 GameObject:
   m_ObjectHideFlags: 0
@@ -3365,9 +3476,9 @@ RectTransform:
   m_Father: {fileID: 3615483969983450466}
   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: -10.6, y: 300.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -10.6, y: -129.5}
   m_SizeDelta: {x: 735.71, y: 47.944}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &982010693170706198
@@ -3464,16 +3575,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4998572468752533410}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 1884760737939374884}
+  m_Father: {fileID: 1906414570362236726}
   m_RootOrder: 1
   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: 10.2, y: -63.899994}
+  m_AnchoredPosition: {x: 0.000002861023, y: -55}
   m_SizeDelta: {x: 384, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4998572468752533409
@@ -3677,9 +3788,9 @@ RectTransform:
   m_Father: {fileID: 3615483969983450466}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 468.927, y: -202.84985}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 44.927002, y: -202.84985}
   m_SizeDelta: {x: 641.85, y: 51.700012}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &298408889244789166
@@ -3783,12 +3894,12 @@ RectTransform:
   - {fileID: 8493072602263507113}
   - {fileID: 2003491014726956654}
   - {fileID: 3089060151680507678}
-  m_Father: {fileID: 1884760737939374884}
-  m_RootOrder: 4
+  m_Father: {fileID: 3615483969983450466}
+  m_RootOrder: 5
   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: 337.10156, y: 161}
+  m_AnchoredPosition: {x: -9.8984375, y: 84.69}
   m_SizeDelta: {x: 537.6425, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1145578526327789010
@@ -4334,10 +4445,10 @@ RectTransform:
   m_Father: {fileID: 1121702884829849981}
   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: -151.9, y: 394.3}
-  m_SizeDelta: {x: 312, y: 27.6666}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 179.1, y: -35.700012}
+  m_SizeDelta: {x: 312, y: 27.666595}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2152406972729702082
 CanvasRenderer:
@@ -4372,7 +4483,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6617770877796975751}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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:
@@ -4384,10 +4495,10 @@ RectTransform:
   m_Father: {fileID: 220491130163044046}
   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: 99.8, y: -33.9}
-  m_SizeDelta: {x: 662, y: 860}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 99.79993, y: -33.899994}
+  m_SizeDelta: {x: -210, y: -220}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3774292698017295994
 CanvasRenderer:
@@ -4804,13 +4915,14 @@ RectTransform:
   - {fileID: 1082948758505576181}
   - {fileID: 3186518530852088656}
   - {fileID: 5068225904510556471}
-  m_Father: {fileID: 1884760737939374884}
-  m_RootOrder: 2
+  - {fileID: 8410889040451008707}
+  m_Father: {fileID: 8173371429987243940}
+  m_RootOrder: 0
   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: -613, y: 397}
-  m_SizeDelta: {x: 848, y: 860.69}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -95, y: -143.00006}
+  m_SizeDelta: {x: -188, y: -219.31}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7186194606203645173
 CanvasRenderer:
@@ -5090,7 +5202,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1884760737939374884}
+    m_TransformParent: {fileID: 1906414570362236726}
     m_Modifications:
     - target: {fileID: 1435332481416965747, guid: 863e1ebc08b38c349a82f38db225ed29, type: 3}
       propertyPath: m_Pivot.x
@@ -5102,7 +5214,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1435332481416965747, guid: 863e1ebc08b38c349a82f38db225ed29, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 1435332481416965747, guid: 863e1ebc08b38c349a82f38db225ed29, type: 3}
       propertyPath: m_AnchorMax.x
@@ -5158,11 +5270,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1435332481416965747, guid: 863e1ebc08b38c349a82f38db225ed29, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -149.40002
+      value: -183
       objectReference: {fileID: 0}
     - target: {fileID: 1435332481416965747, guid: 863e1ebc08b38c349a82f38db225ed29, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -57.899994
+      value: -62
       objectReference: {fileID: 0}
     - target: {fileID: 1435332481416965747, guid: 863e1ebc08b38c349a82f38db225ed29, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

+ 1 - 1
SFGgouhuo/Assets/Bundles/UI/Prefab/GuidePanel.prefab

@@ -107,7 +107,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &592131115250203524
 RectTransform:
   m_ObjectHideFlags: 0

+ 7 - 7
SFGgouhuo/Assets/Bundles/UI/Prefab/LoadingPanel.prefab

@@ -33,9 +33,9 @@ RectTransform:
   m_Father: {fileID: 6688034189427347977}
   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: 17, y: -472}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 197}
   m_SizeDelta: {x: 1472, y: 22}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1767289064986538683
@@ -198,10 +198,10 @@ RectTransform:
   m_Father: {fileID: 1767289064986538629}
   m_RootOrder: 0
   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: 1.0001, y: 10}
-  m_SizeDelta: {x: 1470, y: 22}
+  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_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1767289066465777940
 CanvasRenderer:

+ 164 - 8
SFGgouhuo/Assets/Bundles/UI/Prefab/MainPanel.prefab

@@ -31,7 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4354690881642419827}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -179,12 +179,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4354690879999297767}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 95, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
+  m_AnchoredPosition: {x: 101, y: 0}
+  m_SizeDelta: {x: 121.6339, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &519284696973459568
 CanvasRenderer:
@@ -432,9 +432,86 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   bagButtonBG: {fileID: 4222442129950492757}
   bagIcon: {fileID: 4354690881642419825}
+  bIcon: {fileID: 7718242080910587283}
   txt: {fileID: 519284696802346438}
   targetBG: {fileID: 21300000, guid: c196802f7a22f434f9032bba515f802e, type: 3}
   targetIcon: {fileID: 21300000, guid: fc719350b70145e4eb6b2eef6d8680d6, type: 3}
+  targetBIcon: {fileID: 21300000, guid: 6bda4a492668dd040a8185d7fc27bd1b, type: 3}
+--- !u!1 &2276573669201135224
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3444275461648686458}
+  - component: {fileID: 8606394608033302748}
+  - component: {fileID: 7718242080910587283}
+  m_Layer: 5
+  m_Name: keyIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3444275461648686458
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2276573669201135224}
+  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: 4354690881642419827}
+  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: 37.5, y: 0}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8606394608033302748
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2276573669201135224}
+  m_CullTransparentMesh: 1
+--- !u!114 &7718242080910587283
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2276573669201135224}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0fe95f7ec47106544897ffb3fdd4907e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4354690879999297766
 GameObject:
   m_ObjectHideFlags: 0
@@ -464,14 +541,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.0927376, y: 1.0833751, z: 1.07}
   m_Children:
+  - {fileID: 5170371930325533944}
   - {fileID: 519284696973459570}
   m_Father: {fileID: 7432498850408894912}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 59.999954, y: 31.9}
-  m_SizeDelta: {x: 73, y: 35}
+  m_AnchoredPosition: {x: 39.1, y: 31.9}
+  m_SizeDelta: {x: 34, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690879999297762
 CanvasRenderer:
@@ -718,14 +796,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.1, y: 1.1, z: 1.1}
   m_Children:
+  - {fileID: 3444275461648686458}
   - {fileID: 519284696802346433}
   m_Father: {fileID: 6106807205292587995}
   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: -63.8, y: -0.5}
-  m_SizeDelta: {x: 73, y: 34}
+  m_AnchoredPosition: {x: -83.2, y: -0.5}
+  m_SizeDelta: {x: 36, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690881642419822
 CanvasRenderer:
@@ -1154,6 +1233,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6827749963366611037
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5170371930325533944}
+  - component: {fileID: 2409569006487942045}
+  - component: {fileID: 8417213496366332657}
+  m_Layer: 5
+  m_Name: keyIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5170371930325533944
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6827749963366611037}
+  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: 4354690879999297767}
+  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: 37.8, y: 0}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2409569006487942045
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6827749963366611037}
+  m_CullTransparentMesh: 1
+--- !u!114 &8417213496366332657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6827749963366611037}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 00f8e4ffac55f404d92d86c9cf57326a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7088020249507789000
 GameObject:
   m_ObjectHideFlags: 0
@@ -1290,9 +1444,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   guideButtonBG: {fileID: 1994269475868283425}
   guideIcon: {fileID: 4354690879999297765}
+  xIcon: {fileID: 8417213496366332657}
   txt: {fileID: 519284696973459571}
   targetBG: {fileID: 21300000, guid: c196802f7a22f434f9032bba515f802e, type: 3}
   targetIcon: {fileID: 21300000, guid: 793348bac4c70984f8f96843d2288626, type: 3}
+  targetXIcon: {fileID: 21300000, guid: 334708726f359d24cbf4bef69f918e97, type: 3}
 --- !u!1 &7226887810994878605
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 46
SFGgouhuo/Assets/Bundles/UI/Prefab/MobilePanel.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1059468858373571839
 RectTransform:
   m_ObjectHideFlags: 0
@@ -365,7 +365,6 @@ GameObject:
   - component: {fileID: 7485056878461408215}
   - component: {fileID: 8401055926969279632}
   - component: {fileID: 4370902829883833182}
-  - component: {fileID: 6837939705119895871}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -430,50 +429,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &6837939705119895871
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2977502375751820131}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 2
-  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: 21300000, guid: 625cf718ac4c6384e804bb61bf2ce7b0, type: 3}
-    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: 4370902829883833182}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &4210501449431503650
 GameObject:
   m_ObjectHideFlags: 0

+ 8 - 8
SFGgouhuo/Assets/GameResources/Player/PlayerArmature.prefab

@@ -152,7 +152,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900362077118}
-  m_LocalRotation: {x: 0.60388345, y: 0.052703697, z: 0.007216293, w: 0.79529554}
+  m_LocalRotation: {x: 0.60415524, y: 0.05266596, z: 0.0071932767, w: 0.7950918}
   m_LocalPosition: {x: 0.000004911422, y: 0.3789641, z: 0.0000036811825}
   m_LocalScale: {x: 0.9999998, y: 1.0000001, z: 0.99999994}
   m_Children:
@@ -494,7 +494,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900721381661}
-  m_LocalRotation: {x: -0.00036877705, y: 0.10447107, z: 0.9938201, w: 0.03751314}
+  m_LocalRotation: {x: -0.00036283085, y: 0.10492116, z: 0.9937698, w: 0.03758894}
   m_LocalPosition: {x: -0.06875992, y: -0.042298637, z: 0.022966716}
   m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001}
   m_Children:
@@ -526,7 +526,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900724448093}
-  m_LocalRotation: {x: -0.00027048902, y: 0.10450131, z: 0.9938163, w: -0.03753149}
+  m_LocalRotation: {x: -0.00029462657, y: 0.104950555, z: 0.99376607, w: -0.037607193}
   m_LocalPosition: {x: 0.06875992, y: -0.042298645, z: 0.022966715}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001}
   m_Children:
@@ -1014,7 +1014,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900818529073}
-  m_LocalRotation: {x: 0.6039191, y: -0.05323138, z: -0.006862443, w: 0.7952366}
+  m_LocalRotation: {x: 0.6041903, y: -0.053208947, z: -0.0068296455, w: 0.79503226}
   m_LocalPosition: {x: -0.000004854202, y: 0.37896448, z: 0.0000036954875}
   m_LocalScale: {x: 0.99999976, y: 1, z: 0.9999999}
   m_Children:
@@ -1939,7 +1939,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901331142559}
-  m_LocalRotation: {x: -0.07665415, y: -0.0011562762, z: 0.012627128, w: 0.99697715}
+  m_LocalRotation: {x: -0.07744252, y: -0.0011561915, z: 0.012756723, w: 0.9969145}
   m_LocalPosition: {x: -0.000014133454, y: 0.28059646, z: -0.0000091815}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1.0000001}
   m_Children:
@@ -3705,7 +3705,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901885600985}
-  m_LocalRotation: {x: 0.0054267165, y: 0.007986142, z: -0.0059530814, w: 0.9999357}
+  m_LocalRotation: {x: 0.0054267617, y: 0.007986188, z: -0.00595316, w: 0.9999357}
   m_LocalPosition: {x: 0.000016171934, y: 0.18602999, z: -0.000017125609}
   m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
   m_Children:
@@ -4320,7 +4320,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902218368406}
   m_LocalRotation: {x: 0.6983415, y: 0.00000003342844, z: -0.00000003777715, w: 0.71576476}
-  m_LocalPosition: {x: 0, y: 0.0000076293945, z: -67.029106}
+  m_LocalPosition: {x: 0, y: 0.0000076293945, z: -67.695854}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8762427901970835926}
@@ -4412,7 +4412,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902295418926}
-  m_LocalRotation: {x: -0.07673297, y: 0.0011554016, z: -0.012640765, w: 0.99697095}
+  m_LocalRotation: {x: -0.07752047, y: 0.0011553231, z: -0.012770191, w: 0.9969083}
   m_LocalPosition: {x: 0.000014123917, y: 0.28059638, z: -0.000009194316}
   m_LocalScale: {x: 1, y: 0.9999998, z: 1.0000001}
   m_Children:

+ 1 - 1
SFGgouhuo/Assets/GameResources/Street/FX/VFXAssets/Billboard/Art/VFX/Materials/LogoHologram_Mat 1.mat

@@ -107,7 +107,7 @@ Material:
     m_Floats:
     - Vector1_31bf5f9759414b42b89dab8de92cb72b: 0
     - Vector1_9e6b166160454e0391447db18ada4ad6: 0
-    - _Alpha: 0
+    - _Alpha: 1
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1

+ 1 - 1
SFGgouhuo/Assets/GameResources/Street/FX/VFXAssets/Billboard/Art/VFX/Materials/LogoHologram_Mat 5.mat

@@ -107,7 +107,7 @@ Material:
     m_Floats:
     - Vector1_31bf5f9759414b42b89dab8de92cb72b: 0
     - Vector1_9e6b166160454e0391447db18ada4ad6: 0
-    - _Alpha: 1
+    - _Alpha: 0
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1

+ 12 - 0
SFGgouhuo/Assets/Scripts/UI/BagButtonChangeUI.cs

@@ -9,17 +9,27 @@ public class BagButtonChangeUI : MonoBehaviour,IPointerEnterHandler,IPointerExit
 {
     public Image bagButtonBG;
     public Image bagIcon;
+    public Image bIcon;
     public TextMeshProUGUI txt;
     public Sprite targetBG;
     public Sprite targetIcon;
+    public Sprite targetBIcon;
 
     private Sprite curBG;
     private Sprite curIcon;
+    private Sprite curBIcon;
 
     private void Awake()
     {
         curBG = bagButtonBG.sprite;
         curIcon = bagIcon.sprite;
+        curBIcon = bIcon.sprite;
+
+#if UNITY_STANDALONE_WIN
+#elif UNITY_ANDROID
+        bIcon.gameObject.SetActive(false);
+#elif UNITY_WEBGL
+#endif
     }
     public void OnPointerEnter(PointerEventData eventData)
     {
@@ -35,6 +45,7 @@ public class BagButtonChangeUI : MonoBehaviour,IPointerEnterHandler,IPointerExit
     {
         bagButtonBG.sprite = targetBG;
         bagIcon.sprite = targetIcon;
+        bIcon.sprite = targetBIcon;
         txt.color = Color.black;
     }
 
@@ -42,6 +53,7 @@ public class BagButtonChangeUI : MonoBehaviour,IPointerEnterHandler,IPointerExit
     {
         bagButtonBG.sprite = curBG;
         bagIcon.sprite = curIcon;
+        bIcon.sprite = curBIcon;
         txt.color = Color.white;
     }
 }

+ 12 - 1
SFGgouhuo/Assets/Scripts/UI/GuideButtonChangeUI.cs

@@ -7,17 +7,26 @@ public class GuideButtonChangeUI : MonoBehaviour, IPointerEnterHandler, IPointer
 {
     public Image guideButtonBG;
     public Image guideIcon;
+    public Image xIcon;
     public TextMeshProUGUI txt;
     public Sprite targetBG;
     public Sprite targetIcon;
+    public Sprite targetXIcon;
 
     private Sprite curBG;
     private Sprite curIcon;
-
+    private Sprite curXIcon;
     private void Awake()
     {
         curBG = guideButtonBG.sprite;
         curIcon = guideIcon.sprite;
+        curXIcon=xIcon.sprite;
+
+#if UNITY_STANDALONE_WIN
+#elif UNITY_ANDROID
+        xIcon.gameObject.SetActive(false);
+#elif UNITY_WEBGL
+#endif
     }
     public void OnPointerEnter(PointerEventData eventData)
     {
@@ -33,6 +42,7 @@ public class GuideButtonChangeUI : MonoBehaviour, IPointerEnterHandler, IPointer
     {
         guideButtonBG.sprite = targetBG;
         guideIcon.sprite = targetIcon;
+        xIcon.sprite = targetXIcon;
         txt.color = Color.black;
     }
 
@@ -40,6 +50,7 @@ public class GuideButtonChangeUI : MonoBehaviour, IPointerEnterHandler, IPointer
     {
         guideButtonBG.sprite = curBG;
         guideIcon.sprite = curIcon;
+        xIcon.sprite = curXIcon;
         txt.color = Color.white;
     }
 }