lzx 9 jam lalu
induk
melakukan
10bc82970f
26 mengubah file dengan 1019 tambahan dan 74 penghapusan
  1. 1 1
      Assets/Art/UIAssets/TextrueJson/bg.txt
  2. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  3. TEMPAT SAMPAH
      Assets/Art/UIAssets/bg/bg_gf_xingchendao.png
  4. 203 0
      Assets/Art/UIAssets/bg/bg_gf_xingchendao.png.meta
  5. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_gf_di_xingchendao.png
  6. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_glow.png
  7. 203 0
      Assets/Art/UIAssets/decorate/dec_glow.png.meta
  8. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_tiaozheng.png
  9. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_weixuanzhong.png
  10. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_xuanzhong.png
  11. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_yuanquan.png
  12. 203 0
      Assets/Art/UIAssets/decorate/dec_yuanquan.png.meta
  13. 139 49
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab
  14. 267 23
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  15. 2 0
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  16. 0 0
      Assets/StreamingAssets/assetConfig.txt
  17. 0 0
      UGUIPack/uguiconfig.db
  18. 1 1
      美术/unity_use_ui/TextrueJson/bg.txt
  19. 0 0
      美术/unity_use_ui/TextrueJson/tongyong.txt
  20. TEMPAT SAMPAH
      美术/unity_use_ui/bg/bg_gf_xingchendao.png
  21. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_gf_di_xingchendao.png
  22. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_glow.png
  23. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_tiaozheng.png
  24. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_weixuanzhong.png
  25. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_xuanzhong.png
  26. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_yuanquan.png

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gf_xingchendao","filePath":"/bg/bg_gf_xingchendao.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}

File diff ditekan karena terlalu besar
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


TEMPAT SAMPAH
Assets/Art/UIAssets/bg/bg_gf_xingchendao.png


+ 203 - 0
Assets/Art/UIAssets/bg/bg_gf_xingchendao.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XX0f4Cj/UXySKgccgrRFmx+zQqxG/7gE5uNSylEE9RwYKa05n7IauTkR6vVe
+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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  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: 

TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_gf_di_xingchendao.png


TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_glow.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_glow.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: C30evSykAikqu/WF65a/hVNYflAY9S4d4QAfpWZDlmF1pL4/65pNZZ/IGF70
+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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  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: 

TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_tiaozheng.png


TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_weixuanzhong.png


TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_xuanzhong.png


TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_yuanquan.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_yuanquan.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WnJNsyz4AS7IE/Ap8/mGBaZh4GMf9gIkNLwcXmQ/FW+Zjg1N3NajczQVl8Tp
+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: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  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: 

+ 139 - 49
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -437,7 +437,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 65, y: 66}
+  m_SizeDelta: {x: 62, y: 62}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8716127586724495292
 CanvasRenderer:
@@ -477,7 +477,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_huo
+  _icon_name: dec_tu2
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -525,7 +525,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: -183.19, y: 338}
+  m_AnchoredPosition: {x: -183.19, y: -300.70068}
   m_SizeDelta: {x: 257.0179, y: 56.6005}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5543201938969055767
@@ -1151,13 +1151,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5142448662693722814}
+  m_Father: {fileID: 6097780821610565768}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 315, y: -35.1352}
-  m_SizeDelta: {x: 100, y: 82.181}
-  m_Pivot: {x: 1, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000015258789, y: -0.0000009536743}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5014666907463259958
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1179,7 +1179,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9607844, g: 0.9333334, b: 0.8313726, a: 1}
+  m_Color: {r: 0.36078432, g: 0.34901962, b: 0.24313727, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1188,8 +1188,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 50
-    m_FontStyle: 0
+    m_FontSize: 24
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 50
@@ -1339,7 +1339,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: 140, y: -35.1352}
+  m_AnchoredPosition: {x: 75, y: -35.1352}
   m_SizeDelta: {x: 150, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4678360464258838821
@@ -1363,7 +1363,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9607844, g: 0.9333334, b: 0.8313726, a: 1}
+  m_Color: {r: 0.36862746, g: 0.3529412, b: 0.3137255, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1436,7 +1436,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: -2.4597, y: -371}
+  m_AnchoredPosition: {x: -2.4597, y: 17}
   m_SizeDelta: {x: 655.84, y: 542}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8956727549716453988
@@ -1460,7 +1460,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9058824, g: 0.86666673, b: 0.7803922, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1477,14 +1477,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_zhongdiban
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6472d9ebc06e87fe8abb79924cdc3be1
   imageH: 542
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1755,7 +1755,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  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
@@ -1772,14 +1772,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_diban
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6472d9ebc06e87fe8abb79924cdc3be1
   imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 0.09411766, g: 0.16862746, b: 0.18431373, a: 1}
@@ -2073,6 +2073,96 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &5830136030932177828
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6097780821610565768}
+  - component: {fileID: 1790579942042123380}
+  - component: {fileID: 4769478190559105595}
+  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 &6097780821610565768
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5830136030932177828}
+  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:
+  - {fileID: 1028954343504435061}
+  m_Father: {fileID: 8835694497297248325}
+  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.5914, y: -4.774}
+  m_SizeDelta: {x: 103.1827, y: 29.9798}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &1790579942042123380
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5830136030932177828}
+  m_CullTransparentMesh: 1
+--- !u!114 &4769478190559105595
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5830136030932177828}
+  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.454902, g: 0.7686275, b: 0.5882353, 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: 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
+  _icon_name: dec_juxing_fang_hujiao
+  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: 6472d9ebc06e87fe8abb79924cdc3be1
+  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 &5952158511686725727
 GameObject:
   m_ObjectHideFlags: 0
@@ -2437,16 +2527,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 868834413672771607}
   - {fileID: 8468219431132250151}
-  - {fileID: 1028954343504435061}
+  - {fileID: 868834413672771607}
   m_Father: {fileID: 1062516556747891371}
   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: -38.1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 14.299988, y: -8.5}
   m_SizeDelta: {x: 0, y: 70.2704}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7897920450247940872
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2616,6 +2705,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1804435891179900880}
+  - {fileID: 6097780821610565768}
   m_Father: {fileID: 7374263567999719867}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2644,7 +2734,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5803922, g: 0.68235296, b: 0.64705884, a: 1}
+  m_Color: {r: 0.34901962, g: 0.59607846, b: 0.454902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2805,7 +2895,7 @@ 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: 6.7, y: -39.4}
+  m_AnchoredPosition: {x: 6.7, y: -20.8}
   m_SizeDelta: {x: 0, y: 30.610802}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &102925623945446190
@@ -2894,8 +2984,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: 1.4193, y: 591}
-  m_SizeDelta: {x: 648.08, y: 379}
+  m_AnchoredPosition: {x: 1.4193, y: 599.22217}
+  m_SizeDelta: {x: 648.08, y: 362.5558}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8852455515981834155
 CanvasRenderer:
@@ -2918,7 +3008,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9058824, g: 0.86666673, b: 0.7803922, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2935,14 +3025,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_shangdiban
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6472d9ebc06e87fe8abb79924cdc3be1
   imageH: 379
   useGradient: 0
   topOrLeftColor: {r: 0.14901961, g: 0.26666668, b: 0.27058825, a: 1}
@@ -2984,7 +3074,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: -2.4597, y: 153.70065}
+  m_AnchoredPosition: {x: -2.4597, y: -485}
   m_SizeDelta: {x: 655.8428, y: 284.9714}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4415456503076877641
@@ -3008,7 +3098,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9058824, g: 0.86666673, b: 0.7803922, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3025,7 +3115,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_xiadiban
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

+ 267 - 23
Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -306,6 +306,95 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &220275034093796698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 50435170631078031}
+  - component: {fileID: 5388579598620886646}
+  - component: {fileID: 5398071594155269881}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &50435170631078031
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 220275034093796698}
+  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: 6694772361877173011}
+  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: 750, y: 741}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5388579598620886646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 220275034093796698}
+  m_CullTransparentMesh: 1
+--- !u!114 &5398071594155269881
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 220275034093796698}
+  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.82745105, g: 0.82745105, b: 0.7490196, 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: b70e2b27a4af6b6488a5ef29c0b8e8a6, 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
+  _icon_name: bg_gf_xingchendao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
+  bottomOrRightColor: {r: 0.5568628, g: 0.76470596, b: 0.74509805, a: 1}
+  direction: 0
 --- !u!1 &507132182724022166
 GameObject:
   m_ObjectHideFlags: 0
@@ -618,7 +707,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9921569, g: 0.9803922, b: 0.9607844, a: 1}
+  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
@@ -635,7 +724,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_xuanzhong
+  _icon_name: dec_weixuanzhong
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
@@ -672,7 +761,7 @@ MonoBehaviour:
     - Target: {fileID: 8374476484755925391}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.6431373, y: 0.70980394, z: 0.654902, w: 1}
+      - {x: 0.9411765, y: 0.9490196, z: 0.8784314, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -686,14 +775,14 @@ MonoBehaviour:
     - Target: {fileID: 8374476484755925391}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.8784314, y: 0.95686275, z: 0.89411765, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 857437492319237345}
   - {fileID: 8374476484755925391}
   AllComsStateTypes: 4002000080000000
-  CurrIndex: 1
+  CurrIndex: 0
 --- !u!114 &1911700382173267592
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2039,6 +2128,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &2792882705726486909
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3272393574512112453}
+  - component: {fileID: 749452282353296769}
+  - component: {fileID: 3155142313046984080}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3272393574512112453
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2792882705726486909}
+  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: 6694772361877173011}
+  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: 6, y: 481}
+  m_SizeDelta: {x: 470.3329, y: 470.3329}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &749452282353296769
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2792882705726486909}
+  m_CullTransparentMesh: 1
+--- !u!114 &3155142313046984080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2792882705726486909}
+  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.227451, g: 0.69411767, 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_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: 6472d9ebc06e87fe8abb79924cdc3be1
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
+  bottomOrRightColor: {r: 0.5568628, g: 0.76470596, b: 0.74509805, a: 1}
+  direction: 0
 --- !u!1 &2852344175065108756
 GameObject:
   m_ObjectHideFlags: 0
@@ -2070,6 +2248,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5473342035507285947}
+  - {fileID: 50435170631078031}
+  - {fileID: 3272393574512112453}
   - {fileID: 6870355629153732168}
   - {fileID: 6565763541845300463}
   - {fileID: 4487645842108660236}
@@ -2885,6 +3065,7 @@ GameObject:
   - component: {fileID: 8770117552995916788}
   - component: {fileID: 8438237142757567239}
   - component: {fileID: 1461499720874115526}
+  - component: {fileID: 7136091248352913582}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2933,7 +3114,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6431373, g: 0.70980394, b: 0.654902, a: 1}
+  m_Color: {r: 0.9411765, g: 0.9490196, b: 0.8784314, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2954,6 +3135,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8F85\u52A9"
+--- !u!114 &7136091248352913582
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891518416558775222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &3898641425973088963
 GameObject:
   m_ObjectHideFlags: 0
@@ -3880,7 +4076,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.82745105, g: 0.82745105, b: 0.7490196, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3897,14 +4093,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_diban
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6472d9ebc06e87fe8abb79924cdc3be1
   imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
@@ -4080,7 +4276,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: -3.7, y: 55.425095}
+  m_AnchoredPosition: {x: 0.000012159, y: 55.425095}
   m_SizeDelta: {x: 750, y: 110.8501}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3493563560025743580
@@ -4104,7 +4300,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19215688, g: 0.3647059, b: 0.38431376, a: 1}
+  m_Color: {r: 0.8941177, g: 0.8431373, b: 0.7254902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4145,6 +4341,7 @@ GameObject:
   - component: {fileID: 2509165199344505155}
   - component: {fileID: 4727156979047918535}
   - component: {fileID: 2704694145830204549}
+  - component: {fileID: 5048207027985940991}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4193,7 +4390,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.87843144, g: 0.9568628, b: 0.8941177, a: 1}
+  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
@@ -4214,6 +4411,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5168\u90E8"
+--- !u!114 &5048207027985940991
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5885840101328355703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &6601605642981940278
 GameObject:
   m_ObjectHideFlags: 0
@@ -4448,6 +4660,7 @@ GameObject:
   - component: {fileID: 4070278992186964066}
   - component: {fileID: 1896888060464675892}
   - component: {fileID: 5928119389132673519}
+  - component: {fileID: 7075714363060638667}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4496,7 +4709,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.57254905, g: 0.43529415, b: 0.19607845, a: 1}
+  m_Color: {r: 0.94117653, g: 0.9568628, b: 0.909804, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4504,7 +4717,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
     m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
@@ -4517,6 +4730,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8C03\u6574"
+--- !u!114 &7075714363060638667
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6835285763623382150}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.36078432, g: 0.53333336, b: 0.454902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &7181239539594388838
 GameObject:
   m_ObjectHideFlags: 0
@@ -4800,7 +5028,7 @@ MonoBehaviour:
     - Target: {fileID: 3891518416558775222}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.6431373, y: 0.70980394, z: 0.654902, w: 1}
+      - {x: 0.9411765, y: 0.9490196, z: 0.8784314, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -4814,7 +5042,7 @@ MonoBehaviour:
     - Target: {fileID: 3891518416558775222}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.8784314, y: 0.95686275, z: 0.89411765, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
@@ -4981,6 +5209,7 @@ GameObject:
   - component: {fileID: 1357601294388932923}
   - component: {fileID: 489359079058652538}
   - component: {fileID: 8197373045940010032}
+  - component: {fileID: 566360598316617976}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -5029,7 +5258,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8784314, g: 0.95686275, b: 0.89411765, a: 1}
+  m_Color: {r: 0.9411765, g: 0.9490196, b: 0.8784314, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -5050,6 +5279,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u52A8"
+--- !u!114 &566360598316617976
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8374476484755925391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &8428897132685908306
 GameObject:
   m_ObjectHideFlags: 0
@@ -5381,7 +5625,7 @@ MonoBehaviour:
     - Target: {fileID: 5885840101328355703}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.6431373, y: 0.70980394, z: 0.654902, w: 1}
+      - {x: 0.94117653, y: 0.9490197, z: 0.87843144, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -5395,7 +5639,7 @@ MonoBehaviour:
     - Target: {fileID: 5885840101328355703}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.87843144, y: 0.9568628, z: 0.8941177, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:

+ 2 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -47,6 +47,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 0ca05684ec26a624a9be95c43eaa0897, type: 3}
     - {fileID: 2800000, guid: 7a4d82b8d51add842a86c03efe809031, type: 3}
     - {fileID: 2800000, guid: 17b5819cad711404c975f429ddaacb35, type: 3}
+    - {fileID: 2800000, guid: 471869ab4e95d7148ae33f596ff58701, type: 3}
     - {fileID: 2800000, guid: ed5c755d642c4154ebee5e36e03b7842, type: 3}
     - {fileID: 2800000, guid: 6c45afd6bc7e1db429d58030b64f1609, type: 3}
     - {fileID: 2800000, guid: a3178eda8f1ba914b82935602d128450, type: 3}
@@ -109,6 +110,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
     - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
+    - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}
     - {fileID: 2800000, guid: 416044e3ca43d5d47adb73e0b3c82e5e, type: 3}

File diff ditekan karena terlalu besar
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


File diff ditekan karena terlalu besar
+ 0 - 0
UGUIPack/uguiconfig.db


+ 1 - 1
美术/unity_use_ui/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gf_xingchendao","filePath":"/bg/bg_gf_xingchendao.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}

File diff ditekan karena terlalu besar
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


TEMPAT SAMPAH
美术/unity_use_ui/bg/bg_gf_xingchendao.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_gf_di_xingchendao.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_glow.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_tiaozheng.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_weixuanzhong.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_xuanzhong.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_yuanquan.png


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini